X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b2fb141eada975e36db406b18e4fdee68012d3a7..1646a478b93ec1fceead61763f1a4b294f8eb1b3:/src/instr/instr_config.c diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index ffff7f877d..b948962e98 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -18,7 +18,6 @@ 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" @@ -33,7 +32,6 @@ 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; @@ -42,8 +40,6 @@ 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); @@ -52,7 +48,6 @@ 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); @@ -76,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_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; @@ -107,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(); @@ -122,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 () || @@ -146,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) @@ -166,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(); @@ -258,13 +257,6 @@ void TRACE_global_init(int *argc, char **argv) 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, @@ -273,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, @@ -357,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" @@ -401,49 +389,67 @@ void TRACE_help (int detailed) detailed); } +static void output_types (const char *name, xbt_dynar_t types, FILE *file) +{ + unsigned int i; + fprintf (file, " %s = (", name); + for (i = xbt_dynar_length(types); i > 0; i--) { + char *type = *(char**)xbt_dynar_get_ptr(types, i - 1); + fprintf (file, "\"%s\"", type); + if (i - 1 > 0){ + fprintf (file, ","); + }else{ + fprintf (file, ");\n"); + } + } + xbt_dynar_free (&types); +} + +static void output_categories (const char *name, xbt_dynar_t cats, FILE *file) +{ + unsigned int i; + fprintf (file, " values = ("); + for (i = xbt_dynar_length(cats); i > 0; i--) { + char *cat = *(char**)xbt_dynar_get_ptr(cats, i - 1); + fprintf (file, "\"%s%s\"", name, cat); + if (i - 1 > 0){ + fprintf (file, ","); + }else{ + fprintf (file, ");\n"); + } + } + xbt_dynar_free (&cats); +} + void TRACE_generate_triva_uncat_conf (void) { char *output = TRACE_get_triva_uncat_conf (); if (output && strlen(output) > 0){ - xbt_dict_cursor_t cursor=NULL; - 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"); - //register NODE types - fprintf (file, " node = ("); - xbt_dict_foreach(trivaNodeTypes, cursor, name, value) { - fprintf (file, "%s, ", name); - } - - //register EDGE types - fprintf (file, - ");\n" - " edge = ("); - xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) { - fprintf (file, "%s, ", name); - } - fprintf (file, - ");\n" - "\n"); + //register NODE and EDGE types + output_types ("node", TRACE_get_node_types(), file); + output_types ("edge", TRACE_get_edge_types(), file); + fprintf (file, "\n"); //configuration for all nodes fprintf (file, " host = {\n" - " type = square;\n" - " size = power;\n" - " values = (power_used);\n" + " type = \"square\";\n" + " size = \"power\";\n" + " values = (\"power_used\");\n" " };\n" " link = {\n" - " type = rhombus;\n" - " size = bandwidth;\n" - " values = (bandwidth_used);\n" + " type = \"rhombus\";\n" + " size = \"bandwidth\";\n" + " values = (\"bandwidth_used\");\n" " };\n"); //close fprintf (file, "}\n"); @@ -465,75 +471,44 @@ void TRACE_generate_triva_cat_conf (void) } 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"); - //register NODE types - fprintf (file, " node = ("); - xbt_dict_foreach(trivaNodeTypes, cursor, name, value) { - fprintf (file, "%s, ", name); - } - - //register EDGE types - fprintf (file, - ");\n" - " edge = ("); - xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) { - fprintf (file, "%s, ", name); - } - fprintf (file, - ");\n" - "\n"); + //register NODE and EDGE types + output_types ("node", TRACE_get_node_types(), file); + output_types ("edge", TRACE_get_edge_types(), file); + fprintf (file, "\n"); //configuration for all nodes fprintf (file, - " host = {\n" - " type = square;\n" - " size = power;\n" - " values = ("); - xbt_dict_foreach(created_categories,cursor2,name2,value2) { - fprintf (file, "p%s, ", name2); - } - fprintf (file, - ");\n" - " };\n" - " link = {\n" - " type = rhombus;\n" - " size = bandwidth;\n" - " values = ("); - xbt_dict_foreach(created_categories,cursor2,name2,value2) { - fprintf (file, "b%s, ", name2); - } + " host = {\n" + " type = \"square\";\n" + " size = \"power\";\n"); + output_categories ("p", TRACE_get_categories(), file); fprintf (file, - ");\n" - " };\n"); + " };\n" + " link = {\n" + " type = \"rhombus\";\n" + " size = \"bandwidth\";\n"); + output_categories ("b", TRACE_get_categories(), file); + fprintf (file, " };\n"); //close fprintf (file, "}\n"); fclose (file); } } -void TRACE_set_network_update_mechanism (void) -{ - if (TRACE_is_enabled()){ - if (TRACE_categorized() || TRACE_uncategorized()){ - XBT_INFO ("Tracing resource utilization active, network/optim configuration now set to Full."); - xbt_cfg_set_string (_surf_cfg_set, "network/optim", "Full"); - } - } -} - #undef OPT_TRACING #undef OPT_TRACING_PLATFORM #undef OPT_TRACING_SMPI #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_FILENAME #undef OPT_TRACING_BUFFER