#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_TRIVA_UNCAT_CONF "triva/uncategorized"
#define OPT_TRIVA_CAT_CONF "triva/categorized"
static int trace_msg_process_enabled;
static int trace_buffer;
static int trace_onelink_only;
+static int trace_disable_destroy;
static int trace_configured = 0;
static int trace_active = 0;
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);
}
int TRACE_start()
XBT_DEBUG ("Tracing is on");
/* other trace initialization */
- created_categories = xbt_dict_new();
+ created_categories = xbt_dict_new_homogeneous(xbt_free);
TRACE_surf_alloc();
TRACE_smpi_alloc();
return 0;
/* destroy all data structures of tracing (and free) */
destroyAllContainers();
+ instr_paje_free();
+ TRACE_surf_release();
+ TRACE_smpi_release();
+ xbt_dict_free(&created_categories);
/* close the trace file */
TRACE_paje_end();
return trace_onelink_only && TRACE_is_enabled();
}
+int TRACE_disable_destroy (void)
+{
+ return trace_disable_destroy && TRACE_is_enabled();
+}
+
char *TRACE_get_filename(void)
{
return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
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);
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);
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,
+ "Disable platform containers destruction.",
+ 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,
" only the routes with one link are used to register the topology within an AS.\n"
" Routes among AS continue to be traced as usual.",
detailed);
+ print_line (OPT_TRACING_DISABLE_DESTROY, "Disable platform containers destruction",
+ " Disable the destruction of containers at the end of simulation. This can be\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"
char *name, *name2, *value, *value2;
//check if we do have categories declared
- if (xbt_dict_length(created_categories) == 0){
+ if (xbt_dict_is_empty(created_categories)){
XBT_INFO("No categories declared, ignoring generation of triva graph configuration");
return;
}
}
}
+void TRACE_set_network_update_mechanism (void)
+{
+ if (TRACE_is_enabled()){
+ if (TRACE_categorized() || TRACE_uncategorized()){
+ XBT_INFO ("Tracing resource utilization active, network/optim configuration now set to Full.");
+ xbt_cfg_set_string (_surf_cfg_set, "network/optim", "Full");
+ }
+ }
+}
+
#undef OPT_TRACING
#undef OPT_TRACING_PLATFORM
#undef OPT_TRACING_SMPI
#undef OPT_TRACING_UNCATEGORIZED
#undef OPT_TRACING_MSG_TASK
#undef OPT_TRACING_MSG_PROCESS
-#undef OPT_TRACING_MSG_VOLUME
#undef OPT_TRACING_FILENAME
-#undef OPT_TRACING_PLATFORM_METHOD
+#undef OPT_TRACING_BUFFER
+#undef OPT_TRACING_ONELINK_ONLY
+#undef OPT_TRACING_DISABLE_DESTROY
#undef OPT_TRIVA_UNCAT_CONF
#undef OPT_TRIVA_CAT_CONF