Attempt to correct error tests

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index d787861..8dc1f28 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -111,7 +111,6 @@ int TRACE_start()
     const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
     XBT_DEBUG("Tracing format %s\n", format);
     if(!strcmp(format, "Paje")){
-      TRACE_paje_init();
       TRACE_paje_start();
     }else if (!strcmp(format, "TI")){
       TRACE_TI_init();

diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index ec32afc..96faae2 100644 (file)
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -41,30 +41,7 @@ static void print_timestamp(paje_event_t event) {
     stream << 0;
   else 
     stream << event->timestamp;
-}
-
-void TRACE_paje_init() {
-  /*
-  //active_writer.print_DefineContainerType = &print_pajeDefineContainerType;
-  active_writer.print_DefineVariableType  = &print_pajeDefineVariableType;
-  active_writer.print_DefineStateType     = &print_pajeDefineStateType;
-  active_writer.print_DefineEventType     = &print_pajeDefineEventType;
-  active_writer.print_DefineLinkType      = &print_pajeDefineLinkType;
-  active_writer.print_DefineEntityValue   = &print_pajeDefineEntityValue;
-  active_writer.print_CreateContainer     = &print_pajeCreateContainer;
-  active_writer.print_DestroyContainer    = &print_pajeDestroyContainer;
-  active_writer.print_SetVariable         = &print_pajeSetVariable;
-  active_writer.print_AddVariable         = &print_pajeAddVariable;
-  active_writer.print_SubVariable         = &print_pajeSubVariable;
-  active_writer.print_SetState            = &print_pajeSetState;
-  active_writer.print_PushState           = &print_pajePushState;
-  active_writer.print_PopState            = &print_pajePopState;
-  active_writer.print_ResetState          = &print_pajeResetState;
-  active_writer.print_StartLink           = &print_pajeStartLink;
-  active_writer.print_EndLink             = &print_pajeEndLink;
-  active_writer.print_NewEvent            = &print_pajeNewEvent;
-*/
-}
+}  
 
 void TRACE_paje_start() {
   char *filename = TRACE_get_filename();

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 573f3f4..9220a77 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -121,9 +121,9 @@ class paje_event {
   public:
   double timestamp;
   e_event_type event_type;
-  virtual void print();
+  virtual void print(){};
   void *data;
-  ~paje_event();
+  virtual ~paje_event();
 };
 typedef paje_event s_paje_event_t;
 
@@ -310,6 +310,7 @@ class NewEvent : public paje_event  {
   public:
   NewEvent (double timestamp, container_t container, type_t type, val_t value);
   void print() override;
+
 };
 
 
@@ -324,7 +325,6 @@ extern XBT_PRIVATE double TRACE_last_timestamp_to_dump;
 XBT_PRIVATE void TRACE_header(int basic, int size);
 
 /* from paje.c */
-XBT_PRIVATE void TRACE_paje_init();
 XBT_PRIVATE void TRACE_paje_start();
 XBT_PRIVATE void TRACE_paje_end();
 XBT_PRIVATE void TRACE_paje_dump_buffer (int force);