From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 7 Apr 2015 09:12:51 +0000 (+0200)
Subject: [mc] Cleanup safety initialisation code
X-Git-Tag: v3_12~732^2~68
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c3ac58f9e63770cca194ec50390ac8ccc8e499e8?ds=inline

[mc] Cleanup safety initialisation code
---

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index aa45d45555..53235a47d7 100644
--- 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 409acb5774..b70091d5f7 100644
--- 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 {