X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf108868b4eeed4d0d9d343bc68557d7814e18c0..2fe56becb7b12edd78788a83dbc1d3e1d85d9dbc:/include/simgrid/s4u/host.hpp diff --git a/include/simgrid/s4u/host.hpp b/include/simgrid/s4u/host.hpp index 20e5e7d93d..8d7d2dd1ae 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,34 +22,36 @@ 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 { private: - Host(const char *name); + explicit Host(const char *name); public: // TODO, make me private ~Host(); -public: + /** Do not use this function, it should be private */ + static Host* by_name_or_create(const char* name); + /** 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 die */ static s4u::Host *by_name(std::string name); /** Retrieves the host on which the current actor is running */ static s4u::Host *current(); @@ -60,43 +63,45 @@ public: * All actors on that host which were marked autorestart will be restarted automatically. * This call does nothing if the host is already on. */ - void turn_on(); + void turnOn(); /** Turns that host off. All actors are forcefully stopped. */ - void turn_off(); + void turnOff(); /** Returns if that host is currently up and running */ - bool is_on(); - bool is_off() { return !is_on(); } + bool isOn(); + bool isOff() { return !isOn(); } double speed(); - int core_count(); + int coresCount(); xbt_dict_t properties(); + const char*property(const char*key); + void setProperty(const char*key, const char *value); xbt_swag_t processes(); - double current_power_peak(); - double power_peak_at(int pstate_index); - void set_pstate(int pstate_index); - int pstates_count() const; + double getPstateSpeedCurrent(); + double getPstateSpeed(int pstate_index); + int pstatesCount() const; + void setPstate(int pstate_index); int pstate(); - void get_parameters(vm_params_t params); - void set_parameters(vm_params_t params); - xbt_dict_t mounted_storages_as_dict(); // HACK - xbt_dynar_t attached_storages(); + 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). */ - boost::unordered_map const &mounted_storages(); + boost::unordered_map const &mountedStorages(); 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 + /** 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) */ + routing::NetCard *pimpl_netcard = nullptr; public: /*** Called on each newly created object */ @@ -110,9 +115,7 @@ public: }} // namespace simgrid::s4u extern int MSG_HOST_LEVEL; -extern int SD_HOST_LEVEL; extern int SIMIX_HOST_LEVEL; -extern int ROUTING_HOST_LEVEL; extern int USER_HOST_LEVEL; #endif /* SIMGRID_S4U_HOST_HPP */ @@ -128,20 +131,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. @@ -166,38 +155,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