X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae66e43b95b26467c1cb9df271e83f51d3d7147b..a57d8d507653b5c412c4ac94c1634b9c0f6278e4:/src/msg/global.c diff --git a/src/msg/global.c b/src/msg/global.c index 3acc6b7e68..9325a30bee 100644 --- a/src/msg/global.c +++ b/src/msg/global.c @@ -1,26 +1,31 @@ /* $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; /** \defgroup msg_simulation MSG simulation Functions * \brief This section describes the functions you need to know to - * set up a simulation. You should have a look at \ref MSG_examples + * set up a simulation. You should have a look at \ref MSG_examples * to have an overview of their usage. + */ +/** @addtogroup msg_simulation * \htmlonly \endhtmlonly */ @@ -31,26 +36,49 @@ MSG_Global_t msg_global = NULL; */ void MSG_global_init_args(int *argc, char **argv) { - MSG_global_init(argc,argv); + 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; 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 = 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; + msg_global->sent_msg = 0; + + /* initialization of the mailbox module */ + MSG_mailbox_mod_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); + SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX); + } + return; } /** \ingroup msg_easier_life @@ -64,8 +92,10 @@ 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). + */ +/** @addtogroup m_channel_management * \htmlonly \endhtmlonly - * + * * * For convenience, the simulator provides the notion of channel * that is close to the tag notion in MPI. A channel is not a @@ -86,7 +116,9 @@ void MSG_paje_output(const char *filename) */ 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; @@ -96,77 +128,31 @@ MSG_error_t MSG_set_channel_number(int number) /** \ingroup m_channel_management * \brief Return the number of channel in the simulation. * - * This function has to be called once the number of channel is fixed. I can't + * This function has to be called once the number of channel is fixed. I can't figure out a reason why anyone would like to call this function but nevermind. * \return the number of channel in the simulation. */ 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; } -void __MSG_display_process_status(void) -{ -} - - -/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */ -#include - -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); - - //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); + /* Clean IO before the run */ + fflush(stdout); + fflush(stderr); + SIMIX_init(); + + while (SIMIX_solve(NULL, NULL) != -1.0); + return MSG_OK; } @@ -182,14 +168,15 @@ int MSG_process_killall(int reset_PIDs) 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; @@ -205,18 +192,26 @@ MSG_error_t MSG_clean(void) 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(); + + /* initialization of the action module */ + _MSG_action_exit(); + + SIMIX_clean(); return MSG_OK; } @@ -225,8 +220,12 @@ MSG_error_t MSG_clean(void) /** \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(); } +unsigned long int MSG_get_sent_msg() +{ + return msg_global->sent_msg; +}