char *name_ = nullptr;
NetCard *netcard_ = nullptr; // Our representative in the father AS
As *father_ = nullptr;
- xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL); // sub-ASes
+ xbt_dict_t children_ = xbt_dict_new_homogeneous(NULL); // sub-ASes
xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),NULL); // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
private:
bool sealed_ = false; // We cannot add more content when sealed
- std::map<std::string, std::vector<Link*>*> *bypassRoutes_ = nullptr;
+
+ friend RoutingPlatf;
+ std::map<std::pair<std::string, std::string>, std::vector<Link*>*> bypassRoutes_; // srcName x dstName -> route
+ static void getRouteRecursive(NetCard *src, NetCard *dst, /* OUT */ std::vector<Link*> * links, double *latency);
+ std::vector<Link*> *getBypassRoute(NetCard *src, NetCard *dst);
public:
/**
virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)=0;
- std::vector<Link*> *getBypassRoute(NetCard *src, NetCard *dst);
-
/* Add content to the AS, at parsing time. It should be sealed afterward. */
virtual int addComponent(NetCard *elm); /* A host, a router or an AS, whatever */
virtual void addRoute(sg_platf_route_cbarg_t route);
void addBypassRoute(sg_platf_route_cbarg_t e_route);
+
};
struct XBT_PRIVATE NetCardImpl : public NetCard {
};
/** @ingroup SURF_routing_interface
- * @brief Link of lenght 1, alongside with its source and destination. This is mainly usefull in the ns3 bindings
+ * @brief Link of length 1, alongside with its source and destination. This is mainly useful in the ns3 bindings
*/
class Onelink {
public:
~RoutingPlatf();
As *root_ = nullptr;
Link *loopback_;
- xbt_dynar_t lastRoute_ = xbt_dynar_new(sizeof(Link*),NULL);
xbt_dynar_t getOneLinkRoutes(void);
void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
};
