-#include "surf.hpp"
-#include <float.h>
+/* 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);
-
-/* ************************************************************************** */
-/* ************************* 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);
-
-/***********
- * Classes *
- ***********/
-struct As;
-typedef As *AsPtr;
-
-class RoutingModelDescription;
-typedef RoutingModelDescription *RoutingModelDescriptionPtr;
-
-struct RoutingEdge;
-typedef RoutingEdge *RoutingEdgePtr;
+#include <xbt/base.h>
+#include <xbt/signal.hpp>
-class Onelink;
-typedef Onelink *OnelinkPtr;
-
-class RoutingPlatf;
-typedef RoutingPlatf *RoutingPlatfPtr;
+#include "surf_interface.hpp"
+#include "src/kernel/routing/AsImpl.hpp"
+#include <float.h>
+#include <vector>
-/*FIXME:class RoutingModelDescription {
- const char *p_name;
- const char *p_desc;
- AsPtr create();
- void end(AsPtr as);
-};*/
+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()
-struct 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;
- AsPtr p_routingFather;
- xbt_dict_t p_routingSons;
- RoutingEdgePtr p_netElem;
- xbt_dynar_t p_linkUpDownList;
+namespace simgrid {
+namespace kernel {
+namespace routing {
- As(){};
- virtual ~As(){
- xbt_free(p_name);
- };
+ XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
- 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;
+/***********
+ * Classes *
+ ***********/
- /* 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;
-};
+class XBT_PRIVATE Onelink;
-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<Link*> 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 {
-public:
- ~RoutingPlatf();
- 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);
-};
+}}}
#endif /* NETWORK_ROUTING_HPP_ */
