#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/virtu.h"
-#include "xbt/ex.h" /* ex_backtrace_display */
+#include "xbt/ex.h" /* ex_backtrace_display */
#include "mailbox.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
- "Logging specific to MSG (kernel)");
+ "Logging specific to MSG (kernel)");
MSG_Global_t msg_global = NULL;
msg_global->PID = 1;
msg_global->sent_msg = 0;
- /* initialization of the mailbox module */
- MSG_mailbox_mod_init();
+ /* 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();
SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
MSG_error_t MSG_set_channel_number(int number)
{
xbt_assert0((msg_global)
- && (msg_global->max_channel == 0),
- "Channel number already set!");
+ && (msg_global->max_channel == 0),
+ "Channel number already set!");
msg_global->max_channel = number;
int MSG_get_channel_number(void)
{
xbt_assert0((msg_global)
- && (msg_global->max_channel != 0),
- "Channel number not set yet!");
+ && (msg_global->max_channel != 0),
+ "Channel number not set yet!");
return msg_global->max_channel;
}
-void __MSG_display_process_status(void)
-{
-}
-
-
-/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
-#include <signal.h>
-
-static void _XBT_CALL inthandler(int ignored)
-{
- INFO0("CTRL-C pressed. Displaying status and bailing out");
- __MSG_display_process_status();
- exit(1);
-}
-
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
*/
MSG_error_t MSG_main(void)
{
- smx_cond_t cond = NULL;
smx_action_t smx_action;
xbt_fifo_t actions_done = xbt_fifo_new();
xbt_fifo_t actions_failed = xbt_fifo_new();
- /* Prepare to display some more info when dying on Ctrl-C pressing */
- signal(SIGINT, inthandler);
-
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
while ((smx_action = xbt_fifo_pop(actions_failed))) {
-
-
- DEBUG1("** %s failed **", smx_action->name);
- while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
- SIMIX_cond_broadcast(cond);
- }
+ DEBUG1("** %s failed **", SIMIX_action_get_name(smx_action));
+ SIMIX_action_signal_all(smx_action);
}
while ((smx_action = xbt_fifo_pop(actions_done))) {
-
- DEBUG1("** %s done **", smx_action->name);
- while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
- SIMIX_cond_broadcast(cond);
- }
+ DEBUG1("** %s done **", SIMIX_action_get_name(smx_action));
+ SIMIX_action_signal_all(smx_action);
}
}
xbt_fifo_free(actions_failed);
SIMIX_clean();
-
-
return MSG_OK;
}
return SIMIX_get_clock();
}
-unsigned long int MSG_get_sent_msg() {
+unsigned long int MSG_get_sent_msg()
+{
return msg_global->sent_msg;
}