X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d97d6e19cb366fd112e63d56a9f411d968ee8670..a6d5fdeb22df5f5b1ca02a3dad8ba6094202a4f3:/src/mc/mc_client_api.cpp

diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index 192770fe5e..c257a7603c 100644
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -1,72 +1,90 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * 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 "simgrid/simix.hpp"
+#include "src/kernel/actor/ActorImpl.hpp"
+#include "src/mc/mc_config.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/mc/remote/AppSide.hpp"
+#include "xbt/asserts.h"
+#include "xbt/random.hpp"
 
-#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"
+/* Implementation of the user API from the App to the Checker (see modelchecker.h)  */
 
-extern "C" {
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
-  "Public API for the model-checked application");
-
-void MC_assert(int prop)
+int MC_random(int min, int max)
 {
-  if (MC_is_active() && !prop) {
-    MC_client_send_simple_message(MC_MESSAGE_ASSERTION_FAILED);
-    MC_client_handle_messages();
+#if SIMGRID_HAVE_MC
+  xbt_assert(simgrid::mc::model_checking_mode != simgrid::mc::ModelCheckingMode::CHECKER_SIDE,
+             "This should be called from the client side");
+#endif
+  if (not MC_is_active() && not MC_record_replay_is_active()) { // no need to do a simcall in this case
+    static simgrid::xbt::random::XbtRandom prng;
+    return prng.uniform_int(min, max);
   }
+  simgrid::kernel::actor::RandomSimcall observer{simgrid::kernel::actor::ActorImpl::self(), min, max};
+  return simgrid::kernel::actor::simcall_answered([&observer] { return observer.get_value(); }, &observer);
 }
 
-// TODO, MC_automaton_new_propositional_symbol
-
-void *MC_snapshot(void)
+void MC_assert(int prop)
 {
-  return simcall_mc_snapshot();
+  // Cannot used xbt_assert here, or it would be an infinite recursion.
+#if SIMGRID_HAVE_MC
+  xbt_assert(simgrid::mc::model_checking_mode != simgrid::mc::ModelCheckingMode::CHECKER_SIDE,
+             "This should be called from the client side");
+  if (not prop) {
+    if (MC_is_active())
+      simgrid::mc::AppSide::get()->report_assertion_failure();
+    if (MC_record_replay_is_active())
+      xbt_die("MC assertion failed");
+  }
+#else
+  if (not prop)
+    xbt_die("Safety property violation detected without the model-checker");
+#endif
 }
 
-int simcall_HANDLER_mc_compare_snapshots(smx_simcall_t simcall,
-                                   mc_snapshot_t s1, mc_snapshot_t s2)
+int MC_is_active()
 {
-  return snapshot_compare(s1, s2);
+  return simgrid::mc::model_checking_mode == simgrid::mc::ModelCheckingMode::APP_SIDE ||
+         simgrid::mc::model_checking_mode == simgrid::mc::ModelCheckingMode::CHECKER_SIDE;
 }
 
-int MC_compare_snapshots(void *s1, void *s2)
+void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
 {
-  return simcall_mc_compare_snapshots(s1, s2);
+#if SIMGRID_HAVE_MC
+  xbt_assert(simgrid::mc::model_checking_mode != simgrid::mc::ModelCheckingMode::CHECKER_SIDE,
+             "This should be called from the client side");
+  simgrid::mc::AppSide::get()->declare_symbol(name, value);
+#endif
 }
 
-void MC_cut(void)
+void MC_ignore(void* addr, size_t size)
 {
-  user_max_depth_reached = 1;
+#if SIMGRID_HAVE_MC
+  xbt_assert(simgrid::mc::model_checking_mode != simgrid::mc::ModelCheckingMode::CHECKER_SIDE,
+             "This should be called from the client side");
+  simgrid::mc::AppSide::get()->ignore_memory(addr, size);
+#endif
 }
 
-void MC_ignore(void* addr, size_t size)
+void MC_ignore_heap(void *address, size_t size)
 {
-  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));
-  }
-
-  // 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);
+#if SIMGRID_HAVE_MC
+  xbt_assert(simgrid::mc::model_checking_mode != simgrid::mc::ModelCheckingMode::CHECKER_SIDE,
+             "This should be called from the client side");
+  simgrid::mc::AppSide::get()->ignore_heap(address, size);
+#endif
 }
 
+void MC_unignore_heap(void* address, size_t size)
+{
+#if SIMGRID_HAVE_MC
+  xbt_assert(simgrid::mc::model_checking_mode != simgrid::mc::ModelCheckingMode::CHECKER_SIDE,
+             "This should be called from the client side");
+  simgrid::mc::AppSide::get()->unignore_heap(address, size);
+#endif
 }