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
fix prototype declaration for gtnets compilation
[simgrid.git]
/
src
/
msg
/
msg_global.c
diff --git
a/src/msg/msg_global.c
b/src/msg/msg_global.c
index
b10d9c4
..
1cfcfa3
100644
(file)
--- a/
src/msg/msg_global.c
+++ b/
src/msg/msg_global.c
@@
-64,10
+64,13
@@
void MSG_global_init(int *argc, char **argv)
msg_global = xbt_new0(s_MSG_Global_t, 1);
msg_global = xbt_new0(s_MSG_Global_t, 1);
+#ifdef MSG_USE_DEPRECATED
msg_global->max_channel = 0;
msg_global->max_channel = 0;
+#endif
msg_global->PID = 1;
msg_global->sent_msg = 0;
msg_global->task_copy_callback = NULL;
msg_global->PID = 1;
msg_global->sent_msg = 0;
msg_global->task_copy_callback = NULL;
+ msg_global->process_data_cleanup = NULL;
/* initialization of the action module */
_MSG_action_init();
/* initialization of the action module */
_MSG_action_init();
@@
-84,6
+87,7
@@
void MSG_global_init(int *argc, char **argv)
MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
}
MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
}
+#ifdef MSG_USE_DEPRECATED
/** \defgroup m_channel_management Understanding channels
* \brief This section briefly describes the channel notion of MSG
* (#m_channel_t).
/** \defgroup m_channel_management Understanding channels
* \brief This section briefly describes the channel notion of MSG
* (#m_channel_t).
@@
-111,6
+115,7
@@
void MSG_global_init(int *argc, char **argv)
*/
MSG_error_t MSG_set_channel_number(int number)
{
*/
MSG_error_t MSG_set_channel_number(int number)
{
+ XBT_WARN("DEPRECATED! Now use alias");
xbt_assert((msg_global)
&& (msg_global->max_channel == 0),
"Channel number already set!");
xbt_assert((msg_global)
&& (msg_global->max_channel == 0),
"Channel number already set!");
@@
-129,12
+134,14
@@
MSG_error_t MSG_set_channel_number(int number)
*/
int MSG_get_channel_number(void)
{
*/
int MSG_get_channel_number(void)
{
+ XBT_WARN("DEPRECATED! Now use alias");
xbt_assert((msg_global)
&& (msg_global->max_channel != 0),
"Channel number not set yet!");
return msg_global->max_channel;
}
xbt_assert((msg_global)
&& (msg_global->max_channel != 0),
"Channel number not set yet!");
return msg_global->max_channel;
}
+#endif
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
@@
-194,7
+201,7
@@
MSG_error_t MSG_main_liveness(xbt_automaton_t a, char *prgm)
*/
int MSG_process_killall(int reset_PIDs)
{
*/
int MSG_process_killall(int reset_PIDs)
{
-
SIMIX_req
_process_killall();
+
simcall
_process_killall();
if (reset_PIDs > 0) {
msg_global->PID = reset_PIDs;
if (reset_PIDs > 0) {
msg_global->PID = reset_PIDs;