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
give a network_model to each NetZone (unused for now)
[simgrid.git]
/
src
/
surf
/
sg_platf.cpp
diff --git
a/src/surf/sg_platf.cpp
b/src/surf/sg_platf.cpp
index
3343bfc
..
a5ce276
100644
(file)
--- a/
src/surf/sg_platf.cpp
+++ b/
src/surf/sg_platf.cpp
@@
-564,36
+564,38
@@
simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel::
/* search the routing model */
simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr;
/* search the routing model */
simgrid::kernel::routing::NetZoneImpl* new_zone = nullptr;
+ simgrid::kernel::resource::NetworkModel* netmodel =
+ current_routing == nullptr ? surf_network_model : current_routing->network_model_;
switch (zone->routing) {
case A_surfxml_AS_routing_Cluster:
switch (zone->routing) {
case A_surfxml_AS_routing_Cluster:
- new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id);
+ new_zone = new simgrid::kernel::routing::ClusterZone(current_routing, zone->id
, netmodel
);
break;
case A_surfxml_AS_routing_ClusterDragonfly:
break;
case A_surfxml_AS_routing_ClusterDragonfly:
- new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id);
+ new_zone = new simgrid::kernel::routing::DragonflyZone(current_routing, zone->id
, netmodel
);
break;
case A_surfxml_AS_routing_ClusterTorus:
break;
case A_surfxml_AS_routing_ClusterTorus:
- new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id);
+ new_zone = new simgrid::kernel::routing::TorusZone(current_routing, zone->id
, netmodel
);
break;
case A_surfxml_AS_routing_ClusterFatTree:
break;
case A_surfxml_AS_routing_ClusterFatTree:
- new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id);
+ new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id
, netmodel
);
break;
case A_surfxml_AS_routing_Dijkstra:
break;
case A_surfxml_AS_routing_Dijkstra:
- new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, false);
+ new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id,
netmodel,
false);
break;
case A_surfxml_AS_routing_DijkstraCache:
break;
case A_surfxml_AS_routing_DijkstraCache:
- new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, true);
+ new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id,
netmodel,
true);
break;
case A_surfxml_AS_routing_Floyd:
break;
case A_surfxml_AS_routing_Floyd:
- new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id);
+ new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id
, netmodel
);
break;
case A_surfxml_AS_routing_Full:
break;
case A_surfxml_AS_routing_Full:
- new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id);
+ new_zone = new simgrid::kernel::routing::FullZone(current_routing, zone->id
, netmodel
);
break;
case A_surfxml_AS_routing_None:
break;
case A_surfxml_AS_routing_None:
- new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id);
+ new_zone = new simgrid::kernel::routing::EmptyZone(current_routing, zone->id
, netmodel
);
break;
case A_surfxml_AS_routing_Vivaldi:
break;
case A_surfxml_AS_routing_Vivaldi:
- new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id);
+ new_zone = new simgrid::kernel::routing::VivaldiZone(current_routing, zone->id
, netmodel
);
break;
default:
xbt_die("Not a valid model!");
break;
default:
xbt_die("Not a valid model!");