X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/07c12189c716ea527ddcf8f8b55983213dead2bf..6e8a5aeab4a376b73cdcbe116d2437af319cafc3:/src/kernel/routing/FatTreeZone.hpp diff --git a/src/kernel/routing/FatTreeZone.hpp b/src/kernel/routing/FatTreeZone.hpp index 8d8538752f..e24867f904 100644 --- a/src/kernel/routing/FatTreeZone.hpp +++ b/src/kernel/routing/FatTreeZone.hpp @@ -46,11 +46,11 @@ public: /** Virtual link standing for the node global capacity. */ - Link* limiterLink; + surf::LinkImpl* limiterLink; /** If present, communications from this node to this node will pass through it * instead of passing by an upper level switch. */ - Link* loopback; + surf::LinkImpl* loopback; FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level, int position); }; @@ -63,9 +63,9 @@ class FatTreeLink { public: FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode* source, FatTreeNode* destination); /** Link going up in the tree */ - Link* upLink; + surf::LinkImpl* upLink; /** Link going down in the tree */ - Link* downLink; + surf::LinkImpl* downLink; /** Upper end of the link */ FatTreeNode* upNode; /** Lower end of the link */ @@ -98,7 +98,7 @@ public: */ class XBT_PRIVATE FatTreeZone : public ClusterZone { public: - explicit FatTreeZone(NetZone* father, const char* name); + explicit FatTreeZone(NetZone* father, std::string name); ~FatTreeZone() override; void getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t into, double* latency) override; @@ -119,7 +119,7 @@ public: private: // description of a PGFT (TODO : better doc) - unsigned int levels_ = 0; + unsigned long levels_ = 0; std::vector lowerLevelNodesNumber_; // number of children by node std::vector upperLevelNodesNumber_; // number of parents by node std::vector lowerLevelPortsNumber_; // ports between each level l and l-1