X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cf07616d00639f39bad49729f9e63b7533eed9a4..30f40863fc506c7013dec1902201d4bdffe3a101:/src/surf/HostImpl.hpp diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index 4c28215202..d22e5d4b53 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -4,11 +4,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "surf_interface.hpp" -#include "storage_interface.hpp" #include "cpu_interface.hpp" #include "network_interface.hpp" #include "src/surf/PropertyHolder.hpp" +#include "StorageImpl.hpp" #include #ifndef SURF_HOST_INTERFACE_HPP_ @@ -48,7 +48,7 @@ class HostModel : public Model { public: HostModel() : Model() {} - virtual void adjustWeightOfDummyCpuActions(); + virtual void ignoreEmptyVmInPmLMM(); virtual Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, double rate); }; @@ -64,24 +64,13 @@ class HostImpl : public simgrid::surf::PropertyHolder { public: explicit HostImpl(s4u::Host* host); - virtual ~HostImpl(); + virtual ~HostImpl() = default; /** @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 */ - virtual xbt_dict_t getMountedStorageList(); + virtual simgrid::surf::StorageImpl* findStorageOnMountList(const char* storage); /** @brief Get the xbt_dynar_t of storages attached to the Host */ - virtual std::vector getAttachedStorageList(); - - /** - * @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); + virtual void getAttachedStorageList(std::vector* storages); /** * @brief Close a file @@ -126,20 +115,6 @@ public: */ virtual Action* write(surf_file_t fd, sg_size_t size); - /** - * @brief Get the information of a file descriptor - * @details The returned xbt_dynar_t contains: - * - the size of the file, - * - the mount point, - * - the storage name, - * - the storage typeId, - * - the storage content type - * - * @param fd The file descriptor - * @return An xbt_dynar_t with the file information - */ - virtual xbt_dynar_t getInfo(surf_file_t fd); - /** * @brief Get the current position of the file descriptor * @@ -173,7 +148,7 @@ public: */ virtual int fileMove(surf_file_t fd, const char* fullpath); - std::vector storage_; + std::map storage_; simgrid::s4u::Host* piface_ = nullptr; simgrid::s4u::Host* getHost() { return piface_; }