[mc] FIXME MC_cut()

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

diff --git a/src/mc/mc_ignore.cpp b/src/mc/mc_ignore.cpp
index 1df9b1a..16548a6 100644 (file)
--- a/src/mc/mc_ignore.cpp
+++ b/src/mc/mc_ignore.cpp
@@ -10,13 +10,13 @@
 #include "src/mc/mc_snapshot.h"
 #include "src/mc/mc_ignore.h"
 #include "src/mc/mc_protocol.h"
-#include "src/mc/mc_client.h"
-
-extern "C" {
+#include "src/mc/Client.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ignore, mc,
                                 "Logging specific to MC ignore mechanism");
 
+extern "C" {
+
 // ***** Model-checked
 
 void MC_ignore_heap(void *address, size_t size)
@@ -43,7 +43,7 @@ void MC_ignore_heap(void *address, size_t size)
     heap->heapinfo[message.block].busy_frag.ignore[message.fragment]++;
   }
 
-  if (MC_protocol_send(mc_client->fd, &message, sizeof(message)))
+  if (simgrid::mc::Client::get()->getChannel().send(message))
     xbt_die("Could not send ignored region to MCer");
 }
 
@@ -56,7 +56,8 @@ void MC_remove_ignore_heap(void *address, size_t size)
   message.type = MC_MESSAGE_UNIGNORE_HEAP;
   message.addr = (std::uintptr_t) address;
   message.size = size;
-  MC_client_send_message(&message, sizeof(message));
+  if (simgrid::mc::Client::get()->getChannel().send(message))
+    xbt_die("Could not send UNIGNORE_HEAP mesasge to model-checker");
 }
 
 void MC_ignore_global_variable(const char *name)
@@ -91,7 +92,7 @@ void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* cont
   region.block =
       ((char *) stack -
        (char *) heap->heapbase) / BLOCKSIZE + 1;
-#ifdef HAVE_SMPI
+#if HAVE_SMPI
   if (smpi_privatize_global_variables && process)
     region.process_index = smpi_process_index_of_smx_process(process);
   else
@@ -101,7 +102,8 @@ void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* cont
   s_mc_stack_region_message_t message;
   message.type = MC_MESSAGE_STACK_REGION;
   message.stack_region = region;
-  MC_client_send_message(&message, sizeof(message));
+  if (simgrid::mc::Client::get()->getChannel().send(message))
+    xbt_die("Coule not send STACK_REGION to model-checker");
 }
 
 }