CommWaitTransition mailbox is now valid

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

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 2bf1cebb91a455e21913eb80fd9c564b0b51d3c8..daee1b954c8b7e5ab749445affa6d68a28d984cc 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"
@@ -29,7 +30,7 @@ class ModelChecker {
   Checker* checker_ = 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,12 +50,13 @@ public:
   void shutdown();
   void resume();
   void wait_for_requests();
-  void handle_simcall(Transition const& transition);
+
+  /** 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 */
-  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);
+  bool simcall_is_visible(aid_t aid);
+  std::string simcall_dot_label(aid_t aid, int times_considered);
 
   XBT_ATTRIB_NORETURN void exit(int status);
 
@@ -71,7 +73,6 @@ private:
 
 public:
   unsigned long visited_states = 0;
-  unsigned long executed_transitions = 0;
 };
 
 }