X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c1874fdd0c94bd3126f7440eaf36610832b0432..5d038603f775914afc8c6f35eff53f3682802f5b:/src/msg/global.c diff --git a/src/msg/global.c b/src/msg/global.c index d9d1719568..46f25b58a2 100644 --- a/src/msg/global.c +++ b/src/msg/global.c @@ -1,28 +1,26 @@ -/* $Id$ */ - -/* Copyright (c) 2002-2007 Arnaud Legrand. */ -/* Copyright (c) 2007 Bruno Donassolo. */ -/* All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * 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 "mc/mc.h" #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; /** \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 @@ -50,6 +48,10 @@ XBT_LOG_EXTERNAL_CATEGORY(msg_process); */ void MSG_global_init(int *argc, char **argv) { +#ifdef HAVE_TRACING + TRACE_global_init(argc, argv); +#endif + xbt_getpid = MSG_process_self_PID; if (!msg_global) { /* Connect our log channels: that must be done manually under windows */ @@ -57,7 +59,7 @@ void MSG_global_init(int *argc, char **argv) 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); @@ -66,23 +68,18 @@ void MSG_global_init(int *argc, char **argv) msg_global->process_list = xbt_fifo_new(); msg_global->max_channel = 0; msg_global->PID = 1; + 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 - * \brief Traces MSG events in the Paje format. - */ - -void MSG_paje_output(const char *filename) -{ +#ifdef HAVE_TRACING + TRACE_start(); +#endif } /** \defgroup m_channel_management Understanding channels @@ -91,7 +88,7 @@ void MSG_paje_output(const char *filename) */ /** @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 @@ -113,8 +110,8 @@ 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!"); + && (msg_global->max_channel == 0), + "Channel number already set!"); msg_global->max_channel = number; @@ -124,76 +121,34 @@ 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!"); + && (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); - 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); - } - } + if (MC_IS_ENABLED) { + MC_modelcheck(); + } + else { + SIMIX_run(); } - xbt_fifo_free(actions_failed); - xbt_fifo_free(actions_done); return MSG_OK; } @@ -232,6 +187,9 @@ MSG_error_t MSG_clean(void) m_host_t h = NULL; m_process_t p = NULL; +#ifdef HAVE_TRACING + TRACE_surf_release(); +#endif while ((p = xbt_fifo_pop(msg_global->process_list))) { MSG_process_kill(p); @@ -246,12 +204,14 @@ MSG_error_t MSG_clean(void) free(msg_global); msg_global = NULL; - /* cleanup all resources in the mailbox module */ - MSG_mailbox_mod_exit(); + /* initialization of the action module */ + _MSG_action_exit(); - SIMIX_clean(); +#ifdef HAVE_TRACING + TRACE_end(); +#endif - + SIMIX_clean(); return MSG_OK; } @@ -260,7 +220,12 @@ MSG_error_t MSG_clean(void) /** \ingroup msg_easier_life * \brief A clock (in second). */ -double MSG_get_clock(void) +XBT_INLINE double MSG_get_clock(void) { return SIMIX_get_clock(); } + +unsigned long int MSG_get_sent_msg() +{ + return msg_global->sent_msg; +}