X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/abc28a37af26a526794081574c2d7a748e45ddf7..32dda1d6e208496b7ce85e5f5b677fb295e82277:/src/mc/mc_ignore.cpp?ds=sidebyside

diff --git a/src/mc/mc_ignore.cpp b/src/mc/mc_ignore.cpp
index f1ac12eee7..16548a6f02 100644
--- a/src/mc/mc_ignore.cpp
+++ b/src/mc/mc_ignore.cpp
@@ -1,23 +1,22 @@
-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. 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 "internal_config.h"
-#include "mc_object_info.h"
-#include "mc_private.h"
-#include "smpi/private.h"
-#include "mc/mc_snapshot.h"
-#include "mc_ignore.h"
-#include "mc_protocol.h"
-#include "mc_client.h"
-
-extern "C" {
+#include "src/internal_config.h"
+#include "src/mc/mc_private.h"
+#include "src/smpi/private.h"
+#include "src/mc/mc_snapshot.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_protocol.h"
+#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)
@@ -27,27 +26,24 @@ void MC_ignore_heap(void *address, size_t size)
 
   xbt_mheap_t heap = mmalloc_get_current_heap();
 
-  s_mc_heap_ignore_region_t region;
-  memset(&region, 0, sizeof(region));
-  region.address = address;
-  region.size = size;
-  region.block =
+  s_mc_ignore_heap_message_t message;
+  message.type = MC_MESSAGE_IGNORE_HEAP;
+  message.address = address;
+  message.size = size;
+  message.block =
    ((char *) address -
     (char *) heap->heapbase) / BLOCKSIZE + 1;
-  if (heap->heapinfo[region.block].type == 0) {
-    region.fragment = -1;
-    heap->heapinfo[region.block].busy_block.ignore++;
+  if (heap->heapinfo[message.block].type == 0) {
+    message.fragment = -1;
+    heap->heapinfo[message.block].busy_block.ignore++;
   } else {
-    region.fragment =
+    message.fragment =
         ((uintptr_t) (ADDR2UINT(address) % (BLOCKSIZE))) >>
-        heap->heapinfo[region.block].type;
-    heap->heapinfo[region.block].busy_frag.ignore[region.fragment]++;
+        heap->heapinfo[message.block].type;
+    heap->heapinfo[message.block].busy_frag.ignore[message.fragment]++;
   }
 
-  s_mc_ignore_heap_message_t message;
-  message.type = MC_MESSAGE_IGNORE_HEAP;
-  message.region = region;
-  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");
 }
 
@@ -58,9 +54,10 @@ void MC_remove_ignore_heap(void *address, size_t size)
 
   s_mc_ignore_memory_message_t message;
   message.type = MC_MESSAGE_UNIGNORE_HEAP;
-  message.addr = address;
+  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)
@@ -80,7 +77,7 @@ void MC_ignore_global_variable(const char *name)
  *  @param context
  *  @param size    Size of the stack
  */
-void MC_register_stack_area(void *stack, smx_process_t process, void *context, size_t size)
+void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size)
 {
   if (mc_mode != MC_MODE_CLIENT)
     return;
@@ -95,17 +92,18 @@ void MC_register_stack_area(void *stack, smx_process_t process, void *context, s
   region.block =
       ((char *) stack -
        (char *) heap->heapbase) / BLOCKSIZE + 1;
-#ifdef HAVE_SMPI
-  if (smpi_privatize_global_variables && process) {
+#if HAVE_SMPI
+  if (smpi_privatize_global_variables && process)
     region.process_index = smpi_process_index_of_smx_process(process);
-  } else
+  else
 #endif
   region.process_index = -1;
 
   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");
 }
 
 }