From 187cd6640efa83f05be0f03665054e4640ed202e Mon Sep 17 00:00:00 2001 From: Takishipp Date: Mon, 12 Jun 2017 13:57:04 +0200 Subject: [PATCH] remove some useless structures --- src/instr/instr_paje_trace.cpp | 6 ----- src/instr/instr_private.h | 40 ---------------------------------- 2 files changed, 46 deletions(-) diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index 78f726ecdf..a633018302 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -21,8 +21,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_trace, instr, "tracing event system"); -extern s_instr_trace_writer_t active_writer; - static std::stringstream stream; FILE *tracing_file = nullptr; @@ -35,10 +33,6 @@ void print_NULL(PajeEvent* event){} /* The active set of functions for the selected trace format * By default, they all do nothing, hence the print_NULL to avoid segfaults */ -s_instr_trace_writer_t active_writer = {&print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, - &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, - &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL, &print_NULL}; - std::vector buffer; void buffer_debug(std::vector *buf); diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index 6eb604427c..40726f1d69 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -404,25 +404,6 @@ XBT_PUBLIC(val_t) PJ_value_get_or_new (const char *name, const char *color, typ XBT_PUBLIC(val_t) PJ_value_get (const char *name, const type_t father); XBT_PRIVATE void PJ_value_free (val_t value); -XBT_PRIVATE void print_pajeDefineContainerType(PajeEvent* event); -XBT_PRIVATE void print_pajeDefineVariableType(PajeEvent* event); -XBT_PRIVATE void print_pajeDefineStateType(PajeEvent* event); -XBT_PRIVATE void print_pajeDefineEventType(PajeEvent* event); -XBT_PRIVATE void print_pajeDefineLinkType(PajeEvent* event); -XBT_PRIVATE void print_pajeDefineEntityValue (PajeEvent* event); -XBT_PRIVATE void print_pajeCreateContainer(PajeEvent* event); -XBT_PRIVATE void print_pajeDestroyContainer(PajeEvent* event); -XBT_PRIVATE void print_pajeSetVariable(PajeEvent* event); -XBT_PRIVATE void print_pajeAddVariable(PajeEvent* event); -XBT_PRIVATE void print_pajeSubVariable(PajeEvent* event); -XBT_PRIVATE void print_pajeSetState(PajeEvent* event); -XBT_PRIVATE void print_pajePushState(PajeEvent* event); -XBT_PRIVATE void print_pajePopState(PajeEvent* event); -XBT_PRIVATE void print_pajeResetState(PajeEvent* event); -XBT_PRIVATE void print_pajeStartLink(PajeEvent* event); -XBT_PRIVATE void print_pajeEndLink(PajeEvent* event); -XBT_PRIVATE void print_pajeNewEvent (PajeEvent* event); - XBT_PRIVATE void TRACE_TI_start(); XBT_PRIVATE void TRACE_TI_end(); @@ -431,27 +412,6 @@ XBT_PRIVATE void TRACE_paje_dump_buffer (int force); XBT_PRIVATE void dump_comment_file (const char *filename); XBT_PRIVATE void dump_comment (const char *comment); -typedef struct instr_trace_writer { - void (*print_DefineContainerType) (PajeEvent* event); - void (*print_DefineVariableType)(PajeEvent* event); - void (*print_DefineStateType)(PajeEvent* event); - void (*print_DefineEventType)(PajeEvent* event); - void (*print_DefineLinkType)(PajeEvent* event); - void (*print_DefineEntityValue)(PajeEvent* event); - void (*print_CreateContainer)(PajeEvent* event); - void (*print_DestroyContainer)(PajeEvent* event); - void (*print_SetVariable)(PajeEvent* event); - void (*print_AddVariable)(PajeEvent* event); - void (*print_SubVariable)(PajeEvent* event); - void (*print_SetState)(PajeEvent* event); - void (*print_PushState)(PajeEvent* event); - void (*print_PopState)(PajeEvent* event); - void (*print_ResetState)(PajeEvent* event); - void (*print_StartLink)(PajeEvent* event); - void (*print_EndLink)(PajeEvent* event); - void (*print_NewEvent) (PajeEvent* event); -} s_instr_trace_writer_t; - struct s_instr_extra_data; typedef struct s_instr_extra_data *instr_extra_data; -- 2.20.1