Rename some activity/SynchroBlah into activity/BlahImpl (+clang-format)

[simgrid.git] / src / instr / instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index ef17a58..d4da8fa 100644 (file)
--- 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;
@@ -424,12 +421,8 @@ 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);
@@ -512,6 +505,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