X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fbc5196e44c92ef4ccda2fb737423e373c03d6f9..455435b8a7cc8d84037aa66104a73d4760d9666f:/src/surf/surf_routing.hpp diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 077b4350f5..d42dac9dbf 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2016. 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. */ @@ -11,153 +10,22 @@ #include #include "surf_interface.hpp" +#include "src/kernel/routing/AsImpl.hpp" + #include +#include -XBT_PUBLIC(void) routing_model_create( void *loopback); +SG_BEGIN_DECL() +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 { - -/*********** - * Classes * - ***********/ - -class As; -class XBT_PRIVATE RoutingModelDescription; -class XBT_PRIVATE Onelink; -class RoutingPlatf; - -/** @ingroup SURF_routing_interface - * @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 - */ -class NetCard { -public: - virtual ~NetCard(){}; - virtual int id()=0; // Our rank in the vertices_ array of our containing AS. - virtual void setId(int id)=0; - virtual char *name()=0; - virtual As *containingAS()=0; // This is the AS in which I am - virtual e_surf_network_element_type_t getRcType()=0; -}; - -/** @ingroup SURF_routing_interface - * @brief The Autonomous System (AS) routing interface - * @details [TODO] - */ -class As { -public: - 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 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 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(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(NetCard *src, NetCard *dst,double *lat); - - /* 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); - virtual void parseBypassroute(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 *as) - : name_(xbt_strdup(name)), - componentType_(componentType), - containingAS_(as) - {} - ~NetCardImpl() { xbt_free(name_);}; - - int id() override {return id_;} - void setId(int id) override {id_ = id;} - char *name() override {return name_;} - As *containingAS() override {return containingAS_;} - e_surf_network_element_type_t getRcType() override {return componentType_;} -private: - 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 - */ -class Onelink { -public: - Onelink(void *link, NetCard *src, NetCard *dst) - : src_(src), dst_(dst), link_(link) {}; - NetCard *src_; - NetCard *dst_; - void *link_; -}; - -/** @ingroup SURF_routing_interface - * @brief The class representing a whole routing platform - */ -XBT_PUBLIC_CLASS RoutingPlatf { -public: - RoutingPlatf(void *loopback); - ~RoutingPlatf(); - As *root_ = nullptr; - void *loopback_; - xbt_dynar_t lastRoute_ = xbt_dynar_new(sizeof(Link*),NULL); - xbt_dynar_t getOneLinkRoutes(void); - void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency); -}; - -/************* - * Callbacks * - *************/ +namespace kernel { +namespace routing { -XBT_PUBLIC_DATA(simgrid::xbt::signal) netcardCreatedCallbacks; -XBT_PUBLIC_DATA(simgrid::xbt::signal) asCreatedCallbacks; + XBT_PUBLIC_DATA(simgrid::xbt::signal) asCreatedCallbacks; -} -} +}}} #endif /* NETWORK_ROUTING_HPP_ */