Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
cosmetics
authorMartin Quinson <martin.quinson@loria.fr>
Sun, 15 Jan 2017 20:51:20 +0000 (21:51 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Sun, 15 Jan 2017 20:51:20 +0000 (21:51 +0100)
src/mc/checker/CommunicationDeterminismChecker.cpp
src/mc/checker/CommunicationDeterminismChecker.hpp
src/surf/HostImpl.hpp

index 03a2f4f..ec9ff9e 100644 (file)
@@ -307,10 +307,7 @@ CommunicationDeterminismChecker::CommunicationDeterminismChecker(Session& sessio
 
 }
 
 
 }
 
-CommunicationDeterminismChecker::~CommunicationDeterminismChecker()
-{
-
-}
+CommunicationDeterminismChecker::~CommunicationDeterminismChecker() = default;
 
 RecordTrace CommunicationDeterminismChecker::getRecordTrace() // override
 {
 
 RecordTrace CommunicationDeterminismChecker::getRecordTrace() // override
 {
@@ -361,20 +358,18 @@ void CommunicationDeterminismChecker::logState() // override
 
 void CommunicationDeterminismChecker::prepare()
 {
 
 void CommunicationDeterminismChecker::prepare()
 {
-
-  int i;
   const int maxpid = MC_smx_get_maxpid();
 
   // Create initial_communications_pattern elements:
   initial_communications_pattern = simgrid::xbt::newDeleteDynar<simgrid::mc::PatternCommunicationList*>();
   const int maxpid = MC_smx_get_maxpid();
 
   // Create initial_communications_pattern elements:
   initial_communications_pattern = simgrid::xbt::newDeleteDynar<simgrid::mc::PatternCommunicationList*>();
-  for (i=0; i < maxpid; i++){
+  for (int i = 0; i < maxpid; i++) {
     simgrid::mc::PatternCommunicationList* process_list_pattern = new simgrid::mc::PatternCommunicationList();
     xbt_dynar_insert_at(initial_communications_pattern, i, &process_list_pattern);
   }
 
   // Create incomplete_communications_pattern elements:
   incomplete_communications_pattern = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
     simgrid::mc::PatternCommunicationList* process_list_pattern = new simgrid::mc::PatternCommunicationList();
     xbt_dynar_insert_at(initial_communications_pattern, i, &process_list_pattern);
   }
 
   // Create incomplete_communications_pattern elements:
   incomplete_communications_pattern = xbt_dynar_new(sizeof(xbt_dynar_t), xbt_dynar_free_voidp);
-  for (i=0; i < maxpid; i++){
+  for (int i = 0; i < maxpid; i++) {
     xbt_dynar_t process_pattern = xbt_dynar_new(sizeof(simgrid::mc::PatternCommunication*), nullptr);
     xbt_dynar_insert_at(incomplete_communications_pattern, i, &process_pattern);
   }
     xbt_dynar_t process_pattern = xbt_dynar_new(sizeof(simgrid::mc::PatternCommunication*), nullptr);
     xbt_dynar_insert_at(incomplete_communications_pattern, i, &process_pattern);
   }
@@ -597,12 +592,6 @@ void CommunicationDeterminismChecker::run()
 
   this->prepare();
 
 
   this->prepare();
 
-  this->initial_communications_pattern_done = 0;
-  this->recv_deterministic = 1;
-  this->send_deterministic = 1;
-  this->recv_diff = nullptr;
-  this->send_diff = nullptr;
-
   this->main();
 }
 
   this->main();
 }
 
index a901732..88b1fdb 100644 (file)
@@ -44,9 +44,9 @@ private:
   simgrid::mc::VisitedStates visitedStates_;
   unsigned long expandedStatesCount_ = 0;
 
   simgrid::mc::VisitedStates visitedStates_;
   unsigned long expandedStatesCount_ = 0;
 
-  int initial_communications_pattern_done = 0;
-  int recv_deterministic = 0;
-  int send_deterministic = 0;
+  bool initial_communications_pattern_done = false;
+  bool recv_deterministic                  = true;
+  bool send_deterministic                  = true;
   char *send_diff = nullptr;
   char *recv_diff = nullptr;
 };
   char *send_diff = nullptr;
   char *recv_diff = nullptr;
 };
index 13c19a9..1bc9ff9 100644 (file)
@@ -63,7 +63,7 @@ public:
 class HostImpl : public simgrid::surf::PropertyHolder {
 
 public:
 class HostImpl : public simgrid::surf::PropertyHolder {
 
 public:
-  HostImpl(s4u::Host* host);
+  explicit HostImpl(s4u::Host* host);
   virtual ~HostImpl();
 
 public:
   virtual ~HostImpl();
 
 public: