Cosmetics around std::unique_ptr.

[simgrid.git] / src / mc / remote / Client.cpp

diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp
index 7db1646..321aa36 100644 (file)
--- a/src/mc/remote/Client.cpp
+++ b/src/mc/remote/Client.cpp
@@ -3,28 +3,17 @@
 /* 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/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"
 
@@ -65,7 +54,7 @@ Client* Client::initialize()
     xbt_die("Unexpected socket type %i", type);
   XBT_DEBUG("Model-checked application found expected socket type");
 
-  instance_ = std::unique_ptr<Client>(new simgrid::mc::Client(fd));
+  instance_.reset(new simgrid::mc::Client(fd));
 
   // Wait for the model-checker:
   errno = 0;
@@ -83,7 +72,7 @@ Client* Client::initialize()
   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 */
 }
@@ -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");
@@ -260,7 +249,7 @@ void Client::declareStack(void* stack, size_t size, smx_actor_t process, ucontex
   region.block   = ((char*)stack - (char*)heap->heapbase) / BLOCKSIZE + 1;
 #if HAVE_SMPI
   if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP && process)
-    region.process_index = process->pid_ - 1;
+    region.process_index = process->get_pid() - 1;
   else
 #endif
     region.process_index = -1;