A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify the code taking Cpu::m_speedPeak changes into account
[simgrid.git]
/
src
/
surf
/
surf_routing_cluster_torus.cpp
diff --git
a/src/surf/surf_routing_cluster_torus.cpp
b/src/surf/surf_routing_cluster_torus.cpp
index
9377aa2
..
645a313
100644
(file)
--- a/
src/surf/surf_routing_cluster_torus.cpp
+++ b/
src/surf/surf_routing_cluster_torus.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014
-2015
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-25,9
+25,12
@@
inline unsigned int* rankId_to_coords(int rankId, xbt_dynar_t dimensions) {
AS_t model_torus_cluster_create(void)
{
AS_t model_torus_cluster_create(void)
{
- return new AsClusterTorus();
+ return new
simgrid::surf::
AsClusterTorus();
}
}
+namespace simgrid {
+namespace surf {
+
/* Creation routing model functions */
AsClusterTorus::AsClusterTorus() : AsCluster()
{
/* Creation routing model functions */
AsClusterTorus::AsClusterTorus() : AsCluster()
{
@@
-42,7
+45,7
@@
AsClusterTorus::~AsClusterTorus()
void AsClusterTorus::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position){
void AsClusterTorus::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int rank, int position){
- s_sg_platf_link_cbarg_t link;
+ s_sg_platf_link_cbarg_t link
= SG_PLATF_LINK_INITIALIZER
;
char* link_id;
unsigned int j = 0;
/**
char* link_id;
unsigned int j = 0;
/**
@@
-118,7
+121,7
@@
void AsClusterTorus::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster){
xbt_dynar_free(&dimensions);
}
xbt_dynar_free(&dimensions);
}
-void AsClusterTorus::getRouteAndLatency(
RoutingEdgePtr src, RoutingEdgePtr
dst, sg_platf_route_cbarg_t route, double *lat){
+void AsClusterTorus::getRouteAndLatency(
NetCard *src, NetCard *
dst, sg_platf_route_cbarg_t route, double *lat){
XBT_VERB("torus_get_route_and_latency from '%s'[%d] to '%s'[%d]",
src->getName(), src->getId(),
XBT_VERB("torus_get_route_and_latency from '%s'[%d] to '%s'[%d]",
src->getName(), src->getId(),
@@
-237,3
+240,6
@@
void AsClusterTorus::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
return;
}
return;
}
+
+}
+}