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
Biggest commit ever (SIMIX2): the user processes can now run in parallel
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index 6f1c490e2d3aa800ea15be1ae6a5235fde019e53..84894f7207dd44aef90bc5920c5aacf6458a7564 100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-1,11
+1,11
@@
-/* Copyright (c) 2002-2007 Arnaud Legrand. */
-/* Copyright (c) 2007 Bruno Donassolo. */
-/* All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* 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. */
#include "msg/private.h"
/* 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. */
#include "msg/private.h"
+#include "mc/mc.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/virtu.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/virtu.h"
@@
-48,6
+48,10
@@
XBT_LOG_EXTERNAL_CATEGORY(msg_process);
*/
void MSG_global_init(int *argc, char **argv)
{
*/
void MSG_global_init(int *argc, char **argv)
{
+#ifdef HAVE_TRACING
+ TRACE_global_init(argc, argv);
+#endif
+
xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
/* Connect our log channels: that must be done manually under windows */
xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
/* Connect our log channels: that must be done manually under windows */
@@
-66,9
+70,6
@@
void MSG_global_init(int *argc, char **argv)
msg_global->PID = 1;
msg_global->sent_msg = 0;
msg_global->PID = 1;
msg_global->sent_msg = 0;
- /* initialization of the mailbox module */
- MSG_mailbox_mod_init();
-
/* initialization of the action module */
_MSG_action_init();
/* initialization of the action module */
_MSG_action_init();
@@
-76,7
+77,9
@@
void MSG_global_init(int *argc, char **argv)
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
}
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
}
- return;
+#ifdef HAVE_TRACING
+ TRACE_start();
+#endif
}
/** \defgroup m_channel_management Understanding channels
}
/** \defgroup m_channel_management Understanding channels
@@
-139,10
+142,15
@@
MSG_error_t MSG_main(void)
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
- SIMIX_init();
- while (SIMIX_solve(NULL, NULL) != -1.0);
-
+#ifdef HAVE_MC
+ if (_surf_do_model_check){
+ MC_modelcheck();
+ }else
+#endif
+ {
+ SIMIX_run();
+ }
return MSG_OK;
}
return MSG_OK;
}
@@
-182,7
+190,7
@@
MSG_error_t MSG_clean(void)
m_process_t p = NULL;
#ifdef HAVE_TRACING
m_process_t p = NULL;
#ifdef HAVE_TRACING
- TRACE_
msg_clean
();
+ TRACE_
surf_release
();
#endif
while ((p = xbt_fifo_pop(msg_global->process_list))) {
#endif
while ((p = xbt_fifo_pop(msg_global->process_list))) {
@@
-198,14
+206,15
@@
MSG_error_t MSG_clean(void)
free(msg_global);
msg_global = NULL;
free(msg_global);
msg_global = NULL;
- /* cleanup all resources in the mailbox module */
- MSG_mailbox_mod_exit();
-
/* initialization of the action module */
_MSG_action_exit();
SIMIX_clean();
/* initialization of the action module */
_MSG_action_exit();
SIMIX_clean();
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+
return MSG_OK;
}
return MSG_OK;
}