X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0fe1137efda109ff1a402ab5f8317d3ec3a676dc..345e5695e239400eefc022b644edea70f2082a0f:/src/surf/surf_routing.hpp diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 3d4a4eaf65..f5d541f4a6 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -8,34 +8,34 @@ #define NETWORK_ROUTING_HPP_ #include +#include #include "surf_interface.hpp" #include XBT_PUBLIC(void) routing_model_create( void *loopback); -/* ************************************************************************** */ -/* ************************* GRAPH EXPORTING FUNCTIONS ********************** */ -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); +namespace simgrid { +namespace surf { /*********** * Classes * ***********/ -class XBT_PRIVATE As; +class As; class XBT_PRIVATE RoutingModelDescription; class XBT_PRIVATE Onelink; -class XBT_PRIVATE RoutingPlatf; +class RoutingPlatf; /** @ingroup SURF_routing_interface - * @brief A routing edge - * @details [long description] + * @brief Network cards are the vertices in the graph representing the network, used to compute paths between nodes. + * + * @details This represents a position in the network. One can route information between two netcards */ -struct RoutingEdge { +class NetCard { public: - virtual ~RoutingEdge(){}; - virtual int getId()=0; + virtual ~NetCard(){}; + virtual int getId()=0; // Our rank in the vertices_ array of our englobing AS. virtual int *getIdPtr()=0; virtual void setId(int id)=0; virtual char *getName()=0; @@ -49,86 +49,85 @@ public: */ class As { public: - xbt_dynar_t p_indexNetworkElm; - xbt_dict_t p_bypassRoutes; /* store bypass routes */ - routing_model_description_t p_modelDesc; - e_surf_routing_hierarchy_t p_hierarchy; - char *p_name; - As *p_routingFather; - xbt_dict_t p_routingSons; - RoutingEdge *p_netElem; - xbt_dynar_t p_linkUpDownList; + As(const char*name); + /** @brief Close that AS: no more content can be added to it */ + virtual void Seal()=0; + virtual ~As(); + + char *name_ = nullptr; + NetCard *netcard_ = nullptr; + As *father_ = nullptr; + xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL); + + 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); - /** - * @brief The As constructor - */ - As(){}; - /** - * @brief The As destructor - */ - virtual ~As(){ - xbt_free(p_name); - if (p_netElem) - delete p_netElem; - }; /** - * @brief Get the route and latency between two RoutingEdges - * @details [long description] + * @brief Probe the routing path between two points + * + * The networking model uses this function when creating a communication + * to retrieve both the list of links that the create communication will use, + * and the summed latency that these links represent. + * + * The network could recompute the latency by itself from the list, but it would + * require an additional link set traversal. This operation being on the critical + * path of SimGrid, the routing computes the latency in behalf of the network. + * + * Things are rather complex here because we have to find the path from ASes to ASes, and within each. + * In addition, the different ASes may use differing routing models. + * Some ASes may be routed in full, others may have only some connection information and use a shortest path on top of that, and so on. + * Some ASes may even not have any predefined links and use only coordinate informations to compute the latency. + * + * So, the path is constructed recursively, with each traversed AS adding its information to the set. + * The algorithm for that is explained in http://hal.inria.fr/hal-00650233/ * - * @param src [description] - * @param dst [description] - * @param into [description] - * @param latency [description] + * @param src Initial point of the routing path + * @param dst Final point of the routing path + * @param into Container into which the traversed links should be pushed + * @param latency Accumulator in which the latencies should be added (caller must set it to 0) */ - virtual void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency)=0; + 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 void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)=0; - virtual sg_platf_route_cbarg_t getBypassRoute(RoutingEdge *src, RoutingEdge *dst, double *lat)=0; + + virtual sg_platf_route_cbarg_t getBypassRoute(NetCard *src, NetCard *dst,double *lat)=0; /* The parser calls the following functions to inform the routing models * that a new element is added to the AS currently built. * * Of course, only the routing model of this AS is informed, not every ones */ - virtual int parsePU(RoutingEdge *elm)=0; /* A host or a router, whatever */ - virtual int parseAS( RoutingEdge *elm)=0; + virtual int addComponent(NetCard *elm); /* A host, a router or an AS, whatever */ virtual void parseRoute(sg_platf_route_cbarg_t route)=0; virtual void parseASroute(sg_platf_route_cbarg_t route)=0; virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0; }; -struct XBT_PRIVATE RoutingEdgeImpl : public RoutingEdge { +struct XBT_PRIVATE NetCardImpl : public NetCard { public: - RoutingEdgeImpl(char *name, int id, e_surf_network_element_type_t rcType, As *rcComponent) - : p_rcComponent(rcComponent), p_rcType(rcType), m_id(id), p_name(name) {} - ~RoutingEdgeImpl() { xbt_free(p_name);}; - - int getId() {return m_id;} - int *getIdPtr() {return &m_id;} - void setId(int id) {m_id = id;} - char *getName() {return p_name;} - As *getRcComponent() {return p_rcComponent;} - e_surf_network_element_type_t getRcType() {return p_rcType;} + NetCardImpl(const char *name, e_surf_network_element_type_t componentType, As *component) + : component_(component), + componentType_(componentType), + name_(xbt_strdup(name)) + {} + ~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_;} private: - As *p_rcComponent; - e_surf_network_element_type_t p_rcType; - int m_id; - char *p_name; -}; - -struct RoutingEdgeWrapper : public RoutingEdge { -public: - RoutingEdgeWrapper(RoutingEdge *re) : p_re(re){} - ~RoutingEdgeWrapper(){} - int getId() {return p_re->getId();} - int *getIdPtr() {return p_re->getIdPtr();} - void setId(int id) {p_re->setId(id);} - char *getName() {return p_re->getName();} - As *getRcComponent() {return p_re->getRcComponent();} - e_surf_network_element_type_t getRcType() {return p_re->getRcType();} -private: - RoutingEdge *p_re; + As *component_; + e_surf_network_element_type_t componentType_; + int id_ = -1; + char *name_; }; /** @ingroup SURF_routing_interface @@ -136,10 +135,10 @@ private: */ class Onelink { public: - Onelink(void *link, RoutingEdge *src, RoutingEdge *dst) + Onelink(void *link, NetCard *src, NetCard *dst) : p_src(src), p_dst(dst), p_link(link) {}; - RoutingEdge *p_src; - RoutingEdge *p_dst; + NetCard *p_src; + NetCard *p_dst; void *p_link; }; @@ -148,13 +147,24 @@ public: */ XBT_PUBLIC_CLASS RoutingPlatf { public: + RoutingPlatf(void *loopback); ~RoutingPlatf(); - As *p_root; + As *p_root = nullptr; void *p_loopback; - xbt_dynar_t p_lastRoute; + xbt_dynar_t p_lastRoute = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); xbt_dynar_t getOneLinkRoutes(void); xbt_dynar_t recursiveGetOneLinkRoutes(As *rc); - void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, xbt_dynar_t * links, double *latency); + void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency); }; +/************* + * Callbacks * + *************/ + +XBT_PUBLIC_DATA(simgrid::xbt::signal) netcardCreatedCallbacks; +XBT_PUBLIC_DATA(simgrid::xbt::signal) asCreatedCallbacks; + +} +} + #endif /* NETWORK_ROUTING_HPP_ */