X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02f267e2895f3985fe73344a8b96ac05363b8b62..fb63e0dbde2bbf7fa0d2a42266a9fb3a627e7e35:/src/mc/mc_private.h

diff --git a/src/mc/mc_private.h b/src/mc/mc_private.h
index f6087c6678..c9ea7c2599 100644
--- a/src/mc/mc_private.h
+++ b/src/mc/mc_private.h
@@ -30,12 +30,12 @@
 #include "../xbt/mmalloc/mmprivate.h"
 #include "xbt/automaton.h"
 #include "xbt/hash.h"
-#include "msg/msg.h"
-#include "msg/datatypes.h"
+#include <simgrid/msg.h>
 #include "xbt/strbuff.h"
 #include "xbt/parmap.h"
 
 #include "mc_forward.h"
+#include "mc_protocol.h"
 
 SG_BEGIN_DECL()
 
@@ -48,7 +48,7 @@ typedef struct s_mc_function_index_item s_mc_function_index_item_t, *mc_function
  * @param pid     PID of the target process
  * @param socket  FD for the communication socket **in server mode** (or -1 otherwise)
  */
-void MC_init_pid(pid_t pid, int socket);
+void MC_init_model_checker(pid_t pid, int socket);
 
 extern FILE *dot_output;
 extern const char* colors[13];
@@ -57,11 +57,12 @@ extern xbt_parmap_t parmap;
 extern int user_max_depth_reached;
 
 int MC_deadlock_check(void);
-void MC_replay(xbt_fifo_t stack, int start);
-void MC_replay_liveness(xbt_fifo_t stack, int all_stack);
+void MC_replay(xbt_fifo_t stack);
+void MC_replay_liveness(xbt_fifo_t stack);
 void MC_show_deadlock(smx_simcall_t req);
 void MC_show_stack_safety(xbt_fifo_t stack);
 void MC_dump_stack_safety(xbt_fifo_t stack);
+void MC_show_non_termination(void);
 
 /** Stack (of `mc_state_t`) representing the current position of the
  *  the MC in the exploration graph
@@ -123,15 +124,6 @@ typedef struct s_local_variable{
   int region;
 }s_local_variable_t, *local_variable_t;
 
-/* *********** Sets *********** */
-
-typedef struct s_mc_address_set *mc_address_set_t;
-
-mc_address_set_t mc_address_set_new(void);
-void mc_address_set_free(mc_address_set_t* p);
-void mc_address_add(mc_address_set_t p, const void* value);
-bool mc_address_test(mc_address_set_t p, const void* value);
-
 /* *********** Hash *********** */
 
 /** \brief Hash the current state
@@ -141,15 +133,6 @@ bool mc_address_test(mc_address_set_t p, const void* value);
  * */
 uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks);
 
-/* *********** Snapshot *********** */
-
-#define MC_LOG_REQUEST(log, req, value) \
-  if (XBT_LOG_ISENABLED(log, xbt_log_priority_debug)) { \
-    char* req_str = MC_request_to_string(req, value); \
-    XBT_DEBUG("Execute: %s", req_str); \
-    xbt_free(req_str); \
-  }
-
 /** @brief Dump the stacks of the application processes
  *
  *   This functions is currently not used but it is quite convenient
@@ -159,6 +142,10 @@ uint64_t mc_hash_processes_state(int num_state, xbt_dynar_t stacks);
  */
 void MC_dump_stacks(FILE* file);
 
+void MC_report_assertion_error(void);
+
+void MC_invalidate_cache(void);
+
 SG_END_DECL()
 
 #endif