christoph/fail
1
Fork 0
Code Actions Packages Releases Activity

checksum-oostubs: not named CoolChecksum* anymore

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1041 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
hsc
2012-04-10 19:35:35 +00:00
parent df752dcece
commit e7c1118231
6 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/experiments/checksum-oostubs/CMakeLists.txt
View File

@ -1,5 +1,5 @@
set(EXPERIMENT_NAME checksum-oostubs) set(EXPERIMENT_NAME checksum-oostubs)
set(EXPERIMENT_TYPE CoolChecksumExperiment) # FIXME naming conflict set(EXPERIMENT_TYPE ChecksumOOStuBSExperiment)
configure_file(../instantiate-experiment.ah.in configure_file(../instantiate-experiment.ah.in
${CMAKE_CURRENT_BINARY_DIR}/instantiate-${EXPERIMENT_NAME}.ah @ONLY ${CMAKE_CURRENT_BINARY_DIR}/instantiate-${EXPERIMENT_NAME}.ah @ONLY
) )

4
core/experiments/checksum-oostubs/campaign.cc
View File

@ -65,9 +65,9 @@ const unsigned memoryMap[49][2] = {
bool CoolChecksumCampaign::run() bool ChecksumOOStuBSCampaign::run()
{ {
Logger log("CoolChecksumCampaign"); Logger log("ChecksumOOStuBS Campaign");
ifstream test(results_csv); ifstream test(results_csv);
if (test.is_open()) { if (test.is_open()) {

11
core/experiments/checksum-oostubs/campaign.hpp
View File

@ -1,18 +1,17 @@
#ifndef __COOLCAMPAIGN_HPP__ #ifndef __CHECKSUM_OOSTUBS_CAMPAIGN_HPP__
#define __COOLCAMPAIGN_HPP__ #define __CHECKSUM_OOSTUBS_CAMPAIGN_HPP__
#include "controller/Campaign.hpp" #include "controller/Campaign.hpp"
#include "controller/ExperimentData.hpp" #include "controller/ExperimentData.hpp"
#include "checksum-oostubs.pb.h" #include "checksum-oostubs.pb.h"
class CoolChecksumExperimentData : public fi::ExperimentData { class ChecksumOOStuBSExperimentData : public fi::ExperimentData {
public: public:
OOStuBSProtoMsg msg; OOStuBSProtoMsg msg;
CoolChecksumExperimentData() : fi::ExperimentData(&msg) {} ChecksumOOStuBSExperimentData() : fi::ExperimentData(&msg) {}
}; };
class ChecksumOOStuBSCampaign : public fi::Campaign {
class CoolChecksumCampaign : public fi::Campaign {
public: public:
virtual bool run(); virtual bool run();
}; };

5
core/experiments/checksum-oostubs/experiment.cc
View File

@ -15,12 +15,11 @@
// you need to have the tracing plugin enabled for this // you need to have the tracing plugin enabled for this
#include "plugins/tracing/TracingPlugin.hpp" #include "plugins/tracing/TracingPlugin.hpp"
#include "checksum-oostubs.pb.h"
#include "ecc_region.hpp" #include "ecc_region.hpp"
using std::endl; using std::endl;
bool CoolChecksumExperiment::run() bool ChecksumOOStuBSExperiment::run()
{ {
char const *statename = "checksum-oostubs.state"; char const *statename = "checksum-oostubs.state";
Logger log("Checksum-OOStuBS", false); Logger log("Checksum-OOStuBS", false);
@ -113,7 +112,7 @@ bool CoolChecksumExperiment::run()
// get an experiment parameter set // get an experiment parameter set
log << "asking job server for experiment parameters" << endl; log << "asking job server for experiment parameters" << endl;
CoolChecksumExperimentData param; ChecksumOOStuBSExperimentData param;
/* /*
if (!m_jc.getParam(param)) { if (!m_jc.getParam(param)) {
log << "Dying." << endl; log << "Dying." << endl;

8
core/experiments/checksum-oostubs/experiment.hpp
View File

@ -1,13 +1,13 @@
#ifndef __COOLEXPERIMENT_HPP__ #ifndef __CHECKSUM_OOSTUBS_EXPERIMENT_HPP__
#define __COOLEXPERIMENT_HPP__ #define __CHECKSUM_OOSTUBS_EXPERIMENT_HPP__
#include "controller/ExperimentFlow.hpp" #include "controller/ExperimentFlow.hpp"
#include "jobserver/JobClient.hpp" #include "jobserver/JobClient.hpp"
class CoolChecksumExperiment : public fi::ExperimentFlow { class ChecksumOOStuBSExperiment : public fi::ExperimentFlow {
fi::JobClient m_jc; fi::JobClient m_jc;
public: public:
CoolChecksumExperiment() : m_jc("ios.cs.tu-dortmund.de") {} ChecksumOOStuBSExperiment() : m_jc("ios.cs.tu-dortmund.de") {}
bool run(); bool run();
}; };

2
core/experiments/checksum-oostubs/main.cc
View File

@ -6,7 +6,7 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
CoolChecksumCampaign c; ChecksumOOStuBSCampaign c;
if (fi::campaignmanager.runCampaign(&c)) { if (fi::campaignmanager.runCampaign(&c)) {
return 0; return 0;
} else { } else {