Merge branch 'coverity_scan' of github.com:mquinson/simgrid

[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 af8e8ad..410479f 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -116,7 +116,7 @@ public:
  */
 class XBT_PRIVATE AsClusterFatTree : public AsCluster {
 public:
-  AsClusterFatTree();
+  AsClusterFatTree(const char*name);
   ~AsClusterFatTree();
   virtual void getRouteAndLatency(NetCard *src, NetCard *dst,
                                   sg_platf_route_cbarg_t into,
@@ -133,24 +133,24 @@ public:
    *
    * It will also store the cluster for future use.
    */
-  void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster);
+  void parse_specific_arguments(sg_platf_cluster_cbarg_t cluster) override;
   void addProcessingNode(int id);
   void generateDotFile(const std::string& filename = "fatTree.dot") const;
 
 private:
   
   //description of a PGFT (TODO : better doc)
-  unsigned int levels;
-  std::vector<unsigned int> lowerLevelNodesNumber; // number of children by node
-  std::vector<unsigned int> upperLevelNodesNumber; // number of parents by node
-  std::vector<unsigned int> lowerLevelPortsNumber; // ports between each level l and l-1
+  unsigned int levels_ = 0;
+  std::vector<unsigned int> lowerLevelNodesNumber_; // number of children by node
+  std::vector<unsigned int> upperLevelNodesNumber_; // number of parents by node
+  std::vector<unsigned int> lowerLevelPortsNumber_; // ports between each level l and l-1
   
-  std::map<int, FatTreeNode*> computeNodes;
-  std::vector<FatTreeNode*> nodes;
-  std::vector<FatTreeLink*> links;
-  std::vector<unsigned int> nodesByLevel;
+  std::map<int, FatTreeNode*> computeNodes_;
+  std::vector<FatTreeNode*> nodes_;
+  std::vector<FatTreeLink*> links_;
+  std::vector<unsigned int> nodesByLevel_;
 
-  sg_platf_cluster_cbarg_t cluster;
+  sg_platf_cluster_cbarg_t cluster_;
 
   void addLink(FatTreeNode *parent, unsigned int parentPort,
                FatTreeNode *child, unsigned int childPort);