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 pull request #50 from mpoquet/master
[simgrid.git]
/
src
/
surf
/
surf_routing_cluster_fat_tree.hpp
diff --git
a/src/surf/surf_routing_cluster_fat_tree.hpp
b/src/surf/surf_routing_cluster_fat_tree.hpp
index
2180d06
..
9b5d887
100644
(file)
--- a/
src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/
src/surf/surf_routing_cluster_fat_tree.hpp
@@
-7,8
+7,16
@@
#ifndef SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
#define SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
#ifndef SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
#define SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
+#include <string>
+#include <map>
+#include <vector>
+
+#include <xbt/base.h>
+
#include "surf_routing_cluster.hpp"
#include "surf_routing_cluster.hpp"
+namespace simgrid {
+namespace surf {
/** \file surf_routing_cluster_fat_tree.cpp
* The class AsClusterFatTree describes PGFT, as introduced by Eitan Zahavi
/** \file surf_routing_cluster_fat_tree.cpp
* The class AsClusterFatTree describes PGFT, as introduced by Eitan Zahavi
@@
-17,8
+25,8
@@
* address real world constraints, which are not currently enforced.
*/
* address real world constraints, which are not currently enforced.
*/
-class FatTreeNode;
-class FatTreeLink;
+class
XBT_PRIVATE
FatTreeNode;
+class
XBT_PRIVATE
FatTreeLink;
/** \brief A node in a fat tree.
* A FatTreeNode can either be a switch or a processing node. Switches are
/** \brief A node in a fat tree.
* A FatTreeNode can either be a switch or a processing node. Switches are
@@
-72,17
+80,13
@@
class FatTreeLink {
public:
FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source,
FatTreeNode *destination);
public:
FatTreeLink(sg_platf_cluster_cbarg_t cluster, FatTreeNode *source,
FatTreeNode *destination);
- /** Link going up in the tree
- */
+ /** Link going up in the tree */
Link *upLink;
Link *upLink;
- /** Link going down in the tree
- */
+ /** Link going down in the tree */
Link *downLink;
Link *downLink;
- /** Upper end of the link
- */
+ /** Upper end of the link */
FatTreeNode *upNode;
FatTreeNode *upNode;
- /** Lower end of the link
- */
+ /** Lower end of the link */
FatTreeNode *downNode;
};
FatTreeNode *downNode;
};
@@
-107,13
+111,13
@@
public:
*
* Routing is made using a destination-mod-k scheme.
*/
*
* Routing is made using a destination-mod-k scheme.
*/
-class AsClusterFatTree : public AsCluster {
+class
XBT_PRIVATE
AsClusterFatTree : public AsCluster {
public:
AsClusterFatTree();
~AsClusterFatTree();
public:
AsClusterFatTree();
~AsClusterFatTree();
- virtual void getRouteAndLatency(
RoutingEdge *src, RoutingEdge
*dst,
+ virtual void getRouteAndLatency(
NetCard *src, NetCard
*dst,
sg_platf_route_cbarg_t into,
sg_platf_route_cbarg_t into,
- double *latency);
+ double *latency)
override
;
/** \brief Generate the fat tree
*
/** \brief Generate the fat tree
*
@@
-127,10
+131,8
@@
public:
* It will also store the cluster for future use.
*/
void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster);
* It will also store the cluster for future use.
*/
void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster);
- /** \brief Add a processing node.
- */
void addProcessingNode(int id);
void addProcessingNode(int id);
- void generateDotFile(const string& filename = "fatTree.dot") const;
+ void generateDotFile(const st
d::st
ring& filename = "fatTree.dot") const;
private:
private:
@@
-156,4
+158,8
@@
private:
bool areRelated(FatTreeNode *parent, FatTreeNode *child);
bool isInSubTree(FatTreeNode *root, FatTreeNode *node);
};
bool areRelated(FatTreeNode *parent, FatTreeNode *child);
bool isInSubTree(FatTreeNode *root, FatTreeNode *node);
};
+
+}
+}
+
#endif
#endif