X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4aabf1133bae287cd37f9b9829a724a1bef2be53..dccf1b41e9c7b5a696f01abceaa2779fe65f154f:/include/simgrid/s4u/host.hpp?ds=sidebyside diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp index 2e5144a0ca..b6e7eff3b0 100644 --- a/include/simgrid/s4u/host.hpp +++ b/include/simgrid/s4u/host.hpp @@ -6,8 +6,9 @@ #ifndef SIMGRID_S4U_HOST_HPP #define SIMGRID_S4U_HOST_HPP +#include + #include -#include #include #include @@ -21,39 +22,52 @@ namespace simgrid { namespace xbt { -extern template class XBT_PUBLIC() Extendable; + extern template class XBT_PUBLIC() Extendable; } - namespace s4u { -/** @brief Simulated machine that can host some actors +/** @ingroup s4u_api * - * It represents some physical resource with computing and networking capabilities. + * @tableofcontents + * + * An host represents some physical resource with computing and networking capabilities. * * All hosts are automatically created during the call of the method * @link{simgrid::s4u::Engine::loadPlatform()}. * You cannot create a host yourself. * - * You can retrieve a particular host using @link{simgrid::s4u::Host.byName()}, - * and actors can retrieve the host on which they run using @link{simgrid::s4u::Host.current()}. + * You can retrieve a particular host using simgrid::s4u::Host::byName() + * and actors can retrieve the host on which they run using simgrid::s4u::Host::current(). */ XBT_PUBLIC_CLASS Host : public simgrid::xbt::Extendable { +public: + explicit Host(const char *name); + + /** Host destruction logic */ +protected: + virtual ~Host(); + private: - Host(const char *name); -public: // TODO, make me private - ~Host(); + bool currentlyDestroying_ = false; public: + void destroy(); + // No copy/move + Host(Host const&) = delete; + Host& operator=(Host const&) = delete; + /** Retrieves an host from its name, or return nullptr */ static Host* by_name_or_null(const char* name); - static Host* by_name_or_create(const char* name); - /** Retrieves an host from its name. */ + /** Retrieves an host from its name, or return nullptr */ + static Host* by_name_or_null(std::string name); + /** Retrieves an host from its name, or die */ static s4u::Host *by_name(std::string name); /** Retrieves the host on which the current actor is running */ static s4u::Host *current(); simgrid::xbt::string const& name() const { return name_; } + const char* cname() { return name_.c_str(); } /** Turns that host on if it was previously off * @@ -65,23 +79,24 @@ public: void turnOff(); /** Returns if that host is currently up and running */ bool isOn(); + /** Returns if that host is currently down and offline */ bool isOff() { return !isOn(); } double speed(); - int core_count(); + int coreCount(); xbt_dict_t properties(); + const char*property(const char*key); + void setProperty(const char*key, const char *value); xbt_swag_t processes(); - double currentPowerPeak(); - double powerPeakAt(int pstate_index); + double getPstateSpeedCurrent(); + double getPstateSpeed(int pstate_index); int pstatesCount() const; void setPstate(int pstate_index); int pstate(); - void parameters(vm_params_t params); - void setParameters(vm_params_t params); xbt_dict_t mountedStoragesAsDict(); // HACK xbt_dynar_t attachedStorages(); - /** Get an associative list [mount point]->[Storage] off all local mount points. + /** 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). */ @@ -89,14 +104,15 @@ public: private: simgrid::xbt::string name_ = "noname"; - boost::unordered_map *mounts = NULL; // caching + boost::unordered_map *mounts = nullptr; // caching public: - // FIXME: these should be protected, but it leads to many errors - // Use the extensions stuff for this? Go through simgrid::surf::Host? // TODO, this could be a unique_ptr + surf::HostImpl* pimpl_ = nullptr; + /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */ surf::Cpu *pimpl_cpu = nullptr; - surf::NetCard *pimpl_netcard = nullptr; + /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */ + kernel::routing::NetCard *pimpl_netcard = nullptr; public: /*** Called on each newly created object */ @@ -110,7 +126,6 @@ public: }} // namespace simgrid::s4u extern int MSG_HOST_LEVEL; -extern int SIMIX_HOST_LEVEL; extern int USER_HOST_LEVEL; #endif /* SIMGRID_S4U_HOST_HPP */ @@ -126,20 +141,6 @@ extern int USER_HOST_LEVEL; package org.simgrid.msg; -import org.simgrid.msg.Storage; - -/* -Host jacquelin; - -try { - jacquelin = Host.getByName("Jacquelin"); -} catch(HostNotFoundException e) { - System.err.println(e.toString()); -} -... -\endverbatim - * - */ public class Host { /** * This static method returns all of the hosts of the installed platform. @@ -164,38 +165,12 @@ public class Host { /** * This method returns the number of tasks currently running on a host. - * The external load (comming from an availability trace) is not taken in account. + * 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(); - /** - * This method returns the speed of the processor of a host, - * regardless of the current load of the machine. - * - * @return The speed of the processor of the host in flops. - * - */ - public native double getSpeed(); - - /** - * This method returns the number of core of a host. - * - * @return The speed of the processor of the host in flops. - * - */ - public native double getCoreNumber(); - - /** - * Returns the value of a given host property (set from the platform file). - */ - public native String getProperty(String name); - - /** - * Change the value of a given host property. - */ - public native void setProperty(String name, String value); /** This methods returns the list of storages attached to an host * @return An array containing all storages (name) attached to the host