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 git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_global.c
diff --git
a/src/msg/msg_global.c
b/src/msg/msg_global.c
index
5ea9fa1
..
555f8aa
100644
(file)
--- a/
src/msg/msg_global.c
+++ b/
src/msg/msg_global.c
@@
-11,7
+11,9
@@
#include "xbt/log.h"
#include "xbt/virtu.h"
#include "xbt/ex.h" /* ex_backtrace_display */
#include "xbt/log.h"
#include "xbt/virtu.h"
#include "xbt/ex.h" /* ex_backtrace_display */
+#include "xbt/replay.h"
+XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
"Logging specific to MSG (kernel)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
"Logging specific to MSG (kernel)");
@@
-38,11
+40,7
@@
void MSG_global_init(int *argc, char **argv)
xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
- /* Connect our log channels: that must be done manually under windows */
- XBT_LOG_CONNECT(msg_gos, msg);
- XBT_LOG_CONNECT(msg_kernel, msg);
- XBT_LOG_CONNECT(msg_mailbox, msg);
- XBT_LOG_CONNECT(msg_process, msg);
+ s_msg_vm_t vm; // to compute the offset
SIMIX_global_init(argc, argv);
SIMIX_global_init(argc, argv);
@@
-55,6
+53,7
@@
void MSG_global_init(int *argc, char **argv)
msg_global->sent_msg = 0;
msg_global->task_copy_callback = NULL;
msg_global->process_data_cleanup = NULL;
msg_global->sent_msg = 0;
msg_global->task_copy_callback = NULL;
msg_global->process_data_cleanup = NULL;
+ msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup));
/* initialization of the action module */
_MSG_action_init();
/* initialization of the action module */
_MSG_action_init();
@@
-69,6
+68,7
@@
void MSG_global_init(int *argc, char **argv)
XBT_DEBUG("ADD MSG LEVELS");
MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
XBT_DEBUG("ADD MSG LEVELS");
MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
+
}
#ifdef MSG_USE_DEPRECATED
}
#ifdef MSG_USE_DEPRECATED
@@
-141,14
+141,14
@@
MSG_error_t MSG_main_stateful(void)
}
}
-MSG_error_t MSG_main_liveness(xbt_automaton_t a
, char *prgm
)
+MSG_error_t MSG_main_liveness(xbt_automaton_t a)
{
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
if (MC_IS_ENABLED) {
{
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
if (MC_IS_ENABLED) {
- MC_modelcheck_liveness(a
, prgm
);
+ MC_modelcheck_liveness(a);
}
else {
SIMIX_run();
}
else {
SIMIX_run();
@@
-198,6
+198,7
@@
MSG_error_t MSG_clean(void)
SIMIX_clean();
SIMIX_clean();
+ xbt_swag_free(msg_global->vms);
free(msg_global);
msg_global = NULL;
free(msg_global);
msg_global = NULL;
@@
-205,7
+206,7
@@
MSG_error_t MSG_clean(void)
}
}
-/** \ingroup msg_
easier_life
+/** \ingroup msg_
simulation
* \brief A clock (in second).
*/
XBT_INLINE double MSG_get_clock(void)
* \brief A clock (in second).
*/
XBT_INLINE double MSG_get_clock(void)