X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/adcbfeff6007a7b6f92ea29b46ed82fdc1296a51..a62f7fd52f7273e5cfb7de48e8d530f805c67d74:/src/msg/msg_global.c diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c index b10d9c421b..16f3507a33 100644 --- a/src/msg/msg_global.c +++ b/src/msg/msg_global.c @@ -11,70 +11,54 @@ #include "xbt/log.h" #include "xbt/virtu.h" #include "xbt/ex.h" /* ex_backtrace_display */ +#include "xbt/replay.h" +XBT_LOG_NEW_CATEGORY(msg, "All MSG categories"); 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 - * to have an overview of their usage. - */ -/** @addtogroup msg_simulation - * \htmlonly \endhtmlonly - */ - /********************************* MSG **************************************/ -/** \ingroup msg_simulation - * \brief Initialize some MSG internal data. +/** + * \ingroup msg_simulation + * \brief Initialize MSG with less verifications + * You should use the MSG_init() function instead. Failing to do so may turn into PEBKAC some day. You've been warned. */ -void MSG_global_init_args(int *argc, char **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); +void MSG_init_nocheck(int *argc, char **argv) { -/** \ingroup msg_simulation - * \brief Initialize some MSG internal data. - */ -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 */ - XBT_LOG_CONNECT(msg_gos, msg); - XBT_LOG_CONNECT(msg_kernel, msg); - XBT_LOG_CONNECT(msg_mailbox, msg); - XBT_LOG_CONNECT(msg_process, msg); + s_msg_vm_t vm; // to compute the offset SIMIX_global_init(argc, argv); msg_global = xbt_new0(s_MSG_Global_t, 1); +#ifdef MSG_USE_DEPRECATED msg_global->max_channel = 0; +#endif msg_global->PID = 1; msg_global->sent_msg = 0; msg_global->task_copy_callback = NULL; + msg_global->process_data_cleanup = NULL; + msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup)); + + if(MC_IS_ENABLED){ + /* Ignore total amount of messages sent during the simulation for heap comparison */ + MC_ignore(&(msg_global->sent_msg), sizeof(msg_global->sent_msg)); + } /* 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_from_SIMIX); - SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX); } #ifdef HAVE_TRACING TRACE_start(); @@ -84,33 +68,18 @@ void MSG_global_init(int *argc, char **argv) MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy); } -/** \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 - * socket. It doesn't need to be opened neither closed. It rather - * corresponds to the ports opened on the different machines. - */ - +#ifdef MSG_USE_DEPRECATED -/** \ingroup m_channel_management - * \brief Set the number of channel in the simulation. - * - * This function has to be called to fix the number of channel in the +/* This deprecated function has to be called to fix the number of channel in the simulation before creating any host. Indeed, each channel is represented by a different mailbox on each #m_host_t. This function can then be called only once. This function takes only one parameter. * \param number the number of channel in the simulation. It has to be >0 */ -MSG_error_t MSG_set_channel_number(int number) +msg_error_t MSG_set_channel_number(int number) { + XBT_WARN("DEPRECATED! Please use aliases instead"); xbt_assert((msg_global) && (msg_global->max_channel == 0), "Channel number already set!"); @@ -120,66 +89,33 @@ MSG_error_t MSG_set_channel_number(int number) return MSG_OK; } -/** \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 deprecated 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_WARN("DEPRECATED! Please use aliases instead"); xbt_assert((msg_global) && (msg_global->max_channel != 0), "Channel number not set yet!"); return msg_global->max_channel; } +#endif /** \ingroup msg_simulation * \brief Launch the MSG simulation */ -MSG_error_t MSG_main(void) +msg_error_t MSG_main(void) { /* 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); - - if (MC_IS_ENABLED) { - MC_modelcheck_stateful(); - } - else { - SIMIX_run(); - } - return MSG_OK; -} - - -MSG_error_t MSG_main_liveness(xbt_automaton_t a, char *prgm) -{ - /* Clean IO before the run */ - fflush(stdout); - fflush(stderr); - - if (MC_IS_ENABLED) { - MC_modelcheck_liveness(a, prgm); - } - else { + if (MC_IS_ENABLED) { + MC_do_the_modelcheck_for_real(); + } else { SIMIX_run(); } return MSG_OK; @@ -194,7 +130,7 @@ MSG_error_t MSG_main_liveness(xbt_automaton_t a, char *prgm) */ int MSG_process_killall(int reset_PIDs) { - SIMIX_req_process_killall(); + simcall_process_killall(); if (reset_PIDs > 0) { msg_global->PID = reset_PIDs; @@ -208,7 +144,7 @@ int MSG_process_killall(int reset_PIDs) /** \ingroup msg_simulation * \brief Clean the MSG simulation */ -MSG_error_t MSG_clean(void) +msg_error_t MSG_clean(void) { XBT_DEBUG("Closing MSG"); @@ -227,6 +163,7 @@ MSG_error_t MSG_clean(void) SIMIX_clean(); + xbt_swag_free(msg_global->vms); free(msg_global); msg_global = NULL; @@ -234,7 +171,7 @@ MSG_error_t MSG_clean(void) } -/** \ingroup msg_easier_life +/** \ingroup msg_simulation * \brief A clock (in second). */ XBT_INLINE double MSG_get_clock(void)