From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 7 Apr 2016 09:40:05 +0000 (+0200)
Subject: [mc] Remove MC_state_get_executed_request()
X-Git-Tag: v3_13~134
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2ec9b2255f0b467409a521da2efcc79f43812b2e

[mc] Remove MC_state_get_executed_request()

It claims to get the executed request but actually does something else
at the same time.
---

diff --git a/src/mc/CommunicationDeterminismChecker.cpp b/src/mc/CommunicationDeterminismChecker.cpp
index 6b6a3314d0..174b7e0693 100644
--- a/src/mc/CommunicationDeterminismChecker.cpp
+++ b/src/mc/CommunicationDeterminismChecker.cpp
@@ -315,8 +315,8 @@ std::vector<std::string> CommunicationDeterminismChecker::getTextualTrace() // o
 {
   std::vector<std::string> trace;
   for (auto const& state : stack_) {
-    int value;
-    smx_simcall_t req = MC_state_get_executed_request(state.get(), &value);
+    int value = state->req_num;
+    smx_simcall_t req = &state->executed_req;
     if (req)
       trace.push_back(simgrid::mc::request_to_string(
         req, value, simgrid::mc::RequestType::executed));
diff --git a/src/mc/LivenessChecker.cpp b/src/mc/LivenessChecker.cpp
index 2837d43498..80cffd37e5 100644
--- a/src/mc/LivenessChecker.cpp
+++ b/src/mc/LivenessChecker.cpp
@@ -199,8 +199,8 @@ void LivenessChecker::replay()
 
     if (pair->exploration_started) {
 
-      int value;
-      smx_simcall_t saved_req = MC_state_get_executed_request(state.get(), &value);
+      int value = state->req_num;
+      smx_simcall_t saved_req = &state->executed_req;
 
       smx_simcall_t req = nullptr;
 
@@ -318,8 +318,8 @@ std::vector<std::string> LivenessChecker::getTextualTrace() // override
 {
   std::vector<std::string> trace;
   for (std::shared_ptr<Pair> const& pair : explorationStack_) {
-    int value;
-    smx_simcall_t req = MC_state_get_executed_request(pair->graph_state.get(), &value);
+    int value = pair->graph_state->req_num;
+    smx_simcall_t req = &pair->graph_state->executed_req;
     if (req && req->call != SIMCALL_NONE)
       trace.push_back(simgrid::mc::request_to_string(
         req, value, simgrid::mc::RequestType::executed));
diff --git a/src/mc/SafetyChecker.cpp b/src/mc/SafetyChecker.cpp
index 7cdceede70..831a061f77 100644
--- a/src/mc/SafetyChecker.cpp
+++ b/src/mc/SafetyChecker.cpp
@@ -76,8 +76,8 @@ std::vector<std::string> SafetyChecker::getTextualTrace() // override
 {
   std::vector<std::string> trace;
   for (auto const& state : stack_) {
-    int value;
-    smx_simcall_t req = MC_state_get_executed_request(state.get(), &value);
+    int value = state->req_num;
+    smx_simcall_t req = &state->executed_req;
     if (req)
       trace.push_back(simgrid::mc::request_to_string(
         req, value, simgrid::mc::RequestType::executed));
@@ -220,13 +220,14 @@ int SafetyChecker::backtrack()
             && simgrid::mc::request_depend(req, MC_state_get_internal_request(prev_state))) {
           if (XBT_LOG_ISENABLED(mc_safety, xbt_log_priority_debug)) {
             XBT_DEBUG("Dependent Transitions:");
-            int value;
-            smx_simcall_t prev_req = MC_state_get_executed_request(prev_state, &value);
+            int value = prev_state->req_num;
+            smx_simcall_t prev_req = &prev_state->executed_req;
             XBT_DEBUG("%s (state=%d)",
               simgrid::mc::request_to_string(
                 prev_req, value, simgrid::mc::RequestType::internal).c_str(),
               prev_state->num);
-            prev_req = MC_state_get_executed_request(state.get(), &value);
+            value = state->req_num;
+            prev_req = &state->executed_req;
             XBT_DEBUG("%s (state=%d)",
               simgrid::mc::request_to_string(
                 prev_req, value, simgrid::mc::RequestType::executed).c_str(),
diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 38609f9644..04b2773b47 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -160,8 +160,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 value = 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  
diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp
index 7a164f8b00..af22aa5ffb 100644
--- a/src/mc/mc_state.cpp
+++ b/src/mc/mc_state.cpp
@@ -68,12 +68,6 @@ RecordTraceElement State::getRecordElement() const
 }
 }
 
-smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value)
-{
-  *value = state->req_num;
-  return &state->executed_req;
-}
-
 smx_simcall_t MC_state_get_internal_request(simgrid::mc::State* state)
 {
   return &state->internal_req;
diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h
index c3d6190b5b..880098cefa 100644
--- a/src/mc/mc_state.h
+++ b/src/mc/mc_state.h
@@ -166,7 +166,6 @@ XBT_PRIVATE void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& st
 }
 
 XBT_PRIVATE simgrid::mc::State* MC_state_new(void);
-XBT_PRIVATE smx_simcall_t MC_state_get_executed_request(simgrid::mc::State* state, int *value);
 XBT_PRIVATE smx_simcall_t MC_state_get_internal_request(simgrid::mc::State* state);
 XBT_PRIVATE smx_simcall_t MC_state_get_request(simgrid::mc::State* state, int *value);