[L07] Don't segfault on point-to-point communications

[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 2f924ad..91a2c46 100644 (file)
--- a/src/surf/surf_routing_cluster_fat_tree.hpp
+++ b/src/surf/surf_routing_cluster_fat_tree.hpp
@@ -1,14 +1,16 @@
-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "surf_routing_cluster.hpp"
-
 #ifndef SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
 #define SURF_ROUTING_CLUSTER_FAT_TREE_HPP_
 
+#include <xbt/base.h>
+
+#include "surf_routing_cluster.hpp"
+
 
 /** \file surf_routing_cluster_fat_tree.cpp
  *  The class AsClusterFatTree describes PGFT, as introduced by Eitan Zahavi
@@ -17,8 +19,8 @@
  * 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
@@ -52,11 +54,11 @@ public:
 
   /** Virtual link standing for the node global capacity.
    */
-  NetworkLink* limiterLink;
+  Link* limiterLink;
   /** If present, communications from this node to this node will pass through it
    * instead of passing by an upper level switch.
    */
-  NetworkLink* loopback;
+  Link* loopback;
   FatTreeNode(sg_platf_cluster_cbarg_t cluster, int id, int level,
               int position);
 };
@@ -74,10 +76,10 @@ public:
               FatTreeNode *destination);
   /** Link going up in the tree
    */
-  NetworkLink *upLink; 
+  Link *upLink; 
   /** Link going down in the tree
    */
-  NetworkLink *downLink;
+  Link *downLink;
   /** Upper end of the link
    */
   FatTreeNode *upNode;
@@ -107,11 +109,11 @@ public:
  *
  * Routing is made using a destination-mod-k scheme.
  */
-class AsClusterFatTree : public AsCluster {
+class XBT_PRIVATE AsClusterFatTree : public AsCluster {
 public:
   AsClusterFatTree();
   ~AsClusterFatTree();
-  virtual void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst,
+  virtual void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst,
                                   sg_platf_route_cbarg_t into,
                                   double *latency);