X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aef8ad40dbb075883c0b147319cd73ed813f8cb9..6229ff3a39c8fb195846ea9eb67cf071654de597:/src/msg/global.c?ds=sidebyside diff --git a/src/msg/global.c b/src/msg/global.c index 431996b89d..1cb8503102 100644 --- a/src/msg/global.c +++ b/src/msg/global.c @@ -1,13 +1,11 @@ -/* $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" @@ -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 */ @@ -62,31 +64,23 @@ void MSG_global_init(int *argc, char **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; 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); + SIMIX_function_register_process_create(MSG_process_create_from_SIMIX); + SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX); + SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX); } - return; -} - -/** \ingroup msg_easier_life - * \brief Traces MSG events in the Paje format. - */ +#ifdef HAVE_TRACING + TRACE_start(); +#endif -void MSG_paje_output(const char *filename) -{ + XBT_DEBUG("ADD MSG LEVELS"); + MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy); } /** \defgroup m_channel_management Understanding channels @@ -116,7 +110,7 @@ void MSG_paje_output(const char *filename) */ MSG_error_t MSG_set_channel_number(int number) { - xbt_assert0((msg_global) + xbt_assert((msg_global) && (msg_global->max_channel == 0), "Channel number already set!"); @@ -134,7 +128,7 @@ MSG_error_t MSG_set_channel_number(int number) */ int MSG_get_channel_number(void) { - xbt_assert0((msg_global) + xbt_assert((msg_global) && (msg_global->max_channel != 0), "Channel number not set yet!"); @@ -146,32 +140,61 @@ int MSG_get_channel_number(void) */ MSG_error_t MSG_main(void) { - 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); + if (MC_IS_ENABLED) { + MC_modelcheck(); + } + else { + SIMIX_run(); + } + return MSG_OK; +} + +MSG_error_t MSG_main_stateful(void) +{ /* 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) */ + if (MC_IS_ENABLED) { + MC_modelcheck_stateful(); + } + else { + SIMIX_run(); + } + return MSG_OK; +} - while (SIMIX_solve(actions_done, actions_failed) != -1.0) { +MSG_error_t MSG_main_liveness_stateful(xbt_automaton_t a) +{ + /* Clean IO before the run */ + fflush(stdout); + fflush(stderr); - while ((smx_action = xbt_fifo_pop(actions_failed))) { - DEBUG1("** %s failed **", SIMIX_action_get_name(smx_action)); - SIMIX_action_signal_all(smx_action); - } + if (MC_IS_ENABLED) { + MC_modelcheck_liveness_stateful(a); + } + else { + SIMIX_run(); + } + return MSG_OK; +} + +MSG_error_t MSG_main_liveness_stateless(xbt_automaton_t a, char *prgm) +{ + /* Clean IO before the run */ + fflush(stdout); + fflush(stderr); - while ((smx_action = xbt_fifo_pop(actions_done))) { - DEBUG1("** %s done **", SIMIX_action_get_name(smx_action)); - SIMIX_action_signal_all(smx_action); - } + if (MC_IS_ENABLED) { + MC_modelcheck_liveness_stateless(a, prgm); + } + else { + SIMIX_run(); } - xbt_fifo_free(actions_failed); - xbt_fifo_free(actions_done); return MSG_OK; } @@ -184,13 +207,7 @@ MSG_error_t MSG_main(void) */ 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); - } + SIMIX_req_process_killall(); if (reset_PIDs > 0) { msg_global->PID = reset_PIDs; @@ -206,30 +223,24 @@ int MSG_process_killall(int reset_PIDs) */ MSG_error_t MSG_clean(void) { - xbt_fifo_item_t i = NULL; - 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); - } + MSG_process_killall(0); - 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); + /* initialization of the action module */ + _MSG_action_exit(); - free(msg_global); - msg_global = NULL; - - /* cleanup all resources in the mailbox module */ - MSG_mailbox_mod_exit(); +#ifdef HAVE_TRACING + TRACE_end(); +#endif SIMIX_clean(); - + free(msg_global); + msg_global = NULL; return MSG_OK; } @@ -238,7 +249,7 @@ 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(); }