[mc] Make s_mc_snapshot_stack::context not a pointer

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

diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index e180720..f4bed1b 100644 (file)
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -12,10 +12,10 @@
 #include "mc_record.h"
 #include "mc_private.h"
 #include "mc_mmalloc.h"
-#include "mc_model_checker.h"
 #include "mc_ignore.h"
 #include "mc_protocol.h"
 #include "mc_client.h"
+#include "ModelChecker.hpp"
 
 extern "C" {
 
@@ -25,12 +25,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
 void MC_assert(int prop)
 {
   if (MC_is_active() && !prop) {
-    if (mc_mode == MC_MODE_STANDALONE) {
-      MC_report_assertion_error();
-    } else {
-      MC_client_send_simple_message(MC_MESSAGE_ASSERTION_FAILED);
-      MC_client_handle_messages();
-    }
+    MC_client_send_simple_message(MC_MESSAGE_ASSERTION_FAILED);
+    MC_client_handle_messages();
   }
 }
 
@@ -66,11 +62,6 @@ void MC_ignore(void* addr, size_t size)
     message.size = size;
     MC_client_send_message(&message, sizeof(message));
   }
-
-  // TODO, remove this once the migration has been completed
-  xbt_mheap_t heap = mmalloc_set_current_heap(mc_heap);
-  MC_process_ignore_memory(&mc_model_checker->process, addr, size);
-  mmalloc_set_current_heap(heap);
 }
 
 }