Revert "Revert "[mc] Move MC_random() in mc_client_api.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 f48a80c..bdc12a2 100644 (file)
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -17,11 +17,28 @@
 #include "mc_client.h"
 #include "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");
 
+}
+
+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);
+}
+
 void MC_assert(int prop)
 {
   if (MC_is_active() && !prop) {
@@ -30,8 +47,6 @@ void MC_assert(int prop)
   }
 }
 
-// TODO, MC_automaton_new_propositional_symbol
-
 void *MC_snapshot(void)
 {
   return simcall_mc_snapshot();
@@ -55,13 +70,40 @@ void MC_cut(void)
 
 void MC_ignore(void* addr, size_t size)
 {
-  if (mc_mode == MC_MODE_CLIENT) {
-    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));
-  }
+  xbt_assert(mc_mode != MC_MODE_SERVER);
+  if (mc_mode != MC_MODE_CLIENT)
+    return;
+
+  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_automaton_new_propositional_symbol(const char *id, int(*fct)(void))
+{
+  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_automaton_new_propositional_symbol_pointer(const char *name, int* value)
+{
+  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));
 }