XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
-xbt_dict_t defined_types;
xbt_dict_t created_categories;
-int TRACE_category(const char *category)
+void TRACE_category(const char *category)
{
- return TRACE_category_with_color (category, NULL);
+ TRACE_category_with_color (category, NULL);
}
-int TRACE_category_with_color (const char *category, const char *color)
+void TRACE_category_with_color (const char *category, const char *color)
{
- static int first_time = 1;
- if (!TRACE_is_active())
- return 1;
-
- if (first_time) {
- TRACE_define_type("user_type", "0", 1);
- first_time = 0;
- }
- return TRACE_create_category_with_color(category, "user_type", "0", color);
-}
-
-void TRACE_define_type(const char *type,
- const char *parent_type, int final)
-{
- char *val_one = NULL;
if (!TRACE_is_active())
return;
- 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) {
- //for m_process_t
- if (TRACE_msg_process_is_enabled())
- pajeDefineContainerType("process", type, "process");
- if (TRACE_msg_process_is_enabled())
- pajeDefineStateType("process-state", "process", "process-state");
-
- if (TRACE_msg_task_is_enabled())
- pajeDefineContainerType("task", type, "task");
- if (TRACE_msg_task_is_enabled())
- pajeDefineStateType("task-state", "task", "task-state");
- }
- val_one = xbt_strdup("1");
- xbt_dict_set(defined_types, type, &val_one, xbt_free);
-}
-
-int TRACE_create_category(const char *category,
- const char *type, const char *parent_category)
-{
- return TRACE_create_category_with_color (category, type, parent_category, NULL);
-}
+ xbt_assert1 (instr_platform_traced(),
+ "%s must be called after environment creation", __FUNCTION__);
-int TRACE_create_category_with_color(const char *category,
- const char *type,
- const char *parent_category,
- const char *color)
-{
- char state[100];
- char *val_one = NULL;
- if (!TRACE_is_active())
- return 1;
-
- char *defined = xbt_dict_get_or_null(defined_types, type);
- //check if type is defined
- xbt_assert1 (defined != NULL, "Type %s is not defined", type);
- //check if parent_category exists
- 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
+ //check if category is already created
char *created = xbt_dict_get_or_null(created_categories, category);
- if (created) return 0;
-
- pajeCreateContainer(MSG_get_clock(), category, type, parent_category,
- category);
+ if (created) return;
+ xbt_dict_set (created_categories, category, xbt_strdup("1"), xbt_free);
+ //define final_color
char final_color[INSTR_DEFAULT_STR_SIZE];
if (!color){
//generate a random 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())
- pajeDefineVariableTypeWithColor(state, "LINK", state, final_color);
- snprintf(state, 100, "p%s", category);
- if (TRACE_platform_is_enabled())
- pajeDefineVariableTypeWithColor(state, "HOST", state, final_color);
-
- val_one = xbt_strdup("1");
- xbt_dict_set(created_categories, category, &val_one, xbt_free);
- return 0;
+//FIXME
+// - if (final) {
+// - //for m_process_t
+// - if (TRACE_msg_process_is_enabled())
+// - pajeDefineContainerType("process", type, "process");
+// - if (TRACE_msg_process_is_enabled())
+// - pajeDefineStateType("process-state", "process", "process-state");
+// -
+// - if (TRACE_msg_task_is_enabled())
+// - pajeDefineContainerType("task", type, "task");
+// - if (TRACE_msg_task_is_enabled())
+// - pajeDefineStateType("task-state", "task", "task-state");
+// - }
+
+ //define the type of this category on top of hosts and links
+ if (TRACE_categorized ()){
+ instr_new_user_variable_type (category, final_color);
+ }
}
void TRACE_declare_mark(const char *mark_type)
pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
}
+
+void TRACE_user_link_variable(double time, const char *resource,
+ const char *variable,
+ double value, const char *what)
+{
+ if (!TRACE_is_active())
+ return;
+
+ xbt_assert1 (instr_platform_traced(),
+ "%s must be called after environment creation", __FUNCTION__);
+
+ char valuestr[100];
+ snprintf(valuestr, 100, "%g", value);
+
+ if (strcmp(what, "declare") == 0) {
+ instr_new_user_link_variable_type (variable, NULL);
+ } else{
+ char *variable_id = instr_variable_type(variable, resource);
+ char *resource_id = instr_resource_type(resource);
+ if (strcmp(what, "set") == 0) {
+ pajeSetVariable(time, variable_id, resource_id, valuestr);
+ } else if (strcmp(what, "add") == 0) {
+ pajeAddVariable(time, variable_id, resource_id, valuestr);
+ } else if (strcmp(what, "sub") == 0) {
+ pajeSubVariable(time, variable_id, resource_id, valuestr);
+ }
+ }
+}
+
+void TRACE_user_host_variable(double time, const char *variable,
+ double value, const char *what)
+{
+ if (!TRACE_is_active())
+ return;
+
+ xbt_assert1 (instr_platform_traced(),
+ "%s must be called after environment creation", __FUNCTION__);
+
+ char valuestr[100];
+ snprintf(valuestr, 100, "%g", value);
+
+ if (strcmp(what, "declare") == 0) {
+ instr_new_user_host_variable_type (variable, NULL);
+ } else{
+ char *host_name = MSG_host_self()->name;
+ char *variable_id = instr_variable_type(variable, host_name);
+ char *resource_id = instr_resource_type(host_name);
+ if (strcmp(what, "set") == 0) {
+ pajeSetVariable(time, variable_id, resource_id, valuestr);
+ } else if (strcmp(what, "add") == 0) {
+ pajeAddVariable(time, variable_id, resource_id, valuestr);
+ } else if (strcmp(what, "sub") == 0) {
+ pajeSubVariable(time, variable_id, resource_id, valuestr);
+ }
+ }
+}
+
+
#endif /* HAVE_TRACING */
