Merge with simgrid/master

[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 3aa610a..6afc2a0 100644 (file)
--- a/src/mc/remote/mc_protocol.h
+++ b/src/mc/remote/mc_protocol.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2020. 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. */
@@ -6,47 +6,46 @@
 #ifndef SIMGRID_MC_PROTOCOL_H
 #define SIMGRID_MC_PROTOCOL_H
 
-#include <stdint.h>
-
-#include <xbt/base.h>
-
-#include "mc/datatypes.h"
-#include "simgrid/forward.h"
-
-SG_BEGIN_DECL()
-
 // ***** Environment variables for passing context to the model-checked process
 
-/** Environment variable name set by `simgrid-mc` to enable MC support in the
- *  children MC processes
+/** 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_VARIABLE "SIMGRID_MC"
-
-/** Environment variable name used to pass the communication socket */
 #define MC_ENV_SOCKET_FD "SIMGRID_MC_SOCKET_FD"
 
-// ***** Messages
+#ifdef __cplusplus
+
+#include "mc/datatypes.h"
+#include "simgrid/forward.h" // aid_t
+#include <array>
+#include <cstdint>
 
-enum e_mc_message_type {
-  MC_MESSAGE_NONE,
-  MC_MESSAGE_CONTINUE,
-  MC_MESSAGE_IGNORE_HEAP,
-  MC_MESSAGE_UNIGNORE_HEAP,
-  MC_MESSAGE_IGNORE_MEMORY,
-  MC_MESSAGE_STACK_REGION,
-  MC_MESSAGE_REGISTER_SYMBOL,
-  MC_MESSAGE_DEADLOCK_CHECK,
-  MC_MESSAGE_DEADLOCK_CHECK_REPLY,
-  MC_MESSAGE_WAITING,
-  MC_MESSAGE_SIMCALL_HANDLE,
-  MC_MESSAGE_ASSERTION_FAILED,
-  // MCer request to finish the restoration:
-  MC_MESSAGE_RESTORE,
-  MC_MESSAGE_ACTOR_ENABLED,
-  MC_MESSAGE_ACTOR_ENABLED_REPLY
+// ***** Messages
+namespace simgrid {
+namespace mc {
+
+enum class MessageType {
+  NONE,
+  CONTINUE,
+  IGNORE_HEAP,
+  UNIGNORE_HEAP,
+  IGNORE_MEMORY,
+  STACK_REGION,
+  REGISTER_SYMBOL,
+  DEADLOCK_CHECK,
+  DEADLOCK_CHECK_REPLY,
+  WAITING,
+  SIMCALL_HANDLE,
+  ASSERTION_FAILED,
+  ACTOR_ENABLED,
+  ACTOR_ENABLED_REPLY
 };
 
-#define MC_MESSAGE_LENGTH 512
+} // namespace mc
+} // namespace simgrid
+
+constexpr unsigned MC_MESSAGE_LENGTH = 512;
 
 /** Basic structure for a MC message
  *
@@ -60,17 +59,17 @@ enum e_mc_message_type {
 
 /* Basic structure: all message start with a message type */
 struct s_mc_message_t {
-  enum e_mc_message_type type;
+  simgrid::mc::MessageType type;
 };
 
 struct s_mc_message_int_t {
-  enum e_mc_message_type type;
+  simgrid::mc::MessageType type;
   uint64_t value;
 };
 
 /* Client->Server */
 struct s_mc_message_ignore_heap_t {
-  enum e_mc_message_type type;
+  simgrid::mc::MessageType type;
   int block;
   int fragment;
   void* address;
@@ -78,42 +77,41 @@ struct s_mc_message_ignore_heap_t {
 };
 
 struct s_mc_message_ignore_memory_t {
-  enum e_mc_message_type type;
+  simgrid::mc::MessageType type;
   uint64_t addr;
   size_t size;
 };
 
 struct s_mc_message_stack_region_t {
-  enum e_mc_message_type type;
+  simgrid::mc::MessageType type;
   s_stack_region_t stack_region;
 };
 
 struct s_mc_message_register_symbol_t {
-  enum e_mc_message_type type;
-  char name[128];
+  simgrid::mc::MessageType type;
+  std::array<char, 128> name;
   int (*callback)(void*);
   void* data;
 };
 
 /* Server -> client */
 struct s_mc_message_simcall_handle_t {
-  enum e_mc_message_type type;
+  simgrid::mc::MessageType type;
   unsigned long pid;
   int value;
 };
 
 struct s_mc_message_restore_t {
-  enum e_mc_message_type type;
+  simgrid::mc::MessageType type;
   int index;
 };
 
 struct s_mc_message_actor_enabled_t {
-  enum e_mc_message_type type;
+  simgrid::mc::MessageType type;
   aid_t aid; // actor ID
 };
 
-XBT_PRIVATE const char* MC_message_type_name(enum e_mc_message_type type);
-
-SG_END_DECL()
+XBT_PRIVATE const char* MC_message_type_name(simgrid::mc::MessageType type);
 
+#endif // __cplusplus
 #endif