-/* Copyright (c) 2016-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-2022. 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. */
NetPoint* dst_ = nullptr;
NetPoint* gw_src_ = nullptr;
NetPoint* gw_dst_ = nullptr;
- std::vector<resource::LinkImpl*> link_list_;
+ std::vector<resource::StandardLinkImpl*> link_list_;
};
class BypassRoute {
explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
NetPoint* gw_src;
NetPoint* gw_dst;
- std::vector<resource::LinkImpl*> links;
+ std::vector<resource::StandardLinkImpl*> links;
};
/** @ingroup ROUTING_API
/** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */
/* returns whether we found a bypass path */
bool get_bypass_route(const routing::NetPoint* src, const routing::NetPoint* dst,
- /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency,
+ /* OUT */ std::vector<resource::StandardLinkImpl*>& links, double* latency,
std::unordered_set<NetZoneImpl*>& netzones);
/** @brief Get the NetZone that is represented by the netpoint */
const NetZoneImpl* get_netzone_recursive(const NetPoint* netpoint) const;
/** @brief Get the list of LinkImpl* to add in a route, considering split-duplex links and the direction */
- std::vector<resource::LinkImpl*> get_link_list_impl(const std::vector<s4u::LinkInRoute>& link_list,
- bool backroute) const;
+ std::vector<resource::StandardLinkImpl*> get_link_list_impl(const std::vector<s4u::LinkInRoute>& link_list,
+ bool backroute) const;
public:
enum class RoutingMode {
/** @brief Retrieves the disk model associated to this NetZone */
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 std::shared_ptr<resource::HostModel>& get_host_model() const { return host_model_; }
const s4u::NetZone* get_iface() const { return &piface_; }
s4u::NetZone* get_iface() { return &piface_; }
void seal();
/** @brief Check if netpoint is a member of this NetZone or some of the childrens */
bool is_component_recursive(const NetPoint* netpoint) const;
- 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,
+ virtual unsigned long add_component(NetPoint* elm); /* A host, a router or a netzone, whatever */
+ virtual void add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
const std::vector<s4u::LinkInRoute>& link_list, bool symmetrical);
/** @brief Set parent of this Netzone */
void set_parent(NetZoneImpl* parent);
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);
+ void set_host_model(std::shared_ptr<resource::HostModel> host_model);
/** @brief get the route between two nodes in the full platform
*
* @param links Accumulator in which all traversed links should be pushed (caller must empty it)
* @param latency Accumulator in which the latencies should be added (caller must set it to 0)
*/
- static void get_global_route(const routing::NetPoint* src, const routing::NetPoint* dst,
- /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency);
+ static void get_global_route(const NetPoint* src, const NetPoint* dst,
+ /* OUT */ std::vector<resource::StandardLinkImpl*>& links, double* latency);
/** @brief Similar to get_global_route but get the NetZones traversed by route */
- static void get_global_route_with_netzones(const routing::NetPoint* src, const routing::NetPoint* dst,
- /* OUT */ std::vector<resource::LinkImpl*>& links, double* latency,
+ static void get_global_route_with_netzones(const NetPoint* src, const NetPoint* dst,
+ /* OUT */ std::vector<resource::StandardLinkImpl*>& links, double* latency,
std::unordered_set<NetZoneImpl*>& netzones);
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;
/*** Called on each newly created regular route (not on bypass routes) */
- static xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
- kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- std::vector<kernel::resource::LinkImpl*> const& link_list)>
+ static xbt::signal<void(bool symmetrical, NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+ std::vector<resource::StandardLinkImpl*> const& link_list)>
on_route_creation; // XBT_ATTRIB_DEPRECATED_v332 : should be an internal signal used by NS3.. if necessary,
// callback shouldn't use LinkImpl*
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_;
+ std::shared_ptr<resource::HostModel> host_model_;
/** @brief Perform sealing procedure for derived classes, if necessary */
virtual void do_seal()
{ /* obviously nothing to do by default */
