#include <xbt/signal.hpp>
#include "surf_interface.hpp"
+#include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML.
#include <float.h>
-XBT_PUBLIC(void) routing_model_create( void *loopback);
+#include <vector>
+#include <map>
+
+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 {
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;
+ virtual bool isAS()=0;
+ virtual bool isHost()=0;
+ virtual bool isRouter()=0;
};
/** @ingroup SURF_routing_interface
* @brief Network Autonomous System (AS)
- * @details [TODO]
*/
class As {
public:
char *name_ = nullptr;
NetCard *netcard_ = nullptr; // Our representative in the father AS
As *father_ = nullptr;
- xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL); // sub-ASes
+ 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)
private:
bool sealed_ = false; // We cannot add more content when sealed
+ friend RoutingPlatf;
+ std::map<std::pair<std::string, std::string>, std::vector<Link*>*> bypassRoutes_; // srcName x dstName -> route
+ static void getRouteRecursive(NetCard *src, NetCard *dst, /* OUT */ std::vector<Link*> * links, double *latency);
+ std::vector<Link*> *getBypassRoute(NetCard *src, NetCard *dst);
+
public:
/**
* @brief Probe the routing path between two points
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);
+ void addBypassRoute(sg_platf_route_cbarg_t e_route);
+
};
struct XBT_PRIVATE NetCardImpl : public NetCard {
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_;}
+
+ 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:
int id_ = -1;
char *name_;
};
/** @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:
*/
XBT_PUBLIC_CLASS RoutingPlatf {
public:
- RoutingPlatf(void *loopback);
+ RoutingPlatf(Link *loopback);
~RoutingPlatf();
As *root_ = nullptr;
- void *loopback_;
- xbt_dynar_t lastRoute_ = xbt_dynar_new(sizeof(Link*),NULL);
+ Link *loopback_;
xbt_dynar_t getOneLinkRoutes(void);
- void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency);
+ void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
};
/*************