X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/183a6118a95c570b0c66695505dab7dbebc0c7b3..12e37132d1b9b141fa8497e17b0629cfd4173c36:/src/surf/HostImpl.hpp diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp index d22e5d4b53..1fa3bc729c 100644 --- a/src/surf/HostImpl.hpp +++ b/src/surf/HostImpl.hpp @@ -1,56 +1,37 @@ -/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. 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" +#ifndef SURF_HOST_INTERFACE_HPP_ +#define SURF_HOST_INTERFACE_HPP_ + +#include "StorageImpl.hpp" #include "cpu_interface.hpp" #include "network_interface.hpp" +#include "src/simix/ActorImpl.hpp" #include "src/surf/PropertyHolder.hpp" -#include "StorageImpl.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; - /********* * 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 kernel::resource::Model { public: - HostModel() : Model() {} + HostModel() : Model(Model::UpdateAlgo::FULL) {} - virtual void ignoreEmptyVmInPmLMM(); - virtual Action* executeParallelTask(int host_nb, sg_host_t* host_list, double* flops_amount, double* bytes_amount, - double rate); + virtual kernel::resource::Action* execute_parallel(size_t host_nb, s4u::Host* const* host_list, + const double* flops_amount, const double* bytes_amount, + double rate); }; /************ @@ -60,100 +41,36 @@ public: * @brief SURF Host interface class * @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage */ -class HostImpl : public simgrid::surf::PropertyHolder { +class XBT_PRIVATE HostImpl : public simgrid::surf::PropertyHolder { public: explicit HostImpl(s4u::Host* host); - virtual ~HostImpl() = default; - - /** @brief Return the storage of corresponding mount point */ - virtual simgrid::surf::StorageImpl* findStorageOnMountList(const char* storage); - - /** @brief Get the xbt_dynar_t of storages attached to the Host */ - virtual void getAttachedStorageList(std::vector* storages); - - /** - * @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 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); + virtual ~HostImpl(); + + /** @brief Get the vector of storages (by names) attached to the Host */ + virtual std::vector get_attached_storages(); std::map storage_; simgrid::s4u::Host* piface_ = nullptr; - simgrid::s4u::Host* getHost() { return piface_; } + void turn_on(); + void turn_off(); + std::vector get_all_actors(); + size_t get_actor_count(); + + typedef boost::intrusive::list< + kernel::actor::ActorImpl, + boost::intrusive::member_hook, + &kernel::actor::ActorImpl::host_process_list_hook>> + ActorList; + + // FIXME: make these private + ActorList process_list_; + std::vector actors_at_boot_; }; } } +XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model; + #endif /* SURF_Host_INTERFACE_HPP_ */