X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd77edf75909515d711d8be2c27e61e23a72ba74..c5b2e47a817b31e930436b5609f73aead7910f87:/src/surf/HostImpl.hpp diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index 69d0ce6a37..5ddc32da4f 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -52,14 +52,11 @@ public: HostModel() : Model() {} ~HostModel() override {} - HostImpl *createHost(const char *name, NetCard *net, Cpu *cpu, xbt_dict_t props); + HostImpl *createHost(const char *name, NetCard *net, Cpu *cpu); virtual void adjustWeightOfDummyCpuActions(); - virtual Action *executeParallelTask(int host_nb, - sg_host_t *host_list, - double *flops_amount, - double *bytes_amount, - double rate); + virtual Action *executeParallelTask(int host_nb, sg_host_t *host_list, + double *flops_amount, double *bytes_amount, double rate); bool next_occuring_event_isIdempotent() override {return true;} }; @@ -88,8 +85,7 @@ public: * @param storage The Storage associated to this Host * @param cpu The Cpu associated to this Host */ - HostImpl(HostModel *model, const char *name, xbt_dict_t props, - xbt_dynar_t storage, Cpu *cpu); + HostImpl(HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu); /** * @brief Host constructor @@ -101,7 +97,7 @@ public: * @param storage The Storage associated to this Host * @param cpu The Cpu associated to this Host */ - HostImpl(HostModel *model, const char *name, xbt_dict_t props, + HostImpl(HostModel *model, const char *name, lmm_constraint_t constraint, xbt_dynar_t storage, Cpu *cpu); /* Host destruction logic */ @@ -115,8 +111,8 @@ public: } void attach(simgrid::s4u::Host* host); - bool isOn() override; - bool isOff() override; + bool isOn() const override; + bool isOff() const override; void turnOn() override; void turnOff() override; @@ -181,7 +177,7 @@ public: virtual Action *write(surf_file_t fd, sg_size_t size); /** - * @brief Get the informations of a file descriptor + * @brief Get the information of a file descriptor * @details The returned xbt_dynar_t contains: * - the size of the file, * - the mount point, @@ -190,7 +186,7 @@ public: * - the storage content type * * @param fd The file descriptor - * @return An xbt_dynar_t with the file informations + * @return An xbt_dynar_t with the file information */ virtual xbt_dynar_t getInfo(surf_file_t fd);