#define OPT_TRACING_PLATFORM "tracing/platform"
#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_TASK "tracing/msg/task"
#define OPT_TRACING_MSG_PROCESS "tracing/msg/process"
#define OPT_TRACING_FILENAME "tracing/filename"
#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_task_enabled;
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;
-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_task_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK);
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()
TRACE_paje_start();
/* activate trace */
- xbt_assert (trace_active==0, "Tracing is already active.");
+ 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();
+ 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;
if (!trace_active)
return 1;
- /* generate uncategorized graph configuration for triva */
- if (TRACE_get_triva_uncat_conf()){
- TRACE_generate_triva_uncat_conf();
- }
-
- /* generate categorized graph configuration for triva */
- if (TRACE_get_triva_cat_conf()){
- TRACE_generate_triva_cat_conf();
- }
+ 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) */
- destroyAllContainers();
+ 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();
int TRACE_needs_platform (void)
{
return TRACE_msg_process_is_enabled() ||
- TRACE_msg_task_is_enabled() ||
TRACE_categorized() ||
TRACE_uncategorized() ||
TRACE_platform () ||
int TRACE_smpi_is_enabled(void)
{
- return (xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI) ||
- TRACE_smpi_is_grouped())&&
- TRACE_is_enabled();
+ return (trace_smpi_enabled || TRACE_smpi_is_grouped())
+ && TRACE_is_enabled();
}
int TRACE_smpi_is_grouped(void)
return trace_smpi_grouped;
}
+int TRACE_smpi_is_computing(void)
+{
+ return trace_smpi_computing;
+}
+
+
int TRACE_categorized (void)
{
return trace_categorized;
return trace_uncategorized;
}
-int TRACE_msg_task_is_enabled(void)
-{
- return trace_msg_task_enabled && TRACE_is_enabled();
-}
-
int TRACE_msg_process_is_enabled(void)
{
return trace_msg_process_enabled && TRACE_is_enabled();
return trace_disable_destroy && TRACE_is_enabled();
}
+int TRACE_basic (void)
+{
+ 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)
{
return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
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 */
xbt_cfgelm_int, &default_tracing, 0, 1,
NULL, NULL);
- /* tracing platform*/
+ /* register platform in the trace */
int default_tracing_platform = 0;
xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM,
- "Enable Tracing Platform.",
+ "Register the platform in the trace as a graph.",
xbt_cfgelm_int, &default_tracing_platform, 0, 1,
NULL, NULL);
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 */
+ /* tracing categorized resource utilization traces */
int default_tracing_categorized = 0;
xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED,
- "Tracing of categorized platform (host and link) utilization.",
+ "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);
- /* 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,
NULL, NULL);
/* tracing buffer */
- int default_buffer = 0;
+ 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,
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 */
char *default_triva_uncat_conf_file = xbt_strdup ("");
xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF,
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;
}
" 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"
" 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"
" to generate a uncategorized resource utilization graph to be used as\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"
+ " 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)
{
- char *output = TRACE_get_triva_uncat_conf ();
- if (output && strlen(output) > 0){
- xbt_dict_cursor_t cursor=NULL;
- char *name, *value;
+ 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);
+}
- FILE *file = fopen (output, "w");
- xbt_assert (file != NULL,
- "Unable to open file (%s) for writing triva graph "
- "configuration (uncategorized).", output);
+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
+}
- //open
- fprintf (file, "{\n");
+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
+}
- //register NODE types
- fprintf (file, " node = (");
- xbt_dict_foreach(trivaNodeTypes, cursor, name, value) {
- fprintf (file, "%s, ", name);
+static void generate_uncat_configuration (const char *output, const char *name, int brackets)
+{
+ if (output && strlen(output) > 0){
+ FILE *file = fopen (output, "w");
+ if (file == NULL){
+ THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph "
+ "configuration (uncategorized).", output, 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,
- " 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
- fprintf (file, "}\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){
- xbt_dict_cursor_t cursor=NULL, cursor2=NULL;
- char *name, *name2, *value, *value2;
-
//check if we do have categories declared
if (xbt_dict_is_empty(created_categories)){
- XBT_INFO("No categories declared, ignoring generation of triva graph configuration");
+ XBT_INFO("No categories declared, ignoring generation of %s graph configuration", name);
return;
}
FILE *file = fopen (output, "w");
- 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);
+ if (file == NULL){
+ THROWF (system_error, 1, "Unable to open file (%s) for writing %s graph "
+ "configuration (categorized).", output, 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,
- " host = {\n"
- " type = square;\n"
- " size = power;\n"
- " values = (");
- xbt_dict_foreach(created_categories,cursor2,name2,value2) {
- fprintf (file, "p%s, ", name2);
- }
- fprintf (file,
- ");\n"
- " };\n"
- " link = {\n"
- " type = rhombus;\n"
- " size = bandwidth;\n"
- " values = (");
- xbt_dict_foreach(created_categories,cursor2,name2,value2) {
- fprintf (file, "b%s, ", name2);
- }
- fprintf (file,
- ");\n"
- " };\n");
- //close
- fprintf (file, "}\n");
+ 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);
+}
+
+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_SMPI
#undef OPT_TRACING_SMPI_GROUP
#undef OPT_TRACING_CATEGORIZED
#undef OPT_TRACING_UNCATEGORIZED
-#undef OPT_TRACING_MSG_TASK
#undef OPT_TRACING_MSG_PROCESS
#undef OPT_TRACING_FILENAME
#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 */
