/* 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"
#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_CATEGORIZED "tracing/categorized"
#define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized"
#define OPT_TRACING_MSG_PROCESS "tracing/msg/process"
#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_TRACING_BASIC "tracing/basic"
+#define OPT_TRACING_COMMENT "tracing/comment"
+#define OPT_TRACING_COMMENT_FILE "tracing/comment_file"
#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_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;
{
trace_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING);
trace_platform = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM);
+ trace_platform_topology = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_TOPOLOGY);
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);
}
int TRACE_start()
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();
PJ_type_free_all();
PJ_container_release();
PJ_type_release();
- TRACE_surf_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 */
return trace_platform;
}
+int TRACE_platform_topology(void)
+{
+ return trace_platform_topology;
+}
+
int TRACE_is_configured(void)
{
return trace_configured;
return trace_smpi_grouped;
}
+int TRACE_smpi_is_computing(void)
+{
+ return trace_smpi_computing;
+}
+
+
int TRACE_categorized (void)
{
return trace_categorized;
return trace_disable_destroy && TRACE_is_enabled();
}
-char *TRACE_get_filename(void)
+int TRACE_basic (void)
{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
+ return trace_basic && TRACE_is_enabled();
}
-char *TRACE_get_triva_uncat_conf (void)
+char *TRACE_get_comment (void)
{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_UNCAT_CONF);
+ return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_COMMENT);
}
-char *TRACE_get_triva_cat_conf (void)
+char *TRACE_get_comment_file (void)
{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_CAT_CONF);
+ 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_FILENAME);
}
char *TRACE_get_viva_uncat_conf (void)
/* 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.",
+ "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(&_surf_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_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);
/* tracing categorized resource utilization traces */
int default_tracing_categorized = 0;
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,
- "Triva Graph configuration file for uncategorized resource utilization traces.",
- xbt_cfgelm_string, &default_triva_uncat_conf_file, 1, 1,
+ /* 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);
- /* 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,
+ /* 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);
/* Viva graph configuration for uncategorized tracing */
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)",
" 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_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"
" 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"
- " 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.",
+ 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_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.",
+ 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_VIVA_UNCAT_CONF, "Generate a graph configuration for Viva",
" This option can be used in all types of simulators build with SimGrid\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)
+void TRACE_generate_viva_uncat_conf (void)
{
- generate_uncat_configuration (TRACE_get_triva_uncat_conf (), "triva", 1);
+ generate_uncat_configuration (TRACE_get_viva_uncat_conf (), "viva", 0);
}
-void TRACE_generate_triva_cat_conf (void)
+void TRACE_generate_viva_cat_conf (void)
{
- generate_cat_configuration (TRACE_get_triva_cat_conf(), "triva", 1);
+ generate_cat_configuration (TRACE_get_viva_cat_conf(), "viva", 0);
}
-void TRACE_generate_viva_uncat_conf (void)
+static int previous_trace_state = -1;
+
+void instr_pause_tracing (void)
{
- generate_uncat_configuration (TRACE_get_viva_uncat_conf (), "viva", 0);
+ previous_trace_state = trace_enabled;
+ if (!TRACE_is_enabled()){
+ XBT_DEBUG ("Tracing is already paused, therefore do nothing.");
+ }else{
+ XBT_DEBUG ("Tracing is being paused.");
+ }
+ trace_enabled = 0;
+ XBT_DEBUG ("Tracing is paused.");
}
-void TRACE_generate_viva_cat_conf (void)
+void instr_resume_tracing (void)
{
- generate_cat_configuration (TRACE_get_viva_cat_conf(), "viva", 0);
+ if (TRACE_is_enabled()){
+ XBT_DEBUG ("Tracing is already running while trying to resume, therefore do nothing.");
+ }else{
+ XBT_DEBUG ("Tracing is being resumed.");
+ }
+
+ if (previous_trace_state != -1){
+ trace_enabled = previous_trace_state;
+ }else{
+ trace_enabled = 1;
+ }
+ XBT_DEBUG ("Tracing is resumed.");
+ previous_trace_state = -1;
}
#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_BUFFER
#undef OPT_TRACING_ONELINK_ONLY
#undef OPT_TRACING_DISABLE_DESTROY
-#undef OPT_TRIVA_UNCAT_CONF
-#undef OPT_TRIVA_CAT_CONF
+#undef OPT_TRACING_BASIC
+#undef OPT_TRACING_COMMENT
+#undef OPT_TRACING_COMMENT_FILE
#undef OPT_VIVA_UNCAT_CONF
#undef OPT_VIVA_CAT_CONF
