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
Show also the sub-scheduling rounds.
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
84894f7
..
9ac1659
100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-64,8
+64,9
@@
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);
+ s_m_process_t p;
+ msg_global->process_list = xbt_swag_new(xbt_swag_offset(p, process_list_hookup));
msg_global->host = xbt_fifo_new();
msg_global->host = xbt_fifo_new();
- msg_global->process_list = xbt_fifo_new();
msg_global->max_channel = 0;
msg_global->PID = 1;
msg_global->sent_msg = 0;
msg_global->max_channel = 0;
msg_global->PID = 1;
msg_global->sent_msg = 0;
@@
-143,12
+144,10
@@
MSG_error_t MSG_main(void)
fflush(stdout);
fflush(stderr);
fflush(stdout);
fflush(stderr);
-#ifdef HAVE_MC
- if (_surf_do_model_check){
+ if (MC_IS_ENABLED) {
MC_modelcheck();
MC_modelcheck();
- }else
-#endif
- {
+ }
+ else {
SIMIX_run();
}
return MSG_OK;
SIMIX_run();
}
return MSG_OK;
@@
-166,7
+165,7
@@
int MSG_process_killall(int reset_PIDs)
m_process_t p = NULL;
m_process_t self = MSG_process_self();
m_process_t p = NULL;
m_process_t self = MSG_process_self();
- while ((p = xbt_
fifo_pop
(msg_global->process_list))) {
+ while ((p = xbt_
swag_extract
(msg_global->process_list))) {
if (p != self)
MSG_process_kill(p);
}
if (p != self)
MSG_process_kill(p);
}
@@
-193,7
+192,7
@@
MSG_error_t MSG_clean(void)
TRACE_surf_release();
#endif
TRACE_surf_release();
#endif
- while ((p = xbt_
fifo_pop
(msg_global->process_list))) {
+ while ((p = xbt_
swag_extract
(msg_global->process_list))) {
MSG_process_kill(p);
}
MSG_process_kill(p);
}
@@
-201,7
+200,7
@@
MSG_error_t MSG_clean(void)
__MSG_host_destroy(h);
}
xbt_fifo_free(msg_global->host);
__MSG_host_destroy(h);
}
xbt_fifo_free(msg_global->host);
- xbt_
fifo
_free(msg_global->process_list);
+ xbt_
swag
_free(msg_global->process_list);
free(msg_global);
msg_global = NULL;
free(msg_global);
msg_global = NULL;
@@
-209,12
+208,12
@@
MSG_error_t MSG_clean(void)
/* initialization of the action module */
_MSG_action_exit();
/* initialization of the action module */
_MSG_action_exit();
- SIMIX_clean();
-
#ifdef HAVE_TRACING
TRACE_end();
#endif
#ifdef HAVE_TRACING
TRACE_end();
#endif
+ SIMIX_clean();
+
return MSG_OK;
}
return MSG_OK;
}
@@
-222,7
+221,7
@@
MSG_error_t MSG_clean(void)
/** \ingroup msg_easier_life
* \brief A clock (in second).
*/
/** \ingroup msg_easier_life
* \brief A clock (in second).
*/
-double MSG_get_clock(void)
+
XBT_INLINE
double MSG_get_clock(void)
{
return SIMIX_get_clock();
}
{
return SIMIX_get_clock();
}