#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 "src/surf/AsImpl.hpp"
+
#include <float.h>
+#include <vector>
+#include <map>
-XBT_PUBLIC(void) routing_model_create( void *loopback);
+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 {
* Classes *
***********/
-class As;
-class XBT_PRIVATE RoutingModelDescription;
class XBT_PRIVATE Onelink;
class RoutingPlatf;
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 parseRoute(sg_platf_route_cbarg_t route);
- virtual void parseBypassroute(sg_platf_route_cbarg_t e_route);
+ virtual AsImpl *containingAS()=0; // This is the AS in which I am
+ virtual bool isAS()=0;
+ virtual bool isHost()=0;
+ virtual bool isRouter()=0;
};
struct XBT_PRIVATE NetCardImpl : public NetCard {
public:
- NetCardImpl(const char *name, e_surf_network_element_type_t componentType, As *as)
+ NetCardImpl(const char *name, e_surf_network_element_type_t componentType, AsImpl *as)
: name_(xbt_strdup(name)),
componentType_(componentType),
containingAS_(as)
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_;}
+ AsImpl *containingAS() override {return containingAS_;}
+
+ 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_;
e_surf_network_element_type_t componentType_;
- As *containingAS_;
+ AsImpl *containingAS_;
};
/** @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);
+ AsImpl *root_ = nullptr;
+ Link *loopback_;
xbt_dynar_t getOneLinkRoutes(void);
- xbt_dynar_t recursiveGetOneLinkRoutes(As *rc);
- void getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t * links, double *latency);
+ void getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Link*> * links, double *latency);
};
/*************
*************/
XBT_PUBLIC_DATA(simgrid::xbt::signal<void(NetCard*)>) netcardCreatedCallbacks;
-XBT_PUBLIC_DATA(simgrid::xbt::signal<void(As*)>) asCreatedCallbacks;
+XBT_PUBLIC_DATA(simgrid::xbt::signal<void(s4u::As*)>) asCreatedCallbacks;
}
}
