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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
AsCluster.cpp
diff --git
a/src/surf/AsCluster.cpp
b/src/surf/AsCluster.cpp
index
128115e
..
8fe7144
100644
(file)
--- a/
src/surf/AsCluster.cpp
+++ b/
src/surf/AsCluster.cpp
@@
-19,7
+19,7
@@
namespace surf {
{}
AsCluster::~AsCluster()
{
- xbt_dynar_free(&
upDown
Links_);
+ xbt_dynar_free(&
private
Links_);
}
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
@@
-31,7
+31,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
if (! src->isRouter()) { // No specific link for router
if((src->id() == dst->id()) && has_loopback_ ){
- info = xbt_dynar_get_as(
upDown
Links_, src->id() * nb_links_per_node_, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
private
Links_, src->id() * nb_links_per_node_, s_surf_parsing_link_up_down_t);
route->link_list->push_back(info.link_up);
if (lat)
*lat += info.link_up->getLatency();
@@
-40,11
+40,11
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
if (has_limiter_){ // limiter for sender
- info = xbt_dynar_get_as(
upDown
Links_, src->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
private
Links_, src->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
route->link_list->push_back((Link*)info.link_up);
}
- info = xbt_dynar_get_as(
upDown
Links_, src->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
private
Links_, src->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
if (info.link_up) { // link up
route->link_list->push_back(info.link_up);
if (lat)
@@
-60,7
+60,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
}
if (! dst->isRouter()) { // No specific link for router
- info = xbt_dynar_get_as(
upDown
Links_, dst->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
private
Links_, dst->id() * nb_links_per_node_ + has_loopback_ + has_limiter_, s_surf_parsing_link_up_down_t);
if (info.link_down) { // link down
route->link_list->push_back(info.link_down);
@@
-68,7
+68,7
@@
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cb
*lat += info.link_down->getLatency();
}
if (has_limiter_){ // limiter for receiver
- info = xbt_dynar_get_as(
upDown
Links_, dst->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
private
Links_, dst->id() * nb_links_per_node_ + has_loopback_, s_surf_parsing_link_up_down_t);
route->link_list->push_back(info.link_up);
}
}
@@
-102,7
+102,7
@@
void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
if (! src->isRouter()) {
previous = new_xbt_graph_node(graph, src->name(), nodes);
- info = xbt_dynar_get_as(
upDown
Links_, src->id(), s_surf_parsing_link_up_down_t);
+ info = xbt_dynar_get_as(
private
Links_, src->id(), s_surf_parsing_link_up_down_t);
if (info.link_up) { // link up
@@
-137,10
+137,10
@@
void AsCluster::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
}
void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id, int , int position){
- s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
s_surf_parsing_link_up_down_t info;
char* link_id = bprintf("%s_link_%d", cluster->id, id);
+ s_sg_platf_link_cbarg_t link;
memset(&link, 0, sizeof(link));
link.id = link_id;
link.bandwidth = cluster->bw;
@@
-150,16
+150,15
@@
void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
if (link.policy == SURF_LINK_FULLDUPLEX) {
char *tmp_link = bprintf("%s_UP", link_id);
- info.link_up =
sg_link_by_n
ame(tmp_link);
+ info.link_up =
Link::byN
ame(tmp_link);
xbt_free(tmp_link);
tmp_link = bprintf("%s_DOWN", link_id);
- info.link_down =
sg_link_by_n
ame(tmp_link);
+ info.link_down =
Link::byN
ame(tmp_link);
xbt_free(tmp_link);
} else {
- info.link_up = sg_link_by_name(link_id);
- info.link_down = info.link_up;
+ info.link_up = info.link_down = Link::byName(link_id);
}
- xbt_dynar_set(
upDown
Links_, position, &info);
+ xbt_dynar_set(
private
Links_, position, &info);
xbt_free(link_id);
}