#include "xbt/log.h"
#include "xbt/virtu.h"
#include "xbt/ex.h" /* ex_backtrace_display */
+#include "mailbox.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
"Logging specific to MSG (kernel)");
MSG_global_init(argc, argv);
}
+
+XBT_LOG_EXTERNAL_CATEGORY(msg_gos);
+XBT_LOG_EXTERNAL_CATEGORY(msg_kernel);
+XBT_LOG_EXTERNAL_CATEGORY(msg_mailbox);
+XBT_LOG_EXTERNAL_CATEGORY(msg_process);
+
/** \ingroup msg_simulation
* \brief Initialize some MSG internal data.
*/
void MSG_global_init(int *argc, char **argv)
{
- xbt_getpid = &MSG_process_self_PID;
+ 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);
+
SIMIX_global_init(argc, argv);
msg_global = xbt_new0(s_MSG_Global_t, 1);
msg_global->max_channel = 0;
msg_global->PID = 1;
+ /* initialization of the mailbox module */
+ MSG_mailbox_mod_init();
+
SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
+ SIMIX_init();
//surf_solve(); /* Takes traces into account. Returns 0.0 */
/* xbt_fifo_size(msg_global->process_to_run) */
while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
SIMIX_cond_broadcast(cond);
}
- /* action finished, destroy it */
- // SIMIX_action_destroy(smx_action);
}
while ((smx_action = xbt_fifo_pop(actions_done))) {
while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
SIMIX_cond_broadcast(cond);
}
- /* action finished, destroy it */
- //SIMIX_action_destroy(smx_action);
}
}
xbt_fifo_free(actions_failed);
free(msg_global);
msg_global = NULL;
+
+ /* cleanup all resources in the mailbox module */
+ MSG_mailbox_mod_exit();
+
SIMIX_clean();
+
+
return MSG_OK;
}