Namespaces unified (sal+fi -> fail), Code cleanups (-> coding-style.txt), Doxygen-comments fixed.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1319 8c4709b5-6ec9-48aa-a5cd-a96041d1645a

core/experiments/MHTestCampaign/MHTestCampaign.cc

@@ -1,21 +1,21 @@
-#include "MHTestCampaign.hpp"
-#include <controller/CampaignManager.hpp>
 #include <iostream>
 
-using namespace fi;
+#include "MHTestCampaign.hpp"
+#include <controller/CampaignManager.hpp>
 
+using namespace std;
+using namespace fail;
 
 bool MHTestCampaign::run()
 {
-	
 	MHExperimentData* datas[m_parameter_count];
 	cout << "[MHTestCampaign] Adding " << m_parameter_count << " values." << endl;
-	for(int i = 1; i <= m_parameter_count; i++){
-	  datas[i] = new MHExperimentData;
-	  datas[i]->msg.set_input(i);
-	  
-	  campaignmanager.addParam(datas[i]);
-	  usleep(100 * 1000); // 100 ms
+	for (int i = 1; i <= m_parameter_count; i++) {
+		datas[i] = new MHExperimentData;
+		datas[i]->msg.set_input(i);
+
+		campaignmanager.addParam(datas[i]);
+		usleep(100 * 1000); // 100 ms
 	}
 	campaignmanager.noMoreParameters();
 	// test results.
@@ -23,8 +23,8 @@ bool MHTestCampaign::run()
 	int res = 0;
 	int res2 = 0; 
 	MHExperimentData * exp;
-	for(int i = 1; i <= m_parameter_count; i++){
-		exp = static_cast<MHExperimentData*>( campaignmanager.getDone() );
+	for (int i = 1; i <= m_parameter_count; i++) {
+		exp = static_cast<MHExperimentData*>(campaignmanager.getDone());
 		f = exp->msg.output();
 //		cout << ">>>>>>>>>>>>>>> Output: " << i << "^2 = " <<  f  << endl;
 		res += f;
@@ -33,7 +33,7 @@ bool MHTestCampaign::run()
 	}
 	if (res == res2) {
 		cout << "TEST SUCCESSFUL FINISHED! " << "[" << res << "==" << res2 << "]" << endl;
-	}else{
+	} else {
 		cout << "TEST FAILED!" << " [" << res << "!=" << res2 << "]" << endl;
 	}
 	cout << "thats all... " << endl;

core/experiments/MHTestCampaign/MHTestCampaign.hpp

@@ -1,27 +1,23 @@
-#ifndef __TESTCAMPAIGN_HPP__
-#define __TESTCAMPAIGN_HPP__
-  
- 
+#ifndef __MH_TEST_CAMPAIGN_HPP__
+  #define __MH_TEST_CAMPAIGN_HPP__
+
 #include <controller/Campaign.hpp>
 #include "controller/ExperimentData.hpp"
 #include <experiments/MHTestCampaign/MHTest.pb.h>
 
-using namespace fi;
-
-class MHExperimentData : public ExperimentData {
-  public:
-    MHTestData msg;
-  public:
-    MHExperimentData() : ExperimentData(&msg){  };
+class MHExperimentData : public fail::ExperimentData {
+public:
+	MHTestData msg;
+	MHExperimentData() : fail::ExperimentData(&msg) { }
 };
 
 
-class MHTestCampaign : public Campaign {
-    int m_parameter_count; 
-  public:
-    MHTestCampaign(int parametercount) : m_parameter_count(parametercount){};
-    virtual bool run();
+class MHTestCampaign : public fail::Campaign {
+private:
+	int m_parameter_count; 
+public:
+	MHTestCampaign(int parametercount) : m_parameter_count(parametercount) { }
+	bool run();
 };
 
-  
-#endif 
+#endif // __MH_TEST_CAMPAIGN_HPP__

core/experiments/MHTestCampaign/experiment.cc

@@ -1,32 +1,35 @@
+#include <iostream>
+
 #include "experiment.hpp"
 #include "MHTestCampaign.hpp"
 #include "SAL/SALInst.hpp"
 #include "SAL/Register.hpp"
 #include "controller/Event.hpp"
 
-#include <iostream>
+// FIXME: You should provide a dependency check here!
+
+using namespace std;
+using namespace fail;
 
 bool MHTestExperiment::run()
 {
-	
 	cout << "[MHTestExperiment] Let's go" << endl;
 #if 0
-	fi::BPSingleEvent mainbp(0x00003c34);
-	sal::simulator.addEventAndWait(&mainbp);
+	BPSingleEvent mainbp(0x00003c34);
+	simulator.addEventAndWait(&mainbp);
 	cout << "[MHTestExperiment] breakpoint reached, saving" << endl;
-	sal::simulator.save("hello.main");
+	simulator.save("hello.main");
 #else
 	MHExperimentData par;
-	if(m_jc.getParam(par)){
-
+	if (m_jc.getParam(par)) {
 		int num = par.msg.input();
 		cout << "[MHExperiment] stepping " << num << " instructions" << endl;
 		if (num > 0) {
-			fi::BPSingleEvent nextbp(fi::ANY_ADDR);
+			BPSingleEvent nextbp(ANY_ADDR);
 			nextbp.setCounter(num);
-			sal::simulator.addEventAndWait(&nextbp);
+			simulator.addEventAndWait(&nextbp);
 		}
-		sal::address_t instr = sal::simulator.getRegisterManager().getInstructionPointer();
+		address_t instr = simulator.getRegisterManager().getInstructionPointer();
 		cout << "[MHTestExperiment] Reached instruction: "
 		<< hex << instr
 		<< endl;
@@ -36,8 +39,8 @@ bool MHTestExperiment::run()
 		cout << "No data for me? :(" << endl;
 	}
 #endif
-	sal::simulator.clearEvents(this);
-	sal::simulator.terminate();
+	simulator.clearEvents(this);
+
+	simulator.terminate();
 	return true;
 }
-

core/experiments/MHTestCampaign/experiment.hpp

@@ -1,17 +1,17 @@
-#ifndef __TESTEXPERIMENT_HPP__
-#define __TESTEXPERIMENT_HPP__
+#ifndef __MH_TEST_EXPERIMENT_HPP__
+  #define __MH_TEST_EXPERIMENT_HPP__
   
 #include "controller/ExperimentFlow.hpp"
 #include "jobserver/JobClient.hpp"
 
-class MHTestExperiment : public fi::ExperimentFlow {
-  fi::JobClient m_jc;
-  public: 
-    MHTestExperiment(){};
-    ~MHTestExperiment(){};
-    bool run();
+class MHTestExperiment : public fail::ExperimentFlow {
+private:
+	fail::JobClient m_jc;
+public: 
+	MHTestExperiment() { }
+	~MHTestExperiment() { }
+
+	bool run();
 };
 
-  
-  
-#endif 
+#endif // __MH_TEST_EXPERIMENT_HPP__

core/experiments/MHTestCampaign/mhcampaign.cc

@@ -1,25 +1,24 @@
-#include "controller/CampaignManager.hpp"
-#include "experiments/MHTestCampaign/MHTestCampaign.hpp"
 #include <iostream>
 #include <cstdlib>
 
+#include "controller/CampaignManager.hpp"
+#include "experiments/MHTestCampaign/MHTestCampaign.hpp"
+
 using namespace std;
 
-int main(int argc, char**argv){
+int main(int argc, char**argv)
+{
+	int paramcount = 0;
+	if (argc == 2)
+		paramcount = atoi(argv[1]);
+	else
+		paramcount = 10;
+	cout << "Running MHTestCampaign [" << paramcount <<  " parameter sets]" << endl;
 
-  int paramcount = 0;
-  if(argc == 2){
-    paramcount = atoi(argv[1]);
-  }else{
-    paramcount = 10;
-  }
-  cout << "Running MHTestCampaign [" << paramcount <<  " parameter sets]" << endl;
- 
-  MHTestCampaign mhc(paramcount);
-  campaignmanager.runCampaign(&mhc);
- 
-  cout << "Campaign complete." << endl;
-  
-  return 0;
-  
+	MHTestCampaign mhc(paramcount);
+	campaignmanager.runCampaign(&mhc);
+
+	cout << "Campaign complete." << endl;
+
+	return 0;
 }