X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1e4e803685007394a5a9b63ab87339d3bf35657..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/surf/surf_routing_cluster.hpp diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp index da24d6a21a..5e834c1575 100644 --- a/src/surf/surf_routing_cluster.hpp +++ b/src/surf/surf_routing_cluster.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -14,7 +14,6 @@ * Classes * ***********/ class AsCluster; -typedef AsCluster *AsClusterPtr; /* ************************************************** */ @@ -24,24 +23,24 @@ class AsCluster: public AsNone { public: AsCluster(); - virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency); + virtual void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency); //xbt_dynar_t getOneLinkRoutes(); //void parseRoute(sg_platf_route_cbarg_t route); //void parseASroute(sg_platf_route_cbarg_t route); void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges); - //sg_platf_route_cbarg_t getBypassRoute(RoutingEdgePtr src, RoutingEdgePtr dst, double *lat); + //sg_platf_route_cbarg_t getBypassRoute(RoutingEdge *src, RoutingEdge *dst, double *lat); /* 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 */ - int parsePU(RoutingEdgePtr elm); /* A host or a router, whatever */ - int parseAS(RoutingEdgePtr elm); + int parsePU(RoutingEdge *elm); /* A host or a router, whatever */ + int parseAS(RoutingEdge *elm); virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position); Link* p_backbone; void *p_loopback; - RoutingEdgePtr p_router; + RoutingEdge *p_router; int p_has_limiter; int p_has_loopback; int p_nb_links_per_node;