// our content, as known to our graph routing algorithm (maps vertex_id -> vertex)
std::vector<kernel::routing::NetPoint*> vertices_;
- NetZoneImpl* father_ = nullptr;
+ NetZoneImpl* parent_ = nullptr;
std::vector<NetZoneImpl*> children_; // sub-netzones
std::string name_;
bool sealed_ = false; // We cannot add more content when sealed
std::map<std::pair<NetPoint*, NetPoint*>, BypassRoute*> bypass_routes_; // src x dst -> route
routing::NetPoint* netpoint_ = nullptr; // Our representative in the father NetZone
- resource::NetworkModel* network_model_;
- resource::CpuModel* cpu_model_vm_;
- resource::CpuModel* cpu_model_pm_;
- resource::DiskModel* disk_model_;
protected:
- explicit NetZoneImpl(NetZoneImpl* father, const std::string& name, resource::NetworkModel* network_model);
+ explicit NetZoneImpl(const std::string& name);
NetZoneImpl(const NetZoneImpl&) = delete;
NetZoneImpl& operator=(const NetZoneImpl&) = delete;
virtual ~NetZoneImpl();
public:
enum class RoutingMode {
- unset = 0, /**< Undefined type */
- base, /**< Base case: use simple link lists for routing */
- recursive /**< Recursive case: also return gateway information */
+ base, /**< Base case: use simple link lists for routing */
+ recursive /**< Recursive case: also return gateway information */
};
- /* FIXME: protect the following fields once the construction madness is sorted out */
- RoutingMode hierarchy_ = RoutingMode::unset;
-
/** @brief Retrieves the network model associated to this NetZone */
- resource::NetworkModel* get_network_model() const { return network_model_; }
+ const std::shared_ptr<resource::NetworkModel>& get_network_model() const { return network_model_; }
/** @brief Retrieves the CPU model for virtual machines associated to this NetZone */
- resource::CpuModel* get_cpu_vm_model() const { return cpu_model_vm_; }
+ const std::shared_ptr<resource::CpuModel>& get_cpu_vm_model() const { return cpu_model_vm_; }
/** @brief Retrieves the CPU model for physical machines associated to this NetZone */
- resource::CpuModel* get_cpu_pm_model() const { return cpu_model_pm_; }
+ const std::shared_ptr<resource::CpuModel>& get_cpu_pm_model() const { return cpu_model_pm_; }
/** @brief Retrieves the disk model associated to this NetZone */
- resource::DiskModel* get_disk_model() const { return disk_model_; }
+ const std::shared_ptr<resource::DiskModel>& get_disk_model() const { return disk_model_; }
+ /** @brief Retrieves the host model associated to this NetZone */
+ const std::shared_ptr<surf::HostModel>& get_host_model() const { return host_model_; }
const s4u::NetZone* get_iface() const { return &piface_; }
s4u::NetZone* get_iface() { return &piface_; }
unsigned int get_table_size() const { return vertices_.size(); }
std::vector<kernel::routing::NetPoint*> get_vertices() const { return vertices_; }
- NetZoneImpl* get_father() const { return father_; }
+ XBT_ATTRIB_DEPRECATED_v331("Please use get_parent()") NetZoneImpl* get_father() const { return parent_; }
+ NetZoneImpl* get_parent() const { return parent_; }
/** @brief Returns the list of direct children (no grand-children). This returns the internal data, no copy.
* Don't mess with it.*/
std::vector<NetZoneImpl*>* get_children() { return &children_; }
+ /** @brief Get current netzone hierarchy */
+ RoutingMode get_hierarchy() const { return hierarchy_; }
+
/** @brief Retrieves the name of that netzone as a C++ string */
const std::string& get_name() const { return name_; }
/** @brief Retrieves the name of that netzone as a C string */
int get_host_count() const;
/** @brief Make a host within that NetZone */
- s4u::Host* create_host(const std::string& name, const std::vector<double>& speed_per_pstate, int core_amount);
+ s4u::Host* create_host(const std::string& name, const std::vector<double>& speed_per_pstate);
/** @brief Create a disk with the disk model from this NetZone */
s4u::Disk* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth);
/** @brief Make a link within that NetZone */
- virtual s4u::Link* create_link(const std::string& name, const std::vector<double>& bandwidths,
- s4u::Link::SharingPolicy policy);
+ virtual s4u::Link* create_link(const std::string& name, const std::vector<double>& bandwidths);
/** @brief Creates a new route in this NetZone */
virtual void add_bypass_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
std::vector<resource::LinkImpl*>& link_list, bool symmetrical);
/** @brief Seal your netzone once you're done adding content, and before routing stuff through it */
- virtual void seal() { sealed_ = true; };
+ void seal();
virtual int add_component(kernel::routing::NetPoint* elm); /* A host, a router or a netzone, whatever */
virtual void add_route(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical);
+ const std::vector<kernel::resource::LinkImpl*>& link_list, bool symmetrical);
+ /** @brief Set parent of this Netzone */
+ void set_parent(NetZoneImpl* parent);
+ /** @brief Set network model for this Netzone */
+ void set_network_model(std::shared_ptr<resource::NetworkModel> netmodel);
+ void set_cpu_vm_model(std::shared_ptr<resource::CpuModel> cpu_model);
+ void set_cpu_pm_model(std::shared_ptr<resource::CpuModel> cpu_model);
+ void set_disk_model(std::shared_ptr<resource::DiskModel> disk_model);
+ void set_host_model(std::shared_ptr<surf::HostModel> host_model);
/* @brief get the route between two nodes in the full platform
*
virtual void get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_node_t, std::less<>>* nodes,
std::map<std::string, xbt_edge_t, std::less<>>* edges) = 0;
+
+private:
+ RoutingMode hierarchy_ = RoutingMode::base;
+ std::shared_ptr<resource::NetworkModel> network_model_;
+ std::shared_ptr<resource::CpuModel> cpu_model_vm_;
+ std::shared_ptr<resource::CpuModel> cpu_model_pm_;
+ std::shared_ptr<resource::DiskModel> disk_model_;
+ std::shared_ptr<simgrid::surf::HostModel> host_model_;
+ /** @brief Perform sealing procedure for derived classes, if necessary */
+ virtual void do_seal(){};
+ void add_child(NetZoneImpl* new_zone);
};
} // namespace routing
} // namespace kernel
