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
remove older mpich test suite
[simgrid.git]
/
src
/
simix
/
smx_private.h
diff --git
a/src/simix/smx_private.h
b/src/simix/smx_private.h
index
9cbceaa
..
1875079
100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-75,9
+75,10
@@
typedef struct s_smx_file {
surf_file_t surf_file;
} s_smx_file_t;
surf_file_t surf_file;
} s_smx_file_t;
-typedef struct s_smx_stat {
- s_file_stat_t surf_stat;
-} s_smx_stat_t;
+/* ******************************** Storage ************************************ */
+typedef struct s_smx_storage {
+ surf_storage_t surf_storage;
+} s_smx_storage_t;
/*********************************** Time ************************************/
/*********************************** Time ************************************/
@@
-136,6
+137,12
@@
typedef struct s_smx_action {
struct {
e_smx_comm_type_t type; /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
smx_rdv_t rdv; /* Rendez-vous where the comm is queued */
struct {
e_smx_comm_type_t type; /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
smx_rdv_t rdv; /* Rendez-vous where the comm is queued */
+
+#ifdef HAVE_MC
+ smx_rdv_t rdv_cpy; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR
+ (comm.rdv set to NULL when the communication is removed from the mailbox
+ (used as garbage collector)) */
+#endif
int refcount; /* Number of processes involved in the cond */
int detached; /* If detached or not */
int refcount; /* Number of processes involved in the cond */
int detached; /* If detached or not */
@@
-258,7
+265,8
@@
static XBT_INLINE smx_context_t SIMIX_context_new(xbt_main_func_t code,
void_pfn_smxprocess_t cleanup_func,
smx_process_t simix_process)
{
void_pfn_smxprocess_t cleanup_func,
smx_process_t simix_process)
{
-
+ if (!simix_global)
+ xbt_die("simix is not initialized, please call MSG_init first");
return simix_global->context_factory->create_context(code,
argc, argv,
cleanup_func,
return simix_global->context_factory->create_context(code,
argc, argv,
cleanup_func,
@@
-312,8
+320,6
@@
static XBT_INLINE smx_context_t SIMIX_context_self(void)
if (simix_global && simix_global->context_factory) {
return simix_global->context_factory->self();
}
if (simix_global && simix_global->context_factory) {
return simix_global->context_factory->self();
}
-
- xbt_die("simix is not initialized, please call MSG_init first");
return NULL;
}
return NULL;
}