[mc] s/value/req_num/ because 'value' does not convey any meaning

[simgrid.git] / src / mc / mc_global.cpp

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index ad03c3f..766665b 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -13,6 +13,10 @@
 
 #include <vector>
 
+#include <xbt/dynar.h>
+#include <xbt/automaton.h>
+#include <xbt/swag.h>
+
 #include "mc_base.h"
 
 #include "mc/mc.h"
@@ -111,6 +115,17 @@ void MC_run()
 namespace simgrid {
 namespace mc {
 
+void handle_simcall(smx_simcall_t req, int req_num)
+{
+  for (auto& pi : mc_model_checker->process().smx_process_infos)
+    if (req == &pi.copy.simcall) {
+      mc_model_checker->simcall_handle(
+        mc_model_checker->process(), pi.copy.pid, req_num);
+      return;
+    }
+  xbt_die("Could not find the request");
+}
+
 /**
  * \brief Re-executes from the state at position start all the transitions indicated by
  *        a given model-checker stack.
@@ -145,7 +160,7 @@ void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack)
     assert(n == xbt_dynar_length(initial_communications_pattern));
     for (unsigned j=0; j < n ; j++) {
       xbt_dynar_reset((xbt_dynar_t)xbt_dynar_get_as(incomplete_communications_pattern, j, xbt_dynar_t));
-      xbt_dynar_get_as(initial_communications_pattern, j, mc_list_comm_pattern_t)->index_comm = 0;
+      xbt_dynar_get_as(initial_communications_pattern, j, simgrid::mc::PatternCommunicationList*)->index_comm = 0;
     }
   }
 
@@ -156,8 +171,8 @@ void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack)
     if (state == stack.back())
       break;
 
-    int value;
-    smx_simcall_t saved_req = MC_state_get_executed_request(state.get(), &value);
+    int req_num = state->req_num;
+    smx_simcall_t saved_req = &state->executed_req;
     
     if (saved_req) {
       /* because we got a copy of the executed request, we have to fetch the  
@@ -167,22 +182,19 @@ void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack)
       smx_simcall_t req = &issuer->simcall;
 
       /* Debug information */
-      if (XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)) {
-        char* req_str = simgrid::mc::request_to_string(req, value, simgrid::mc::RequestType::simix);
-        XBT_DEBUG("Replay: %s (%p)", req_str, state.get());
-        xbt_free(req_str);
-      }
+      XBT_DEBUG("Replay: %s (%p)",
+        simgrid::mc::request_to_string(
+          req, req_num, simgrid::mc::RequestType::simix).c_str(),
+        state.get());
 
       /* TODO : handle test and testany simcalls */
       e_mc_call_type_t call = MC_CALL_TYPE_NONE;
       if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
         call = MC_get_call_type(req);
 
-      simgrid::mc::handle_simcall(req, value);
-
+      simgrid::mc::handle_simcall(req, req_num);
       if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
-        MC_handle_comm_pattern(call, req, value, nullptr, 1);
-
+        MC_handle_comm_pattern(call, req, req_num, nullptr, 1);
       mc_model_checker->wait_for_requests();
 
       count++;