X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8b29f2bc452ad2be0c7285e98f3bf7026d0ce6d..255700918582111f0aacaa7b7fed87dcedc1a840:/src/surf/HostImpl.hpp diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index 76926014b3..0dcc24d81f 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -1,57 +1,35 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * 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" +#ifndef SURF_HOST_INTERFACE_HPP +#define SURF_HOST_INTERFACE_HPP -#include +#include "src/kernel/actor/ActorImpl.hpp" +#include "src/kernel/resource/CpuImpl.hpp" +#include "src/kernel/resource/DiskImpl.hpp" +#include "src/surf/network_interface.hpp" +#include -#ifndef SURF_HOST_INTERFACE_HPP_ -#define SURF_HOST_INTERFACE_HPP_ - -/*********** - * Classes * - ***********/ +#include namespace simgrid { -namespace surf { - -class XBT_PRIVATE HostModel; -class XBT_PRIVATE HostImpl; -class XBT_PRIVATE HostAction; -} -} - -/********* - * Tools * - *********/ - -XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model; - +namespace kernel { +namespace resource { /********* * 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 XBT_PRIVATE HostModel : public Model { public: - HostModel() : Model() {} - - virtual void adjustWeightOfDummyCpuActions(); - virtual Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, - double rate); + using Model::Model; + virtual Action* execute_parallel(const std::vector& host_list, const double* flops_amount, + const double* bytes_amount, double rate) = 0; }; /************ @@ -59,132 +37,62 @@ public: ************/ /** @ingroup SURF_host_interface * @brief SURF Host interface class - * @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage + * @details A host represents a machine with an aggregation of a Cpu, a RoutingEdge and Disk(s) */ -class HostImpl : public simgrid::surf::PropertyHolder { - -public: - HostImpl(s4u::Host* host, xbt_dynar_t storage); - virtual ~HostImpl(); +class XBT_PRIVATE HostImpl : public xbt::PropertyHolder { + using ActorList = + boost::intrusive::list, + &actor::ActorImpl::host_actor_list_hook>>; + + ActorList actor_list_; + std::vector actors_at_boot_; + s4u::Host piface_; + std::map> disks_; + xbt::string name_{"noname"}; + bool sealed_ = false; + +protected: + virtual ~HostImpl(); // Use destroy() instead of this destructor. + HostImpl(const std::string& name, s4u::Host* piface); public: - /** @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(); - - /** @brief Get the xbt_dynar_t of storages attached to the Host */ - virtual xbt_dynar_t 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); - - /** - * @brief Close a file - * - * @param fd The file descriptor to close - * @return The StorageAction corresponding to the closing - */ - virtual Action* close(surf_file_t fd); - - /** - * @brief Unlink a file - * @details [long description] - * - * @param fd [description] - * @return [description] - */ - virtual int unlink(surf_file_t fd); - - /** - * @brief Get the size in bytes of the file - * - * @param fd The file descriptor to read - * @return The size in bytes of the file - */ - virtual sg_size_t getSize(surf_file_t fd); - - /** - * @brief Read a file - * - * @param fd The file descriptor to read - * @param size The size in bytes to read - * @return The StorageAction corresponding to the reading - */ - virtual Action* read(surf_file_t fd, sg_size_t size); - - /** - * @brief Write a file - * - * @param fd The file descriptor to write - * @param size The size in bytes to write - * @return The StorageAction corresponding to the writing - */ - 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 - * - * @param fd The file descriptor - * @return The current position of the file descriptor - */ - virtual sg_size_t fileTell(surf_file_t fd); - - /** - * @brief Set the position indicator associated with the file descriptor to a new position - * @details [long description] - * - * @param fd The file descriptor - * @param offset The offset from the origin - * @param origin Position used as a reference for the offset - * - SEEK_SET: beginning of the file - * - SEEK_CUR: current position indicator - * - SEEK_END: end of the file - * @return MSG_OK if successful, otherwise MSG_TASK_CANCELED - */ - virtual int fileSeek(surf_file_t fd, sg_offset_t offset, int origin); - - /** - * @brief Move a file to another location on the *same mount point*. - * @details [long description] - * - * @param fd The file descriptor - * @param fullpath The new full path - * @return MSG_OK if successful, MSG_TASK_CANCELED and a warning if the new - * full path is not on the same mount point - */ - virtual int fileMove(surf_file_t fd, const char* fullpath); - -public: - xbt_dynar_t storage_ = nullptr; - simgrid::s4u::Host* piface_ = nullptr; - - /** @brief Get the list of virtual machines on the current Host */ - xbt_dynar_t getVms(); - - simgrid::s4u::Host* getHost() { return piface_; } + friend VirtualMachineImpl; + explicit HostImpl(const std::string& name); + + void destroy(); // Must be called instead of the destructor + + std::vector get_disks() const; + s4u::Disk* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth); + void add_disk(const s4u::Disk* disk); + void remove_disk(const std::string& name); + + virtual const s4u::Host* get_iface() const { return &piface_; } + virtual s4u::Host* get_iface() { return &piface_; } + + /** Retrieves the name of that host as a C++ string */ + xbt::string const& get_name() const { return name_; } + /** Retrieves the name of that host as a C string */ + const char* get_cname() const { return name_.c_str(); } + + void turn_on() const; + void turn_off(const actor::ActorImpl* issuer); + std::vector get_all_actors(); + size_t get_actor_count() const; + void add_actor(actor::ActorImpl* actor) { actor_list_.push_back(*actor); } + void remove_actor(actor::ActorImpl* actor) { xbt::intrusive_erase(actor_list_, *actor); } + void add_actor_at_boot(actor::ProcessArg* arg) { actors_at_boot_.emplace_back(arg); } + + void seal(); + + template void foreach_actor(F function) + { + for (auto& actor : actor_list_) + function(actor); + } }; -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid -#endif /* SURF_Host_INTERFACE_HPP_ */ +#endif /* HOST_INTERFACE_HPP */