X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bcc1dbe28f658ea786ba234a679601edd30758a..62cbd47a6b39a36431539d60f0f0efe81d228e4b:/src/surf/host_interface.hpp diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index 39e87803c5..832ef5e8a7 100644 --- a/src/surf/host_interface.hpp +++ b/src/surf/host_interface.hpp @@ -8,6 +8,7 @@ #include "storage_interface.hpp" #include "cpu_interface.hpp" #include "network_interface.hpp" +#include "src/surf/PropertyHolder.hpp" #include @@ -18,55 +19,41 @@ * Classes * ***********/ +namespace simgrid { +namespace surf { + class XBT_PRIVATE HostModel; class XBT_PRIVATE Host; class XBT_PRIVATE HostAction; -/************* - * Callbacks * - *************/ - -/** @ingroup SURF_callbacks - * @brief Callbacks fired after Host creation. Signature: `void(Host*)` - */ -XBT_PUBLIC_DATA(surf_callback(void, Host*)) hostCreatedCallbacks; -/** @ingroup SURF_callbacks - * @brief Callbacks fired Host destruction. Signature: `void(Host*)` - */ -XBT_PUBLIC_DATA(surf_callback(void, Host*)) 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; - -/** @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; +} +} /********* * 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 { +class HostModel : public Model{ public: 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, @@ -75,7 +62,7 @@ public: double *bytes_amount, double rate)=0; - bool shareResourcesIsIdempotent() {return true;} + bool shareResourcesIsIdempotent() override {return true;} }; /************ @@ -83,10 +70,20 @@ public: ************/ /** @ingroup SURF_host_interface * @brief SURF Host interface class - * @details An host represents a machine with a aggregation of a Cpu, a Link and a Storage + * @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage */ -class Host : public Resource { +class Host : public simgrid::surf::Resource, + public simgrid::surf::PropertyHolder { +public: + static simgrid::xbt::Extension EXTENSION_ID; + + /* callbacks */ + static simgrid::surf::signal onCreation; /** Called on each newly created object */ + static simgrid::surf::signal onDestruction; /** Called just before destructing an object */ + static simgrid::surf::signal onStateChange; + public: + static void classInit(); /** * @brief Host constructor * @@ -97,7 +94,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); /** @@ -111,21 +108,25 @@ 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 destruction logic */ + /**************************/ +protected: + ~Host(); +public: + void destroy(); // Must be called instead of the destructor +private: + bool currentlyDestroying_ = false; - 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(); +public: + void attach(simgrid::Host* host); + + e_surf_resource_state_t getState(); + void setState(e_surf_resource_state_t state); /** * @brief Execute some quantity of computation @@ -134,7 +135,7 @@ public: * @return The CpuAction corresponding to the processing * @see Cpu */ - virtual Action *execute(double flops_amount)=0; + Action *execute(double flops_amount); /** * @brief Make a process sleep for duration seconds @@ -143,10 +144,10 @@ public: * @return The CpuAction corresponding to the sleeping * @see Cpu */ - virtual Action *sleep(double duration)=0; + Action *sleep(double duration); /** @brief Return the storage of corresponding mount point */ - virtual Storage *findStorageOnMountList(const char* storage); + virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage); /** @brief Get the xbt_dict_t of mount_point: Storage */ virtual xbt_dict_t getMountedStorageList(); @@ -158,7 +159,6 @@ public: * @brief Open a file * * @param fullpath The full path to the file - * * @return The StorageAction corresponding to the opening */ virtual Action *open(const char* fullpath); @@ -253,9 +253,13 @@ public: */ virtual int fileMove(surf_file_t fd, const char* fullpath); + bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource + +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 */ xbt_dynar_t getVms(); @@ -266,6 +270,7 @@ public: 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; }; @@ -279,6 +284,8 @@ private: */ class HostAction : public Action { public: + static simgrid::surf::signal onStateChange; + /** * @brief HostAction constructor * @@ -286,7 +293,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) {} /** @@ -297,11 +304,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_ */