[mc] Rename mc_client.{h,cpp} to Client.{hpp,cpp}

[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 bdc12a2..bd2482d 100644 (file)
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -9,13 +9,12 @@
 #include <xbt/sysdep.h>
 #include <simgrid/modelchecker.h>
 
-#include "mc_record.h"
-#include "mc_private.h"
-#include "mc_mmalloc.h"
-#include "mc_ignore.h"
-#include "mc_protocol.h"
-#include "mc_client.h"
-#include "ModelChecker.hpp"
+#include "src/mc/mc_record.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_protocol.h"
+#include "src/mc/Client.hpp"
+#include "src/mc/ModelChecker.hpp"
 
 /** \file mc_client_api.cpp
  *
@@ -23,46 +22,20 @@
  *  communicate with the MC (declared in modelchecker.h).
  */
 
-extern "C" {
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
   "Public API for the model-checked application");
 
-}
-
-int MC_random(int min, int max)
-{
-  xbt_assert(mc_mode != MC_MODE_SERVER);
-  /* TODO, if the MC is disabled we do not really need to make a simcall for
-   * this :) */
-  /* FIXME: return mc_current_state->executed_transition->random.value; */
-  return simcall_mc_random(min, max);
-}
+// MC_random() is in mc_base.cpp
 
 void MC_assert(int prop)
 {
   if (MC_is_active() && !prop) {
-    MC_client_send_simple_message(MC_MESSAGE_ASSERTION_FAILED);
-    MC_client_handle_messages();
+    if (simgrid::mc::Client::get()->getChannel().send(MC_MESSAGE_ASSERTION_FAILED))
+      xbt_die("Could not send assertion to model-checker");
+    simgrid::mc::Client::get()->handleMessages();
   }
 }
 
-void *MC_snapshot(void)
-{
-  return simcall_mc_snapshot();
-}
-
-int simcall_HANDLER_mc_compare_snapshots(smx_simcall_t simcall,
-                                   mc_snapshot_t s1, mc_snapshot_t s2)
-{
-  return snapshot_compare(s1, s2);
-}
-
-int MC_compare_snapshots(void *s1, void *s2)
-{
-  return simcall_mc_compare_snapshots(s1, s2);
-}
-
 void MC_cut(void)
 {
   user_max_depth_reached = 1;
@@ -78,7 +51,8 @@ void MC_ignore(void* addr, size_t size)
   message.type = MC_MESSAGE_IGNORE_MEMORY;
   message.addr = (std::uintptr_t) addr;
   message.size = size;
-  MC_client_send_message(&message, sizeof(message));
+  if (simgrid::mc::Client::get()->getChannel().send(message))
+    xbt_die("Could not send IGNORE_MEMORY mesage to model-checker");
 }
 
 void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void))
@@ -105,5 +79,6 @@ void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
   strncpy(message.name, name, sizeof(message.name));
   message.callback = nullptr;
   message.data = value;
-  MC_client_send_message(&message, sizeof(message));
+  if (simgrid::mc::Client::get()->getChannel().send(message))
+    xbt_die("Could send REGISTER_SYMBOL message to model-checker");
 }