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
SMPI's network model calibration script: you give it information about your platform...
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
454fea7
..
7933918
100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-1,13
+1,11
@@
-/* $Id$ */
-
-/* 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"
@@
-50,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 */
@@
-78,15
+80,6
@@
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;
-}
-
-/** \ingroup msg_easier_life
- * \brief Traces MSG events in the Paje format.
- */
-
-void MSG_paje_output(const char *filename)
-{
}
/** \defgroup m_channel_management Understanding channels
}
/** \defgroup m_channel_management Understanding channels
@@
-151,7
+144,12
@@
MSG_error_t MSG_main(void)
fflush(stderr);
SIMIX_init();
fflush(stderr);
SIMIX_init();
- while (SIMIX_solve(NULL, NULL) != -1.0);
+#ifdef HAVE_MC
+ if (_surf_do_model_check)
+ MC_modelcheck(1);
+ else
+#endif
+ while (SIMIX_solve(NULL, NULL) != -1.0);
return MSG_OK;
}
return MSG_OK;
}
@@
-191,6
+189,9
@@
MSG_error_t MSG_clean(void)
m_host_t h = NULL;
m_process_t p = NULL;
m_host_t h = NULL;
m_process_t p = NULL;
+#ifdef HAVE_TRACING
+ TRACE_msg_clean ();
+#endif
while ((p = xbt_fifo_pop(msg_global->process_list))) {
MSG_process_kill(p);
while ((p = xbt_fifo_pop(msg_global->process_list))) {
MSG_process_kill(p);
@@
-208,6
+209,9
@@
MSG_error_t MSG_clean(void)
/* cleanup all resources in the mailbox module */
MSG_mailbox_mod_exit();
/* cleanup all resources in the mailbox module */
MSG_mailbox_mod_exit();
+ /* initialization of the action module */
+ _MSG_action_exit();
+
SIMIX_clean();
return MSG_OK;
SIMIX_clean();
return MSG_OK;