#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
-#include "src/surf/StorageImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#include <xbt/PropertyHolder.hpp>
*/
class XBT_PRIVATE HostModel : public kernel::resource::Model {
public:
- HostModel() : Model(Model::UpdateAlgo::FULL) {}
-
+ using Model::Model;
virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount,
double rate) = 0;
************/
/** @ingroup SURF_host_interface
* @brief SURF Host interface class
- * @details A host represents a machine with an 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 XBT_PRIVATE HostImpl : public xbt::PropertyHolder {
+ using ActorList = boost::intrusive::list<
+ kernel::actor::ActorImpl,
+ boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
+ &kernel::actor::ActorImpl::host_actor_list_hook>>;
+
+ ActorList actor_list_;
std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
s4u::Host* piface_ = nullptr; // we must have a pointer there because the VM wants to change the piface in its ctor
- std::map<std::string, kernel::resource::StorageImpl*, std::less<>> storage_;
std::vector<kernel::resource::DiskImpl*> disks_;
public:
void add_disk(const s4u::Disk* disk);
void remove_disk(const std::string& disk_name);
- /** @brief Get the vector of storages (by names) attached to the Host */
- virtual std::vector<const char*> get_attached_storages();
- std::unordered_map<std::string, s4u::Storage*>* get_mounted_storages();
- void set_storages(const std::map<std::string, kernel::resource::StorageImpl*, std::less<>>& storages)
- {
- storage_ = storages;
- }
-
s4u::Host* get_iface() const { return piface_; }
void turn_on() const;
void remove_actor(kernel::actor::ActorImpl* actor) { xbt::intrusive_erase(actor_list_, *actor); }
void add_actor_at_boot(kernel::actor::ProcessArg* arg) { actors_at_boot_.emplace_back(arg); }
- using ActorList = boost::intrusive::list<
- kernel::actor::ActorImpl,
- boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
- &kernel::actor::ActorImpl::host_actor_list_hook>>;
-
- // FIXME: make these private
- ActorList actor_list_;
+ template <class F> void foreach_actor(F function)
+ {
+ for (auto& actor : actor_list_)
+ function(actor);
+ }
};
}
}
-XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
-
#endif /* SURF_HOST_INTERFACE_HPP */