A few more sonar smells.

[simgrid.git] / src / mc / ModelChecker.hpp

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 486145a670682b54bf49f2262be31377f25533e3..8bf67d31d1187e42d60b8a926820152f0c6f2481 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -27,7 +27,7 @@ class ModelChecker {
   // This is the parent snapshot of the current state:
   PageStore page_store_{500};
   std::unique_ptr<RemoteProcess> remote_process_;
-  Checker* checker_ = nullptr;
+  Exploration* exploration_ = nullptr;
 
   // Expect MessageType::SIMCALL_TO_STRING or MessageType::SIMCALL_DOT_LABEL
   std::string simcall_to_string(MessageType type, aid_t aid, int times_considered);
@@ -50,22 +50,17 @@ public:
   void shutdown();
   void resume();
   void wait_for_requests();
-  RemotePtr<simgrid::kernel::actor::SimcallObserver> handle_simcall(Transition const& transition);
 
-  /* Interactions with the simcall observer */
-  bool simcall_is_visible(aid_t aid);
-  bool requests_are_dependent(RemotePtr<kernel::actor::SimcallObserver> obs1,
-                              RemotePtr<kernel::actor::SimcallObserver> obs2) const;
-  std::string simcall_to_string(aid_t aid, int times_considered);
-  std::string simcall_dot_label(aid_t aid, int times_considered);
+  /** Let the application take a transition. A new Transition is created iff the last parameter is true */
+  Transition* handle_simcall(aid_t aid, int times_considered, bool new_transition);
 
+  /* Interactions with the simcall observer */
   XBT_ATTRIB_NORETURN void exit(int status);
 
-  bool checkDeadlock();
   void finalize_app(bool terminate_asap = false);
 
-  Checker* getChecker() const { return checker_; }
-  void setChecker(Checker* checker) { checker_ = checker; }
+  Exploration* get_exploration() const { return exploration_; }
+  void set_exploration(Exploration* exploration) { exploration_ = exploration; }
 
 private:
   void setup_ignore();
@@ -74,7 +69,6 @@ private:
 
 public:
   unsigned long visited_states = 0;
-  unsigned long executed_transitions = 0;
 };
 
 }