From b1e4e803685007394a5a9b63ab87339d3bf35657 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 18 Jul 2015 18:31:51 +0200 Subject: [PATCH 1/1] kill LinkPtr type and make Link* explicit --- src/surf/host_interface.hpp | 2 +- src/surf/host_ptask_L07.cpp | 2 +- src/surf/host_ptask_L07.hpp | 2 +- src/surf/network_cm02.cpp | 30 ++++++++++++------------- src/surf/network_cm02.hpp | 5 +---- src/surf/network_constant.hpp | 3 --- src/surf/network_gtnets.cpp | 6 ++--- src/surf/network_gtnets.hpp | 3 --- src/surf/network_interface.cpp | 6 ++--- src/surf/network_interface.hpp | 14 ++++++------ src/surf/network_ns3.cpp | 10 ++++----- src/surf/network_ns3.hpp | 5 +---- src/surf/network_smpi.cpp | 4 +--- src/surf/network_smpi.hpp | 2 +- src/surf/surf_c_bindings.cpp | 2 +- src/surf/surf_interface.cpp | 2 +- src/surf/surf_routing_cluster.cpp | 6 ++--- src/surf/surf_routing_cluster.hpp | 2 +- src/surf/surf_routing_cluster_torus.cpp | 6 ++--- src/surf/surf_routing_dijkstra.cpp | 6 ++--- src/surf/surf_routing_floyd.cpp | 2 +- src/surf/surf_routing_full.cpp | 2 +- src/surf/surf_routing_generic.cpp | 2 +- src/surf/surf_routing_vivaldi.cpp | 4 ++-- 24 files changed, 57 insertions(+), 71 deletions(-) diff --git a/src/surf/host_interface.hpp b/src/surf/host_interface.hpp index 3b1defdb35..9c88ad66d0 100644 --- a/src/surf/host_interface.hpp +++ b/src/surf/host_interface.hpp @@ -353,7 +353,7 @@ public: xbt_dynar_t p_storage; RoutingEdgePtr p_netElm; CpuPtr p_cpu; - LinkPtr p_network; + Link* p_network; //FIXME:rename /** * @brief Get the list of virtual machines on the current Host diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp index 698247d41d..8b6d7b6878 100644 --- a/src/surf/host_ptask_L07.cpp +++ b/src/surf/host_ptask_L07.cpp @@ -340,7 +340,7 @@ CpuPtr CpuL07Model::createCpu(const char *name, xbt_dynar_t powerPeak, return cpu; } -LinkPtr NetworkL07Model::createLink(const char *name, +Link* NetworkL07Model::createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp index 9a5c9cb548..93038d3d95 100644 --- a/src/surf/host_ptask_L07.hpp +++ b/src/surf/host_ptask_L07.hpp @@ -79,7 +79,7 @@ class NetworkL07Model : public NetworkModel { public: NetworkL07Model() : NetworkModel() {}; ~NetworkL07Model() {surf_network_model = NULL;}; - LinkPtr createLink(const char *name, + Link* createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp index 2228d67fe6..9251512503 100644 --- a/src/surf/network_cm02.cpp +++ b/src/surf/network_cm02.cpp @@ -201,7 +201,7 @@ void NetworkCm02Model::initialize() m_haveGap = false; } -LinkPtr NetworkCm02Model::createLink(const char *name, +Link* NetworkCm02Model::createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -215,7 +215,7 @@ LinkPtr NetworkCm02Model::createLink(const char *name, "Link '%s' declared several times in the platform file.", name); - NetworkCm02LinkPtr nw_link = + NetworkCm02Link *nw_link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial, history, state_initial, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy); @@ -240,7 +240,7 @@ void NetworkCm02Model::updateActionsStateLazy(double now, double /*delta*/) lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem, action->getVariable(), i); - NetworkCm02LinkPtr link = static_cast(lmm_constraint_id(constraint)); + NetworkCm02Link *link = static_cast(lmm_constraint_id(constraint)); TRACE_surf_link_set_utilization(link->getName(), action->getCategory(), (lmm_variable_getvalue(action->getVariable())* @@ -308,7 +308,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta) lmm_constraint_t constraint = lmm_get_cnst_from_var(p_maxminSystem, action->getVariable(), i); - NetworkCm02LinkPtr link = static_cast(lmm_constraint_id(constraint)); + NetworkCm02Link* link = static_cast(lmm_constraint_id(constraint)); TRACE_surf_link_set_utilization(link->getName(), action->getCategory(), (lmm_variable_getvalue(action->getVariable())* @@ -352,7 +352,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, { unsigned int i; void *_link; - NetworkCm02LinkPtr link; + NetworkCm02Link *link; int failed = 0; NetworkCm02ActionPtr action = NULL; double bandwidth_bound; @@ -370,7 +370,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, src->getName(), dst->getName()); xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); if (link->getState() == SURF_RESOURCE_OFF) { failed = 1; break; @@ -379,7 +379,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, if (sg_network_crosstraffic == 1) { routing_platf->getRouteAndLatency(dst, src, &back_route, NULL); xbt_dynar_foreach(back_route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); if (link->getState() == SURF_RESOURCE_OFF) { failed = 1; break; @@ -403,12 +403,12 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, bandwidth_bound = -1.0; if (sg_weight_S_parameter > 0) { xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); action->m_weight += sg_weight_S_parameter / link->getBandwidth(); } } xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); double bb = bandwidthFactor(size) * link->getBandwidth(); //(link->p_power.peak * link->p_power.scale); bandwidth_bound = (bandwidth_bound < 0.0) ? bb : min(bandwidth_bound, bb); @@ -421,7 +421,7 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_assert(!xbt_dynar_is_empty(route), "Using a model with a gap (e.g., SMPI) with a platform without links (e.g. vivaldi)!!!"); - link = *static_cast(xbt_dynar_get_ptr(route, 0)); + link = *static_cast(xbt_dynar_get_ptr(route, 0)); gapAppend(size, link, action); XBT_DEBUG("Comm %p: %s -> %s gap=%f (lat=%f)", action, src->getName(), dst->getName(), action->m_senderGap, @@ -451,14 +451,14 @@ ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, } xbt_dynar_foreach(route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); lmm_expand(p_maxminSystem, link->getConstraint(), action->getVariable(), 1.0); } if (sg_network_crosstraffic == 1) { XBT_DEBUG("Fullduplex active adding backward flow using 5%%"); xbt_dynar_foreach(back_route, i, _link) { - link = static_cast(_link); + link = static_cast(_link); lmm_expand(p_maxminSystem, link->getConstraint(), action->getVariable(), .05); } } @@ -482,7 +482,7 @@ void NetworkCm02Model::addTraces(){ /* connect all traces relative to network */ xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02LinkPtr link = static_cast( + NetworkCm02Link *link = static_cast( xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", @@ -496,7 +496,7 @@ void NetworkCm02Model::addTraces(){ xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02LinkPtr link = static_cast( + NetworkCm02Link *link = static_cast( xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", @@ -510,7 +510,7 @@ void NetworkCm02Model::addTraces(){ xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name); - NetworkCm02LinkPtr link = static_cast( + NetworkCm02Link *link = static_cast( xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL)); xbt_assert(link, "Cannot connect trace %s to link %s: link undefined", diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 83750f4d1e..84b0e992c8 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -17,9 +17,6 @@ class NetworkCm02Model; typedef NetworkCm02Model *NetworkCm02ModelPtr; -class NetworkCm02Link; -typedef NetworkCm02Link *NetworkCm02LinkPtr; - class NetworkCm02Action; typedef NetworkCm02Action *NetworkCm02ActionPtr; @@ -48,7 +45,7 @@ public: } ~NetworkCm02Model() { } - LinkPtr createLink(const char *name, + Link* createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp index e793ac3725..13f2833af9 100644 --- a/src/surf/network_constant.hpp +++ b/src/surf/network_constant.hpp @@ -15,9 +15,6 @@ class NetworkConstantModel; typedef NetworkConstantModel *NetworkConstantModelPtr; -class NetworkConstantLink; -typedef NetworkConstantLink *NetworkConstantLinkPtr; - class NetworkConstantAction; typedef NetworkConstantAction *NetworkConstantActionPtr; diff --git a/src/surf/network_gtnets.cpp b/src/surf/network_gtnets.cpp index 894feae14f..d6a35e3adc 100644 --- a/src/surf/network_gtnets.cpp +++ b/src/surf/network_gtnets.cpp @@ -24,7 +24,7 @@ void newRoute(int src_id, int dst_id, xbt_dynar_t links, int nb_link) { void *_link; - NetworkGTNetsLinkPtr link; + NetworkGTNetsLink *link; unsigned int cursor; int i = 0; int *gtnets_links; @@ -36,7 +36,7 @@ void newRoute(int src_id, int dst_id, gtnets_links = xbt_new0(int, nb_link); i = 0; xbt_dynar_foreach(links, cursor, _link) { - link = (NetworkGTNetsLinkPtr) _link; + link = (NetworkGTNetsLink*) _link; gtnets_links[i++] = link->m_id; } @@ -47,7 +47,7 @@ void newRoute(int src_id, int dst_id, } void newRouteOnehop(int src_id, int dst_id, - NetworkGTNetsLinkPtr link) + NetworkGTNetsLink *link) { if (gtnets_add_onehop_route(src_id, dst_id, link->m_id)) { xbt_die("Cannot create GTNetS route"); diff --git a/src/surf/network_gtnets.hpp b/src/surf/network_gtnets.hpp index 7cc1c5aa6d..b15f2bba92 100644 --- a/src/surf/network_gtnets.hpp +++ b/src/surf/network_gtnets.hpp @@ -30,9 +30,6 @@ xbt_dict_t network_card_ids; class NetworkGTNetsModel; typedef NetworkGTNetsModel *NetworkGTNetsModelPtr; -class NetworkGTNetsLink; -typedef NetworkGTNetsLink *NetworkGTNetsLinkPtr; - class NetworkGTNetsAction; typedef NetworkGTNetsAction *NetworkGTNetsActionPtr; diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp index ecd437eb1d..ce1e2f3f6b 100644 --- a/src/surf/network_interface.cpp +++ b/src/surf/network_interface.cpp @@ -34,9 +34,9 @@ SG_END_DECL() * Callbacks * *************/ -surf_callback(void, LinkPtr) networkLinkCreatedCallbacks; -surf_callback(void, LinkPtr) networkLinkDestructedCallbacks; -surf_callback(void, LinkPtr, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks; +surf_callback(void, Link*) networkLinkCreatedCallbacks; +surf_callback(void, Link*) networkLinkDestructedCallbacks; +surf_callback(void, Link*, e_surf_resource_state_t, e_surf_resource_state_t) networkLinkStateChangedCallbacks; surf_callback(void, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t) networkActionStateChangedCallbacks; surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate) networkCommunicateCallbacks; diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 159a650864..bb6beaa997 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -27,21 +27,21 @@ typedef NetworkAction *NetworkActionPtr; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after Link creation - * @details Callback functions have the following signature: `void(LinkPtr)` + * @details Callback functions have the following signature: `void(Link*)` */ -XBT_PUBLIC_DATA( surf_callback(void, LinkPtr)) networkLinkCreatedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, Link*)) networkLinkCreatedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after Link destruction - * @details Callback functions have the following signature: `void(LinkPtr)` + * @details Callback functions have the following signature: `void(Link*)` */ -XBT_PUBLIC_DATA( surf_callback(void, LinkPtr)) networkLinkDestructedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, Link*)) networkLinkDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after Link State changed * @details Callback functions have the following signature: `void(LinkActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)` */ -XBT_PUBLIC_DATA( surf_callback(void, LinkPtr, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, Link*, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after NetworkAction State changed @@ -105,7 +105,7 @@ public: * @param properties Dictionary of properties associated to this Resource * @return The created Link */ - virtual LinkPtr createLink(const char *name, + virtual Link* createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -115,7 +115,7 @@ public: e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0; - virtual void gapAppend(double /*size*/, const LinkPtr /*link*/, NetworkActionPtr /*action*/) {}; + virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkActionPtr /*action*/) {}; /** * @brief Create a communication between two hosts. diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp index 2550a71c15..0c5969f599 100644 --- a/src/surf/network_ns3.cpp +++ b/src/surf/network_ns3.cpp @@ -57,7 +57,7 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link) if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free); - LinkPtr net_link = surf_network_model->createLink(link->id, + Link* net_link = surf_network_model->createLink(link->id, link->bandwidth, link->bandwidth_trace, link->latency, @@ -207,7 +207,7 @@ static void create_ns3_topology(void) xbt_dynar_foreach(onelink_routes, iter, onelink) { char *src = onelink->p_src->getName(); char *dst = onelink->p_dst->getName(); - NetworkNS3LinkPtr link = static_cast(onelink->p_link); + NetworkNS3Link *link = static_cast(onelink->p_link); if (strcmp(src,dst) && link->m_created){ XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName()); @@ -258,7 +258,7 @@ static void define_callbacks_ns3(void) *********/ static void free_ns3_link(void * elmts) { - delete static_cast(elmts); + delete static_cast(elmts); } static void free_ns3_host(void * elmts) @@ -294,7 +294,7 @@ NetworkNS3Model::~NetworkNS3Model() { xbt_dict_free(&dict_socket); } -LinkPtr NetworkNS3Model::createLink(const char *name, +Link* NetworkNS3Model::createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -390,7 +390,7 @@ void NetworkNS3Model::updateActionsState(double now, double delta) routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &route, NULL); unsigned int i; for (i = 0; i < xbt_dynar_length (route); i++){ - NetworkNS3LinkPtr link = ((NetworkNS3LinkPtr)xbt_dynar_get_ptr (route, i)); + NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr (route, i)); TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 2807f8fc5e..b04d5c98b0 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -16,9 +16,6 @@ class NetworkNS3Model; typedef NetworkNS3Model *NetworkNS3ModelPtr; -class NetworkNS3Link; -typedef NetworkNS3Link *NetworkNS3LinkPtr; - class NetworkNS3Action; typedef NetworkNS3Action *NetworkNS3ActionPtr; @@ -37,7 +34,7 @@ public: NetworkNS3Model(); ~NetworkNS3Model(); - LinkPtr createLink(const char *name, + Link* createLink(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index 9321f8e6dc..706e05369a 100644 --- a/src/surf/network_smpi.cpp +++ b/src/surf/network_smpi.cpp @@ -104,12 +104,10 @@ NetworkSmpiModel::~NetworkSmpiModel(){ } } -void NetworkSmpiModel::gapAppend(double size, const LinkPtr link, NetworkActionPtr action) +void NetworkSmpiModel::gapAppend(double size, Link* link, NetworkActionPtr action) { const char *src = link->getName(); xbt_fifo_t fifo; - //surf_action_network_CM02_t last_action; - //double bw; if (sg_sender_gap > 0.0) { if (!gap_lookup) { diff --git a/src/surf/network_smpi.hpp b/src/surf/network_smpi.hpp index 8421ce7d47..879d59caf1 100644 --- a/src/surf/network_smpi.hpp +++ b/src/surf/network_smpi.hpp @@ -26,7 +26,7 @@ public: NetworkSmpiModel(); ~NetworkSmpiModel(); - void gapAppend(double size, const LinkPtr link, NetworkActionPtr action); + void gapAppend(double size, Link* link, NetworkActionPtr action); void gapRemove(ActionPtr action); double latencyFactor(double size); double bandwidthFactor(double size); diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 02078c00aa..50f59b4c92 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -224,7 +224,7 @@ void *surf_as_cluster_get_backbone(AS_t as){ } void surf_as_cluster_set_backbone(AS_t as, void* backbone){ - static_cast(as)->p_backbone = static_cast(backbone); + static_cast(as)->p_backbone = static_cast(backbone); } const char *surf_model_name(surf_model_t model){ diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 43c529656e..88f3f1a26e 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -362,7 +362,7 @@ static XBT_INLINE void routing_asr_prop_free(void *p) static XBT_INLINE void surf_link_free(void *r) { - delete static_cast(r); + delete static_cast(r); } static XBT_INLINE void surf_host_free(void *r) diff --git a/src/surf/surf_routing_cluster.cpp b/src/surf/surf_routing_cluster.cpp index 87321b40f2..8a8b101877 100644 --- a/src/surf/surf_routing_cluster.cpp +++ b/src/surf/surf_routing_cluster.cpp @@ -41,7 +41,7 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl info = xbt_dynar_get_as(p_linkUpDownList, src->getId() * p_nb_links_per_node, s_surf_parsing_link_up_down_t); xbt_dynar_push_as(route->link_list, void *, info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); return; } @@ -55,7 +55,7 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl if (info.link_up) { // link up xbt_dynar_push_as(route->link_list, void *, info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } } @@ -72,7 +72,7 @@ void AsCluster::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl if (info.link_down) { // link down xbt_dynar_push_as(route->link_list, void *, info.link_down); if (lat) - *lat += static_cast(info.link_down)->getLatency(); + *lat += static_cast(info.link_down)->getLatency(); } if (p_has_limiter){ // limiter for receiver info = xbt_dynar_get_as(p_linkUpDownList, dst->getId() * p_nb_links_per_node + p_has_loopback, s_surf_parsing_link_up_down_t); diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp index 06570b4f3f..da24d6a21a 100644 --- a/src/surf/surf_routing_cluster.hpp +++ b/src/surf/surf_routing_cluster.hpp @@ -39,7 +39,7 @@ public: int parsePU(RoutingEdgePtr elm); /* A host or a router, whatever */ int parseAS(RoutingEdgePtr elm); virtual void create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position); - LinkPtr p_backbone; + Link* p_backbone; void *p_loopback; RoutingEdgePtr p_router; int p_has_limiter; diff --git a/src/surf/surf_routing_cluster_torus.cpp b/src/surf/surf_routing_cluster_torus.cpp index 91f69e6d10..a1e2d97649 100644 --- a/src/surf/surf_routing_cluster_torus.cpp +++ b/src/surf/surf_routing_cluster_torus.cpp @@ -133,7 +133,7 @@ void AsClusterTorus::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_push_as(route->link_list, void *, info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); return; } @@ -222,12 +222,12 @@ void AsClusterTorus::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, xbt_dynar_push_as(route->link_list,void*,info.link_down); if (lat) - *lat += static_cast(info.link_down)->getLatency(); + *lat += static_cast(info.link_down)->getLatency(); }else{ xbt_dynar_push_as(route->link_list,void*,info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } current_node = next_node; next_node = 0; diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp index dcc2bb1e4d..57d39b9a46 100644 --- a/src/surf/surf_routing_dijkstra.cpp +++ b/src/surf/surf_routing_dijkstra.cpp @@ -256,7 +256,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } } @@ -364,7 +364,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_insert_at(route->link_list, pos, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); pos++; } } @@ -373,7 +373,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } size++; } diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index 033478aaa5..a2c35f8564 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -124,7 +124,7 @@ void AsFloyd::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_plat xbt_dynar_foreach(links, cpt, link) { xbt_dynar_push_as(res->link_list, sg_routing_link_t, link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } prev_dst_gw = e_route->gw_dst; diff --git a/src/surf/surf_routing_full.cpp b/src/surf/surf_routing_full.cpp index 3f056641a1..3c72ad8581 100644 --- a/src/surf/surf_routing_full.cpp +++ b/src/surf/surf_routing_full.cpp @@ -127,7 +127,7 @@ void AsFull::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf xbt_dynar_foreach(e_route->link_list, cpt, link) { xbt_dynar_push(res->link_list, &link); if (lat) - *lat += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } } } diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp index 6c81ae1b2a..01a0e2073c 100644 --- a/src/surf/surf_routing_generic.cpp +++ b/src/surf/surf_routing_generic.cpp @@ -322,7 +322,7 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src, sg_platf_route_cbarg_t new_e_route = NULL; if (e_route_bypass) { - LinkPtr link; + Link* link; unsigned int cpt = 0; new_e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); new_e_route->gw_src = e_route_bypass->gw_src; diff --git a/src/surf/surf_routing_vivaldi.cpp b/src/surf/surf_routing_vivaldi.cpp index 30692ce646..783b99d7bd 100644 --- a/src/surf/surf_routing_vivaldi.cpp +++ b/src/surf/surf_routing_vivaldi.cpp @@ -51,7 +51,7 @@ void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl if(info.link_up) { // link up xbt_dynar_push_as(route->link_list, void*, info.link_up); if (lat) - *lat += static_cast(info.link_up)->getLatency(); + *lat += static_cast(info.link_up)->getLatency(); } } src_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL); @@ -73,7 +73,7 @@ void AsVivaldi::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_pl if(info.link_down) { // link down xbt_dynar_push_as(route->link_list,void*,info.link_down); if (lat) - *lat += static_cast(info.link_down)->getLatency(); + *lat += static_cast(info.link_down)->getLatency(); } } dst_ctn = (xbt_dynar_t) xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL); -- 2.20.1