simcall_check_dependency() defined and implemented

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

diff --git a/src/mc/mc_api.hpp b/src/mc/mc_api.hpp
index fc4e15a44cf6bd0c5921d1d0445e6ed44c71b360..99b51f571e050e4aa08e4d01851f0a38da37592f 100644 (file)
--- a/src/mc/mc_api.hpp
+++ b/src/mc/mc_api.hpp
@@ -8,6 +8,8 @@
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_request.hpp"
 #include "src/mc/mc_state.hpp"
+#include "src/mc/mc_record.hpp"
+#include "xbt/automaton.hpp"
 #include "xbt/base.h"
 
 namespace simgrid {
@@ -25,6 +27,14 @@ class mc_api {
 private:
   mc_api() = default;
 
+  struct DerefAndCompareByActorsCountAndUsedHeap {
+    template <class X, class Y> bool operator()(X const& a, Y const& b) const
+    {
+      return std::make_pair(a->actors_count, a->heap_bytes_used) < std::make_pair(b->actors_count, b->heap_bytes_used);
+    }
+  };
+
+
 public:
   // No copy:
   mc_api(mc_api const&) = delete;
@@ -36,7 +46,7 @@ public:
     return mcapi;
   }
 
-  void initialize(char** argv);
+  void initialize(char** argv) const;
 
   // ACTOR APIs  
   std::vector<simgrid::mc::ActorInformation>& get_actors() const;
@@ -65,7 +75,6 @@ public:
   std::size_t get_remote_heap_bytes() const;
 
   // MODEL CHECKER APIs
-  ModelChecker* get_model_checker() const;
   void mc_inc_visited_states() const;
   void mc_inc_executed_trans() const;
   unsigned long mc_get_visited_states() const;
@@ -74,6 +83,7 @@ public:
   void mc_show_deadlock() const;
   bool mc_is_null() const;
   Checker* mc_get_checker() const;
+  void set_checker(Checker* const checker) const;
   RemoteSimulation& mc_get_remote_simulation() const;
   void handle_simcall(Transition const& transition) const;
   void mc_wait_for_requests() const;
@@ -83,11 +93,15 @@ public:
   smx_simcall_t mc_state_choose_request(simgrid::mc::State* state) const;
 
   // SIMCALL APIs
-  bool request_depend(smx_simcall_t req1, smx_simcall_t req2) const;
   std::string request_to_string(smx_simcall_t req, int value, RequestType request_type) const;
   std::string request_get_dot_output(smx_simcall_t req, int value) const;
   const char *simcall_get_name(simgrid::simix::Simcall kind) const;
   smx_actor_t simcall_get_issuer(s_smx_simcall const* req) const;
+  long simcall_get_actor_id(s_smx_simcall const* req) const;
+  smx_mailbox_t simcall_get_mbox(smx_simcall_t const req) const;
+  simgrid::kernel::activity::CommImpl* simcall_get_comm(smx_simcall_t const req) const;
+  bool simcall_check_dependency(smx_simcall_t const req1, smx_simcall_t const req2) const;
+
 #if HAVE_SMPI
   int get_smpi_request_tag(smx_simcall_t const& simcall, simgrid::simix::Simcall type) const;
 #endif
@@ -111,6 +125,22 @@ public:
   void automaton_load(const char *file) const;
   #endif
   std::vector<int> automaton_propositional_symbol_evaluate() const;
+  std::vector<xbt_automaton_state_t> get_automaton_state() const;
+  int compare_automaton_exp_label(const xbt_automaton_exp_label* l) const;
+  void set_property_automaton(xbt_automaton_state_t const& automaton_state) const;
+  inline DerefAndCompareByActorsCountAndUsedHeap compare_pair() const {
+    return DerefAndCompareByActorsCountAndUsedHeap();
+  }
+  inline int automaton_state_compare(const_xbt_automaton_state_t const& s1, const_xbt_automaton_state_t const& s2) const {
+    return xbt_automaton_state_compare(s1, s2);
+  }
+  xbt_automaton_exp_label_t get_automaton_transition_label(xbt_dynar_t const& dynar, int index) const;
+  xbt_automaton_state_t get_automaton_transition_dst(xbt_dynar_t const& dynar, int index) const;
+
+  // DYNAR APIs
+  inline unsigned long get_dynar_length(const_xbt_dynar_t const& dynar) const {
+    return xbt_dynar_length(dynar);
+  }
 };
 
 } // namespace mc