[mc] Cleanup safety initialisation code

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index aa45d45..53235a4 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -294,6 +294,7 @@ void MC_do_the_modelcheck_for_real()
         XBT_INFO("Check non progressive cycles");
       else
         XBT_INFO("Check a safety property");
+      MC_wait_for_requests();
       MC_modelcheck_safety();
     }
     else {

diff --git a/src/mc/simgrid_mc.cpp b/src/mc/simgrid_mc.cpp
index 409acb5..b70091d 100644 (file)
--- a/src/mc/simgrid_mc.cpp
+++ b/src/mc/simgrid_mc.cpp
@@ -85,9 +85,7 @@ static int do_parent(int socket, pid_t child)
     else if (!_sg_mc_property_file || _sg_mc_property_file[0] == '\0') {
       if (mc_reduce_kind == e_mc_reduce_unset)
         mc_reduce_kind = e_mc_reduce_dpor;
-      XBT_INFO("Check a safety property");
-      MC_wait_for_requests();
-      MC_modelcheck_safety();
+      MC_do_the_modelcheck_for_real();
     }
 
     else {