[trace] adding a new structure to keep the type hierarchy of the trace

[simgrid.git] / src / instr / instr_interface.c

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 33d2803..2b03005 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -12,90 +12,30 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
 

-xbt_dict_t defined_types;

 xbt_dict_t created_categories;
 
 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;
   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 hosts have been created
+//    xbt_assert1 (allHostTypes != NULL && xbt_dict_length(allHostTypes) != 0,
+//        "%s must be called after environment creation", __FUNCTION__);
+//  }
+
+  //check if category is already created

   char *created = xbt_dict_get_or_null(created_categories, category);
   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
   char final_color[INSTR_DEFAULT_STR_SIZE];
   if (!color){
     //generate a random color


@@ -109,17 +49,24 @@ int TRACE_create_category_with_color(const char *category,
 
   DEBUG2("CAT,declare %s, %s", category, final_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 ()){
+    instr_new_user_variable_type (category, final_color);
+  }

 }
 
 void TRACE_declare_mark(const char *mark_type)
 }
 
 void TRACE_declare_mark(const char *mark_type)