Separate mmalloc from xbt

[simgrid.git] / src / mc / remote / mc_protocol.h

diff --git a/src/mc/remote/mc_protocol.h b/src/mc/remote/mc_protocol.h
index f03cf3f..c04acc1 100644 (file)
--- a/src/mc/remote/mc_protocol.h
+++ b/src/mc/remote/mc_protocol.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2022. 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. */
@@ -8,33 +8,29 @@
 
 // ***** Environment variables for passing context to the model-checked process
 
-/** Environment variable name used to pass the communication socket.
- *
- * It is set by `simgrid-mc` to enable MC support in the children processes
- */
-#define MC_ENV_SOCKET_FD "SIMGRID_MC_SOCKET_FD"
-
 #ifdef __cplusplus
 
+#include "src/kernel/actor/SimcallObserver.hpp"
+
 #include "mc/datatypes.h"
 #include "simgrid/forward.h" // aid_t
 #include <array>
 #include <cstdint>
+#include <xbt/dynar.h>
+#include <xbt/mmalloc.h>
 #include <xbt/utility.hpp>
 
 // ***** Messages
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
 
 XBT_DECLARE_ENUM_CLASS(MessageType, NONE, INITIAL_ADDRESSES, CONTINUE, IGNORE_HEAP, UNIGNORE_HEAP, IGNORE_MEMORY,
-                       STACK_REGION, REGISTER_SYMBOL, DEADLOCK_CHECK, DEADLOCK_CHECK_REPLY, WAITING, SIMCALL_HANDLE,
-                       SIMCALL_IS_VISIBLE, SIMCALL_IS_VISIBLE_ANSWER, SIMCALL_TO_STRING, SIMCALL_TO_STRING_ANSWER,
-                       SIMCALL_DOT_LABEL, ASSERTION_FAILED, ACTOR_ENABLED, ACTOR_ENABLED_REPLY);
+                       STACK_REGION, REGISTER_SYMBOL, DEADLOCK_CHECK, DEADLOCK_CHECK_REPLY, WAITING, SIMCALL_EXECUTE,
+                       SIMCALL_EXECUTE_ANSWER, ASSERTION_FAILED, ACTOR_ENABLED, ACTOR_ENABLED_REPLY, FINALIZE);
 
-} // namespace mc
-} // namespace simgrid
+} // namespace simgrid::mc
 
 constexpr unsigned MC_MESSAGE_LENGTH = 512;
+constexpr unsigned SIMCALL_SERIALIZATION_BUFFER_SIZE = 2048;
 
 /** Basic structure for a MC message
  *
@@ -59,10 +55,9 @@ struct s_mc_message_int_t {
 /* Client->Server */
 struct s_mc_message_initial_addresses_t {
   simgrid::mc::MessageType type;
-  void* mmalloc_default_mdp;
-  void* maxpid;
-  void* actors;
-  void* dead_actors;
+  xbt_mheap_t mmalloc_default_mdp;
+  unsigned long* maxpid;
+  xbt_dynar_t actors;
 };
 
 struct s_mc_message_ignore_heap_t {
@@ -92,11 +87,15 @@ struct s_mc_message_register_symbol_t {
 };
 
 /* Server -> client */
-struct s_mc_message_simcall_handle_t {
+struct s_mc_message_simcall_execute_t {
   simgrid::mc::MessageType type;
-  unsigned long pid_;
+  aid_t aid_;
   int times_considered_;
 };
+struct s_mc_message_simcall_execute_answer_t {
+  simgrid::mc::MessageType type;
+  std::array<char, SIMCALL_SERIALIZATION_BUFFER_SIZE> buffer;
+};
 
 struct s_mc_message_restore_t {
   simgrid::mc::MessageType type;
@@ -108,25 +107,5 @@ struct s_mc_message_actor_enabled_t {
   aid_t aid; // actor ID
 };
 
-/* RPC */
-struct s_mc_message_simcall_is_visible_t { // MessageType::SIMCALL_IS_VISIBLE
-  simgrid::mc::MessageType type;
-  int aid;
-};
-struct s_mc_message_simcall_is_visible_answer_t { // MessageType::SIMCALL_IS_VISIBLE_ANSWER
-  simgrid::mc::MessageType type;
-  bool value;
-};
-
-struct s_mc_message_simcall_to_string_t { // MessageType::SIMCALL_TO_STRING or MessageType::SIMCALL_DOT_LABEL
-  simgrid::mc::MessageType type;
-  int aid;
-  int time_considered;
-};
-struct s_mc_message_simcall_to_string_answer_t { // MessageType::SIMCALL_TO_STRING_ANSWER
-  simgrid::mc::MessageType type;
-  char value[1024];
-};
-
 #endif // __cplusplus
 #endif