#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_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"
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;
{
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);
return trace_platform;
}
+int TRACE_platform_topology(void)
+{
+ return trace_platform_topology;
+}
+
int TRACE_is_configured(void)
{
return trace_configured;
return trace_basic && TRACE_is_enabled();
}
+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)
{
/* 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_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 */
char *default_triva_uncat_conf_file = xbt_strdup ("");
xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF,
" 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"
+ " 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)",
" 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"
" 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)
generate_cat_configuration (TRACE_get_viva_cat_conf(), "viva", 0);
}
+static int previous_trace_state = -1;
+
+void instr_pause_tracing (void)
+{
+ 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 instr_resume_tracing (void)
+{
+ 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_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
