#define OPT_TRACING "tracing"
#define OPT_TRACING_SMPI "tracing/smpi"
#define OPT_TRACING_SMPI_GROUP "tracing/smpi/group"
-#define OPT_TRACING_PLATFORM "tracing/platform"
+#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"
static int trace_configured = 0;
static int trace_active = 0;
-extern xbt_dict_t created_categories; //declared in instr_interface.c
+xbt_dict_t created_categories; //declared in instr_interface.c
+
+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;
+ }
+
+ DEBUG0("Tracing starts");
+
+ /* open the trace file */
+ TRACE_paje_start();
+
+ /* activate trace */
+ TRACE_activate ();
+
+ /* other trace initialization */
+ created_categories = xbt_dict_new();
+ TRACE_surf_alloc();
+ TRACE_smpi_alloc();
+ return 0;
+}
+
+int TRACE_end()
+{
+ if (!TRACE_is_active())
+ return 1;
+
+ /* close the trace file */
+ TRACE_paje_end();
+
+ /* 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();
+ }
+
+ /* activate trace */
+ TRACE_desactivate ();
+ DEBUG0("Tracing system is shutdown");
+ return 0;
+}
void TRACE_activate (void)
{
return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP);
}
-int TRACE_platform_is_enabled(void)
+int TRACE_categorized (void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED);
}
int TRACE_uncategorized (void)
/* platform */
int default_tracing_platform = 0;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM,
+ xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED,
"Tracing of categorized platform (host and link) utilization.",
xbt_cfgelm_int, &default_tracing_platform, 0, 1,
NULL, NULL);
" 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);
" size = power;\n"
" values = (");
xbt_dict_foreach(created_categories,cursor,key,data) {
- fprintf(file, "p%s, ",key);
+ fprintf(file, "%s, ",key);
}
fprintf (file,
");\n"
" size = bandwidth;\n"
" values = (");
xbt_dict_foreach(created_categories,cursor,key,data) {
- fprintf(file, "b%s, ",key);
+ fprintf(file, "%s, ",key);
}
fprintf (file,
");\n"
#undef OPT_TRACING
#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