X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40334ce6fe520b2fa7d1e240716e4f34a5fdc74e..e6ca184e99d50d0ee8fe405a83ee5277e2ecfce6:/src/mc/mc_client_api.cpp?ds=sidebyside

diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index f4bed1b6cf..9433798db9 100644
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -9,19 +9,28 @@
 #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/mc_client.h"
+#include "src/mc/ModelChecker.hpp"
+
+/** \file mc_client_api.cpp
+ *
+ *  This is the implementation of the API used by the user simulated program to
+ *  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");
 
+}
+
+// MC_random() is in mc_base.cpp
+
 void MC_assert(int prop)
 {
   if (MC_is_active() && !prop) {
@@ -30,38 +39,47 @@ void MC_assert(int prop)
   }
 }
 
-// TODO, MC_automaton_new_propositional_symbol
-
-void *MC_snapshot(void)
+void MC_cut(void)
 {
-  return simcall_mc_snapshot();
+  user_max_depth_reached = 1;
 }
 
-int simcall_HANDLER_mc_compare_snapshots(smx_simcall_t simcall,
-                                   mc_snapshot_t s1, mc_snapshot_t s2)
+void MC_ignore(void* addr, size_t size)
 {
-  return snapshot_compare(s1, s2);
-}
+  xbt_assert(mc_mode != MC_MODE_SERVER);
+  if (mc_mode != MC_MODE_CLIENT)
+    return;
 
-int MC_compare_snapshots(void *s1, void *s2)
-{
-  return simcall_mc_compare_snapshots(s1, s2);
+  s_mc_ignore_memory_message_t message;
+  message.type = MC_MESSAGE_IGNORE_MEMORY;
+  message.addr = (std::uintptr_t) addr;
+  message.size = size;
+  MC_client_send_message(&message, sizeof(message));
 }
 
-void MC_cut(void)
+void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void))
 {
-  user_max_depth_reached = 1;
+  xbt_assert(mc_mode != MC_MODE_SERVER);
+  if (mc_mode != MC_MODE_CLIENT)
+    return;
+
+  xbt_die("Support for client-side function proposition is not implemented: "
+    "use MC_automaton_new_propositional_symbol_pointer instead."
+  );
 }
 
-void MC_ignore(void* addr, size_t size)
+void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
 {
-  if (mc_mode == MC_MODE_CLIENT) {
-    s_mc_ignore_memory_message_t message;
-    message.type = MC_MESSAGE_IGNORE_MEMORY;
-    message.addr = addr;
-    message.size = size;
-    MC_client_send_message(&message, sizeof(message));
-  }
-}
+  xbt_assert(mc_mode != MC_MODE_SERVER);
+  if (mc_mode != MC_MODE_CLIENT)
+    return;
 
+  s_mc_register_symbol_message_t message;
+  message.type = MC_MESSAGE_REGISTER_SYMBOL;
+  if (strlen(name) + 1 > sizeof(message.name))
+    xbt_die("Symbol is too long");
+  strncpy(message.name, name, sizeof(message.name));
+  message.callback = nullptr;
+  message.data = value;
+  MC_client_send_message(&message, sizeof(message));
 }