#ifdef HAVE_TRACING
-XBT_LOG_NEW_DEFAULT_CATEGORY(tracing,"Tracing Surf");
+XBT_LOG_NEW_DEFAULT_CATEGORY(tracing,"Tracing Interface");
-extern xbt_dict_t created_containers; /* declared in general.c */
static xbt_dict_t defined_types;
static xbt_dict_t created_categories;
int trace_mask;
-/**
+/** \ingroup tracing
+ * \brief Simple initialization of tracing.
+ *
+ * \param filename of the file that will contain the traces
+ * \return 0 if everything is ok
+ */
+int TRACE_start (const char *filename)
+{
+ return TRACE_start_with_mask (filename, TRACE_PLATFORM);
+}
+
+/** \ingroup tracing
* \brief Initialization of tracing.
*
* Function to be called at first when tracing a simulation
if (IS_TRACING_PLATFORM) pajeCreateContainer(MSG_get_clock(), "platform", "PLATFORM", "0", "simgrid-platform");
- created_containers = xbt_dict_new();
defined_types = xbt_dict_new();
created_categories = xbt_dict_new();
__TRACE_msg_init();
return 0;
}
-void TRACE_category (const char *category)
+int TRACE_category (const char *category)
{
- if (!IS_TRACING) return;
+ if (!IS_TRACING) return 1;
static int first_time = 1;
if (first_time){
TRACE_define_type ("user_type", "0", 1);
first_time = 0;
}
- TRACE_create_category (category, "user_type", "0");
+ return TRACE_create_category (category, "user_type", "0");
}
void TRACE_define_type (const char *type,
xbt_dict_set (defined_types, type, xbt_strdup("1"), xbt_free);
}
-void TRACE_create_category (const char *category,
+int TRACE_create_category (const char *category,
const char *type, const char *parent_category)
{
if (!IS_TRACING) return;
//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;
}
//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;
}
//check if category is created
if (xbt_dict_get_or_null (created_categories, category)){
- THROW1 (tracing_error, TRACE_ERROR_CATEGORY_ALREADY_DEFINED, "Category %s is already created", category);
+ return 1;
}
pajeCreateContainer(MSG_get_clock(), category, type, parent_category, category);
if (IS_TRACING_PLATFORM) pajeDefineVariableType (state, "HOST", state);
xbt_dict_set (created_categories, category, xbt_strdup("1"), xbt_free);
+ return 0;
}
void TRACE_set_mask (int mask)