From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Thu, 7 Apr 2016 11:23:02 +0000 (+0200)
Subject: [mc] s/value/req_num/ because 'value' does not convey any meaning
X-Git-Tag: v3_13~130
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3c2446f1bc61391940ec704c471bed424a948b2e

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

diff --git a/src/mc/LivenessChecker.cpp b/src/mc/LivenessChecker.cpp
index 61cf565b16..f84e892e75 100644
--- a/src/mc/LivenessChecker.cpp
+++ b/src/mc/LivenessChecker.cpp
@@ -199,7 +199,7 @@ void LivenessChecker::replay()
 
     if (pair->exploration_started) {
 
-      int value = state->req_num;
+      int req_num = state->req_num;
       smx_simcall_t saved_req = &state->executed_req;
 
       smx_simcall_t req = nullptr;
@@ -214,11 +214,11 @@ void LivenessChecker::replay()
         XBT_DEBUG("Replay (depth = %d) : %s (%p)",
           depth,
           simgrid::mc::request_to_string(
-            req, value, simgrid::mc::RequestType::simix).c_str(),
+            req, req_num, simgrid::mc::RequestType::simix).c_str(),
           state.get());
       }
 
-      simgrid::mc::handle_simcall(req, value);
+      simgrid::mc::handle_simcall(req, req_num);
       mc_model_checker->wait_for_requests();
     }
 
@@ -318,11 +318,11 @@ std::vector<std::string> LivenessChecker::getTextualTrace() // override
 {
   std::vector<std::string> trace;
   for (std::shared_ptr<Pair> const& pair : explorationStack_) {
-    int value = pair->graph_state->req_num;
+    int req_num = 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));
+        req, req_num, simgrid::mc::RequestType::executed));
   }
   return trace;
 }
diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index a37b9471eb..516b0ff0ce 100644
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -35,7 +35,7 @@ XBT_PRIVATE void wait_for_requests(void);
 XBT_PRIVATE extern std::vector<double> processes_time;
 
 /** Execute a given simcall */
-XBT_PRIVATE void handle_simcall(smx_simcall_t req, int value);
+XBT_PRIVATE void handle_simcall(smx_simcall_t req, int req_num);
 
 /** Check if the given simcall is visible
  *
diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 0f882a25cf..766665b9cf 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -115,12 +115,12 @@ void MC_run()
 namespace simgrid {
 namespace mc {
 
-void handle_simcall(smx_simcall_t req, int value)
+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, value);
+        mc_model_checker->process(), pi.copy.pid, req_num);
       return;
     }
   xbt_die("Could not find the request");
@@ -171,7 +171,7 @@ void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack)
     if (state == stack.back())
       break;
 
-    int value = state->req_num;
+    int req_num = state->req_num;
     smx_simcall_t saved_req = &state->executed_req;
     
     if (saved_req) {
@@ -184,7 +184,7 @@ void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack)
       /* Debug information */
       XBT_DEBUG("Replay: %s (%p)",
         simgrid::mc::request_to_string(
-          req, value, simgrid::mc::RequestType::simix).c_str(),
+          req, req_num, simgrid::mc::RequestType::simix).c_str(),
         state.get());
 
       /* TODO : handle test and testany simcalls */
@@ -192,9 +192,9 @@ void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack)
       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++;