Merge branch 'master' of github.com:mquinson/simgrid

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

diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index 0c2acf8..9500f33 100644 (file)
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -19,13 +19,9 @@
 
 using simgrid::mc::remote;
 
-extern "C" {
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
                                 "Logging specific to MC (request)");
 
-}
-
 static char *pointer_to_string(void *pointer);
 static char *buff_size_to_string(size_t size);
 
@@ -140,7 +136,7 @@ bool request_depend_asymmetric(smx_simcall_t r1, smx_simcall_t r2)
 // Those are MC_state_get_internal_request(state)
 bool request_depend(smx_simcall_t r1, smx_simcall_t r2)
 {
-  if (mc_reduce_kind == e_mc_reduce_none)
+  if (simgrid::mc::reduction_mode == simgrid::mc::ReductionMode::none)
     return true;
 
   if (r1->issuer == r2->issuer)
@@ -399,16 +395,6 @@ char *simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::
     break;
   }
 
-  case SIMCALL_MC_SNAPSHOT:
-    type = "MC_SNAPSHOT";
-    args = nullptr;
-    break;
-
-  case SIMCALL_MC_COMPARE_SNAPSHOTS:
-    type = "MC_COMPARE_SNAPSHOTS";
-    args = nullptr;
-    break;
-
   case SIMCALL_MC_RANDOM:
     type = "MC_RANDOM";
     args = bprintf("%d", value);
@@ -612,24 +598,6 @@ char *request_get_dot_output(smx_simcall_t req, int value)
       label = bprintf("[(%lu)] MC_RANDOM (%d)", issuer->pid, value);
     break;
 
-  case SIMCALL_MC_SNAPSHOT:
-    if (issuer->host)
-      label =
-          bprintf("[(%lu)%s] MC_SNAPSHOT", issuer->pid,
-                  MC_smx_process_get_host_name(issuer));
-    else
-      label = bprintf("[(%lu)] MC_SNAPSHOT", issuer->pid);
-    break;
-
-  case SIMCALL_MC_COMPARE_SNAPSHOTS:
-    if (issuer->host)
-      label =
-          bprintf("[(%lu)%s] MC_COMPARE_SNAPSHOTS", issuer->pid,
-                  MC_smx_process_get_host_name(issuer));
-    else
-      label = bprintf("[(%lu)] MC_COMPARE_SNAPSHOTS", issuer->pid);
-    break;
-
   default:
     THROW_UNIMPLEMENTED;
   }