X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8976bfbf1b73e13049d914169c672eabf7b63164..edada81d50549499871369f63a5ac01d652b283e:/src/instr/instr_paje_events.hpp

diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp
index ebdad78bf7..266f328676 100644
--- a/src/instr/instr_paje_events.hpp
+++ b/src/instr/instr_paje_events.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -7,66 +7,87 @@
 #define INSTR_PAJE_EVENTS_HPP
 
 #include "src/instr/instr_private.hpp"
+#include "src/internal_config.h"
+#include <memory>
+#include <sstream>
 #include <string>
 
 namespace simgrid {
 namespace instr {
 class EntityValue;
-
-enum e_event_type : unsigned int {
-  PAJE_DefineContainerType,
-  PAJE_DefineVariableType,
-  PAJE_DefineStateType,
-  PAJE_DefineEventType,
-  PAJE_DefineLinkType,
-  PAJE_DefineEntityValue,
-  PAJE_CreateContainer,
-  PAJE_DestroyContainer,
-  PAJE_SetVariable,
-  PAJE_AddVariable,
-  PAJE_SubVariable,
-  PAJE_SetState,
-  PAJE_PushState,
-  PAJE_PopState,
-  PAJE_ResetState,
-  PAJE_StartLink,
-  PAJE_EndLink,
-  PAJE_NewEvent
+class TIData;
+
+enum class PajeEventType : unsigned int {
+  DefineContainerType,
+  DefineVariableType,
+  DefineStateType,
+  DefineEventType,
+  DefineLinkType,
+  DefineEntityValue,
+  CreateContainer,
+  DestroyContainer,
+  SetVariable,
+  AddVariable,
+  SubVariable,
+  SetState,
+  PushState,
+  PopState,
+  ResetState,
+  StartLink,
+  EndLink,
+  NewEvent
 };
 
-class PajeEvent {
-protected:
-  Container* container;
-  Type* type;
+inline std::ostream& operator<<(std::ostream& os, PajeEventType event)
+{
+  return os << static_cast<std::underlying_type_t<PajeEventType>>(event);
+}
 
+class PajeEvent {
+  Container* container_;
+  Type* type_;
 public:
+  static xbt::signal<void(PajeEvent&)> on_creation;
+  static xbt::signal<void(PajeEvent const&)> on_destruction;
+
   double timestamp_;
-  e_event_type eventType_;
-  PajeEvent(Container* container, Type* type, double timestamp, e_event_type eventType)
-      : container(container), type(type), timestamp_(timestamp), eventType_(eventType){};
+  PajeEventType eventType_;
+  std::stringstream stream_;
+
+  PajeEvent(Container* container, Type* type, double timestamp, PajeEventType eventType);
   virtual ~PajeEvent();
+
+  Container* get_container() const { return container_; }
+  Type* get_type() const { return type_; }
+
   virtual void print() = 0;
-  void insertIntoBuffer();
+  void insert_into_buffer();
 };
 
 class VariableEvent : public PajeEvent {
-  double value;
+  double value_;
 
 public:
-  VariableEvent(double timestamp, Container* container, Type* type, e_event_type event_type, double value);
-  void print() override;
+  VariableEvent(double timestamp, Container* container, Type* type, PajeEventType event_type, double value)
+      : PajeEvent::PajeEvent(container, type, timestamp, event_type), value_(value)
+  {
+  }
+  void print() override { stream_ << " " << value_; }
 };
 
 class StateEvent : public PajeEvent {
   EntityValue* value;
-  std::string filename;
-  int linenumber;
-  void* extra_ = nullptr;
+#if HAVE_SMPI
+  std::string filename = "(null)";
+  int linenumber       = -1;
+#endif
+  std::unique_ptr<TIData> extra_;
 
 public:
-  StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value);
-  StateEvent(double timestamp, Container* container, Type* type, e_event_type event_type, EntityValue* value,
-             void* extra);
+  static xbt::signal<void(StateEvent const&)> on_destruction;
+  StateEvent(Container* container, Type* type, PajeEventType event_type, EntityValue* value, TIData* extra);
+  ~StateEvent() override { on_destruction(*this); }
+  bool has_extra() const { return extra_ != nullptr; }
   void print() override;
 };
 
@@ -77,21 +98,28 @@ class LinkEvent : public PajeEvent {
   int size_ = -1;
 
 public:
-  LinkEvent(double timestamp, Container* container, Type* type, e_event_type event_type, Container* sourceContainer,
-            std::string value, std::string key);
-  LinkEvent(double timestamp, Container* container, Type* type, e_event_type event_type, Container* sourceContainer,
-            std::string value, std::string key, int size);
+  LinkEvent(Container* container, Type* type, PajeEventType event_type, Container* sourceContainer,
+            const std::string& value, const std::string& key, int size)
+      : PajeEvent(container, type, SIMIX_get_clock(), event_type)
+      , endpoint_(sourceContainer)
+      , value_(value)
+      , key_(key)
+      , size_(size)
+  {
+  }
   void print() override;
 };
 
 class NewEvent : public PajeEvent {
-  EntityValue* val;
+  EntityValue* value;
 
 public:
-  NewEvent(double timestamp, Container* container, Type* type, EntityValue* val);
+  NewEvent(double timestamp, Container* container, Type* type, EntityValue* value)
+      : PajeEvent::PajeEvent(container, type, timestamp, PajeEventType::NewEvent), value(value)
+  {
+  }
   void print() override;
 };
-}
-}
-
+} // namespace instr
+} // namespace simgrid
 #endif