X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b57d0dc822c4b229e52ecc40d8a7b75e0e2db6a1..ad4640ba22bba03fdc83e735157be1b4d23079eb:/src/instr/instr_config.c diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 53b4ec8d7a..680fa68ce0 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -15,21 +15,21 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING "tracing" #define OPT_TRACING_SMPI "tracing/smpi" #define OPT_TRACING_SMPI_GROUP "tracing/smpi/group" -#define OPT_TRACING_PLATFORM "tracing/categorized" +#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_MSG_VOLUME "tracing/msg/volume" #define OPT_TRACING_FILENAME "tracing/filename" -#define OPT_TRACING_PLATFORM_METHOD "tracing/platform/method" +#define OPT_TRACING_BUFFER "tracing/buffer" +#define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only" #define OPT_TRIVA_UNCAT_CONF "triva/uncategorized" #define OPT_TRIVA_CAT_CONF "triva/categorized" static int trace_configured = 0; static int trace_active = 0; -extern xbt_dict_t created_categories; //declared in instr_interface.c -extern xbt_dict_t defined_types; //declared in instr_interface.c +xbt_dict_t created_categories; //declared in instr_interface.c int TRACE_start() { @@ -40,7 +40,7 @@ int TRACE_start() return 0; } - DEBUG0("Tracing starts"); + XBT_DEBUG("Tracing starts"); /* open the trace file */ TRACE_paje_start(); @@ -48,80 +48,9 @@ int TRACE_start() /* activate trace */ TRACE_activate (); - /* base type hierarchy: - * --cfg=tracing - */ - pajeDefineContainerType("PLATFORM", "0", "platform"); - pajeDefineContainerType("HOST", "PLATFORM", "HOST"); - pajeDefineContainerType("LINK", "PLATFORM", "LINK"); - pajeDefineVariableType("power", "HOST", "power"); - pajeDefineVariableType("bandwidth", "LINK", "bandwidth"); - pajeDefineVariableType("latency", "LINK", "latency"); - pajeDefineEventType("source", "LINK", "source"); - pajeDefineEventType("destination", "LINK", "destination"); - - /* type hierarchy for: - * --cfg=tracing/uncategorized - */ - if (TRACE_uncategorized()){ - pajeDefineVariableTypeWithColor("power_used", "HOST", "power_used", "0.5 0.5 0.5"); - pajeDefineVariableTypeWithColor("bandwidth_used", "LINK", "bandwidth_used", "0.5 0.5 0.5"); - } - - /* type hierarchy for: - * --cfg=tracing/msg/process - * --cfg=tracing/msg/volume - */ - if (TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()) { - //processes grouped by host - pajeDefineContainerType("PROCESS", "HOST", "PROCESS"); - } - - if (TRACE_msg_process_is_enabled()) { - pajeDefineStateType("category", "PROCESS", "category"); - pajeDefineStateType("presence", "PROCESS", "presence"); - } - - if (TRACE_msg_volume_is_enabled()) { - pajeDefineLinkType("volume", "0", "PROCESS", "PROCESS", "volume"); - } - - /* type hierarchy for: - * --cfg=tracing/msg/task - */ - if (TRACE_msg_task_is_enabled()) { - //tasks grouped by host - pajeDefineContainerType("TASK", "HOST", "TASK"); - pajeDefineStateType("category", "TASK", "category"); - pajeDefineStateType("presence", "TASK", "presence"); - } - - /* type hierarchy for - * --cfg=tracing/smpi - * --cfg=tracing/smpi/group - */ - if (TRACE_smpi_is_enabled()) { - if (TRACE_smpi_is_grouped()){ - pajeDefineContainerType("MPI_PROCESS", "HOST", "MPI_PROCESS"); - }else{ - pajeDefineContainerType("MPI_PROCESS", "PLATFORM", "MPI_PROCESS"); - } - pajeDefineStateType("MPI_STATE", "MPI_PROCESS", "MPI_STATE"); - pajeDefineLinkType("MPI_LINK", "0", "MPI_PROCESS", "MPI_PROCESS", - "MPI_LINK"); - } - - /* creating the platform */ - pajeCreateContainer(MSG_get_clock(), "platform", "PLATFORM", "0", - "simgrid-platform"); - /* other trace initialization */ - defined_types = xbt_dict_new(); created_categories = xbt_dict_new(); - TRACE_msg_task_alloc(); - TRACE_category_alloc(); TRACE_surf_alloc(); - TRACE_msg_process_alloc(); TRACE_smpi_alloc(); return 0; } @@ -130,10 +59,6 @@ int TRACE_end() { if (!TRACE_is_active()) return 1; - XBT_IN; - - /* close the trace file */ - TRACE_paje_end(); /* generate uncategorized graph configuration for triva */ if (TRACE_get_triva_uncat_conf()){ @@ -145,23 +70,33 @@ int TRACE_end() TRACE_generate_triva_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(); + + /* close the trace file */ + TRACE_paje_end(); + /* activate trace */ TRACE_desactivate (); - DEBUG0("Tracing system is shutdown"); + XBT_DEBUG("Tracing system is shutdown"); return 0; } void TRACE_activate (void) { - xbt_assert0 (trace_active==0, "Tracing is already active."); + xbt_assert (trace_active==0, "Tracing is already active."); trace_active = 1; - DEBUG0 ("Tracing is on"); + XBT_DEBUG ("Tracing is on"); } void TRACE_desactivate (void) { trace_active = 0; - DEBUG0 ("Tracing is off"); + XBT_DEBUG ("Tracing is off"); } int TRACE_is_active (void) @@ -181,7 +116,8 @@ int TRACE_is_configured(void) int TRACE_smpi_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI); + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI) && + TRACE_is_enabled(); } int TRACE_smpi_is_grouped(void) @@ -189,9 +125,9 @@ int TRACE_smpi_is_grouped(void) return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP); } -int TRACE_platform_is_enabled(void) +int TRACE_categorized (void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM); + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED); } int TRACE_uncategorized (void) @@ -201,27 +137,37 @@ int TRACE_uncategorized (void) int TRACE_msg_task_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK); + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK) && + TRACE_is_enabled(); } int TRACE_msg_process_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS); + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS) && + TRACE_is_enabled(); } int TRACE_msg_volume_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME); + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME) && + TRACE_is_enabled(); } -char *TRACE_get_filename(void) +int TRACE_buffer (void) { - return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_BUFFER) && + TRACE_is_enabled(); } -char *TRACE_get_platform_method(void) +int TRACE_onelink_only (void) { - return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD); + return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_ONELINK_ONLY) && + TRACE_is_enabled(); +} + +char *TRACE_get_filename(void) +{ + return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); } char *TRACE_get_triva_uncat_conf (void) @@ -267,7 +213,7 @@ void TRACE_global_init(int *argc, char **argv) /* platform */ int default_tracing_platform = 0; - xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM, + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED, "Tracing of categorized platform (host and link) utilization.", xbt_cfgelm_int, &default_tracing_platform, 0, 1, NULL, NULL); @@ -279,13 +225,6 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing_uncategorized, 0, 1, NULL, NULL); - /* platform method */ - char *default_tracing_platform_method = xbt_strdup("a"); - xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD, - "Tracing method used to register categorized resource behavior.", - xbt_cfgelm_string, &default_tracing_platform_method, 1, - 1, NULL, NULL); - /* msg task */ int default_tracing_msg_task = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_TASK, @@ -307,6 +246,20 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing_msg_volume, 0, 1, NULL, NULL); + /* msg volume (experimental) */ + int default_buffer = 0; + 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, + NULL, NULL); + + /* msg volume (experimental) */ + int default_onelink_only = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_ONELINK_ONLY, + "Use only routes with one link to trace platform.", + xbt_cfgelm_int, &default_onelink_only, 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, @@ -345,7 +298,7 @@ void TRACE_help (int detailed) " It activates the tracing system and register the simulation platform\n" " in the trace file. You have to enable this option to others take effect.", detailed); - print_line (OPT_TRACING_PLATFORM, "Trace categorized resource utilization", + print_line (OPT_TRACING_CATEGORIZED, "Trace categorized resource utilization", " It activates the categorized resource utilization tracing. It should\n" " be enabled if tracing categories are used by this simulator.", detailed); @@ -354,18 +307,6 @@ void TRACE_help (int detailed) " this simulator do not use tracing categories and resource use have to be\n" " traced.", detailed); - print_line (OPT_TRACING_PLATFORM_METHOD, "Change the resource utilization tracing method", - " It changes the way resource utilization (categorized or not) is traced\n" - " inside the simulation core. Method 'a' (default) traces all updates defined\n" - " by the CPU/network model of a given resource. Depending on the interface used\n" - " by this simulator (MSG, SMPI, SimDAG), the default method can generate large\n" - " trace files. Method 'b' tries to make smaller tracefiles using clever updates,\n" - " without losing details of resource utilization. Method 'c' generates even\n" - " smaller files by doing time integration during the simulation, but it loses\n" - " precision. If this last method is used, the smallest timeslice used in the\n" - " tracefile analysis must be bigger than the smaller resource utilization. If\n" - " unsure, do not change this option.", - detailed); print_line (OPT_TRACING_FILENAME, "Filename to register traces", " A file with this name will be created to register the simulation. The file\n" " is in the Paje format and can be analyzed using Triva or Paje visualization\n" @@ -396,6 +337,20 @@ void TRACE_help (int detailed) " This experimental option only has effect if this simulator is MSG-based.\n" " It traces the communication volume of MSG send/receive.", detailed); + print_line (OPT_TRACING_BUFFER, "Buffer events to put them in temporal order", + " This option put some events in a time-ordered buffer using the insertion\n" + " sort algorithm. The process of acquiring and releasing locks to access this\n" + " buffer and the cost of the sorting algorithm make this process slow. The\n" + " simulator performance can be severely impacted if this option is activated,\n" + " but you are sure to get a trace file with events sorted.", + detailed); + print_line (OPT_TRACING_ONELINK_ONLY, "Consider only one link routes to trace platform", + " This option changes the way SimGrid register its platform on the trace file.\n" + " Normally, the tracing considers all routes (no matter their size) on the\n" + " platform file to re-create the resource topology. If this option is activated,\n" + " 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_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" @@ -416,38 +371,48 @@ 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_assert1 (file != NULL, + xbt_assert (file != NULL, "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"); + + //configuration for all nodes fprintf (file, - "{\n" - " node = (HOST);\n" - " edge = (LINK);\n" - "\n" - " HOST = {\n" + " host = {\n" + " type = square;\n" " size = power;\n" - " scale = global;\n" - " host_sep = {\n" - " type = separation;\n" - " size = power;\n" - " values = (power_used);\n" - " };\n" + " values = (power_used);\n" " };\n" - " LINK = {\n" - " src = source;\n" - " dst = destination;\n" + " link = {\n" + " type = rhombus;\n" " size = bandwidth;\n" - " scale = global;\n" - " link_sep = {\n" - " type = separation;\n" - " size = bandwidth;\n" - " values = (bandwidth_used);\n" - " };\n" - " };\n" - " graphviz-algorithm = neato;\n" - "}\n" - ); + " values = (bandwidth_used);\n" + " };\n"); + //close + fprintf (file, "}\n"); fclose (file); } } @@ -456,63 +421,72 @@ void TRACE_generate_triva_cat_conf (void) { 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){ - INFO0("No categories declared, ignoring generation of triva graph configuration"); + XBT_INFO("No categories declared, ignoring generation of triva graph configuration"); return; } - xbt_dict_cursor_t cursor=NULL; - char *key, *data; + FILE *file = fopen (output, "w"); - xbt_assert1 (file != NULL, + 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); + } + + //register EDGE types fprintf (file, - "{\n" - " node = (HOST);\n" - " edge = (LINK);\n" - "\n" - " HOST = {\n" + ");\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" - " scale = global;\n" - " host_sep = {\n" - " type = separation;\n" - " size = power;\n" - " values = ("); - xbt_dict_foreach(created_categories,cursor,key,data) { - fprintf(file, "p%s, ",key); + " values = ("); + xbt_dict_foreach(created_categories,cursor2,name2,value2) { + fprintf (file, "p%s, ", name2); } fprintf (file, ");\n" - " };\n" " };\n" - " LINK = {\n" - " src = source;\n" - " dst = destination;\n" + " link = {\n" + " type = rhombus;\n" " size = bandwidth;\n" - " scale = global;\n" - " link_sep = {\n" - " type = separation;\n" - " size = bandwidth;\n" - " values = ("); - xbt_dict_foreach(created_categories,cursor,key,data) { - fprintf(file, "b%s, ",key); + " values = ("); + xbt_dict_foreach(created_categories,cursor2,name2,value2) { + fprintf (file, "b%s, ", name2); } fprintf (file, ");\n" - " };\n" - " };\n" - " graphviz-algorithm = neato;\n" - "}\n" - ); - fclose(file); + " };\n"); + //close + fprintf (file, "}\n"); + fclose (file); } } #undef OPT_TRACING #undef OPT_TRACING_SMPI #undef OPT_TRACING_SMPI_GROUP -#undef OPT_TRACING_PLATFORM +#undef OPT_TRACING_CATEGORIZED #undef OPT_TRACING_UNCATEGORIZED #undef OPT_TRACING_MSG_TASK #undef OPT_TRACING_MSG_PROCESS