From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 13 Apr 2016 10:04:26 +0000 (+0200)
Subject: [mc] Remove useless model-checker/model-checked round trip
X-Git-Tag: v3_13~97^2~15
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b5e771f630cc0d48cbf5da8afb43f971cfaa36b1

[mc] Remove useless model-checker/model-checked round trip
---

diff --git a/src/mc/Client.cpp b/src/mc/Client.cpp
index 9fc8688739..c05696f5d1 100644
--- a/src/mc/Client.cpp
+++ b/src/mc/Client.cpp
@@ -156,10 +156,10 @@ void Client::handleMessages()
 void Client::mainLoop(void)
 {
   while (1) {
+    simgrid::mc::wait_for_requests();
     if (channel_.send(MC_MESSAGE_WAITING))
       xbt_die("Could not send WAITING mesage to model-checker");
     this->handleMessages();
-    simgrid::mc::wait_for_requests();
   }
 }
 
diff --git a/src/mc/CommunicationDeterminismChecker.cpp b/src/mc/CommunicationDeterminismChecker.cpp
index 2c09269583..2b20a33cf5 100644
--- a/src/mc/CommunicationDeterminismChecker.cpp
+++ b/src/mc/CommunicationDeterminismChecker.cpp
@@ -351,9 +351,6 @@ void CommunicationDeterminismChecker::prepare()
 
   XBT_DEBUG("********* Start communication determinism verification *********");
 
-  /* Wait for requests (schedules processes) */
-  mc_model_checker->wait_for_requests();
-
   /* Get an enabled process and insert it in the interleave set of the initial state */
   for (auto& p : mc_model_checker->process().simix_processes())
     if (simgrid::mc::process_is_enabled(&p.copy))
diff --git a/src/mc/LivenessChecker.cpp b/src/mc/LivenessChecker.cpp
index 2ea5b2285b..e33db3a191 100644
--- a/src/mc/LivenessChecker.cpp
+++ b/src/mc/LivenessChecker.cpp
@@ -158,7 +158,6 @@ void LivenessChecker::removeAcceptancePair(int pair_num)
 
 void LivenessChecker::prepare(void)
 {
-  mc_model_checker->wait_for_requests();
   initial_global_state->snapshot = simgrid::mc::take_snapshot(0);
   initial_global_state->prev_pair = 0;
 
diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp
index 698b546327..d565169835 100644
--- a/src/mc/SafetyChecker.cpp
+++ b/src/mc/SafetyChecker.cpp
@@ -295,9 +295,6 @@ void SafetyChecker::init()
   XBT_DEBUG("**************************************************");
   XBT_DEBUG("Initial state");
 
-  /* Wait for requests (schedules processes) */
-  mc_model_checker->wait_for_requests();
-
   /* Get an enabled process and insert it in the interleave set of the initial state */
   for (auto& p : mc_model_checker->process().simix_processes())
     if (simgrid::mc::process_is_enabled(&p.copy)) {