X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..c26fdbfb69cff48549d5a522eb7d6b84c9c669db:/src/mc/remote/Client.cpp

diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp
index 291d359a97..ffbbfae6ab 100644
--- a/src/mc/remote/Client.cpp
+++ b/src/mc/remote/Client.cpp
@@ -1,30 +1,19 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include "src/mc/remote/Client.hpp"
+#include "src/internal_config.h"
+#include <simgrid/modelchecker.h>
+
 #include <cerrno>
 #include <cstdlib>
-
+#include <cstring>
 #include <sys/ptrace.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <xbt/log.h>
-#include <xbt/mmalloc.h>
-#include <xbt/swag.h>
-#include <xbt/sysdep.h>
-
-#include <simgrid/modelchecker.h>
-
-#include "src/internal_config.h"
-
-#include "src/mc/mc_request.hpp"
-#include "src/mc/remote/Client.hpp"
-#include "src/mc/remote/mc_protocol.h"
-
-#include "src/smpi/include/private.hpp"
-
 // We won't need those once the separation MCer/MCed is complete:
 #include "src/mc/mc_smx.hpp"
 
@@ -77,13 +66,13 @@ Client* Client::initialize()
 #error "no ptrace equivalent coded for this platform"
 #endif
   if (errno != 0 || raise(SIGSTOP) != 0)
-    xbt_die("Could not wait for the model-checker");
+    xbt_die("Could not wait for the model-checker (errno = %d: %s)", errno, strerror(errno));
 
   instance_->handleMessages();
   return instance_.get();
 }
 
-void Client::handleDeadlockCheck(s_mc_message_t* msg)
+void Client::handleDeadlockCheck(s_mc_message_t*)
 {
   bool deadlock = false;
   if (not simix_global->process_list.empty()) {
@@ -99,7 +88,7 @@ void Client::handleDeadlockCheck(s_mc_message_t* msg)
   s_mc_message_int_t answer{MC_MESSAGE_DEADLOCK_CHECK_REPLY, deadlock};
   xbt_assert(channel_.send(answer) == 0, "Could not send response");
 }
-void Client::handleContinue(s_mc_message_t* msg)
+void Client::handleContinue(s_mc_message_t*)
 {
   /* Nothing to do */
 }
@@ -115,7 +104,7 @@ void Client::handleSimcall(s_mc_message_simcall_handle_t* message)
 void Client::handleRestore(s_mc_message_restore_t* message)
 {
 #if HAVE_SMPI
-  smpi_really_switch_data_segment(message->index);
+  smpi_really_switch_data_segment(simgrid::s4u::Actor::by_pid(message->index));
 #endif
 }
 void Client::handleActorEnabled(s_mc_message_actor_enabled_t* msg)
@@ -187,7 +176,7 @@ void Client::mainLoop()
   }
 }
 
-void Client::reportAssertionFailure(const char* description)
+void Client::reportAssertionFailure()
 {
   if (channel_.send(MC_MESSAGE_ASSERTION_FAILED))
     xbt_die("Could not send assertion to model-checker");
@@ -259,8 +248,8 @@ void Client::declareStack(void* stack, size_t size, smx_actor_t process, ucontex
   region.size    = size;
   region.block   = ((char*)stack - (char*)heap->heapbase) / BLOCKSIZE + 1;
 #if HAVE_SMPI
-  if (smpi_privatize_global_variables == SMPI_PRIVATIZE_MMAP && process)
-    region.process_index = process->pid - 1;
+  if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP && process)
+    region.process_index = process->pid_ - 1;
   else
 #endif
     region.process_index = -1;