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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_private.h
diff --git
a/src/msg/msg_private.h
b/src/msg/msg_private.h
index
4c5e9e4
..
1c5a83f
100644
(file)
--- a/
src/msg/msg_private.h
+++ b/
src/msg/msg_private.h
@@
-86,6
+86,7
@@
typedef struct MSG_Global {
int session;
unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
void (*task_copy_callback) (m_task_t task, m_process_t src, m_process_t dst);
int session;
unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
void (*task_copy_callback) (m_task_t task, m_process_t src, m_process_t dst);
+ void_f_pvoid_t process_data_cleanup;
} s_MSG_Global_t, *MSG_Global_t;
/*extern MSG_Global_t msg_global;*/
} s_MSG_Global_t, *MSG_Global_t;
/*extern MSG_Global_t msg_global;*/
@@
-102,8
+103,8
@@
XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
#define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
/* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
#define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
/* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
-/*#define CHECK_HOST() xbt_assert(
SIMIX_req
_host_get_state(SIMIX_host_self())==1,\
- "Host failed, you cannot call this function. (state=%d)",
SIMIX_req
_host_get_state(SIMIX_host_self()))*/
+/*#define CHECK_HOST() xbt_assert(
simcall
_host_get_state(SIMIX_host_self())==1,\
+ "Host failed, you cannot call this function. (state=%d)",
simcall
_host_get_state(SIMIX_host_self()))*/
#else
# define MSG_RETURN(val) return(val)
#endif
#else
# define MSG_RETURN(val) return(val)
#endif
@@
-120,7
+121,7
@@
void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
const char *hostname, int argc,
char **argv, xbt_dict_t properties);
void MSG_process_kill_from_SIMIX(smx_process_t p);
const char *hostname, int argc,
char **argv, xbt_dict_t properties);
void MSG_process_kill_from_SIMIX(smx_process_t p);
-void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, size_t buff_size);
+void MSG_comm_copy_data_from_SIMIX(smx_action_t comm,
void* buff,
size_t buff_size);
void _MSG_action_init(void);
void _MSG_action_exit(void);
void _MSG_action_init(void);
void _MSG_action_exit(void);