X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52089b08b629d77bce06104b92bf99fecaf0349b..e1a5f89a7c21cf47e6b9603906d32abf0f3b0dd0:/src/surf/surf_routing.hpp diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 7d34cbc091..dbedf325c4 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -1,104 +1,116 @@ -#include "surf.hpp" -#include +/* 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. */ #ifndef NETWORK_ROUTING_HPP_ #define NETWORK_ROUTING_HPP_ -void routing_model_create( void *loopback); +#include +#include -/* ************************************************************************** */ -/* ************************* GRAPH EXPORTING FUNCTIONS ********************** */ -xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes); -xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges); +#include "surf_interface.hpp" +#include "src/kernel/routing/AsImpl.hpp" -/*********** - * Classes * - ***********/ -struct As; -typedef As *AsPtr; - -class RoutingModelDescription; -typedef RoutingModelDescription *RoutingModelDescriptionPtr; +#include +#include -struct RoutingEdge; -typedef RoutingEdge *RoutingEdgePtr; +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() -class Onelink; -typedef Onelink *OnelinkPtr; +namespace simgrid { +namespace kernel { +namespace routing { -class RoutingPlatf; -typedef RoutingPlatf *RoutingPlatfPtr; + XBT_PUBLIC_DATA(simgrid::xbt::signal) asCreatedCallbacks; + XBT_PUBLIC_DATA(simgrid::xbt::signal) netcardCreatedCallbacks; +/*********** + * Classes * + ***********/ -/*FIXME:class RoutingModelDescription { - const char *p_name; - const char *p_desc; - AsPtr create(); - void end(AsPtr as); -};*/ +class XBT_PRIVATE Onelink; +class RoutingPlatf; -struct As { +/** @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: - 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; - AsPtr p_routingFather; - xbt_dict_t p_routingSons; - RoutingEdgePtr p_netElem; - xbt_dynar_t p_linkUpDownList; - - As(){}; - virtual ~As(){ - xbt_free(p_name); + virtual ~NetCard() = default; + virtual unsigned int id()=0; // Our rank in the vertices_ array of our containing AS. + virtual std::string name() = 0; + virtual const char* cname() = 0; + virtual AsImpl* containingAS() = 0; // This is the AS in which I am + virtual bool isAS()=0; + virtual bool isHost()=0; + virtual bool isRouter()=0; + enum class Type { + Host, Router, As }; +}; - virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency)=0; - 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(RoutingEdgePtr src, RoutingEdgePtr 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(RoutingEdgePtr elm)=0; /* A host or a router, whatever */ - virtual int parseAS( RoutingEdgePtr elm)=0; - 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 NetCardImpl : public NetCard { +public: + NetCardImpl(std::string name, NetCard::Type componentType, AsImpl* containingAS) + : name_(name), componentType_(componentType), containingAS_(containingAS) + { + if (containingAS != nullptr) + id_ = containingAS->addComponent(this); + simgrid::kernel::routing::netcardCreatedCallbacks(this); + } + ~NetCardImpl() = default; + + unsigned int id() override {return id_;} + std::string name() override { return name_; } + const char* cname() override { return name_.c_str(); } + AsImpl *containingAS() override {return containingAS_;} + + bool isAS() override {return componentType_ == Type::As;} + bool isHost() override {return componentType_ == Type::Host;} + bool isRouter() override {return componentType_ == Type::Router;} + +private: + unsigned int id_; + std::string name_; + NetCard::Type componentType_; + AsImpl *containingAS_; }; -struct RoutingEdge { +class AsRoute { public: - ~RoutingEdge() { xbt_free(p_name);}; - AsPtr p_rcComponent; - e_surf_network_element_type_t p_rcType; - int m_id; - char *p_name; + explicit AsRoute(NetCard* gwSrc, NetCard* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {} + const NetCard* gw_src; + const NetCard* gw_dst; + std::vector links; }; -/* - * Link of lenght 1, alongside with its source and destination. This is mainly usefull in the bindings to gtnets and ns3 +/** @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, RoutingEdgePtr src, RoutingEdgePtr dst) - : p_src(src), p_dst(dst), p_link(link) {}; - RoutingEdgePtr p_src; - RoutingEdgePtr p_dst; - void *p_link; + Onelink(Link* link, NetCard* src, NetCard* dst) : src_(src), dst_(dst), link_(link){}; + NetCard* src_; + NetCard* dst_; + Link* link_; }; -class RoutingPlatf { +/** @ingroup SURF_routing_interface + * @brief The class representing a whole routing platform + */ +XBT_PUBLIC_CLASS RoutingPlatf { public: - AsPtr p_root; - void *p_loopback; - xbt_dynar_t p_lastRoute; - xbt_dynar_t getOneLinkRoutes(void); - xbt_dynar_t recursiveGetOneLinkRoutes(AsPtr rc); - void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_t * links, double *latency); + explicit RoutingPlatf(); + ~RoutingPlatf(); + AsImpl *root_ = nullptr; + void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector * links, double *latency); }; +}}} + #endif /* NETWORK_ROUTING_HPP_ */