X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/32c376f9ec726c9710a0c61697d7f5a5e47c16a0..187cd6640efa83f05be0f03665054e4640ed202e:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index ef17a58ff6..40726f1d69 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -114,13 +114,11 @@ class s_container {
 typedef s_container s_container_t;
 
 //--------------------------------------------------
-class PajeEvent;
-
 class PajeEvent {
   public:
   double timestamp;
   e_event_type event_type;
-  virtual void print(){};
+  virtual void print() = 0;
   void *data;
   virtual ~PajeEvent();
 };
@@ -151,7 +149,7 @@ class DefineStateTypeEvent : public PajeEvent  {
   type_t type;
   public:
   DefineStateTypeEvent(type_t type);
-  void print();// override;
+  void print() override;
 };
 
 class DefineEventTypeEvent : public PajeEvent  {
@@ -246,7 +244,7 @@ class PushStateEvent : public PajeEvent  {
   int size;
   const char* filename;
   int linenumber;
-  void* extra;
+  void* extra_;
   public:
   PushStateEvent (double timestamp, container_t container, type_t type, val_t value);
   PushStateEvent (double timestamp, container_t container, type_t type, val_t value,
@@ -257,7 +255,6 @@ class PushStateEvent : public PajeEvent  {
 class PopStateEvent : public PajeEvent  {
   container_t container;
   type_t type;
-  xbt_dynar_t extra;
   public:
   PopStateEvent (double timestamp, container_t container, type_t type);
   void print() override;
@@ -280,11 +277,12 @@ class StartLinkEvent : public PajeEvent  {
   char *key;
   int size;
   public:
-  StartLinkEvent (double timestamp, container_t container, type_t type, container_t sourceContainer,
-                                    const char *value, const char *key);
-  StartLinkEvent (double timestamp, container_t container, type_t type,
-                                            container_t sourceContainer, const char *value, const char *key, int size);
-  void print() override;
+    ~StartLinkEvent();
+    StartLinkEvent(double timestamp, container_t container, type_t type, container_t sourceContainer, const char* value,
+                   const char* key);
+    StartLinkEvent(double timestamp, container_t container, type_t type, container_t sourceContainer, const char* value,
+                   const char* key, int size);
+    void print() override;
 };
 
 class EndLinkEvent : public PajeEvent  {
@@ -296,6 +294,7 @@ class EndLinkEvent : public PajeEvent  {
   public:
   EndLinkEvent (double timestamp, container_t container, type_t type, container_t destContainer,
                                   const char *value, const char *key);
+  ~EndLinkEvent();
   void print() override;
 };
 
@@ -405,58 +404,14 @@ 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 print_TIPushState(PajeEvent* event);
-XBT_PRIVATE void print_TICreateContainer(PajeEvent* event);
-XBT_PRIVATE void print_TIDestroyContainer(PajeEvent* event);
 XBT_PRIVATE void TRACE_TI_start();
 XBT_PRIVATE void TRACE_TI_end();
-XBT_PRIVATE void TRACE_TI_init();
 
 XBT_PRIVATE void print_NULL (PajeEvent* event);
 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;
 
@@ -512,6 +467,14 @@ typedef struct s_instr_extra_data {
   int num_processes;
 } s_instr_extra_data_t;
 
+/* Format of TRACING output.
+ *   - paje is the regular format, that we all know
+ *   - TI is a trick to reuse the tracing functions to generate a time independent trace during the execution. Such trace can easily be replayed with smpi_replay afterward.
+ *     This trick should be removed and replaced by some code using the signal that we will create to cleanup the TRACING
+ */
+typedef enum { instr_fmt_paje, instr_fmt_TI } instr_fmt_type_t;
+extern instr_fmt_type_t instr_fmt_type;
+
 SG_END_DECL()
 
 #endif