X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/399a7727d537d5225f2c48613b1c67b50f31b9f2..272ccad1b68b6d9c17069f3c934886925bb15b5d:/src/instr/instr_config.c diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 640837e9ab..d8014a43de 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -18,13 +18,15 @@ 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" +#define OPT_VIVA_UNCAT_CONF "viva/uncategorized" +#define OPT_VIVA_CAT_CONF "viva/categorized" static int trace_enabled; static int trace_platform; @@ -32,16 +34,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 +50,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,10 +73,17 @@ int TRACE_start() TRACE_paje_start(); /* activate trace */ - TRACE_activate (); + 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; @@ -84,57 +91,40 @@ int TRACE_start() int TRACE_end() { - if (!TRACE_is_active()) + if (!trace_active) return 1; - /* generate uncategorized graph configuration for triva */ - if (TRACE_get_triva_uncat_conf()){ - TRACE_generate_triva_uncat_conf(); - } - - /* generate categorized graph configuration for triva */ - if (TRACE_get_triva_cat_conf()){ - TRACE_generate_triva_cat_conf(); - } + TRACE_generate_triva_uncat_conf(); + TRACE_generate_triva_cat_conf(); + 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) */ - 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(); - /* activate trace */ - TRACE_desactivate (); - XBT_DEBUG("Tracing system is shutdown"); - return 0; -} - -void TRACE_activate (void) -{ - xbt_assert (trace_active==0, "Tracing is already active."); - trace_active = 1; - XBT_DEBUG ("Tracing is on"); -} - -void TRACE_desactivate (void) -{ + /* de-activate trace */ trace_active = 0; XBT_DEBUG ("Tracing is off"); -} - -int TRACE_is_active (void) -{ - return trace_active; + XBT_DEBUG("Tracing system is shutdown"); + return 0; } int TRACE_needs_platform (void) { return TRACE_msg_process_is_enabled() || - TRACE_msg_task_is_enabled() || TRACE_categorized() || TRACE_uncategorized() || TRACE_platform () || @@ -158,9 +148,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) @@ -178,11 +167,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(); @@ -198,6 +182,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); @@ -213,6 +202,16 @@ char *TRACE_get_triva_cat_conf (void) return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_CAT_CONF); } +char *TRACE_get_viva_uncat_conf (void) +{ + return xbt_cfg_get_string(_surf_cfg_set, OPT_VIVA_UNCAT_CONF); +} + +char *TRACE_get_viva_cat_conf (void) +{ + return xbt_cfg_get_string(_surf_cfg_set, OPT_VIVA_CAT_CONF); +} + void TRACE_global_init(int *argc, char **argv) { /* name of the tracefile */ @@ -229,10 +228,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); @@ -251,27 +250,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, @@ -280,7 +272,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, @@ -293,6 +285,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, @@ -307,6 +306,20 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_string, &default_triva_cat_conf_file, 1, 1, NULL, NULL); + /* Viva graph configuration for uncategorized tracing */ + char *default_viva_uncat_conf_file = xbt_strdup (""); + xbt_cfg_register(&_surf_cfg_set, OPT_VIVA_UNCAT_CONF, + "Viva Graph configuration file for uncategorized resource utilization traces.", + xbt_cfgelm_string, &default_viva_uncat_conf_file, 1, 1, + NULL, NULL); + + /* Viva graph configuration for uncategorized tracing */ + char *default_viva_cat_conf_file = xbt_strdup (""); + xbt_cfg_register(&_surf_cfg_set, OPT_VIVA_CAT_CONF, + "Viva Graph configuration file for categorized resource utilization traces.", + xbt_cfgelm_string, &default_viva_cat_conf_file, 1, 1, + NULL, NULL); + /* instrumentation can be considered configured now */ trace_configured = 1; } @@ -357,10 +370,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" @@ -380,6 +389,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" @@ -394,136 +408,171 @@ void TRACE_help (int detailed) " file for the Triva visualization tool that can be used to analyze a categorized\n" " resource utilization.", detailed); + print_line (OPT_VIVA_UNCAT_CONF, "Generate a graph configuration for Viva", + " 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" + " configuration for the Viva visualization tool. This option\n" + " can be used with tracing/categorized:1 and tracing:1 options to\n" + " analyze an unmodified simulator before changing it to contain\n" + " categories.", + detailed); + print_line (OPT_VIVA_CAT_CONF, "Generate an uncategorized graph configuration for Viva", + " This option can be used if this simulator uses tracing categories\n" + " in its code. The file specified by this option holds a graph configuration\n" + " file for the Viva visualization tool that can be used to analyze a categorized\n" + " resource utilization.", + detailed); } -void TRACE_generate_triva_uncat_conf (void) +static void output_types (const char *name, xbt_dynar_t types, FILE *file) { - char *output = TRACE_get_triva_uncat_conf (); - if (output && strlen(output) > 0){ - xbt_dict_cursor_t cursor=NULL; - char *name, *value; + 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); +} - FILE *file = fopen (output, "w"); - xbt_assert (file != NULL, - "Unable to open file (%s) for writing triva graph " - "configuration (uncategorized).", output); +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); +} - //open - fprintf (file, "{\n"); +static void uncat_configuration (FILE *file) +{ + //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" + " };\n" + " link = {\n" + " type = \"rhombus\";\n" + " size = \"bandwidth\";\n" + " values = (\"bandwidth_used\");\n" + " };\n"); + //close +} - //register NODE types - fprintf (file, " node = ("); - xbt_dict_foreach(trivaNodeTypes, cursor, name, value) { - fprintf (file, "%s, ", name); - } +static void cat_configuration (FILE *file) +{ + //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"); + output_categories ("p", TRACE_get_categories(), file); + fprintf (file, + " };\n" + " link = {\n" + " type = \"rhombus\";\n" + " size = \"bandwidth\";\n"); + output_categories ("b", TRACE_get_categories(), file); + fprintf (file, " };\n"); + //close +} - //register EDGE types - fprintf (file, - ");\n" - " edge = ("); - xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) { - fprintf (file, "%s, ", name); +static void generate_uncat_configuration (const char *output, const char *name, int brackets) +{ + if (output && strlen(output) > 0){ + FILE *file = fopen (output, "w"); + if (file == NULL){ + THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph " + "configuration (uncategorized).", output, name); } - fprintf (file, - ");\n" - "\n"); - - //configuration for all nodes - fprintf (file, - " host = {\n" - " type = square;\n" - " size = power;\n" - " values = (power_used);\n" - " };\n" - " link = {\n" - " type = rhombus;\n" - " size = bandwidth;\n" - " values = (bandwidth_used);\n" - " };\n"); - //close - fprintf (file, "}\n"); + + if (brackets) fprintf (file, "{\n"); + uncat_configuration (file); + if (brackets) fprintf (file, "}\n"); fclose (file); } } -void TRACE_generate_triva_cat_conf (void) +static void generate_cat_configuration (const char *output, const char *name, int brackets) { - char *output = TRACE_get_triva_cat_conf(); if (output && strlen(output) > 0){ - xbt_dict_cursor_t cursor=NULL, cursor2=NULL; - char *name, *name2, *value, *value2; - //check if we do have categories declared - if (xbt_dict_length(created_categories) == 0){ - XBT_INFO("No categories declared, ignoring generation of triva graph configuration"); + if (xbt_dict_is_empty(created_categories)){ + XBT_INFO("No categories declared, ignoring generation of %s graph configuration", name); return; } FILE *file = fopen (output, "w"); - xbt_assert (file != NULL, - "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); + if (file == NULL){ + THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph " + "configuration (categorized).", output, name); } - //register EDGE types - fprintf (file, - ");\n" - " edge = ("); - xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) { - fprintf (file, "%s, ", name); - } - fprintf (file, - ");\n" - "\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); - } - fprintf (file, - ");\n" - " };\n"); - //close - fprintf (file, "}\n"); + if (brackets) fprintf (file, "{\n"); + cat_configuration (file); + if (brackets) fprintf (file, "}\n"); fclose (file); } } +void TRACE_generate_triva_uncat_conf (void) +{ + generate_uncat_configuration (TRACE_get_triva_uncat_conf (), "triva", 1); +} + +void TRACE_generate_triva_cat_conf (void) +{ + generate_cat_configuration (TRACE_get_triva_cat_conf(), "triva", 1); +} + +void TRACE_generate_viva_uncat_conf (void) +{ + generate_uncat_configuration (TRACE_get_viva_uncat_conf (), "viva", 0); +} + +void TRACE_generate_viva_cat_conf (void) +{ + generate_cat_configuration (TRACE_get_viva_cat_conf(), "viva", 0); +} + #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_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 +#undef OPT_VIVA_UNCAT_CONF +#undef OPT_VIVA_CAT_CONF #endif /* HAVE_TRACING */