Revert my (subtle) attempts to fork simgrid...

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

diff --git a/src/mc/mc_protocol.h b/src/mc/mc_protocol.h
index b6507f4..ac3c0db 100644 (file)
--- a/src/mc/mc_protocol.h
+++ b/src/mc/mc_protocol.h
@@ -4,10 +4,12 @@
 /* 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. */
 
-#ifndef MC_PROTOCOL_H
-#define MC_PROTOCOL_H
+#ifndef SIMGRID_MC_PROTOCOL_H
+#define SIMGRID_MC_PROTOCOL_H
 
-#include <xbt/misc.h>
+#include <stdint.h>
+
+#include <xbt/base.h>
 
 #include "mc/datatypes.h"
 
@@ -18,7 +20,7 @@ SG_BEGIN_DECL()
 /** Environment variable name set by `simgrid-mc` to enable MC support in the
  *  children MC processes
  */
-#define MC_ENV_VARIABLE "SIMGRIC_MC"
+#define MC_ENV_VARIABLE "SIMGRID_MC"
 
 /** Environment variable name used to pass the communication socket */
 #define MC_ENV_SOCKET_FD "SIMGRID_MC_SOCKET_FD"
@@ -27,7 +29,6 @@ SG_BEGIN_DECL()
 
 typedef enum {
   MC_MODE_NONE = 0,
-  MC_MODE_STANDALONE,
   MC_MODE_CLIENT,
   MC_MODE_SERVER
 } e_mc_mode_t;
@@ -38,7 +39,6 @@ extern e_mc_mode_t mc_mode;
 
 typedef enum {
   MC_MESSAGE_NONE,
-  MC_MESSAGE_HELLO,
   MC_MESSAGE_CONTINUE,
   MC_MESSAGE_IGNORE_HEAP,
   MC_MESSAGE_UNIGNORE_HEAP,
@@ -50,6 +50,8 @@ typedef enum {
   MC_MESSAGE_WAITING,
   MC_MESSAGE_SIMCALL_HANDLE,
   MC_MESSAGE_ASSERTION_FAILED,
+  // MCer request to finish the restoration:
+  MC_MESSAGE_RESTORE,
 } e_mc_message_type;
 
 #define MC_MESSAGE_LENGTH 512
@@ -77,12 +79,15 @@ typedef struct s_mc_int_message {
 
 typedef struct s_mc_ignore_heap_message {
   e_mc_message_type type;
-  s_mc_heap_ignore_region_t region;
+  int block;
+  int fragment;
+  void *address;
+  size_t size;
 } s_mc_ignore_heap_message_t, *mc_ignore_heap_message_t;
 
 typedef struct s_mc_ignore_memory_message {
   e_mc_message_type type;
-  void *addr;
+  uint64_t addr;
   size_t size;
 } s_mc_ignore_memory_message_t, *mc_ignore_memory_message_t;
 
@@ -104,13 +109,13 @@ typedef struct s_mc_register_symbol_message {
   void* data;
 } s_mc_register_symbol_message_t, * mc_register_symbol_message_t;
 
-int MC_protocol_send(int socket, void* message, size_t size);
-int MC_protocol_send_simple_message(int socket, int type);
-int MC_protocol_hello(int socket);
-ssize_t MC_receive_message(int socket, void* message, size_t size, int options);
+typedef struct s_mc_restore_message {
+  e_mc_message_type type;
+  int index;
+} s_mc_restore_message_t, *mc_restore_message_t;
 
-const char* MC_message_type_name(e_mc_message_type type);
-const char* MC_mode_name(e_mc_mode_t mode);
+XBT_PRIVATE const char* MC_message_type_name(e_mc_message_type type);
+XBT_PRIVATE const char* MC_mode_name(e_mc_mode_t mode);
 
 SG_END_DECL()