-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2020. 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. */
-#ifndef SURF_HOST_INTERFACE_HPP_
-#define SURF_HOST_INTERFACE_HPP_
+#ifndef SURF_HOST_INTERFACE_HPP
+#define SURF_HOST_INTERFACE_HPP
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/kernel/resource/DiskImpl.hpp"
-#include "src/surf/PropertyHolder.hpp"
#include "src/surf/StorageImpl.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include <xbt/PropertyHolder.hpp>
#include <vector>
virtual kernel::resource::Action* execute_parallel(const std::vector<s4u::Host*>& host_list,
const double* flops_amount, const double* bytes_amount,
- double rate);
+ double rate) = 0;
};
/************
* @brief SURF Host interface class
* @details An host represents a machine with a aggregation of a Cpu, a RoutingEdge and a Storage
*/
-class XBT_PRIVATE HostImpl : public simgrid::surf::PropertyHolder {
+class XBT_PRIVATE HostImpl : public xbt::PropertyHolder {
std::vector<kernel::actor::ProcessArg*> actors_at_boot_;
- s4u::Host* piface_ = nullptr; // FIXME: why don't we store a s4u::Host here as we do everywhere else?
+ 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*> storage_;
+ std::vector<kernel::resource::DiskImpl*> disks_;
public:
friend simgrid::vm::VirtualMachineImpl;
virtual ~HostImpl();
std::vector<s4u::Disk*> get_disks();
- void add_disk(s4u::Disk* disk);
+ void set_disks(const std::vector<kernel::resource::DiskImpl*>& disks, s4u::Host* host);
+ 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::map<std::string, kernel::resource::StorageImpl*> storage_;
- std::vector<kernel::resource::DiskImpl*> disks_;
+ std::unordered_map<std::string, s4u::Storage*>* get_mounted_storages();
+ void set_storages(const std::map<std::string, kernel::resource::StorageImpl*>& storages) { storage_ = storages; }
s4u::Host* get_iface() { return piface_; }
XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
-#endif /* SURF_Host_INTERFACE_HPP_ */
+#endif /* SURF_HOST_INTERFACE_HPP */