/* $Id$ */
-
+
/* Copyright (c) 2002-2007 Arnaud Legrand. */
/* Copyright (c) 2007 Bruno Donassolo. */
/* 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"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "xbt/ex.h" /* ex_backtrace_display */
+#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)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
+ "Logging specific to MSG (kernel)");
MSG_Global_t msg_global = NULL;
* \brief This section describes the functions you need to know to
* set up a simulation. You should have a look at \ref MSG_examples
* to have an overview of their usage.
+ */
+/** @addtogroup msg_simulation
* \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Simulation functions" --> \endhtmlonly
*/
*/
void MSG_global_init_args(int *argc, char **argv)
{
- MSG_global_init(argc,argv);
+ MSG_global_init(argc, argv);
}
/** \ingroup msg_simulation
*/
void MSG_global_init(int *argc, char **argv)
{
+ xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
- SIMIX_global_init(argc, argv);
+ /* 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);
- msg_global = xbt_new0(s_MSG_Global_t,1);
+ SIMIX_global_init(argc, argv);
+
+ msg_global = xbt_new0(s_MSG_Global_t, 1);
msg_global->host = xbt_fifo_new();
msg_global->process_list = xbt_fifo_new();
msg_global->max_channel = 0;
msg_global->PID = 1;
- }
- return;
+ /* 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);
+ }
+ return;
}
/** \ingroup msg_easier_life
/** \defgroup m_channel_management Understanding channels
* \brief This section briefly describes the channel notion of MSG
* (#m_channel_t).
+ */
+/** @addtogroup m_channel_management
* \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Channels" --> \endhtmlonly
*
*
*/
MSG_error_t MSG_set_channel_number(int number)
{
- xbt_assert0((msg_global) && (msg_global->max_channel == 0), "Channel number already set!");
+ xbt_assert0((msg_global)
+ && (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!");
+ xbt_assert0((msg_global)
+ && (msg_global->max_channel != 0),
+ "Channel number not set yet!");
return msg_global->max_channel;
}
static void _XBT_CALL inthandler(int ignored)
{
- INFO0("CTRL-C pressed. Displaying status and bailing out");
- __MSG_display_process_status();
- exit(1);
+ INFO0("CTRL-C pressed. Displaying status and bailing out");
+ __MSG_display_process_status();
+ exit(1);
}
/** \ingroup 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);
-
- //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);
- }
- /* action finished, destroy it */
- // SIMIX_action_destroy(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);
- }
- /* action finished, destroy it */
- //SIMIX_action_destroy(smx_action);
- }
- }
- xbt_fifo_free(actions_failed);
- xbt_fifo_free(actions_done);
+ 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);
+
+ //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);
+ }
+ /* action finished, destroy it */
+ // SIMIX_action_destroy(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);
+ }
+ /* action finished, destroy it */
+ //SIMIX_action_destroy(smx_action);
+ }
+ }
+ xbt_fifo_free(actions_failed);
+ xbt_fifo_free(actions_done);
return MSG_OK;
}
m_process_t p = NULL;
m_process_t self = MSG_process_self();
- while((p=xbt_fifo_pop(msg_global->process_list))) {
- if(p!=self) MSG_process_kill(p);
- }
+ while ((p = xbt_fifo_pop(msg_global->process_list))) {
+ if (p != self)
+ MSG_process_kill(p);
+ }
- if(reset_PIDs>0) {
- msg_global->PID = reset_PIDs;
+ if (reset_PIDs > 0) {
+ msg_global->PID = reset_PIDs;
msg_global->session++;
- }
+ }
return msg_global->PID;
m_process_t p = NULL;
- while((p=xbt_fifo_pop(msg_global->process_list))) {
+ while ((p = xbt_fifo_pop(msg_global->process_list))) {
MSG_process_kill(p);
}
- xbt_fifo_foreach(msg_global->host,i,h,m_host_t) {
+ xbt_fifo_foreach(msg_global->host, i, h, m_host_t) {
__MSG_host_destroy(h);
}
xbt_fifo_free(msg_global->host);
xbt_fifo_free(msg_global->process_list);
free(msg_global);
- SIMIX_clean();
+ msg_global = NULL;
+
+ /* cleanup all resources in the mailbox module */
+ MSG_mailbox_mod_exit();
+
+ SIMIX_clean();
+
+
return MSG_OK;
}
/** \ingroup msg_easier_life
* \brief A clock (in second).
*/
-double MSG_get_clock(void)
+double MSG_get_clock(void)
{
- return SIMIX_get_clock();
+ return SIMIX_get_clock();
}
-
