#include "msg/msg.h"
#include "simdag/simdag.h"
-XBT_PUBLIC(int) TRACE_category(const char *category);
-XBT_PUBLIC(int) TRACE_category_with_color (const char *category, const char *color);
-XBT_PUBLIC(void) TRACE_define_type(const char *type,
- const char *parent_type, int final);
-XBT_PUBLIC(int) TRACE_create_category(const char *category,
- const char *type,
- const char *parent_category);
-XBT_PUBLIC(int) TRACE_create_category_with_color(const char *category,
- const char *type,
- const char *parent_category,
- const char *color);
+XBT_PUBLIC(void) TRACE_category(const char *category);
+XBT_PUBLIC(void) TRACE_category_with_color (const char *category, const char *color);
XBT_PUBLIC(void) TRACE_msg_set_task_category(m_task_t task,
const char *category);
XBT_PUBLIC(void) TRACE_msg_set_process_category(m_process_t process,
#define TRACE_category(cat)
#define TRACE_category_with_color(cat,color)
-#define TRACE_define_type(cat,supercat,final)
-#define TRACE_create_category(inst,cat)
-#define TRACE_create_category_with_color(inst,cat,supercat,color)
#define TRACE_msg_set_task_category(task,cat)
#define TRACE_msg_set_process_category(proc,cat)
#define TRACE_set_mask(mask)
xbt_dict_t defined_types;
xbt_dict_t created_categories;
-int TRACE_category(const char *category)
-{
- return TRACE_category_with_color (category, NULL);
-}
+extern xbt_dict_t hosts_types;
+extern xbt_dict_t links_types;
-int TRACE_category_with_color (const char *category, const char *color)
+void TRACE_category(const char *category)
{
- 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);
+ TRACE_category_with_color (category, NULL);
}
-void TRACE_define_type(const char *type,
- const char *parent_type, int final)
+void TRACE_category_with_color (const char *category, const char *color)
{
- 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);
-}
-
-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_categorized ())
- pajeDefineVariableTypeWithColor(state, "LINK", state, final_color);
- snprintf(state, 100, "p%s", category);
- if (TRACE_categorized ())
- 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 ()){
+ char new_type[INSTR_DEFAULT_STR_SIZE];
+ xbt_dict_cursor_t cursor = NULL;
+ char *type;
+ void *data;
+ xbt_dict_foreach(links_types, cursor, type, data) {
+ snprintf (new_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", category, type);
+ pajeDefineVariableTypeWithColor(new_type, type, category, final_color);
+ }
+ cursor = NULL;
+ xbt_dict_foreach(hosts_types, cursor, type, data) {
+ snprintf (new_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", category, type);
+ pajeDefineVariableTypeWithColor(new_type, type, category, final_color);
+ }
+ }
}
void TRACE_declare_mark(const char *mark_type)