#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);
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
* \brief This section briefly describes the channel notion of MSG
* (#m_channel_t).
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;
}
*/
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();
-
/* 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 (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);
- }
- }
-
- 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);
- }
- }
- }
- xbt_fifo_free(actions_failed);
- xbt_fifo_free(actions_done);
+ while (SIMIX_solve(NULL, NULL) != -1.0);
+
return MSG_OK;
}
/* cleanup all resources in the mailbox module */
MSG_mailbox_mod_exit();
- SIMIX_clean();
-
+ /* initialization of the action module */
+ _MSG_action_exit();
+ 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;
}