X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55a08c7439db5b0335a5b26e40b3a46e1e03d3e8..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/instr/instr_paje_events.hpp

diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp
index f26a206ec4..d182088913 100644
--- a/src/instr/instr_paje_events.hpp
+++ b/src/instr/instr_paje_events.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2022. 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. */
@@ -8,47 +8,55 @@
 
 #include "src/instr/instr_private.hpp"
 #include "src/internal_config.h"
+#include <memory>
 #include <sstream>
 #include <string>
 
-namespace simgrid {
-namespace instr {
+namespace simgrid::instr {
 class EntityValue;
 class TIData;
 
-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
+enum class PajeEventType : unsigned int {
+  DefineContainerType,
+  DefineVariableType,
+  DefineStateType,
+  DefineEventType,
+  DefineLinkType,
+  DefineEntityValue,
+  CreateContainer,
+  DestroyContainer,
+  SetVariable,
+  AddVariable,
+  SubVariable,
+  SetState,
+  PushState,
+  PopState,
+  ResetState,
+  StartLink,
+  EndLink,
+  NewEvent
 };
 
+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&)> on_destruction;
+  static xbt::signal<void(PajeEvent const&)> on_destruction;
+
+public:
+  static void on_creation_cb(const std::function<void(PajeEvent&)>& cb) { on_creation.connect(cb); }
+  static void on_destruction_cb(const std::function<void(PajeEvent const&)>& cb) { on_destruction.connect(cb); }
 
   double timestamp_;
-  e_event_type eventType_;
+  PajeEventType eventType_;
   std::stringstream stream_;
 
-  PajeEvent(Container* container, Type* type, double timestamp, e_event_type eventType);
+  PajeEvent(Container* container, Type* type, double timestamp, PajeEventType eventType);
   virtual ~PajeEvent();
 
   Container* get_container() const { return container_; }
@@ -62,7 +70,7 @@ class VariableEvent : public PajeEvent {
   double value_;
 
 public:
-  VariableEvent(double timestamp, Container* container, Type* type, e_event_type event_type, double value)
+  VariableEvent(double timestamp, Container* container, Type* type, PajeEventType event_type, double value)
       : PajeEvent::PajeEvent(container, type, timestamp, event_type), value_(value)
   {
   }
@@ -77,10 +85,12 @@ class StateEvent : public PajeEvent {
 #endif
   std::unique_ptr<TIData> extra_;
 
+  static xbt::signal<void(StateEvent const&)> on_destruction;
+
 public:
-  static xbt::signal<void(StateEvent&)> on_destruction;
-  StateEvent(Container* container, Type* type, e_event_type event_type, EntityValue* value, TIData* extra);
-  ~StateEvent() { on_destruction(*this); }
+  static void on_destruction_cb(const std::function<void(StateEvent const&)>& cb) { on_destruction.connect(cb); }
+  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;
 };
@@ -89,12 +99,12 @@ class LinkEvent : public PajeEvent {
   Container* endpoint_;
   std::string value_;
   std::string key_;
-  int size_ = -1;
+  size_t size_;
 
 public:
-  LinkEvent(Container* container, Type* type, e_event_type event_type, Container* sourceContainer,
-            const std::string& value, const std::string& key, int size)
-      : PajeEvent(container, type, SIMIX_get_clock(), event_type)
+  LinkEvent(Container* container, Type* type, PajeEventType event_type, Container* sourceContainer,
+            const std::string& value, const std::string& key, size_t size = static_cast<size_t>(-1))
+      : PajeEvent(container, type, simgrid_get_clock(), event_type)
       , endpoint_(sourceContainer)
       , value_(value)
       , key_(key)
@@ -109,11 +119,10 @@ class NewEvent : public PajeEvent {
 
 public:
   NewEvent(double timestamp, Container* container, Type* type, EntityValue* value)
-      : PajeEvent::PajeEvent(container, type, timestamp, PAJE_NewEvent), value(value)
+      : PajeEvent::PajeEvent(container, type, timestamp, PajeEventType::NewEvent), value(value)
   {
   }
   void print() override;
 };
-} // namespace instr
-} // namespace simgrid
+} // namespace simgrid::instr
 #endif