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 github.com:mquinson/simgrid
[simgrid.git]
/
src
/
surf
/
surf_routing_cluster.cpp
diff --git
a/src/surf/surf_routing_cluster.cpp
b/src/surf/surf_routing_cluster.cpp
index 04f9da6c2215e4ad0813d19100719f95afdcb178..6c284fc59eee26792d9f2305916957858d49743a 100644
(file)
--- a/
src/surf/surf_routing_cluster.cpp
+++ b/
src/surf/surf_routing_cluster.cpp
@@
-21,17
+21,6
@@
AS_t model_cluster_create(void)
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
-/* Creation routing model functions */
-AsCluster::AsCluster() : AsNone()
-{
- p_backbone = 0;
- p_loopback = 0;
- p_router = 0;
- p_has_limiter = 0;
- p_has_loopback = 0;
- p_nb_links_per_node = 1;
-}
-
/* Business methods */
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
{
/* Business methods */
void AsCluster::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat)
{
@@
-157,7
+146,7
@@
void AsCluster::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
link.id = link_id;
link.bandwidth = cluster->bw;
link.latency = cluster->lat;
link.id = link_id;
link.bandwidth = cluster->bw;
link.latency = cluster->lat;
- link.
state = SURF_RESOURCE_ON
;
+ link.
initiallyOn = 1
;
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);
link.policy = cluster->sharing_policy;
sg_platf_new_link(&link);