A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mc] Add LivenessChecker::purgeVisitedPairs() method
[simgrid.git]
/
src
/
mc
/
mc_protocol.h
diff --git
a/src/mc/mc_protocol.h
b/src/mc/mc_protocol.h
index
251e184
..
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. */
/* 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"
#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
*/
/** Environment variable name set by `simgrid-mc` to enable MC support in the
* children MC processes
*/
-#define MC_ENV_VARIABLE "SIMGRI
C
_MC"
+#define MC_ENV_VARIABLE "SIMGRI
D
_MC"
/** Environment variable name used to pass the communication socket */
#define MC_ENV_SOCKET_FD "SIMGRID_MC_SOCKET_FD"
/** 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,
typedef enum {
MC_MODE_NONE = 0,
- MC_MODE_STANDALONE,
MC_MODE_CLIENT,
MC_MODE_SERVER
} e_mc_mode_t;
MC_MODE_CLIENT,
MC_MODE_SERVER
} e_mc_mode_t;
@@
-38,13
+39,19
@@
extern e_mc_mode_t mc_mode;
typedef enum {
MC_MESSAGE_NONE,
typedef enum {
MC_MESSAGE_NONE,
- MC_MESSAGE_HELLO,
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_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,
} e_mc_message_type;
#define MC_MESSAGE_LENGTH 512
} e_mc_message_type;
#define MC_MESSAGE_LENGTH 512
@@
-65,14
+72,22
@@
typedef struct s_mc_message {
e_mc_message_type type;
} s_mc_message_t, *mc_message_t;
e_mc_message_type type;
} s_mc_message_t, *mc_message_t;
+typedef struct s_mc_int_message {
+ e_mc_message_type type;
+ uint64_t value;
+} s_mc_int_message_t, *mc_int_message_t;
+
typedef struct s_mc_ignore_heap_message {
e_mc_message_type type;
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;
} 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;
size_t size;
} s_mc_ignore_memory_message_t, *mc_ignore_memory_message_t;
@@
-81,6
+96,12
@@
typedef struct s_mc_stack_region_message {
s_stack_region_t stack_region;
} s_mc_stack_region_message_t, *mc_stack_region_message_t;
s_stack_region_t stack_region;
} s_mc_stack_region_message_t, *mc_stack_region_message_t;
+typedef struct s_mc_simcall_handle_message {
+ e_mc_message_type type;
+ unsigned long pid;
+ int value;
+} s_mc_simcall_handle_message_t, *mc_simcall_handle_message;
+
typedef struct s_mc_register_symbol_message {
e_mc_message_type type;
char name[128];
typedef struct s_mc_register_symbol_message {
e_mc_message_type type;
char name[128];
@@
-88,9
+109,13
@@
typedef struct s_mc_register_symbol_message {
void* data;
} s_mc_register_symbol_message_t, * mc_register_symbol_message_t;
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);
+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);
SG_END_DECL()
SG_END_DECL()