Merge branch 'master' into 'master'

[simgrid.git] / src / mc / explo / Exploration.hpp

diff --git a/src/mc/explo/Exploration.hpp b/src/mc/explo/Exploration.hpp
index ee3c452f1c725eddc6d10f3d66f68c51096e047f..aa6d420245758e45e3bc06b7ff61928cbabcb0ea 100644 (file)
--- a/src/mc/explo/Exploration.hpp
+++ b/src/mc/explo/Exploration.hpp
@@ -29,13 +29,15 @@ namespace simgrid::mc {
 // abstract
 class Exploration : public xbt::Extendable<Exploration> {
   std::unique_ptr<RemoteApp> remote_app_;
+  static Exploration* instance_;
 
   FILE* dot_output_ = nullptr;
 
 public:
-  explicit Exploration(const std::vector<char*>& args);
+  explicit Exploration(const std::vector<char*>& args, bool need_memory_introspection);
   virtual ~Exploration();
 
+  static Exploration* get_instance() { return instance_; }
   // No copy:
   Exploration(Exploration const&) = delete;
   Exploration& operator=(Exploration const&) = delete;
@@ -44,12 +46,12 @@ public:
   virtual void run() = 0;
 
   /** Produce an error message indicating that the application crashed (status was produced by waitpid) */
-  void report_crash(int status);
+  XBT_ATTRIB_NORETURN void report_crash(int status);
   /** Produce an error message indicating that a property was violated */
-  void report_assertion_failure();
+  XBT_ATTRIB_NORETURN void report_assertion_failure();
 
   /** Kill the application and the model-checker (which exits with `status`)*/
-  XBT_ATTRIB_NORETURN void system_exit(int status);
+  XBT_ATTRIB_NORETURN void system_exit(int status) const;
 
   /* These methods are callbacks called by the model-checking engine
    * to get and display information about the current state of the