From 23e9d3ae59822a5df6abc1963fa6703362363a65 Mon Sep 17 00:00:00 2001 From: schnorr Date: Wed, 4 Jul 2012 11:14:37 +0200 Subject: [PATCH 1/1] [trace] don't specify color when declaring an event type --- src/instr/instr_interface.c | 2 +- src/instr/instr_paje_types.c | 11 ++--------- src/instr/instr_private.h | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c index 673cac879e..944e441724 100644 --- 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); - 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); } diff --git a/src/instr/instr_paje_types.c b/src/instr/instr_paje_types.c index 3f1538b930..c2c4c428e2 100644 --- 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; } -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"); } - 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; diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index b8065ec32e..1b6068fbd4 100644 --- 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); -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); -- 2.20.1