X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf57fb58889894670e2594d2e3b6a213d8fd6089..a7dc4456f42a853a6294c774ccc9397304732c6e:/src/instr/instr_config.c diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 1bd308f42c..b0fc9e03ab 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -18,11 +18,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING_SMPI_GROUP "tracing/smpi/group" #define OPT_TRACING_CATEGORIZED "tracing/categorized" #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized" -#define OPT_TRACING_MSG_TASK "tracing/msg/task" #define OPT_TRACING_MSG_PROCESS "tracing/msg/process" #define OPT_TRACING_FILENAME "tracing/filename" #define OPT_TRACING_BUFFER "tracing/buffer" #define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only" +#define OPT_TRACING_DISABLE_DESTROY "tracing/disable_destroy" #define OPT_TRIVA_UNCAT_CONF "triva/uncategorized" #define OPT_TRIVA_CAT_CONF "triva/categorized" @@ -32,16 +32,14 @@ static int trace_smpi_enabled; static int trace_smpi_grouped; static int trace_categorized; static int trace_uncategorized; -static int trace_msg_task_enabled; static int trace_msg_process_enabled; static int trace_buffer; static int trace_onelink_only; +static int trace_disable_destroy; static int trace_configured = 0; static int trace_active = 0; -xbt_dict_t created_categories; //declared in instr_interface.c - static void TRACE_getopts(void) { trace_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING); @@ -50,10 +48,10 @@ static void TRACE_getopts(void) trace_smpi_grouped = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP); trace_categorized = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED); trace_uncategorized = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_UNCATEGORIZED); - trace_msg_task_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK); trace_msg_process_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS); trace_buffer = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_BUFFER); trace_onelink_only = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_ONELINK_ONLY); + trace_disable_destroy = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_DISABLE_DESTROY); } int TRACE_start() @@ -73,12 +71,17 @@ int TRACE_start() TRACE_paje_start(); /* activate trace */ - xbt_assert (trace_active==0, "Tracing is already active."); + 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(); + 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(); return 0; @@ -104,7 +107,13 @@ int TRACE_end() TRACE_paje_dump_buffer(1); /* destroy all data structures of tracing (and free) */ - destroyAllContainers(); + PJ_container_free_all(); + PJ_type_free_all(); + PJ_container_release(); + PJ_type_release(); + TRACE_surf_release(); + TRACE_smpi_release(); + xbt_dict_free(&created_categories); /* close the trace file */ TRACE_paje_end(); @@ -119,7 +128,6 @@ int TRACE_end() int TRACE_needs_platform (void) { return TRACE_msg_process_is_enabled() || - TRACE_msg_task_is_enabled() || TRACE_categorized() || TRACE_uncategorized() || TRACE_platform () || @@ -143,9 +151,8 @@ int TRACE_is_configured(void) int TRACE_smpi_is_enabled(void) { - return (xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI) || - TRACE_smpi_is_grouped())&& - TRACE_is_enabled(); + return (trace_smpi_enabled || TRACE_smpi_is_grouped()) + && TRACE_is_enabled(); } int TRACE_smpi_is_grouped(void) @@ -163,11 +170,6 @@ int TRACE_uncategorized (void) return trace_uncategorized; } -int TRACE_msg_task_is_enabled(void) -{ - return trace_msg_task_enabled && TRACE_is_enabled(); -} - int TRACE_msg_process_is_enabled(void) { return trace_msg_process_enabled && TRACE_is_enabled(); @@ -183,6 +185,11 @@ int TRACE_onelink_only (void) return trace_onelink_only && TRACE_is_enabled(); } +int TRACE_disable_destroy (void) +{ + return trace_disable_destroy && TRACE_is_enabled(); +} + char *TRACE_get_filename(void) { return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); @@ -214,10 +221,10 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing, 0, 1, NULL, NULL); - /* tracing platform*/ + /* register platform in the trace */ int default_tracing_platform = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM, - "Enable Tracing Platform.", + "Register the platform in the trace as a graph.", xbt_cfgelm_int, &default_tracing_platform, 0, 1, NULL, NULL); @@ -236,27 +243,20 @@ void TRACE_global_init(int *argc, char **argv) NULL, NULL); - /* platform */ + /* tracing categorized resource utilization traces */ int default_tracing_categorized = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED, - "Tracing of categorized platform (host and link) utilization.", + "Tracing categorized resource utilization of hosts and links.", xbt_cfgelm_int, &default_tracing_categorized, 0, 1, NULL, NULL); /* tracing uncategorized resource utilization */ int default_tracing_uncategorized = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_UNCATEGORIZED, - "Tracing of uncategorized resource (host and link) utilization.", + "Tracing uncategorized resource utilization of hosts and links.", xbt_cfgelm_int, &default_tracing_uncategorized, 0, 1, NULL, NULL); - /* msg task */ - int default_tracing_msg_task = 0; - xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_TASK, - "Tracing of MSG task behavior.", - xbt_cfgelm_int, &default_tracing_msg_task, 0, 1, - NULL, NULL); - /* msg process */ int default_tracing_msg_process = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_PROCESS, @@ -265,7 +265,7 @@ void TRACE_global_init(int *argc, char **argv) NULL, NULL); /* tracing buffer */ - int default_buffer = 0; + int default_buffer = 1; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_BUFFER, "Buffer trace events to put them in temporal order.", xbt_cfgelm_int, &default_buffer, 0, 1, @@ -278,6 +278,13 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_onelink_only, 0, 1, NULL, NULL); + /* disable destroy */ + int default_disable_destroy = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_DISABLE_DESTROY, + "Disable platform containers destruction.", + xbt_cfgelm_int, &default_disable_destroy, 0, 1, + NULL, NULL); + /* Triva graph configuration for uncategorized tracing */ char *default_triva_uncat_conf_file = xbt_strdup (""); xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF, @@ -342,10 +349,6 @@ void TRACE_help (int detailed) " This option only has effect if this simulator is SMPI-based. The processes\n" " are grouped by the hosts where they were executed.", detailed); - print_line (OPT_TRACING_MSG_TASK, "Trace task behavior (MSG)", - " This option only has effect if this simulator is MSG-based. It traces the\n" - " behavior of all categorized MSG tasks, grouping them by hosts.", - 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" @@ -365,6 +368,11 @@ void TRACE_help (int detailed) " only the routes with one link are used to register the topology within an AS.\n" " Routes among AS continue to be traced as usual.", detailed); + print_line (OPT_TRACING_DISABLE_DESTROY, "Disable platform containers destruction", + " Disable the destruction of containers at the end of simulation. This can be\n" + " used with simulators that have a different notion of time (different from\n" + " the simulated time).", + detailed); print_line (OPT_TRIVA_UNCAT_CONF, "Generate graph configuration for Triva", " This option can be used in all types of simulators build with SimGrid\n" " to generate a uncategorized resource utilization graph to be used as\n" @@ -389,9 +397,10 @@ void TRACE_generate_triva_uncat_conf (void) char *name, *value; FILE *file = fopen (output, "w"); - xbt_assert (file != NULL, - "Unable to open file (%s) for writing triva graph " - "configuration (uncategorized).", output); + if (file == NULL){ + THROWF (system_error, 1, "Unable to open file (%s) for writing triva graph " + "configuration (uncategorized).", output); + } //open fprintf (file, "{\n"); @@ -439,15 +448,16 @@ void TRACE_generate_triva_cat_conf (void) char *name, *name2, *value, *value2; //check if we do have categories declared - if (xbt_dict_length(created_categories) == 0){ + if (xbt_dict_is_empty(created_categories)){ XBT_INFO("No categories declared, ignoring generation of triva graph configuration"); return; } FILE *file = fopen (output, "w"); - xbt_assert (file != NULL, - "Unable to open file (%s) for writing triva graph " - "configuration (categorized).", output); + if (file == NULL){ + THROWF (system_error, 1, "Unable to open file (%s) for writing triva graph " + "configuration (categorized).", output); + } //open fprintf (file, "{\n"); @@ -503,11 +513,11 @@ void TRACE_generate_triva_cat_conf (void) #undef OPT_TRACING_SMPI_GROUP #undef OPT_TRACING_CATEGORIZED #undef OPT_TRACING_UNCATEGORIZED -#undef OPT_TRACING_MSG_TASK #undef OPT_TRACING_MSG_PROCESS -#undef OPT_TRACING_MSG_VOLUME #undef OPT_TRACING_FILENAME -#undef OPT_TRACING_PLATFORM_METHOD +#undef OPT_TRACING_BUFFER +#undef OPT_TRACING_ONELINK_ONLY +#undef OPT_TRACING_DISABLE_DESTROY #undef OPT_TRIVA_UNCAT_CONF #undef OPT_TRIVA_CAT_CONF