X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f91935dd64073af1ce54dfbe930c3991d45eafe2..fd317f3cbf1cafcd1eeb4841b9a4b22d0dc81a0b:/src/instr/instr_config.c diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index bad7e613de..95163f1284 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -13,45 +13,143 @@ XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used fo XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING "tracing" +#define OPT_TRACING_PLATFORM "tracing/platform" #define OPT_TRACING_SMPI "tracing/smpi" #define OPT_TRACING_SMPI_GROUP "tracing/smpi/group" -#define OPT_TRACING_PLATFORM "tracing/platform" +#define OPT_TRACING_SMPI_COMPUTING "tracing/smpi/computing" +#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_TRACING_DISABLE_DESTROY "tracing/disable_destroy" +#define OPT_TRACING_BASIC "tracing/basic" +#define OPT_TRACING_COMMENT "tracing/comment" +#define OPT_TRACING_COMMENT_FILE "tracing/comment_file" #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; +static int trace_smpi_enabled; +static int trace_smpi_grouped; +static int trace_smpi_computing; +static int trace_categorized; +static int trace_uncategorized; +static int trace_msg_process_enabled; +static int trace_buffer; +static int trace_onelink_only; +static int trace_disable_destroy; +static int trace_basic; static int trace_configured = 0; static int trace_active = 0; -extern 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); + trace_platform = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM); + trace_smpi_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI); + trace_smpi_grouped = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP); + trace_smpi_computing = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_COMPUTING); + 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_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); + trace_basic = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_BASIC); +} -void TRACE_activate (void) +int TRACE_start() { - if (trace_active){ - THROW0(tracing_error, TRACE_ERROR_ALREADY_ACTIVE, - "Tracing is already active."); + TRACE_getopts(); + + // 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; + } + + XBT_DEBUG("Tracing starts"); + + /* open the trace file */ + TRACE_paje_start(); + + /* 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_link_variables = xbt_dict_new_homogeneous (xbt_free); + TRACE_surf_alloc(); + TRACE_smpi_alloc(); + return 0; } -void TRACE_desactivate (void) +int TRACE_end() { + if (!trace_active) + return 1; + + 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) */ + 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 TRACE_is_active (void) +int TRACE_needs_platform (void) { - return trace_active; + return TRACE_msg_process_is_enabled() || + TRACE_categorized() || + TRACE_uncategorized() || + TRACE_platform () || + (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()); } int TRACE_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING); + return trace_enabled; +} + +int TRACE_platform(void) +{ + return trace_platform; } int TRACE_is_configured(void) @@ -61,47 +159,69 @@ int TRACE_is_configured(void) int TRACE_smpi_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI); + return (trace_smpi_enabled || TRACE_smpi_is_grouped()) + && TRACE_is_enabled(); } int TRACE_smpi_is_grouped(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP); + return trace_smpi_grouped; } -int TRACE_platform_is_enabled(void) +int TRACE_smpi_is_computing(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM); + return trace_smpi_computing; } -int TRACE_uncategorized (void) + +int TRACE_categorized (void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_UNCATEGORIZED); + return trace_categorized; } -int TRACE_msg_task_is_enabled(void) +int TRACE_uncategorized (void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK); + return trace_uncategorized; } int TRACE_msg_process_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS); + return trace_msg_process_enabled && TRACE_is_enabled(); } -int TRACE_msg_volume_is_enabled(void) +int TRACE_buffer (void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME); + return trace_buffer && TRACE_is_enabled(); } -char *TRACE_get_filename(void) +int TRACE_onelink_only (void) { - return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); + return trace_onelink_only && TRACE_is_enabled(); +} + +int TRACE_disable_destroy (void) +{ + return trace_disable_destroy && TRACE_is_enabled(); +} + +int TRACE_basic (void) +{ + return trace_basic && TRACE_is_enabled(); } -char *TRACE_get_platform_method(void) +char *TRACE_get_comment (void) +{ + return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_COMMENT); +} + +char *TRACE_get_comment_file (void) +{ + return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_COMMENT_FILE); +} + +char *TRACE_get_filename(void) { - return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD); + return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); } char *TRACE_get_triva_uncat_conf (void) @@ -114,6 +234,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 */ @@ -130,6 +260,13 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing, 0, 1, NULL, NULL); + /* register platform in the trace */ + int default_tracing_platform = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM, + "Register the platform in the trace as a graph.", + xbt_cfgelm_int, &default_tracing_platform, 0, 1, + NULL, NULL); + /* smpi */ int default_tracing_smpi = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI, @@ -144,35 +281,27 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing_smpi_grouped, 0, 1, NULL, NULL); + /* smpi computing */ + int default_tracing_smpi_computing = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI_COMPUTING, + "Generate states for timing out of SMPI parts of the application", + xbt_cfgelm_int, &default_tracing_smpi_computing, 0, 1, + NULL, NULL); - /* platform */ - int default_tracing_platform = 0; - xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM, - "Tracing of categorized platform (host and link) utilization.", - xbt_cfgelm_int, &default_tracing_platform, 0, 1, + /* tracing categorized resource utilization traces */ + int default_tracing_categorized = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED, + "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); - /* 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, - "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, @@ -180,11 +309,46 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing_msg_process, 0, 1, NULL, NULL); - /* msg volume (experimental) */ - int default_tracing_msg_volume = 0; - xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_VOLUME, - "Tracing of MSG communication volume (experimental).", - xbt_cfgelm_int, &default_tracing_msg_volume, 0, 1, + /* tracing buffer */ + 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, + NULL, NULL); + + /* tracing one link only */ + 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); + + /* 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); + + /* basic -- Avoid extended events (impoverished trace file) */ + int default_basic = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_BASIC, + "Avoid extended events (impoverished trace file).", + xbt_cfgelm_int, &default_basic, 0, 1, + NULL, NULL); + + /* comment */ + char *default_tracing_comment = xbt_strdup (""); + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_COMMENT, + "Comment to be added on the top of the trace file.", + xbt_cfgelm_string, &default_tracing_comment, 1, 1, + NULL, NULL); + + /* comment_file */ + char *default_tracing_comment_file = xbt_strdup (""); + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_COMMENT_FILE, + "The contents of the file are added to the top of the trace file as comment.", + xbt_cfgelm_string, &default_tracing_comment_file, 1, 1, NULL, NULL); /* Triva graph configuration for uncategorized tracing */ @@ -201,6 +365,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; } @@ -225,7 +403,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); @@ -234,18 +412,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" @@ -263,18 +429,45 @@ 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.", + print_line (OPT_TRACING_SMPI_COMPUTING, "Generates a \" Computing \" State", + " 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_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" " can be used to track process location if this simulator has process migration.", detailed); - print_line (OPT_TRACING_MSG_VOLUME, "Tracing of communication volume (MSG)", - " This experimental option only has effect if this simulator is MSG-based.\n" - " It traces the communication volume of MSG send/receive.", + 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_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_TRACING_BASIC, "Avoid extended events (impoverished trace file).", + " Some visualization tools are not able to parse correctly the Paje file format.\n" + " Use this option if you are using one of these tools to visualize the simulation\n" + " trace. Keep in mind that the trace might be incomplete, without all the\n" + " information that would be registered otherwise.", + detailed); + print_line (OPT_TRACING_COMMENT, "Comment to be added on the top of the trace file.", + " Use this to add a comment line to the top of the trace file.", + detailed); + print_line (OPT_TRACING_COMMENT_FILE, "File contents added to trace file as comment.", + " Use this to add the contents of a file to the top of the trace file as comment.", 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" @@ -290,118 +483,174 @@ 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) +{ + 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); +} + +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 +} + +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 +} + +static void generate_uncat_configuration (const char *output, const char *name, int brackets) { - char *output = TRACE_get_triva_uncat_conf (); if (output && strlen(output) > 0){ FILE *file = fopen (output, "w"); - if (!file){ - THROW1(tracing_error, TRACE_ERROR_FILE_OPEN, - "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 %s graph " + "configuration (uncategorized).", output, name); } - fprintf (file, - "{\n" - " node = (HOST);\n" - " edge = (LINK);\n" - "\n" - " HOST = {\n" - " size = power;\n" - " scale = global;\n" - " host_sep = {\n" - " type = separation;\n" - " size = power;\n" - " values = (power_used);\n" - " };\n" - " };\n" - " LINK = {\n" - " src = source;\n" - " dst = destination;\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" - ); + + 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){ //check if we do have categories declared - if (xbt_dict_length(created_categories) == 0){ -// INFO0("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; } - xbt_dict_cursor_t cursor=NULL; - char *key, *data; + FILE *file = fopen (output, "w"); - if (!file){ - THROW1(tracing_error, TRACE_ERROR_FILE_OPEN, - "Unable to open file (%s) for writing triva graph configuration (categorized).", output); - } - fprintf (file, - "{\n" - " node = (HOST);\n" - " edge = (LINK);\n" - "\n" - " HOST = {\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); + if (file == NULL){ + THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph " + "configuration (categorized).", output, name); } - fprintf (file, - ");\n" - " };\n" - " };\n" - " LINK = {\n" - " src = source;\n" - " dst = destination;\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); - } - fprintf (file, - ");\n" - " };\n" - " };\n" - " graphviz-algorithm = neato;\n" - "}\n" - ); - fclose(file); + + 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_PLATFORM +#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_TRACING_BASIC +#undef OPT_TRACING_COMMENT +#undef OPT_TRACING_COMMENT_FILE #undef OPT_TRIVA_UNCAT_CONF #undef OPT_TRIVA_CAT_CONF +#undef OPT_VIVA_UNCAT_CONF +#undef OPT_VIVA_CAT_CONF #endif /* HAVE_TRACING */