X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c4ffa9d533441c926ec687986415b635629d496a..808745d358295b6534b2c472b29cffa2b29d1b18:/src/surf/surf_routing.hpp diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index a97b766440..6007faf4c9 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -11,9 +11,17 @@ #include #include "surf_interface.hpp" +#include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML. #include -XBT_PUBLIC(void) routing_model_create( void *loopback); +#include +#include + +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 surf { @@ -35,37 +43,43 @@ class RoutingPlatf; class NetCard { public: virtual ~NetCard(){}; - virtual int getId()=0; // Our rank in the vertices_ array of our container AS. - virtual int *getIdPtr()=0; + virtual int id()=0; // Our rank in the vertices_ array of our containing AS. virtual void setId(int id)=0; - virtual char *getName()=0; - virtual As *getRcComponent()=0; - virtual e_surf_network_element_type_t getRcType()=0; + virtual char *name()=0; + virtual As *containingAS()=0; // This is the AS in which I am + virtual bool isAS()=0; + virtual bool isHost()=0; + virtual bool isRouter()=0; }; /** @ingroup SURF_routing_interface - * @brief The Autonomous System (AS) routing interface - * @details [TODO] + * @brief Network Autonomous System (AS) */ class As { public: As(const char*name); /** @brief Close that AS: no more content can be added to it */ - virtual void Seal()=0; + virtual void Seal(); virtual ~As(); + e_surf_routing_hierarchy_t hierarchy_ = SURF_ROUTING_NULL; + xbt_dynar_t upDownLinks = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); + char *name_ = nullptr; - NetCard *netcard_ = nullptr; + NetCard *netcard_ = nullptr; // Our representative in the father AS As *father_ = nullptr; - xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL); - + 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) - xbt_dict_t bypassRoutes_ = nullptr; - e_surf_routing_hierarchy_t hierarchy_ = SURF_ROUTING_NULL; - xbt_dynar_t upDownLinks = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); +private: + bool sealed_ = false; // We cannot add more content when sealed + friend RoutingPlatf; + std::map, std::vector*> bypassRoutes_; // srcName x dstName -> route + static void getRouteRecursive(NetCard *src, NetCard *dst, /* OUT */ std::vector * links, double *latency); + std::vector *getBypassRoute(NetCard *src, NetCard *dst); +public: /** * @brief Probe the routing path between two points * @@ -92,51 +106,52 @@ public: */ virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency)=0; /** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */ - virtual xbt_dynar_t getOneLinkRoutes()=0; + virtual xbt_dynar_t getOneLinkRoutes(); virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)=0; - virtual sg_platf_route_cbarg_t getBypassRoute(NetCard *src, NetCard *dst,double *lat)=0; - /* 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 parseRoute(sg_platf_route_cbarg_t route); - virtual void parseASroute(sg_platf_route_cbarg_t route); - virtual void parseBypassroute(sg_platf_route_cbarg_t e_route); + virtual void addRoute(sg_platf_route_cbarg_t route); + void addBypassRoute(sg_platf_route_cbarg_t e_route); + }; struct XBT_PRIVATE NetCardImpl : public NetCard { public: - NetCardImpl(const char *name, e_surf_network_element_type_t componentType, As *component) - : component_(component), + NetCardImpl(const char *name, e_surf_network_element_type_t componentType, As *as) + : name_(xbt_strdup(name)), componentType_(componentType), - name_(xbt_strdup(name)) + containingAS_(as) {} ~NetCardImpl() { xbt_free(name_);}; - int getId() {return id_;} - int *getIdPtr() {return &id_;} - void setId(int id) {id_ = id;} - char *getName() {return name_;} - As *getRcComponent() {return component_;} - e_surf_network_element_type_t getRcType() {return componentType_;} + int id() override {return id_;} + void setId(int id) override {id_ = id;} + char *name() override {return name_;} + As *containingAS() override {return containingAS_;} + + bool isAS() override {return componentType_ == SURF_NETWORK_ELEMENT_AS;} + bool isHost() override {return componentType_ == SURF_NETWORK_ELEMENT_HOST;} + bool isRouter() override {return componentType_ == SURF_NETWORK_ELEMENT_ROUTER;} + private: - As *component_; - e_surf_network_element_type_t componentType_; int id_ = -1; char *name_; + e_surf_network_element_type_t componentType_; + As *containingAS_; }; /** @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: Onelink(void *link, NetCard *src, NetCard *dst) - : p_src(src), p_dst(dst), p_link(link) {}; - NetCard *p_src; - NetCard *p_dst; - void *p_link; + : src_(src), dst_(dst), link_(link) {}; + NetCard *src_; + NetCard *dst_; + void *link_; }; /** @ingroup SURF_routing_interface @@ -144,14 +159,12 @@ public: */ XBT_PUBLIC_CLASS RoutingPlatf { public: - RoutingPlatf(void *loopback); + RoutingPlatf(Link *loopback); ~RoutingPlatf(); - As *p_root = nullptr; - void *p_loopback; - xbt_dynar_t p_lastRoute = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); + As *root_ = nullptr; + Link *loopback_; xbt_dynar_t getOneLinkRoutes(void); - xbt_dynar_t recursiveGetOneLinkRoutes(As *rc); - void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency); + void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector * links, double *latency); }; /*************