X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/187fd0eeffe07e62ceef374ae965f04f81138e7c..f757db3e61c8c5cbcab605a1beba36b5e21dc6f9:/src/msg/msg_global.c diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c index 555f8aae93..d98766c398 100644 --- a/src/msg/msg_global.c +++ b/src/msg/msg_global.c @@ -1,9 +1,10 @@ -/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2004-2013. 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 "instr/instr_interface.h" #include "msg_private.h" #include "msg_mailbox.h" #include "mc/mc.h" @@ -12,28 +13,25 @@ #include "xbt/virtu.h" #include "xbt/ex.h" /* ex_backtrace_display */ #include "xbt/replay.h" +#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */ + 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; +static void MSG_exit(void); /********************************* 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); -} +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 @@ -43,13 +41,12 @@ void MSG_global_init(int *argc, char **argv) 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; @@ -60,15 +57,24 @@ void MSG_global_init(int *argc, char **argv) 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); + + sg_platf_postparse_add_cb(MSG_post_create_environment); } + + if(MC_is_active()){ + /* Ignore total amount of messages sent during the simulation for heap comparison */ + MC_ignore_heap(&(msg_global->sent_msg), sizeof(msg_global->sent_msg)); + } + #ifdef HAVE_TRACING TRACE_start(); #endif XBT_DEBUG("ADD MSG LEVELS"); MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy); + MSG_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, (void_f_pvoid_t) __MSG_storage_destroy); + if(sg_cfg_get_boolean("clean_atexit")) atexit(MSG_exit); } #ifdef MSG_USE_DEPRECATED @@ -80,7 +86,7 @@ void MSG_global_init(int *argc, char **argv) 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) @@ -110,52 +116,34 @@ int MSG_get_channel_number(void) /** \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 { + if (MC_is_active()) { + MC_do_the_modelcheck_for_real(); + } 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; +/** \ingroup msg_simulation + * \brief set a configuration variable + * + * Do --help on any simgrid binary to see the list of currently existing configuration variables, and see Section @ref options. + * + * Example: + * MSG_config("workstation/model","ptask_L07"); + */ +void MSG_config(const char *key, const char *value){ + xbt_assert(msg_global,"ERROR: Please call MSG_init() before using MSG_config()"); + xbt_cfg_set_as_string(_sg_cfg_set, key, value); } -MSG_error_t MSG_main_liveness(xbt_automaton_t a) -{ - /* Clean IO before the run */ - fflush(stdout); - fflush(stderr); - - if (MC_IS_ENABLED) { - MC_modelcheck_liveness(a); - } - else { - SIMIX_run(); - } - return MSG_OK; -} - /** \ingroup msg_simulation * \brief Kill all running process @@ -165,30 +153,23 @@ MSG_error_t MSG_main_liveness(xbt_automaton_t a) */ int MSG_process_killall(int reset_PIDs) { - simcall_process_killall(); + simcall_process_killall(reset_PIDs); - if (reset_PIDs > 0) { - msg_global->PID = reset_PIDs; + if (reset_PIDs > 0) msg_global->session++; - } - return msg_global->PID; + return 0; } -/** \ingroup msg_simulation - * \brief Clean the MSG simulation - */ -MSG_error_t MSG_clean(void) -{ - XBT_DEBUG("Closing MSG"); +static void MSG_exit(void) { + if (msg_global==NULL) + return; #ifdef HAVE_TRACING - TRACE_surf_release(); + TRACE_surf_resource_utilization_release(); #endif - MSG_process_killall(0); - /* initialization of the action module */ _MSG_action_exit(); @@ -196,13 +177,9 @@ MSG_error_t MSG_clean(void) TRACE_end(); #endif - SIMIX_clean(); - xbt_swag_free(msg_global->vms); free(msg_global); msg_global = NULL; - - return MSG_OK; } @@ -218,3 +195,9 @@ unsigned long int MSG_get_sent_msg() { return msg_global->sent_msg; } + +#ifdef MSG_USE_DEPRECATED +msg_error_t MSG_clean(void) { + return MSG_OK; +} +#endif