X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..c941a6b513a71ef786c4c749f8c01f5d018d976c:/src/surf/host_interface.hpp diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index e0ec337a7f..f1c199dc60 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; } } @@ -55,8 +33,8 @@ XBT_PUBLIC_DATA(surf_callback(void, HostAction*, e_surf_action_state_t, e_surf_a /********* * Tools * *********/ + XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model; -XBT_PUBLIC(void) host_add_traces(); /********* * Model * @@ -72,19 +50,18 @@ namespace surf { class HostModel : public Model { public: HostModel() : Model() {} - ~HostModel() {} + ~HostModel() override {} - virtual Host *createHost(const char *name, RoutingEdge *net, Cpu *cpu)=0; - void addTraces(){DIE_IMPOSSIBLE;} + Host *createHost(const char *name, NetCard *net, Cpu *cpu, xbt_dict_t props); virtual void adjustWeightOfDummyCpuActions(); virtual Action *executeParallelTask(int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double rate)=0; + sg_host_t *host_list, + double *flops_amount, + double *bytes_amount, + double rate); - bool shareResourcesIsIdempotent() {return true;} + bool next_occuring_event_isIdempotent() override {return true;} }; /************ @@ -92,10 +69,16 @@ 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::Extension EXTENSION_ID; + public: + static void classInit(); // must be called before the first use of that class /** * @brief Host constructor * @@ -103,11 +86,10 @@ public: * @param name The name of the Host * @param props Dictionary of properties associated to this Host * @param storage The Storage associated to this Host - * @param netElm The RoutingEdge associated to this Host * @param cpu The Cpu associated to this Host */ - Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, - xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu); + Host(HostModel *model, const char *name, xbt_dict_t props, + xbt_dynar_t storage, Cpu *cpu); /** * @brief Host constructor @@ -117,42 +99,26 @@ public: * @param props Dictionary of properties associated to this Host * @param constraint The lmm constraint associated to this Host if it is part of a LMM component * @param storage The Storage associated to this Host - * @param netElm The RoutingEdge associated to this Host * @param cpu The Cpu associated to this Host */ - 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(); - - void setState(e_surf_resource_state_t state); + Host(HostModel *model, const char *name, xbt_dict_t props, + lmm_constraint_t constraint, xbt_dynar_t storage, Cpu *cpu); - /** - * @brief Get the properties of the current Host - * - * @return The properties of the current Host - */ - xbt_dict_t getProperties(); + /* Host destruction logic */ + /**************************/ + ~Host(); - /** - * @brief Execute some quantity of computation - * - * @param flops_amount The value of the processing amount (in flop) needed to process - * @return The CpuAction corresponding to the processing - * @see Cpu - */ - virtual Action *execute(double flops_amount)=0; +public: + HostModel *getModel() + { + return static_cast(Resource::getModel()); + } + void attach(simgrid::s4u::Host* host); - /** - * @brief Make a process sleep for duration seconds - * - * @param duration The number of seconds to sleep - * @return The CpuAction corresponding to the sleeping - * @see Cpu - */ - virtual Action *sleep(double duration)=0; + bool isOn() override; + bool isOff() override; + void turnOn() override; + void turnOff() override; /** @brief Return the storage of corresponding mount point */ virtual simgrid::surf::Storage *findStorageOnMountList(const char* storage); @@ -167,7 +133,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); @@ -262,9 +227,14 @@ public: */ virtual int fileMove(surf_file_t fd, const char* fullpath); + bool isUsed() override {DIE_IMPOSSIBLE;} // FIXME: Host should not be a Resource + void apply_event(tmgr_trace_iterator_t event, double value) override + {THROW_IMPOSSIBLE;} // FIXME: Host should not be a Resource + +public: xbt_dynar_t p_storage; - RoutingEdge *p_netElm; Cpu *p_cpu; + simgrid::s4u::Host* p_host = nullptr; /** @brief Get the list of virtual machines on the current Host */ xbt_dynar_t getVms(); @@ -275,43 +245,11 @@ public: void getParams(vm_params_t params); /** @brief Sets the params of that VM/PM */ void setParams(vm_params_t params); + simgrid::s4u::Host* getHost() { return p_host; } 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); -}; - } }