X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a92d7b716f51a53dea7f59db8524d4add713b910..d5b29830df70e823202e384a7655e4371193ecd7:/include/simgrid/s4u/Host.hpp diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp index 665f2c85fe..31ecd57f3e 100644 --- a/include/simgrid/s4u/Host.hpp +++ b/include/simgrid/s4u/Host.hpp @@ -7,8 +7,7 @@ #define SIMGRID_S4U_HOST_HPP #include - -#include +#include #include "xbt/Extendable.hpp" #include "xbt/dict.h" @@ -95,21 +94,20 @@ public: int pstatesCount() const; void setPstate(int pstate_index); int pstate(); - xbt_dict_t mountedStoragesAsDict(); // HACK void attachedStorages(std::vector * storages); /** Get an associative list [mount point]->[Storage] of all local mount points. * * This is defined in the platform file, and cannot be modified programatically (yet). */ - boost::unordered_map const& mountedStorages(); + std::unordered_map const& mountedStorages(); void routeTo(Host * dest, std::vector * links, double* latency); void routeTo(Host * dest, std::vector * links, double* latency); private: simgrid::xbt::string name_ = "noname"; - boost::unordered_map* mounts = nullptr; // caching + std::unordered_map* mounts = nullptr; // caching public: // TODO, this could be a unique_ptr @@ -119,13 +117,13 @@ public: /** 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 object */ + /*** Called on each newly created host */ static simgrid::xbt::signal onCreation; - /*** Called just before destructing an object */ + /*** Called just before destructing an host */ static simgrid::xbt::signal onDestruction; - /*** Called when the machine is turned on or off */ + /*** Called when the machine is turned on or off (called AFTER the change) */ static simgrid::xbt::signal onStateChange; - /*** Called when the speed of the machine is changed + /*** 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 onSpeedChange; }; @@ -145,9 +143,8 @@ public class Host { * The external load (coming from an availability trace) is not taken in account. * * @return The number of tasks currently running on a host. - */ + */ public native int getLoad(); - } #endif