From 05257c8e62399d484d4971dfc4ca4a5a7564cf08 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Fri, 8 Apr 2016 12:01:27 +0200
Subject: [PATCH] [mc] Remove useless MC_MODE_CLIENT paths

---
 src/mc/mc_base.cpp    |  7 ++++---
 src/mc/mc_request.cpp |  2 ++
 src/mc/mc_smx.cpp     | 11 +++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 1417283c0f..4dcc139da8 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -153,16 +153,17 @@ bool request_is_enabled(smx_simcall_t req)
       mutex = &temp_mutex;
     }
 #endif
+
     if(mutex->owner == nullptr)
       return true;
-    else
 #if HAVE_MC
+    else if (mc_mode == MC_MODE_SERVER)
       // TODO, *(mutex->owner) :/
       return MC_smx_resolve_process(simgrid::mc::remote(mutex->owner))->pid ==
         MC_smx_resolve_process(simgrid::mc::remote(req->issuer))->pid;
-#else
-      return mutex->owner->pid == req->issuer->pid;
 #endif
+    else
+      return mutex->owner->pid == req->issuer->pid;
     }
 
   default:
diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp
index 679df52a2b..5d6656fd91 100644
--- a/src/mc/mc_request.cpp
+++ b/src/mc/mc_request.cpp
@@ -205,6 +205,8 @@ static char *buff_size_to_string(size_t buff_size)
 
 std::string simgrid::mc::request_to_string(smx_simcall_t req, int value, simgrid::mc::RequestType request_type)
 {
+  xbt_assert(mc_mode == MC_MODE_SERVER);
+
   bool use_remote_comm = true;
   switch(request_type) {
   case simgrid::mc::RequestType::simix:
diff --git a/src/mc/mc_smx.cpp b/src/mc/mc_smx.cpp
index 09981a5b46..9487799fe1 100644
--- a/src/mc/mc_smx.cpp
+++ b/src/mc/mc_smx.cpp
@@ -113,8 +113,7 @@ void Process::refresh_simix()
  */
 smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
 {
-  if (mc_mode == MC_MODE_CLIENT)
-    return req->issuer;
+  xbt_assert(mc_mode == MC_MODE_SERVER);
 
   // This is the address of the smx_process in the MCed process:
   auto address = simgrid::mc::remote(req->issuer);
@@ -133,10 +132,10 @@ smx_process_t MC_smx_simcall_get_issuer(s_smx_simcall_t const* req)
 smx_process_t MC_smx_resolve_process(
   simgrid::mc::RemotePtr<s_smx_process_t> process_remote_address)
 {
+  xbt_assert(mc_mode == MC_MODE_SERVER);
+
   if (!process_remote_address)
     return nullptr;
-  if (mc_mode == MC_MODE_CLIENT)
-    return process_remote_address.local();
 
   simgrid::mc::SimixProcessInformation* process_info =
     MC_smx_resolve_process_info(process_remote_address);
@@ -149,8 +148,8 @@ smx_process_t MC_smx_resolve_process(
 simgrid::mc::SimixProcessInformation* MC_smx_resolve_process_info(
   simgrid::mc::RemotePtr<s_smx_process_t> process_remote_address)
 {
-  if (mc_mode == MC_MODE_CLIENT)
-    xbt_die("No process_info for local process is not enabled.");
+  xbt_assert(mc_mode == MC_MODE_SERVER);
+
   for (auto& process_info : mc_model_checker->process().smx_process_infos)
     if (process_info.address == process_remote_address)
       return &process_info;
-- 
2.20.1