X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5410c0dedd6e07e55c0a74a0664d1f8a73d69c1e..6d8b8ade25d24e33e57eb02b443f567a0733c664:/src/surf/host_interface.hpp diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index 5c081d2b9a..c6c144d231 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 @@ -25,29 +26,6 @@ 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; } } @@ -69,13 +47,13 @@ namespace surf { * @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, RoutingEdge *net, Cpu *cpu)=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, @@ -84,7 +62,7 @@ public: double *bytes_amount, double rate)=0; - bool shareResourcesIsIdempotent() {return true;} + bool shareResourcesIsIdempotent() override {return true;} }; /************ @@ -92,12 +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 simgrid::surf::Resource { +class Host : public simgrid::surf::Resource, + public simgrid::surf::PropertyHolder { public: - static simgrid::xbt::FacetLevel LEVEL; - static void init(); + 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 * @@ -126,18 +112,21 @@ public: lmm_constraint_t constraint, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu); - /** @brief Host destructor */ + /* Host destruction logic */ + /**************************/ +protected: ~Host(); +public: + void destroy(); // Must be called instead of the destructor +private: + bool currentlyDestroying_ = false; + +public: 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(); + e_surf_resource_state_t getState(); + void setState(e_surf_resource_state_t state); /** * @brief Execute some quantity of computation @@ -146,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 @@ -155,7 +144,7 @@ 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 simgrid::surf::Storage *findStorageOnMountList(const char* storage); @@ -170,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); @@ -265,6 +253,11 @@ public: */ virtual int fileMove(surf_file_t fd, const char* fullpath); + bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource + void updateState(tmgr_trace_event_t event_type, double value, double date) override + {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource + +public: xbt_dynar_t p_storage; RoutingEdge *p_netElm; Cpu *p_cpu; @@ -284,39 +277,6 @@ private: s_vm_params_t p_params; }; -/********** - * Action * - **********/ - -/** @ingroup SURF_host_interface - * @brief SURF host action interface class - */ -class HostAction : public Action { -public: - /** - * @brief HostAction constructor - * - * @param model The HostModel associated to this HostAction - * @param cost The cost of this HostAction in [TODO] - * @param failed [description] - */ - HostAction(simgrid::surf::Model *model, double cost, bool failed) - : Action(model, cost, failed) {} - - /** - * @brief HostAction constructor - * - * @param model The HostModel associated to this HostAction - * @param cost The cost of this HostAction in [TODO] - * @param failed [description] - * @param var The lmm variable associated to this StorageAction if it is part of a LMM component - */ - 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); -}; - } }