X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3715b2a421abd8357f41fb2be3c25a351f1af8cb..153259d001d7e03ebc06ea7dc27803788a9cdb9d:/src/surf/host_interface.hpp diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index 78e7f5ac05..8fde63d95d 100644 --- a/src/surf/host_interface.hpp +++ b/src/surf/host_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,6 +8,9 @@ #include "storage_interface.hpp" #include "cpu_interface.hpp" #include "network_interface.hpp" +#include "src/surf/PropertyHolder.hpp" + +#include #ifndef SURF_HOST_INTERFACE_HPP_ #define SURF_HOST_INTERFACE_HPP_ @@ -16,9 +19,12 @@ * Classes * ***********/ -class HostModel; -class Host; -class HostAction; +namespace simgrid { +namespace surf { + +class XBT_PRIVATE HostModel; +class XBT_PRIVATE Host; +class XBT_PRIVATE HostAction; /************* * Callbacks * @@ -27,61 +33,59 @@ class HostAction; /** @ingroup SURF_callbacks * @brief Callbacks fired after Host creation. Signature: `void(Host*)` */ -XBT_PUBLIC_DATA(surf_callback(void, Host*)) hostCreatedCallbacks; +XBT_PUBLIC_DATA(simgrid::surf::signal) hostCreatedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks fired Host destruction. Signature: `void(Host*)` */ -XBT_PUBLIC_DATA(surf_callback(void, Host*)) hostDestructedCallbacks; +XBT_PUBLIC_DATA(simgrid::surf::signal) hostDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks fired after Host State changed. Signature: `void(Host *, e_surf_resource_state_t old, e_surf_resource_state_t current)` */ -XBT_PUBLIC_DATA(surf_callback(void, Host*, e_surf_resource_state_t, e_surf_resource_state_t)) hostStateChangedCallbacks; +XBT_PUBLIC_DATA(simgrid::surf::signal) hostStateChangedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks fired HostAction State changed. Signature: `void(HostAction *, e_surf_action_state_t old, e_surf_action_state_t current)` */ -XBT_PUBLIC_DATA(surf_callback(void, HostAction*, e_surf_action_state_t, e_surf_action_state_t)) hostActionStateChangedCallbacks; +XBT_PUBLIC_DATA(simgrid::surf::signal) hostActionStateChangedCallbacks; + +} +} /********* * Tools * *********/ -XBT_PUBLIC_DATA(HostModel*) surf_host_model; -XBT_PUBLIC(void) host_parse_init(sg_platf_host_cbarg_t host); +XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model; XBT_PUBLIC(void) host_add_traces(); /********* * Model * *********/ + +namespace simgrid { +namespace surf { + /** @ingroup SURF_host_interface * @brief SURF Host model interface class * @details A model is an object which handle the interactions between its Resources and its Actions */ class HostModel : public Model { public: - /** @brief Constructor */ - HostModel(const char *name); - - /** @brief Constructor */ - HostModel(); - - /** @brief Destructor */ - ~HostModel(); + HostModel() : Model() {} + ~HostModel() {} - virtual Host *createHost(const char *name)=0; - void addTraces(){DIE_IMPOSSIBLE;} + virtual Host *createHost(const char *name, RoutingEdge *net, Cpu *cpu, xbt_dict_t props)=0; + void addTraces() override {DIE_IMPOSSIBLE;} virtual void adjustWeightOfDummyCpuActions(); virtual Action *executeParallelTask(int host_nb, - void **host_list, - double *flops_amount, - double *bytes_amount, - double rate)=0; + sg_host_t *host_list, + double *flops_amount, + double *bytes_amount, + double rate)=0; - virtual Action *communicate(Host *src, Host *dst, double size, double rate)=0; - - bool shareResourcesIsIdempotent() {return true;} + bool shareResourcesIsIdempotent() override {return true;} }; /************ @@ -91,8 +95,11 @@ public: * @brief SURF Host interface class * @details An host represents a machine with a aggregation of a Cpu, a Link and a Storage */ -class Host : public Resource { +class Host : public simgrid::surf::Resource, + public simgrid::surf::PropertyHolder { public: + static simgrid::xbt::Extension EXTENSION_ID; + static void init(); /** * @brief Host constructor * @@ -103,7 +110,7 @@ public: * @param netElm The RoutingEdge associated to this Host * @param cpu The Cpu associated to this Host */ - Host(Model *model, const char *name, xbt_dict_t props, + Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu); /** @@ -117,22 +124,16 @@ public: * @param netElm The RoutingEdge associated to this Host * @param cpu The Cpu associated to this Host */ - Host(Model *model, const char *name, xbt_dict_t props, + Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu); /** @brief Host destructor */ - ~ Host(); + ~Host(); + void attach(simgrid::Host* host); void setState(e_surf_resource_state_t state); - /** - * @brief Get the properties of the current Host - * - * @return The properties of the current Host - */ - xbt_dict_t getProperties(); - /** * @brief Execute some quantity of computation * @@ -151,65 +152,13 @@ public: */ virtual Action *sleep(double duration)=0; - /** - * @brief Get the number of cores of the associated Cpu - * - * @return The number of cores of the associated Cpu - * @see Cpu - */ - virtual int getCore(); - - /** - * @brief Get the speed of the associated Cpu - * - * @param load [TODO] - * @return The speed of the associated Cpu - * @see Cpu - */ - virtual double getSpeed(double load); - - /** - * @brief Get the available speed of the associated Cpu - * @details [TODO] - * - * @return The available speed of the associated Cpu - * @see Cpu - */ - virtual double getAvailableSpeed(); - - /** - * @brief Get the associated Cpu power peak - * - * @return The associated Cpu power peak - * @see Cpu - */ - virtual double getCurrentPowerPeak(); - - virtual double getPowerPeakAt(int pstate_index); - virtual int getNbPstates(); - virtual void setPstate(int pstate_index); - virtual int getPstate(); - - /** - * @brief Return the storage of corresponding mount point - * - * @param storage The mount point - * @return The corresponding Storage - */ - virtual Storage *findStorageOnMountList(const char* storage); + /** @brief Return the storage of corresponding mount point */ + virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage); - /** - * @brief Get the xbt_dict_t of mount_point: Storage - * - * @return The xbt_dict_t of mount_point: Storage - */ + /** @brief Get the xbt_dict_t of mount_point: Storage */ virtual xbt_dict_t getMountedStorageList(); - /** - * @brief Get the xbt_dynar_t of storages attached to the Host - * - * @return The xbt_dynar_t of Storage names - */ + /** @brief Get the xbt_dynar_t of storages attached to the Host */ virtual xbt_dynar_t getAttachedStorageList(); /** @@ -311,34 +260,27 @@ public: */ virtual int fileMove(surf_file_t fd, const char* fullpath); +protected: + void onDie() override; + +public: xbt_dynar_t p_storage; RoutingEdge *p_netElm; Cpu *p_cpu; + simgrid::Host* p_host = nullptr; - /** - * @brief Get the list of virtual machines on the current Host - * - * @return The list of VMs - */ + /** @brief Get the list of virtual machines on the current Host */ xbt_dynar_t getVms(); /* common with vm */ - /** - * @brief [brief description] - * @details [long description] - * - * @param params [description] - */ - void getParams(ws_params_t params); - - /** - * @brief [brief description] - * @details [long description] - * - * @param params [description] - */ - void setParams(ws_params_t params); - s_ws_params_t p_params; + /** @brief Retrieve a copy of the parameters of that VM/PM + * @details The ramsize and overcommit fields are used on the PM too */ + void getParams(vm_params_t params); + /** @brief Sets the params of that VM/PM */ + void setParams(vm_params_t params); + simgrid::Host* getHost() { return p_host; } +private: + s_vm_params_t p_params; }; /********** @@ -357,7 +299,7 @@ public: * @param cost The cost of this HostAction in [TODO] * @param failed [description] */ - HostAction(Model *model, double cost, bool failed) + HostAction(simgrid::surf::Model *model, double cost, bool failed) : Action(model, cost, failed) {} /** @@ -368,11 +310,13 @@ public: * @param failed [description] * @param var The lmm variable associated to this StorageAction if it is part of a LMM component */ - HostAction(Model *model, double cost, bool failed, lmm_variable_t var) + HostAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) : Action(model, cost, failed, var) {} void setState(e_surf_action_state_t state); }; +} +} #endif /* SURF_Host_INTERFACE_HPP_ */