From 439a1a4277c4bf714ad422d81ab6f4e244605e54 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 16 May 2018 17:07:48 +0200 Subject: [PATCH 1/1] s4u::Host: move signals to the top and deprecated functions to the end --- include/simgrid/s4u/Host.hpp | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp index b62ab7aa2e..c0f9ffba83 100644 --- a/include/simgrid/s4u/Host.hpp +++ b/include/simgrid/s4u/Host.hpp @@ -47,6 +47,16 @@ private: bool currentlyDestroying_ = false; public: + /*** Called on each newly created host */ + static simgrid::xbt::signal on_creation; + /*** Called just before destructing an host */ + static simgrid::xbt::signal on_destruction; + /*** Called when the machine is turned on or off (called AFTER the change) */ + static simgrid::xbt::signal on_state_change; + /*** Called when the speed of the machine is changed (called AFTER the change) + * (either because of a pstate switch or because of an external load event coming from the profile) */ + static simgrid::xbt::signal on_speed_change; + virtual void destroy(); // No copy/move Host(Host const&) = delete; @@ -63,12 +73,6 @@ public: /** Retrieves the host on which the current actor is running */ static s4u::Host* current(); - XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_name()") simgrid::xbt::string const& getName() const - { - return name_; - } - XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_cname()") const char* getCname() const { return name_.c_str(); } - /** Retrieves the name of that host as a C++ string */ simgrid::xbt::string const& get_name() const { return name_; } /** Retrieves the name of that host as a C string */ @@ -130,6 +134,13 @@ public: */ double getLoad(); + // Deprecated functions + XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_name()") simgrid::xbt::string const& getName() const + { + return name_; + } + XBT_ATTRIB_DEPRECATED_v323("Please use Host::get_cname()") const char* getCname() const { return name_.c_str(); } + private: simgrid::xbt::string name_{"noname"}; std::unordered_map* mounts_ = nullptr; // caching @@ -141,16 +152,6 @@ public: surf::Cpu* pimpl_cpu = nullptr; /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */ kernel::routing::NetPoint* pimpl_netpoint = nullptr; - - /*** Called on each newly created host */ - static simgrid::xbt::signal on_creation; - /*** Called just before destructing an host */ - static simgrid::xbt::signal on_destruction; - /*** Called when the machine is turned on or off (called AFTER the change) */ - static simgrid::xbt::signal on_state_change; - /*** Called when the speed of the machine is changed (called AFTER the change) - * (either because of a pstate switch or because of an external load event coming from the profile) */ - static simgrid::xbt::signal on_speed_change; }; } } // namespace simgrid::s4u -- 2.20.1