#include "surf_interface.hpp"
#include <float.h>
+#include <vector>
+#include <map>
+
XBT_PUBLIC(void) routing_model_create( void *loopback);
namespace simgrid {
};
/** @ingroup SURF_routing_interface
- * @brief The Autonomous System (AS) routing interface
+ * @brief Network Autonomous System (AS)
* @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 void Seal();
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);
+ 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_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
+ std::map<std::string, std::vector<Link*>*> *bypassRoutes_ = nullptr;
+public:
/**
* @brief Probe the routing path between two points
*
*/
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 xbt_dynar_t getOneLinkRoutes();
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);
+ std::vector<Link*> *getBypassRoute(NetCard *src, NetCard *dst);
/* 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 parseRoute(sg_platf_route_cbarg_t route);
- virtual void parseBypassroute(sg_platf_route_cbarg_t e_route);
+ virtual void addRoute(sg_platf_route_cbarg_t route);
+ void addBypassRoute(sg_platf_route_cbarg_t e_route);
};
struct XBT_PRIVATE NetCardImpl : public NetCard {