#include "instr/instr_private.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(tracing, "Tracing Interface");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
-static xbt_dict_t defined_types;
-static xbt_dict_t created_categories;
-
-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;
- }
-
- /* open the trace file */
- TRACE_paje_start();
-
- /* activate trace */
- TRACE_activate ();
-
- /* define paje hierarchy for tracing */
- pajeDefineContainerType("PLATFORM", "0", "platform");
- pajeDefineContainerType("HOST", "PLATFORM", "HOST");
- pajeDefineContainerType("LINK", "PLATFORM", "LINK");
- pajeDefineVariableType("power", "HOST", "power");
- pajeDefineVariableType("bandwidth", "LINK", "bandwidth");
- pajeDefineVariableType("latency", "LINK", "latency");
- pajeDefineEventType("source", "LINK", "source");
- pajeDefineEventType("destination", "LINK", "destination");
-
- if (TRACE_platform_is_enabled()) {
- if (TRACE_uncategorized()){
- pajeDefineVariableType("power_used", "HOST", "power_used");
- pajeDefineVariableType("bandwidth_used", "LINK", "bandwidth_used");
- }
- }
-
- if (TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()) {
- //processes grouped by host
- pajeDefineContainerType("PROCESS", "HOST", "PROCESS");
- }
-
- if (TRACE_msg_process_is_enabled()) {
- pajeDefineStateType("category", "PROCESS", "category");
- pajeDefineStateType("presence", "PROCESS", "presence");
- }
-
- if (TRACE_msg_volume_is_enabled()) {
- pajeDefineLinkType("volume", "0", "PROCESS", "PROCESS", "volume");
- }
-
- if (TRACE_msg_task_is_enabled()) {
- //tasks grouped by host
- pajeDefineContainerType("TASK", "HOST", "TASK");
- pajeDefineStateType("category", "TASK", "category");
- pajeDefineStateType("presence", "TASK", "presence");
- }
-
- if (TRACE_smpi_is_enabled()) {
- if (TRACE_smpi_is_grouped()){
- pajeDefineContainerType("MPI_PROCESS", "HOST", "MPI_PROCESS");
- }else{
- pajeDefineContainerType("MPI_PROCESS", "PLATFORM", "MPI_PROCESS");
- }
- pajeDefineStateType("MPI_STATE", "MPI_PROCESS", "MPI_STATE");
- pajeDefineLinkType("MPI_LINK", "0", "MPI_PROCESS", "MPI_PROCESS",
- "MPI_LINK");
- }
-
- /* creating the platform */
- pajeCreateContainer(MSG_get_clock(), "platform", "PLATFORM", "0",
- "simgrid-platform");
-
- /* other trace initialization */
- defined_types = xbt_dict_new();
- created_categories = xbt_dict_new();
- TRACE_msg_task_alloc();
- TRACE_category_alloc();
- TRACE_surf_alloc();
- TRACE_msg_process_alloc();
- TRACE_smpi_alloc();
- return 0;
-}
-
-int TRACE_end()
-{
- if (!TRACE_is_active())
- return 1;
-
- /* close the trace file */
- TRACE_paje_end();
-
- /* activate trace */
- TRACE_desactivate ();
- return 0;
-}
+xbt_dict_t defined_types;
+xbt_dict_t created_categories;
int TRACE_category(const char *category)
{
if (!TRACE_is_active())
return;
- //check if type is already defined
- if (xbt_dict_get_or_null(defined_types, type)) {
- THROW1(tracing_error, TRACE_ERROR_TYPE_ALREADY_DEFINED,
- "Type %s is already defined", type);
- }
- //check if parent_type is already defined
- if (strcmp(parent_type, "0")
- && !xbt_dict_get_or_null(defined_types, parent_type)) {
- THROW1(tracing_error, TRACE_ERROR_TYPE_NOT_DEFINED,
- "Type (used as parent) %s is not defined", parent_type);
- }
+ char *defined;
+ //type must not exist
+ defined = xbt_dict_get_or_null(defined_types, type);
+ xbt_assert1 (defined == NULL, "Type %s is already defined", type);
+ //parent_type must exist or be different of 0
+ defined = xbt_dict_get_or_null(defined_types, parent_type);
+ xbt_assert1 (defined != NULL || strcmp(parent_type, "0") == 0,
+ "Type (used as parent) %s is not defined", parent_type);
pajeDefineContainerType(type, parent_type, type);
if (final) {
if (!TRACE_is_active())
return 1;
+ char *defined = xbt_dict_get_or_null(defined_types, type);
//check if type is defined
- if (!xbt_dict_get_or_null(defined_types, type)) {
- THROW1(tracing_error, TRACE_ERROR_TYPE_NOT_DEFINED,
- "Type %s is not defined", type);
- return 1;
- }
+ xbt_assert1 (defined != NULL, "Type %s is not defined", type);
//check if parent_category exists
- if (strcmp(parent_category, "0")
- && !xbt_dict_get_or_null(created_categories, parent_category)) {
- THROW1(tracing_error, TRACE_ERROR_CATEGORY_NOT_DEFINED,
- "Category (used as parent) %s is not created", parent_category);
- return 1;
- }
+ defined = xbt_dict_get_or_null(created_categories, parent_category);
+ xbt_assert1 (defined != NULL || strcmp(parent_category, "0") == 0,
+ "Category (used as parent) %s is not created", parent_category);
//check if category is created
- if (xbt_dict_get_or_null(created_categories, category)) {
- return 1;
- }
+ char *created = xbt_dict_get_or_null(created_categories, category);
+ xbt_assert1 (created == NULL, "Category %s is already defined", category);
pajeCreateContainer(MSG_get_clock(), category, type, parent_category,
category);
snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
}
+ DEBUG2("CAT,declare %s, %s", category, final_color);
+
/* for registering application categories on top of platform */
snprintf(state, 100, "b%s", category);
if (TRACE_platform_is_enabled())
if (!mark_type)
return;
+ DEBUG1("MARK,declare %s", mark_type);
pajeDefineEventType(mark_type, "0", mark_type);
}
if (!mark_type || !mark_value)
return;
+ DEBUG2("MARK %s %s", mark_type, mark_value);
pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
}