* under the terms of the license (GNU LGPL) which comes with this package. */
#include <xbt/log.h>
-#include <xbt/fifo.h>
#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
*
* 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();
- }
-}
-
-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);
+ if (MC_is_active() && !prop)
+ simgrid::mc::Client::get()->reportAssertionFailure();
}
void MC_cut(void)
{
- user_max_depth_reached = 1;
+ // FIXME, We want to do this in the model-checker:
+ xbt_die("MC_cut() not implemented");
}
void MC_ignore(void* addr, size_t size)
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));
+ simgrid::mc::Client::get()->ignoreMemory(addr, size);
}
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;
+ simgrid::mc::Client::get()->declareSymbol(name, value);
+}
+
+/** @brief Register a stack in the model checker
+ *
+ * The stacks are allocated in the heap. The MC handle them especially
+ * when we analyse/compare the content of the heap so it must be told where
+ * they are with this function.
+ *
+ * @param stack
+ * @param process Process owning the stack
+ * @param context
+ * @param size Size of the stack
+ */
+void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size)
+{
+ if (mc_mode != MC_MODE_CLIENT)
+ return;
+ simgrid::mc::Client::get()->declareStack(stack, size, process, context);
+}
+
+void MC_ignore_global_variable(const char *name)
+{
+ // TODO, send a message to the model_checker
+ xbt_die("Unimplemented");
+}
+
+void MC_ignore_heap(void *address, size_t size)
+{
+ if (mc_mode != MC_MODE_CLIENT)
+ return;
+ simgrid::mc::Client::get()->ignoreHeap(address, size);
+}
- 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));
+void MC_remove_ignore_heap(void *address, size_t size)
+{
+ if (mc_mode != MC_MODE_CLIENT)
+ return;
+ simgrid::mc::Client::get()->unignoreHeap(address, size);
}
