X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7d9a2608433e246294b7c4b339371fd4d3530ba6..1d18e615eaa617d3354bc22dfbe711d34be9f902:/src/instr/instr_config.c diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 9da8976b8b..7d61fef6da 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -6,6 +6,7 @@ #include "instr/instr_private.h" #include "simgrid/sg_config.h" +#include "surf/surf.h" #ifdef HAVE_TRACING @@ -18,9 +19,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING_SMPI "tracing/smpi" #define OPT_TRACING_SMPI_GROUP "tracing/smpi/group" #define OPT_TRACING_SMPI_COMPUTING "tracing/smpi/computing" +#define OPT_TRACING_SMPI_INTERNALS "tracing/smpi/internals" #define OPT_TRACING_CATEGORIZED "tracing/categorized" #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized" #define OPT_TRACING_MSG_PROCESS "tracing/msg/process" +#define OPT_TRACING_MSG_VM "tracing/msg/vm" #define OPT_TRACING_FILENAME "tracing/filename" #define OPT_TRACING_BUFFER "tracing/buffer" #define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only" @@ -30,6 +33,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING_COMMENT_FILE "tracing/comment_file" #define OPT_VIVA_UNCAT_CONF "viva/uncategorized" #define OPT_VIVA_CAT_CONF "viva/categorized" +#define OPT_TRACING_DISABLE_LINK "tracing/disable_link" +#define OPT_TRACING_DISABLE_POWER "tracing/disable_power" static int trace_enabled; static int trace_platform; @@ -37,17 +42,23 @@ static int trace_platform_topology; static int trace_smpi_enabled; static int trace_smpi_grouped; static int trace_smpi_computing; +static int trace_view_internals; static int trace_categorized; static int trace_uncategorized; static int trace_msg_process_enabled; +static int trace_msg_vm_enabled; static int trace_buffer; static int trace_onelink_only; static int trace_disable_destroy; static int trace_basic; +static int trace_disable_link; +static int trace_disable_power; static int trace_configured = 0; static int trace_active = 0; + + static void TRACE_getopts(void) { trace_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING); @@ -56,13 +67,25 @@ static void TRACE_getopts(void) trace_smpi_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI); trace_smpi_grouped = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_GROUP); trace_smpi_computing = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING); + trace_view_internals = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS); trace_categorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_CATEGORIZED); trace_uncategorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED); trace_msg_process_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_MSG_PROCESS); + trace_msg_vm_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_MSG_VM); trace_buffer = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BUFFER); trace_onelink_only = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY); trace_disable_destroy = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY); trace_basic = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BASIC); + trace_disable_link = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_LINK); + trace_disable_power = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_POWER); +} + +static xbt_dynar_t TRACE_start_functions = NULL; +void TRACE_add_start_function(void (*func) ()) +{ + if (TRACE_start_functions == NULL) + TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), NULL); + xbt_dynar_push(TRACE_start_functions, &func); } int TRACE_start() @@ -72,69 +95,97 @@ int TRACE_start() // tracing system must be: // - enabled (with --cfg=tracing:1) // - already configured (TRACE_global_init already called) - if (!(TRACE_is_enabled() && TRACE_is_configured())){ - return 0; - } + if (TRACE_is_enabled() && TRACE_is_configured()) { + XBT_DEBUG("Tracing starts"); - XBT_DEBUG("Tracing starts"); + /* open the trace file */ + TRACE_paje_start(); - /* open the trace file */ - TRACE_paje_start(); - - /* activate trace */ - if (trace_active == 1){ - THROWF (tracing_error, 0, "Tracing is already active"); + /* activate trace */ + if (trace_active == 1) { + THROWF(tracing_error, 0, "Tracing is already active"); + } + trace_active = 1; + XBT_DEBUG("Tracing is on"); + + /* other trace initialization */ + created_categories = xbt_dict_new_homogeneous(xbt_free); + declared_marks = xbt_dict_new_homogeneous(xbt_free); + user_host_variables = xbt_dict_new_homogeneous(xbt_free); + user_vm_variables = xbt_dict_new_homogeneous (xbt_free); + user_link_variables = xbt_dict_new_homogeneous(xbt_free); + + if (TRACE_start_functions != NULL) { + void (*func) (); + unsigned int iter = xbt_dynar_length(TRACE_start_functions); + xbt_dynar_foreach(TRACE_start_functions, iter, func) { + func(); + } + } } - trace_active = 1; - XBT_DEBUG ("Tracing is on"); - - /* other trace initialization */ - created_categories = xbt_dict_new_homogeneous(xbt_free); - declared_marks = xbt_dict_new_homogeneous (xbt_free); - user_host_variables = xbt_dict_new_homogeneous (xbt_free); - user_link_variables = xbt_dict_new_homogeneous (xbt_free); - TRACE_surf_alloc(); - TRACE_smpi_alloc(); + xbt_dynar_free(&TRACE_start_functions); return 0; } +static xbt_dynar_t TRACE_end_functions = NULL; +void TRACE_add_end_function(void (*func) (void)) +{ + if (TRACE_end_functions == NULL) + TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), NULL); + xbt_dynar_push(TRACE_end_functions, &func); +} + int TRACE_end() { - if (!trace_active) - return 1; - - TRACE_generate_viva_uncat_conf(); - TRACE_generate_viva_cat_conf(); - - /* dump trace buffer */ - TRACE_last_timestamp_to_dump = surf_get_clock(); - TRACE_paje_dump_buffer(1); - - /* destroy all data structures of tracing (and free) */ - PJ_container_free_all(); - PJ_type_free_all(); - PJ_container_release(); - PJ_type_release(); - TRACE_smpi_release(); - TRACE_surf_release(); - xbt_dict_free(&user_link_variables); - xbt_dict_free(&user_host_variables); - xbt_dict_free(&declared_marks); - xbt_dict_free(&created_categories); - - /* close the trace file */ - TRACE_paje_end(); - - /* de-activate trace */ - trace_active = 0; - XBT_DEBUG ("Tracing is off"); - XBT_DEBUG("Tracing system is shutdown"); - return 0; + int retval; + if (!trace_active) { + retval = 1; + } else { + retval = 0; + + TRACE_generate_viva_uncat_conf(); + TRACE_generate_viva_cat_conf(); + + /* dump trace buffer */ + TRACE_last_timestamp_to_dump = surf_get_clock(); + TRACE_paje_dump_buffer(1); + + /* destroy all data structures of tracing (and free) */ + PJ_container_free_all(); + PJ_type_free_all(); + PJ_container_release(); + PJ_type_release(); + + if (TRACE_end_functions != NULL) { + void (*func) (void); + unsigned int iter; + xbt_dynar_foreach(TRACE_end_functions, iter, func) { + func(); + } + } + + xbt_dict_free(&user_link_variables); + xbt_dict_free(&user_host_variables); + xbt_dict_free(&user_vm_variables); + xbt_dict_free(&declared_marks); + xbt_dict_free(&created_categories); + + /* close the trace file */ + TRACE_paje_end(); + + /* de-activate trace */ + trace_active = 0; + XBT_DEBUG("Tracing is off"); + XBT_DEBUG("Tracing system is shutdown"); + } + xbt_dynar_free(&TRACE_end_functions); + return retval; } int TRACE_needs_platform (void) { return TRACE_msg_process_is_enabled() || + TRACE_msg_vm_is_enabled() || TRACE_categorized() || TRACE_uncategorized() || TRACE_platform () || @@ -177,6 +228,10 @@ int TRACE_smpi_is_computing(void) return trace_smpi_computing; } +int TRACE_smpi_view_internals(void) +{ + return trace_view_internals; +} int TRACE_categorized (void) { @@ -193,6 +248,21 @@ int TRACE_msg_process_is_enabled(void) return trace_msg_process_enabled && TRACE_is_enabled(); } +int TRACE_msg_vm_is_enabled(void) +{ + return trace_msg_vm_enabled && TRACE_is_enabled(); +} + +int TRACE_disable_link(void) +{ + return trace_disable_link && TRACE_is_enabled(); +} + +int TRACE_disable_power(void) +{ + return trace_disable_power && TRACE_is_enabled(); +} + int TRACE_buffer (void) { return trace_buffer && TRACE_is_enabled(); @@ -289,6 +359,13 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing_smpi_computing, 0, 1, NULL, NULL); + /* smpi internals */ + int default_tracing_smpi_internals = 0; + xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_INTERNALS, + "View internal messages sent by Collective communications in SMPI", + xbt_cfgelm_int, &default_tracing_smpi_internals, 0, 1, + NULL, NULL); + /* tracing categorized resource utilization traces */ int default_tracing_categorized = 0; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_CATEGORIZED, @@ -310,6 +387,28 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing_msg_process, 0, 1, NULL, NULL); + /* msg process */ + int default_tracing_msg_vm = 0; + xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_VM, + "Tracing of MSG process behavior.", + xbt_cfgelm_int, &default_tracing_msg_vm, 0, 1, + NULL, NULL); + + /* disable tracing link */ + int default_tracing_disable_link = 0; + xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_LINK, + "Do not trace link bandwidth and latency.", + xbt_cfgelm_int, &default_tracing_disable_link, 0, 1, + NULL, NULL); + + /* disable tracing link */ + int default_tracing_disable_power = 0; + xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_POWER, + "Do not trace host power.", + xbt_cfgelm_int, &default_tracing_disable_power, 0, 1, + NULL, NULL); + + /* tracing buffer */ int default_buffer = 1; xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BUFFER, @@ -421,6 +520,9 @@ void TRACE_help (int detailed) " This option aims at tracing computations in the application, outside SMPI\n" " to allow further study of simulated or real computation time", detailed); + print_line (OPT_TRACING_SMPI_INTERNALS, "Generates tracing events corresponding", + " to point-to-point messages sent by collective communications", + detailed); print_line (OPT_TRACING_MSG_PROCESS, "Trace processes behavior (MSG)", " This option only has effect if this simulator is MSG-based. It traces the\n" " behavior of all categorized MSG processes, grouping them by hosts. This option\n"