Rename mc::Checker to mc::Exploration as it defines an exploration algo

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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 6dead6e..8bf67d3 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,6 +7,7 @@
 #define SIMGRID_MC_MODEL_CHECKER_HPP
 
 #include "src/mc/remote/CheckerSide.hpp"
+#include "src/mc/remote/RemotePtr.hpp"
 #include "src/mc/sosp/PageStore.hpp"
 #include "xbt/base.h"
 #include "xbt/string.hpp"
@@ -26,10 +27,10 @@ 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, int aid, int times_considered);
+  std::string simcall_to_string(MessageType type, aid_t aid, int times_considered);
 
 public:
   ModelChecker(ModelChecker const&) = delete;
@@ -49,20 +50,17 @@ public:
   void shutdown();
   void resume();
   void wait_for_requests();
-  void handle_simcall(Transition const& transition);
 
-  /* Interactions with the simcall observer */
-  bool simcall_is_visible(int aid);
-  std::string simcall_to_string(int aid, int times_considered);
-  std::string simcall_dot_label(int 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();
+  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();
@@ -71,7 +69,6 @@ private:
 
 public:
   unsigned long visited_states = 0;
-  unsigned long executed_transitions = 0;
 };
 
 }