#include "surf_interface.hpp"
#include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML.
-#include "src/routing/AsImpl.hpp"
+#include "src/kernel/routing/AsImpl.hpp"
#include <float.h>
#include <vector>
SG_BEGIN_DECL()
-XBT_PUBLIC(void) routing_model_create(Link *loopback);
XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);
XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
SG_END_DECL()
namespace simgrid {
+namespace kernel {
namespace routing {
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
*/
class NetCard {
public:
- virtual ~NetCard(){};
- virtual int id()=0; // Our rank in the vertices_ array of our containing AS.
- virtual char *name()=0;
+ virtual ~NetCard() = default;
+ virtual unsigned int id()=0; // Our rank in the vertices_ array of our containing AS.
+ virtual std::string name() = 0;
virtual AsImpl *containingAS()=0; // This is the AS in which I am
virtual bool isAS()=0;
virtual bool isHost()=0;
struct XBT_PRIVATE NetCardImpl : public NetCard {
public:
- NetCardImpl(const char *name, NetCard::Type componentType, AsImpl *containingAS)
- : name_(xbt_strdup(name)),
- componentType_(componentType),
- containingAS_(containingAS)
+ NetCardImpl(std::string name, NetCard::Type componentType, AsImpl* containingAS)
+ : name_(name), componentType_(componentType), containingAS_(containingAS)
{
if (containingAS != nullptr)
id_ = containingAS->addComponent(this);
- simgrid::routing::netcardCreatedCallbacks(this);
+ simgrid::kernel::routing::netcardCreatedCallbacks(this);
}
- ~NetCardImpl() { xbt_free(name_);};
+ ~NetCardImpl() = default;
- int id() override {return id_;}
- char *name() override {return name_;}
+ unsigned int id() override {return id_;}
+ std::string name() override { return name_; }
AsImpl *containingAS() override {return containingAS_;}
bool isAS() override {return componentType_ == Type::As;}
bool isRouter() override {return componentType_ == Type::Router;}
private:
- int id_ = -1;
- char *name_;
+ unsigned int id_;
+ std::string name_;
NetCard::Type componentType_;
AsImpl *containingAS_;
};
+class AsRoute {
+public:
+ explicit AsRoute(NetCard* gwSrc, NetCard* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
+ const NetCard* gw_src;
+ const NetCard* gw_dst;
+ std::vector<Link*> links;
+};
+
/** @ingroup SURF_routing_interface
* @brief Link of length 1, alongside with its source and destination. This is mainly useful in the ns3 bindings
*/
class Onelink {
public:
- Onelink(void *link, NetCard *src, NetCard *dst)
- : src_(src), dst_(dst), link_(link) {};
- NetCard *src_;
- NetCard *dst_;
- void *link_;
+ Onelink(Link* link, NetCard* src, NetCard* dst) : src_(src), dst_(dst), link_(link){};
+ NetCard* src_;
+ NetCard* dst_;
+ Link* link_;
};
/** @ingroup SURF_routing_interface
*/
XBT_PUBLIC_CLASS RoutingPlatf {
public:
- explicit RoutingPlatf(Link *loopback);
+ explicit RoutingPlatf();
~RoutingPlatf();
AsImpl *root_ = nullptr;
- Link *loopback_;
- xbt_dynar_t getOneLinkRoutes(void);
void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
};
-}
-}
+}}}
#endif /* NETWORK_ROUTING_HPP_ */