#define OPT_TRACING_COMMENT_FILE "tracing/comment_file"
#define OPT_VIVA_UNCAT_CONF "viva/uncategorized"
#define OPT_VIVA_CAT_CONF "viva/categorized"
+#define OPT_TRACING_DISABLE_LINK "tracing/disable_link"
+#define OPT_TRACING_DISABLE_POWER "tracing/disable_power"
static int trace_enabled;
static int trace_platform;
static int trace_onelink_only;
static int trace_disable_destroy;
static int trace_basic;
+static int trace_disable_link;
+static int trace_disable_power;
static int trace_configured = 0;
static int trace_active = 0;
trace_onelink_only = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY);
trace_disable_destroy = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY);
trace_basic = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BASIC);
+ trace_disable_link = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_LINK);
+ trace_disable_power = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_POWER);
}
-xbt_dynar_t TRACE_start_functions = NULL;
+static xbt_dynar_t TRACE_start_functions = NULL;
void TRACE_add_start_function(void (*func) ())
{
if (TRACE_start_functions == NULL)
TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), NULL);
xbt_dynar_push(TRACE_start_functions, &func);
-
-
-
}
int TRACE_start()
/* open the trace file */
TRACE_paje_start();
- int retval;
- if (!trace_active) {
+ /* activate trace */
+ 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_homogeneous(xbt_free);
+ declared_marks = xbt_dict_new_homogeneous(xbt_free);
+ user_host_variables = xbt_dict_new_homogeneous(xbt_free);
+ user_vm_variables = xbt_dict_new_homogeneous (xbt_free);
+ user_link_variables = xbt_dict_new_homogeneous(xbt_free);
+
+ if (TRACE_start_functions != NULL) {
+ void (*func) ();
+ unsigned int iter = xbt_dynar_length(TRACE_start_functions);
+ xbt_dynar_foreach(TRACE_start_functions, iter, func) {
+ func();
+ }
+ }
+ }
+ xbt_dynar_free(&TRACE_start_functions);
+ return 0;
+}
+
+static xbt_dynar_t TRACE_end_functions = NULL;
+void TRACE_add_end_function(void (*func) (void))
+{
+ if (TRACE_end_functions == NULL)
+ TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), NULL);
+ xbt_dynar_push(TRACE_end_functions, &func);
+}
+
+int TRACE_end()
+{
+ int retval;
+ if (!trace_active) {
retval = 1;
} else {
retval = 0;
xbt_dict_free(&user_link_variables);
xbt_dict_free(&user_host_variables);
+ xbt_dict_free(&user_vm_variables);
xbt_dict_free(&declared_marks);
xbt_dict_free(&created_categories);
return retval;
}
-xbt_dynar_t TRACE_end_functions = NULL;
-void TRACE_add_end_function(void (*func) (void))
-{
- if (TRACE_end_functions == NULL)
- TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), NULL);
- xbt_dynar_push(TRACE_end_functions, &func);
-}
-
-int TRACE_end()
-{
- if (!trace_active)
- return 1;
-
- 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) */
- 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(&user_vm_variables);
-
- xbt_dict_free(&declared_marks);
- xbt_dict_free(&created_categories);
-
- /* close the trace file */
- TRACE_paje_end();
-
- /* de-activate trace */
- trace_active = 0;
- XBT_DEBUG ("Tracing is off");
- XBT_DEBUG("Tracing system is shutdown");
- return 0;
-}
-
int TRACE_needs_platform (void)
{
return TRACE_msg_process_is_enabled() ||
return trace_msg_vm_enabled && TRACE_is_enabled();
}
+int TRACE_disable_link(void)
+{
+ return trace_disable_link && TRACE_is_enabled();
+}
+
+int TRACE_disable_power(void)
+{
+ return trace_disable_power && TRACE_is_enabled();
+}
int TRACE_buffer (void)
{
/* msg process */
int default_tracing_msg_vm = 0;
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_VM,
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_VM,
"Tracing of MSG process behavior.",
xbt_cfgelm_int, &default_tracing_msg_vm, 0, 1,
NULL, NULL);
+ /* disable tracing link */
+ int default_tracing_disable_link = 0;
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_LINK,
+ "Do not trace link bandwidth and latency.",
+ xbt_cfgelm_int, &default_tracing_disable_link, 0, 1,
+ NULL, NULL);
+
+ /* disable tracing link */
+ int default_tracing_disable_power = 0;
+ xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_DISABLE_POWER,
+ "Do not trace host power.",
+ xbt_cfgelm_int, &default_tracing_disable_power, 0, 1,
+ NULL, NULL);
+
+
/* tracing buffer */
int default_buffer = 1;
xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BUFFER,