Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp
index dae03e7..9bfc523 100644 (file)
--- a/src/mc/remote/Client.cpp
+++ b/src/mc/remote/Client.cpp
@@ -23,7 +23,7 @@
 #include "src/mc/remote/Client.hpp"
 #include "src/mc/remote/mc_protocol.h"
 
-#include "src/smpi/private.hpp"
+#include "src/smpi/include/private.hpp"
 
 // We won't need those once the separation MCer/MCed is complete:
 #include "src/mc/mc_smx.h"
@@ -118,6 +118,12 @@ void Client::handleRestore(s_mc_message_restore_t* message)
   smpi_really_switch_data_segment(message->index);
 #endif
 }
+void Client::handleActorEnabled(s_mc_message_actor_enabled_t* msg)
+{
+  bool res = simgrid::mc::actor_is_enabled(SIMIX_process_from_PID(msg->aid));
+  s_mc_message_int answer{MC_MESSAGE_ACTOR_ENABLED_REPLY, res};
+  channel_.send(answer);
+}
 
 void Client::handleMessages()
 {
@@ -158,6 +164,13 @@ void Client::handleMessages()
         handleRestore((s_mc_message_restore_t*)message_buffer);
         break;
 
+      case MC_MESSAGE_ACTOR_ENABLED:
+        xbt_assert(received_size == sizeof(s_mc_message_actor_enabled_t),
+                   "Unexpected size for ACTOR_ENABLED (%zu != %zu)", received_size,
+                   sizeof(s_mc_message_actor_enabled_t));
+        handleActorEnabled((s_mc_message_actor_enabled_t*)message_buffer);
+        break;
+
       default:
         xbt_die("Received unexpected message %s (%i)", MC_message_type_name(message->type), message->type);
         break;