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

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

diff --git a/src/mc/Client.cpp b/src/mc/Client.cpp
index 38ebb68..e712aff 100644 (file)
--- a/src/mc/Client.cpp
+++ b/src/mc/Client.cpp
@@ -14,15 +14,18 @@
 #include <xbt/log.h>
 #include <xbt/sysdep.h>
 #include <xbt/mmalloc.h>
+#include <xbt/swag.h>
+
+#include <simgrid/modelchecker.h>
 
 #include "src/internal_config.h"
 
 #include "src/mc/mc_protocol.h"
 #include "src/mc/Client.hpp"
+#include "src/mc/mc_request.h"
 
 // We won't need those once the separation MCer/MCed is complete:
 #include "src/mc/mc_ignore.h"
-#include "src/mc/mc_private.h" // MC_deadlock_check()
 #include "src/mc/mc_smx.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client, mc, "MC client logic");
@@ -43,10 +46,7 @@ Client* Client::initialize()
   if (client_)
     return client_.get();
 
-  // Check and set the mode:
-  if (mc_mode != MC_MODE_NONE)
-    abort();
-  mc_mode = MC_MODE_CLIENT;
+  _sg_do_model_check = 1;
 
   // Fetch socket from MC_ENV_SOCKET_FD:
   char* fd_env = std::getenv(MC_ENV_SOCKET_FD);
@@ -67,7 +67,15 @@ Client* Client::initialize()
   client_ = std::unique_ptr<Client>(new simgrid::mc::Client(fd));
 
   // Wait for the model-checker:
-  if (ptrace(PTRACE_TRACEME, 0, nullptr, NULL) == -1 || raise(SIGSTOP) != 0)
+  errno = 0;
+#if defined __linux__
+  ptrace(PTRACE_TRACEME, 0, nullptr, nullptr);
+#elif defined BSD
+  ptrace(PT_TRACE_ME, 0, nullptr, 0);
+#else
+# error "no ptrace equivalent coded for this platform"
+#endif
+  if(errno != 0 || raise(SIGSTOP) != 0)
     xbt_die("Could not wait for the model-checker");
 
   client_->handleMessages();
@@ -93,10 +101,22 @@ void Client::handleMessages()
 
     case MC_MESSAGE_DEADLOCK_CHECK:
       {
-        int result = MC_deadlock_check();
+        // Check deadlock:
+        bool deadlock = false;
+        smx_actor_t process;
+        if (xbt_swag_size(simix_global->process_list)) {
+          deadlock = true;
+          xbt_swag_foreach(process, simix_global->process_list)
+            if (simgrid::mc::process_is_enabled(process)) {
+              deadlock = false;
+              break;
+            }
+        }
+
+        // Send result:
         s_mc_int_message_t answer;
         answer.type = MC_MESSAGE_DEADLOCK_CHECK_REPLY;
-        answer.value = result;
+        answer.value = deadlock;
         if (channel_.send(answer))
           xbt_die("Could not send response");
       }
@@ -111,7 +131,7 @@ void Client::handleMessages()
         if (s != sizeof(message))
           xbt_die("Unexpected size for SIMCALL_HANDLE");
         memcpy(&message, message_buffer, sizeof(message));
-        smx_process_t process = SIMIX_process_from_PID(message.pid);
+        smx_actor_t process = SIMIX_process_from_PID(message.pid);
         if (!process)
           xbt_die("Invalid pid %lu", (unsigned long) message.pid);
         SIMIX_simcall_handle(&process->simcall, message.value);
@@ -126,13 +146,14 @@ void Client::handleMessages()
         if (s != sizeof(message))
           xbt_die("Unexpected size for SIMCALL_HANDLE");
         memcpy(&message, message_buffer, sizeof(message));
+#if HAVE_SMPI
         smpi_really_switch_data_segment(message.index);
+#endif
       }
       break;
 
     default:
-      xbt_die("%s received unexpected message %s (%i)",
-        MC_mode_name(mc_mode),
+      xbt_die("Received unexpected message %s (%i)",
         MC_message_type_name(message.type),
         message.type
       );
@@ -143,10 +164,10 @@ void Client::handleMessages()
 void Client::mainLoop(void)
 {
   while (1) {
+    simgrid::mc::wait_for_requests();
     if (channel_.send(MC_MESSAGE_WAITING))
       xbt_die("Could not send WAITING mesage to model-checker");
     this->handleMessages();
-    simgrid::mc::wait_for_requests();
   }
 }
 
@@ -215,7 +236,7 @@ void Client::declareSymbol(const char *name, int* value)
     xbt_die("Could send REGISTER_SYMBOL message to model-checker");
 }
 
-void Client::declareStack(void *stack, size_t size, smx_process_t process, ucontext_t* context)
+void Client::declareStack(void *stack, size_t size, smx_actor_t process, ucontext_t* context)
 {
   xbt_mheap_t heap = mmalloc_get_current_heap();