X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8e579781408282aaead93a271b6bb8855ba87603..6fbcdfade89b3812c24152c86f8aa3be510df7f2:/src/instr/instr_paje_events.hpp diff --git a/src/instr/instr_paje_events.hpp b/src/instr/instr_paje_events.hpp index bfb79da55e..ed12cd6236 100644 --- a/src/instr/instr_paje_events.hpp +++ b/src/instr/instr_paje_events.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2023. 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. */ @@ -12,8 +12,7 @@ #include #include -namespace simgrid { -namespace instr { +namespace simgrid::instr { class EntityValue; class TIData; @@ -46,10 +45,13 @@ inline std::ostream& operator<<(std::ostream& os, PajeEventType event) class PajeEvent { Container* container_; Type* type_; -public: static xbt::signal on_creation; static xbt::signal on_destruction; +public: + static void on_creation_cb(const std::function& cb) { on_creation.connect(cb); } + static void on_destruction_cb(const std::function& cb) { on_destruction.connect(cb); } + double timestamp_; PajeEventType eventType_; std::stringstream stream_; @@ -83,8 +85,10 @@ class StateEvent : public PajeEvent { #endif std::unique_ptr extra_; -public: static xbt::signal on_destruction; + +public: + static void on_destruction_cb(const std::function& 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; } @@ -100,7 +104,7 @@ class LinkEvent : public PajeEvent { public: LinkEvent(Container* container, Type* type, PajeEventType event_type, Container* sourceContainer, const std::string& value, const std::string& key, size_t size = static_cast(-1)) - : PajeEvent(container, type, SIMIX_get_clock(), event_type) + : PajeEvent(container, type, simgrid_get_clock(), event_type) , endpoint_(sourceContainer) , value_(value) , key_(key) @@ -120,6 +124,5 @@ public: } void print() override; }; -} // namespace instr -} // namespace simgrid +} // namespace simgrid::instr #endif