Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / mc / checker / CommunicationDeterminismChecker.hpp

diff --git a/src/mc/checker/CommunicationDeterminismChecker.hpp b/src/mc/checker/CommunicationDeterminismChecker.hpp
index 6b85fb2..d185c90 100644 (file)
--- a/src/mc/checker/CommunicationDeterminismChecker.hpp
+++ b/src/mc/checker/CommunicationDeterminismChecker.hpp
@@ -9,9 +9,10 @@
 #include <string>
 #include <vector>
 
-#include "src/mc/mc_forward.hpp"
-#include "src/mc/checker/Checker.hpp"
 #include "src/mc/VisitedState.hpp"
+#include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_comm_pattern.h"
+#include "src/mc/mc_forward.hpp"
 
 #ifndef SIMGRID_MC_COMMUNICATION_DETERMINISM_CHECKER_HPP
 #define SIMGRID_MC_COMMUNICATION_DETERMINISM_CHECKER_HPP
@@ -23,12 +24,12 @@ class XBT_PRIVATE CommunicationDeterminismChecker : public Checker {
 public:
   CommunicationDeterminismChecker(Session& session);
   ~CommunicationDeterminismChecker();
-  int run() override;
+  void run() override;
   RecordTrace getRecordTrace() override;
   std::vector<std::string> getTextualTrace() override;
 private:
   void prepare();
-  int main();
+  void main();
   void logState() override;
   void deterministic_comm_pattern(int process, simgrid::mc::PatternCommunication* comm, int backtracking);
   void restoreState();
@@ -44,9 +45,9 @@ private:
   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;
 };