X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f0921c868b916da79370ef6ba03d368be06a6e3..e7c0a8d73d340b86d3236d7e0458898600d1c0fe:/src/mc/mc_protocol.h diff --git a/src/mc/mc_protocol.h b/src/mc/mc_protocol.h index 80b144e456..ac3c0dbaf3 100644 --- a/src/mc/mc_protocol.h +++ b/src/mc/mc_protocol.h @@ -7,7 +7,9 @@ #ifndef SIMGRID_MC_PROTOCOL_H #define SIMGRID_MC_PROTOCOL_H -#include +#include + +#include #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" @@ -48,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 @@ -75,7 +79,10 @@ 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 { @@ -102,9 +109,10 @@ typedef struct s_mc_register_symbol_message { void* data; } s_mc_register_symbol_message_t, * mc_register_symbol_message_t; -XBT_PRIVATE int MC_protocol_send(int socket, const void* message, size_t size); -XBT_PRIVATE int MC_protocol_send_simple_message(int socket, e_mc_message_type type); -XBT_PRIVATE 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; 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);