X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a872e2945dc4e397cee131bcfe9ebedb1460e609..e16e0233:/src/kernel/routing/TorusZone.cpp diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp index 1ea74b3af1..971fd4c5e4 100644 --- a/src/kernel/routing/TorusZone.cpp +++ b/src/kernel/routing/TorusZone.cpp @@ -18,8 +18,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "T namespace simgrid { namespace kernel { namespace routing { -TorusZone::TorusZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel) - : ClusterZone(father, std::move(name), netmodel) +TorusZone::TorusZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel) + : ClusterZone(father, name, netmodel) { } @@ -40,7 +40,7 @@ void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int std::string link_id = std::string(cluster->id) + "_link_from_" + std::to_string(id) + "_to_" + std::to_string(neighbor_rank_id); link.id = link_id; - link.bandwidth = cluster->bw; + link.bandwidths.push_back(cluster->bw); link.latency = cluster->lat; link.policy = cluster->sharing_policy; sg_platf_new_link(&link); @@ -104,12 +104,12 @@ void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* */ /* - * Arrays that hold the coordinates of the current node andthe target; comparing the values at the i-th position of + * Arrays that hold the coordinates of the current node and the target; comparing the values at the i-th position of * both arrays, we can easily assess whether we need to route into this dimension or not. */ const unsigned int dsize = dimensions_.size(); - unsigned int myCoords[dsize]; - unsigned int targetCoords[dsize]; + unsigned int* myCoords = new unsigned int[dsize]; + unsigned int* targetCoords= new unsigned int[dsize]; unsigned int dim_size_product = 1; for (unsigned i = 0; i < dsize; i++) { unsigned cur_dim_size = dimensions_[i]; @@ -187,6 +187,8 @@ void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* current_node = next_node; } + delete[] myCoords; + delete[] targetCoords; } } }