model-checker : separate informations for safety stateful/stateless and liveness...

[simgrid.git] / src / msg / global.c

diff --git a/src/msg/global.c b/src/msg/global.c
index 7df2150..2122c9e 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -80,7 +80,7 @@ void MSG_global_init(int *argc, char **argv)
 #endif
 
   XBT_DEBUG("ADD MSG LEVELS");
-  MSG_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
+  MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
 }
 
 /** \defgroup m_channel_management    Understanding channels
@@ -110,7 +110,7 @@ void MSG_global_init(int *argc, char **argv)
  */
 MSG_error_t MSG_set_channel_number(int number)
 {
-  xbt_assert0((msg_global)
+  xbt_assert((msg_global)
               && (msg_global->max_channel == 0),
               "Channel number already set!");
 
@@ -128,7 +128,7 @@ MSG_error_t MSG_set_channel_number(int number)
  */
 int MSG_get_channel_number(void)
 {
-  xbt_assert0((msg_global)
+  xbt_assert((msg_global)
               && (msg_global->max_channel != 0),
               "Channel number not set yet!");
 
@@ -153,6 +153,51 @@ MSG_error_t MSG_main(void)
   return MSG_OK;
 }
 
+MSG_error_t MSG_main_stateful(void)
+{
+  /* Clean IO before the run */
+  fflush(stdout);
+  fflush(stderr);
+
+  if (MC_IS_ENABLED) {
+    MC_modelcheck_stateful();
+  }
+  else {
+    SIMIX_run();
+  }
+  return MSG_OK;
+}
+
+MSG_error_t MSG_main_liveness_stateful(xbt_automaton_t a)
+{
+  /* Clean IO before the run */
+  fflush(stdout);
+  fflush(stderr);
+
+  if (MC_IS_ENABLED) {
+    MC_modelcheck_liveness_stateful(a);
+  }
+  else {
+    SIMIX_run();
+  }
+  return MSG_OK;
+}
+
+MSG_error_t MSG_main_liveness_stateless(xbt_automaton_t a)
+{
+  /* Clean IO before the run */
+  fflush(stdout);
+  fflush(stderr);
+
+  if (MC_IS_ENABLED) {
+    MC_modelcheck_liveness_stateless(a);
+  }
+  else {
+    SIMIX_run();
+  }
+  return MSG_OK;
+}
+
 /** \ingroup msg_simulation
  * \brief Kill all running process
 
@@ -185,9 +230,6 @@ MSG_error_t MSG_clean(void)
 
   MSG_process_killall(0);
 
-  free(msg_global);
-  msg_global = NULL;
-
   /* initialization of the action module */
   _MSG_action_exit();
 
@@ -197,6 +239,9 @@ MSG_error_t MSG_clean(void)
 
   SIMIX_clean();
 
+  free(msg_global);
+  msg_global = NULL;
+
   return MSG_OK;
 }