X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/00e79d1291f14583564ed0eba2d5e56ee30bf7d3..501b1d3f4293a4a3c27ad38fd74e995584799576:/src/mc/api/RemoteApp.hpp

diff --git a/src/mc/api/RemoteApp.hpp b/src/mc/api/RemoteApp.hpp
index f920da6f75..6954a985bf 100644
--- a/src/mc/api/RemoteApp.hpp
+++ b/src/mc/api/RemoteApp.hpp
@@ -7,8 +7,8 @@
 #define SIMGRID_MC_REMOTE_APP_HPP
 
 #include "simgrid/forward.h"
-#include "src/mc/ModelChecker.hpp"
 #include "src/mc/api/ActorState.hpp"
+#include "src/mc/remote/CheckerSide.hpp"
 #include "src/mc/remote/RemotePtr.hpp"
 
 #include <functional>
@@ -17,17 +17,19 @@ namespace simgrid::mc {
 
 /** High-level view of the verified application, from the model-checker POV
  *
- *  This is expected to become the interface used by model-checking
- *  algorithms to control the execution of the model-checked process
- *  and the exploration of the execution graph. Model-checking
- *  algorithms should be able to be written in high-level languages
- *  (e.g. Python) using bindings on this interface.
+ *  This is expected to become the interface used by model-checking algorithms to control the execution of
+ *  the application process during the exploration of the execution graph.
+ *
+ *  One day, this will allow parallel exploration, ie, the handling of several application processes (each encapsulated
+ * in a separate CheckerSide objects) that explore several parts of the exploration graph.
  */
 class XBT_PUBLIC RemoteApp {
 private:
-  std::unique_ptr<ModelChecker> model_checker_;
-  PageStore page_store_{500};
-  std::shared_ptr<simgrid::mc::Snapshot> initial_snapshot_;
+  std::unique_ptr<CheckerSide> checker_side_;
+  std::unique_ptr<CheckerSide> application_factory_; // when no meminfo, create checker_side_ by cloning this one
+  int master_socket_ = -1;
+
+  const std::vector<char*> app_args_;
 
   // No copy:
   RemoteApp(RemoteApp const&) = delete;
@@ -43,23 +45,23 @@ public:
    */
   explicit RemoteApp(const std::vector<char*>& args);
 
-  ~RemoteApp();
-
-  void restore_initial_state() const;
+  void restore_initial_state();
+  void wait_for_requests();
 
-  /** Ask to the application to check for a deadlock. If so, do an error message and throw a DeadlockError. */
+  /** Ask to the application to check for a deadlock. If so, do an error message and throw a McError(DEADLOCK). */
   void check_deadlock() const;
 
+  /** Ask the application to run post-mortem analysis, and maybe to stop ASAP */
+  void finalize_app(bool terminate_asap = false);
+
   /** Retrieve the max PID of the running actors */
   unsigned long get_maxpid() const;
 
   /* Get the list of actors that are ready to run at that step. Usually shorter than maxpid */
   void get_actors_status(std::map<aid_t, simgrid::mc::ActorState>& whereto) const;
 
-  /* Get the remote process */
-  RemoteProcess& get_remote_process() { return model_checker_->get_remote_process(); }
-
-  PageStore& get_page_store() { return page_store_; }
+  /** 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);
 };
 } // namespace simgrid::mc