/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-
#include "instr/instr_private.h"
+#include "simgrid/sg_config.h"
+#include "surf/surf.h"
#ifdef HAVE_TRACING
#define OPT_TRACING "tracing"
#define OPT_TRACING_PLATFORM "tracing/platform"
+#define OPT_TRACING_TOPOLOGY "tracing/platform/topology"
#define OPT_TRACING_SMPI "tracing/smpi"
#define OPT_TRACING_SMPI_GROUP "tracing/smpi/group"
#define OPT_TRACING_SMPI_COMPUTING "tracing/smpi/computing"
#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_platform_topology;
static int trace_smpi_enabled;
static int trace_smpi_grouped;
static int trace_smpi_computing;
static int trace_configured = 0;
static int trace_active = 0;
+
+
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_msg_vm_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VM);
- 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);
+ trace_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING);
+ trace_platform = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_PLATFORM);
+ trace_platform_topology = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_TOPOLOGY);
+ trace_smpi_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI);
+ trace_smpi_grouped = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_GROUP);
+ trace_smpi_computing = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_SMPI_COMPUTING);
+ trace_categorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_CATEGORIZED);
+ trace_uncategorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED);
+ trace_msg_process_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_MSG_PROCESS);
+ trace_msg_vm_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_MSG_VM);
+ trace_buffer = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BUFFER);
+ trace_onelink_only = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY);
+ trace_disable_destroy = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY);
+ trace_basic = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BASIC);
+}
+
+static xbt_dynar_t TRACE_start_functions = NULL;
+void TRACE_add_start_function(void (*func) ())
+{
+ if (TRACE_start_functions == NULL)
+ TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), NULL);
+ xbt_dynar_push(TRACE_start_functions, &func);
}
int TRACE_start()
// 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;
- }
+ if (TRACE_is_enabled() && TRACE_is_configured()) {
+ XBT_DEBUG("Tracing starts");
- XBT_DEBUG("Tracing starts");
+ /* open the trace file */
+ TRACE_paje_start();
- /* open the trace file */
- TRACE_paje_start();
-
- /* activate trace */
- if (trace_active == 1){
- THROWF (tracing_error, 0, "Tracing is already active");
+ /* 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_vm_variables = xbt_dict_new_homogeneous (xbt_free);
+ user_link_variables = xbt_dict_new_homogeneous(xbt_free);
+
+ if (TRACE_start_functions != NULL) {
+ void (*func) ();
+ unsigned int iter = xbt_dynar_length(TRACE_start_functions);
+ xbt_dynar_foreach(TRACE_start_functions, iter, func) {
+ func();
+ }
+ }
}
- 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_vm_variables = xbt_dict_new_homogeneous (xbt_free);
- user_link_variables = xbt_dict_new_homogeneous (xbt_free);
- TRACE_surf_alloc();
- TRACE_smpi_alloc();
+ xbt_dynar_free(&TRACE_start_functions);
return 0;
}
+static xbt_dynar_t TRACE_end_functions = NULL;
+void TRACE_add_end_function(void (*func) (void))
+{
+ if (TRACE_end_functions == NULL)
+ TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), NULL);
+ xbt_dynar_push(TRACE_end_functions, &func);
+}
+
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(&user_vm_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 retval;
+ if (!trace_active) {
+ retval = 1;
+ } else {
+ retval = 0;
+
+ 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();
+
+ if (TRACE_end_functions != NULL) {
+ void (*func) (void);
+ unsigned int iter;
+ xbt_dynar_foreach(TRACE_end_functions, iter, func) {
+ func();
+ }
+ }
+
+ xbt_dict_free(&user_link_variables);
+ xbt_dict_free(&user_host_variables);
+ xbt_dict_free(&user_vm_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");
+ }
+ xbt_dynar_free(&TRACE_end_functions);
+ return retval;
}
int TRACE_needs_platform (void)
return trace_platform;
}
+int TRACE_platform_topology(void)
+{
+ return trace_platform_topology;
+}
+
int TRACE_is_configured(void)
{
return trace_configured;
char *TRACE_get_comment (void)
{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_COMMENT);
+ return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_COMMENT);
}
char *TRACE_get_comment_file (void)
{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_COMMENT_FILE);
+ return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_COMMENT_FILE);
}
char *TRACE_get_filename(void)
{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
-}
-
-char *TRACE_get_triva_uncat_conf (void)
-{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_UNCAT_CONF);
-}
-
-char *TRACE_get_triva_cat_conf (void)
-{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_CAT_CONF);
+ return xbt_cfg_get_string(_sg_cfg_set, OPT_TRACING_FILENAME);
}
char *TRACE_get_viva_uncat_conf (void)
{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_VIVA_UNCAT_CONF);
+ return xbt_cfg_get_string(_sg_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);
+ return xbt_cfg_get_string(_sg_cfg_set, OPT_VIVA_CAT_CONF);
}
void TRACE_global_init(int *argc, char **argv)
{
/* name of the tracefile */
char *default_tracing_filename = xbt_strdup("simgrid.trace");
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_FILENAME,
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_FILENAME,
"Trace file created by the instrumented SimGrid.",
xbt_cfgelm_string, &default_tracing_filename, 1, 1,
NULL, NULL);
/* tracing */
int default_tracing = 0;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING,
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING,
"Enable Tracing.",
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_cfg_register(&_sg_cfg_set, OPT_TRACING_PLATFORM,
+ "Register the platform in the trace as a hierarchy.",
xbt_cfgelm_int, &default_tracing_platform, 0, 1,
NULL, NULL);
+ /* register platform in the trace */
+ int default_tracing_platform_topology = 1;
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_TOPOLOGY,
+ "Register the platform topology in the trace as a graph.",
+ xbt_cfgelm_int, &default_tracing_platform_topology, 0, 1,
+ NULL, NULL);
+
/* smpi */
int default_tracing_smpi = 0;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI,
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI,
"Tracing of the SMPI interface.",
xbt_cfgelm_int, &default_tracing_smpi, 0, 1,
NULL, NULL);
/* smpi grouped */
int default_tracing_smpi_grouped = 0;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI_GROUP,
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_SMPI_GROUP,
"Group MPI processes by host.",
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,
+ xbt_cfg_register(&_sg_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);
/* tracing categorized resource utilization traces */
int default_tracing_categorized = 0;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED,
+ xbt_cfg_register(&_sg_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,
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_UNCATEGORIZED,
"Tracing uncategorized resource utilization of hosts and links.",
xbt_cfgelm_int, &default_tracing_uncategorized, 0, 1,
NULL, NULL);
/* msg process */
int default_tracing_msg_process = 0;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_PROCESS,
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_PROCESS,
"Tracing of MSG process behavior.",
xbt_cfgelm_int, &default_tracing_msg_process, 0, 1,
NULL, NULL);
/* msg process */
int default_tracing_msg_vm = 0;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_VM,
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_VM,
"Tracing of MSG process behavior.",
xbt_cfgelm_int, &default_tracing_msg_vm, 0, 1,
NULL, NULL);
/* tracing buffer */
int default_buffer = 1;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_BUFFER,
+ xbt_cfg_register(&_sg_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,
+ xbt_cfg_register(&_sg_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,
+ xbt_cfg_register(&_sg_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,
+ xbt_cfg_register(&_sg_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,
+ xbt_cfg_register(&_sg_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,
+ xbt_cfg_register(&_sg_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 */
- char *default_triva_uncat_conf_file = xbt_strdup ("");
- xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF,
- "Triva Graph configuration file for uncategorized resource utilization traces.",
- xbt_cfgelm_string, &default_triva_uncat_conf_file, 1, 1,
- NULL, NULL);
-
- /* Triva graph configuration for uncategorized tracing */
- char *default_triva_cat_conf_file = xbt_strdup ("");
- xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_CAT_CONF,
- "Triva Graph configuration file for categorized resource utilization traces.",
- 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,
+ xbt_cfg_register(&_sg_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,
+ xbt_cfg_register(&_sg_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);
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"
+ " is in the Paje format and can be analyzed using Viva, Paje, and PajeNG visualization\n"
" tools. More information can be found in these webpages:\n"
- " http://triva.gforge.inria.fr/\n"
+ " http://github.com/schnorr/viva/\n"
+ " http://github.com/schnorr/pajeng/\n"
" http://paje.sourceforge.net/",
detailed);
print_line (OPT_TRACING_SMPI, "Trace the MPI Interface (SMPI)",
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"
- " to generate a uncategorized resource utilization graph to be used as\n"
- " configuration for the Triva visualization analysis. 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_TRIVA_CAT_CONF, "generate uncategorized graph configuration for Triva",
- " 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 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"
" file for the Viva visualization tool that can be used to analyze a categorized\n"
" resource utilization.",
detailed);
+ print_line (OPT_TRACING_TOPOLOGY, "Register the platform topology as a graph",
+ " This option (enabled by default) can be used to disable the tracing of\n"
+ " the platform topology in the trace file. Sometimes, such task is really\n"
+ " time consuming, since it must get the route from each host ot other hosts\n"
+ " within the same Autonomous System (AS).",
+ detailed);
}
static void output_types (const char *name, xbt_dynar_t types, FILE *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);
#undef OPT_TRACING
#undef OPT_TRACING_PLATFORM
+#undef OPT_TRACING_TOPOLOGY
#undef OPT_TRACING_SMPI
#undef OPT_TRACING_SMPI_GROUP
#undef OPT_TRACING_CATEGORIZED
#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
