[trace] don't specify color when declaring an event type

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index 673cac8..944e441 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -168,7 +168,7 @@ void TRACE_declare_mark(const char *mark_type)
   }
 
   XBT_DEBUG("MARK,declare %s", mark_type);
   }
 
   XBT_DEBUG("MARK,declare %s", mark_type);

-  PJ_type_event_new(mark_type, NULL, PJ_type_get_root());
+  PJ_type_event_new(mark_type, PJ_type_get_root());

   xbt_dict_set (declared_marks, mark_type, xbt_strdup("1"), NULL);
 }
 
   xbt_dict_set (declared_marks, mark_type, xbt_strdup("1"), NULL);
 }
 

diff --git a/src/instr/instr_paje_types.c b/src/instr/instr_paje_types.c
index 3f1538b..c2c4c42 100644 (file)
--- a/src/instr/instr_paje_types.c
+++ b/src/instr/instr_paje_types.c
@@ -135,20 +135,13 @@ type_t PJ_type_container_new (const char *name, type_t father)
   return ret;
 }
 
   return ret;
 }
 

-type_t PJ_type_event_new (const char *name, const char *color, type_t father)
+type_t PJ_type_event_new (const char *name, type_t father)

 {
   if (name == NULL){
     THROWF (tracing_error, 0, "can't create an event type with a NULL name");
   }
 
 {
   if (name == NULL){
     THROWF (tracing_error, 0, "can't create an event type with a NULL name");
   }
 

-  type_t ret = NULL;
-
-  char white[INSTR_DEFAULT_STR_SIZE] = "1 1 1";
-  if (!color){
-    ret = newType (name, name, white, TYPE_EVENT, father);
-  }else{
-    ret = newType (name, name, color, TYPE_EVENT, father);
-  }
+  type_t ret = newType (name, name, NULL, TYPE_EVENT, father);

   XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
   new_pajeDefineEventType(ret);
   return ret;
   XBT_DEBUG("EventType %s(%s), child of %s(%s)", ret->name, ret->id, father->name, father->id);
   new_pajeDefineEventType(ret);
   return ret;

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index b8065ec..1b6068f 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -213,7 +213,7 @@ void PJ_type_alloc (void);
 void PJ_type_release (void);
 type_t PJ_type_get_root (void);
 type_t PJ_type_container_new (const char *name, type_t father);
 void PJ_type_release (void);
 type_t PJ_type_get_root (void);
 type_t PJ_type_container_new (const char *name, type_t father);

-type_t PJ_type_event_new (const char *name, const char *color, type_t father);
+type_t PJ_type_event_new (const char *name, type_t father);

 type_t PJ_type_variable_new (const char *name, const char *color, type_t father);
 type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest);
 type_t PJ_type_state_new (const char *name, type_t father);
 type_t PJ_type_variable_new (const char *name, const char *color, type_t father);
 type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest);
 type_t PJ_type_state_new (const char *name, type_t father);