make NetZoneImpl public too

diff --git a/include/simgrid/kernel/routing/ClusterZone.hpp b/include/simgrid/kernel/routing/ClusterZone.hpp
index 2e2cbfe..b74924c 100644 (file)
--- a/include/simgrid/kernel/routing/ClusterZone.hpp
+++ b/include/simgrid/kernel/routing/ClusterZone.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_ROUTING_CLUSTER_HPP_
 #define SIMGRID_ROUTING_CLUSTER_HPP_
 
 #ifndef SIMGRID_ROUTING_CLUSTER_HPP_
 #define SIMGRID_ROUTING_CLUSTER_HPP_
 

-#include <src/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>

 
 #include <unordered_map>
 
 
 #include <unordered_map>
 

diff --git a/include/simgrid/kernel/routing/EmptyZone.hpp b/include/simgrid/kernel/routing/EmptyZone.hpp
index eb8898e..8f13116 100644 (file)
--- a/include/simgrid/kernel/routing/EmptyZone.hpp
+++ b/include/simgrid/kernel/routing/EmptyZone.hpp
@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_NONE_HPP_
 #define SURF_ROUTING_NONE_HPP_
 
 #ifndef SURF_ROUTING_NONE_HPP_
 #define SURF_ROUTING_NONE_HPP_
 

-#include "src/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"

 
 namespace simgrid {
 namespace kernel {
 
 namespace simgrid {
 namespace kernel {

diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp
index 8810824..847c4e4 100644 (file)
--- a/include/simgrid/kernel/routing/NetPoint.hpp
+++ b/include/simgrid/kernel/routing/NetPoint.hpp
@@ -10,7 +10,7 @@
 #include <xbt/base.h>
 #include <xbt/signal.hpp>
 
 #include <xbt/base.h>
 #include <xbt/signal.hpp>
 

-#include <src/kernel/routing/NetZoneImpl.hpp>
+#include <simgrid/kernel/routing/NetZoneImpl.hpp>

 
 namespace simgrid {
 namespace kernel {
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/kernel/routing/NetZoneImpl.hpp b/include/simgrid/kernel/routing/NetZoneImpl.hpp
similarity index 88%
rename from src/kernel/routing/NetZoneImpl.hpp
rename to include/simgrid/kernel/routing/NetZoneImpl.hpp
index acfb8d3..eb79d14 100644 (file)
--- a/src/kernel/routing/NetZoneImpl.hpp
+++ b/include/simgrid/kernel/routing/NetZoneImpl.hpp
@@ -52,7 +52,7 @@ class XBT_PUBLIC NetZoneImpl : public s4u::NetZone {
   friend simgrid::kernel::EngineImpl; // it destroys netRoot_
 
 protected:
   friend simgrid::kernel::EngineImpl; // it destroys netRoot_
 
 protected:

-  explicit NetZoneImpl(NetZone * father, std::string name);
+  explicit NetZoneImpl(NetZone* father, std::string name);

   virtual ~NetZoneImpl();
 
 public:
   virtual ~NetZoneImpl();
 
 public:


@@ -60,8 +60,8 @@ public:
   simgrid::s4u::Host* createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
                                  std::map<std::string, std::string>* props);
   /** @brief Creates a new route in this NetZone */
   simgrid::s4u::Host* createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
                                  std::map<std::string, std::string>* props);
   /** @brief Creates a new route in this NetZone */

-  void addBypassRoute(NetPoint * src, NetPoint * dst, NetPoint * gw_src, NetPoint * gw_dst,
-                      std::vector<simgrid::surf::LinkImpl*> & link_list, bool symmetrical) override;
+  void addBypassRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+                      std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical) override;

 
 protected:
   /**
 
 protected:
   /**


@@ -72,10 +72,10 @@ protected:
    * @param into Container into which the traversed links and gateway informations should be pushed
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */
    * @param into Container into which the traversed links and gateway informations should be pushed
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */

-  virtual void getLocalRoute(NetPoint * src, NetPoint * dst, RouteCreationArgs * into, double* latency) = 0;
+  virtual void getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) = 0;

   /** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */
   /* returns whether we found a bypass path */
   /** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */
   /* returns whether we found a bypass path */

-  bool getBypassRoute(routing::NetPoint * src, routing::NetPoint * dst,
+  bool getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst,

                       /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency);
 
 public:
                       /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency);
 
 public:


@@ -86,11 +86,11 @@ public:
    * @param links Accumulator in which all traversed links should be pushed (caller must empty it)
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */
    * @param links Accumulator in which all traversed links should be pushed (caller must empty it)
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */

-  static void getGlobalRoute(routing::NetPoint * src, routing::NetPoint * dst,
+  static void getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst,

                              /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency);
 
                              /* OUT */ std::vector<surf::LinkImpl*>& links, double* latency);
 

-  virtual void getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t> * nodes,
-                        std::map<std::string, xbt_edge_t> * edges) = 0;
+  virtual void getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
+                        std::map<std::string, xbt_edge_t>* edges) = 0;

   enum class RoutingMode {
     unset = 0, /**< Undefined type                                   */
     base,      /**< Base case: use simple link lists for routing     */
   enum class RoutingMode {
     unset = 0, /**< Undefined type                                   */
     base,      /**< Base case: use simple link lists for routing     */


@@ -103,8 +103,8 @@ private:
   std::map<std::pair<NetPoint*, NetPoint*>, BypassRoute*> bypassRoutes_; // src x dst -> route
   routing::NetPoint* netpoint_ = nullptr;                                // Our representative in the father NetZone
 };
   std::map<std::pair<NetPoint*, NetPoint*>, BypassRoute*> bypassRoutes_; // src x dst -> route
   routing::NetPoint* netpoint_ = nullptr;                                // Our representative in the father NetZone
 };

-}
-}
-}; // Namespace simgrid::kernel::routing
+} // namespace routing
+} // namespace kernel
+}; // namespace simgrid

 
 #endif /* SIMGRID_ROUTING_NETZONEIMPL_HPP */
 
 #endif /* SIMGRID_ROUTING_NETZONEIMPL_HPP */

diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp
index 168dbda..f8ab5d1 100644 (file)
--- a/include/simgrid/kernel/routing/RoutedZone.hpp
+++ b/include/simgrid/kernel/routing/RoutedZone.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_ROUTING_GENERIC_HPP_
 #define SIMGRID_ROUTING_GENERIC_HPP_
 
 #ifndef SIMGRID_ROUTING_GENERIC_HPP_
 #define SIMGRID_ROUTING_GENERIC_HPP_
 

-#include "src/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"

 
 namespace simgrid {
 namespace kernel {
 
 namespace simgrid {
 namespace kernel {

diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp
index d06d1d4..9c7935d 100644 (file)
--- a/src/bindings/java/jmsg_as.cpp
+++ b/src/bindings/java/jmsg_as.cpp
@@ -5,9 +5,9 @@
 /* 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. */
 
 /* 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 "simgrid/kernel/routing/NetZoneImpl.hpp"

 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"

-#include "src/kernel/routing/NetZoneImpl.hpp"

 
 #include "jmsg.hpp"
 #include "jmsg_as.hpp"
 
 #include "jmsg.hpp"
 #include "jmsg_as.hpp"

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 52cc45d..abda1e2 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -5,8 +5,8 @@
 
 #include "src/kernel/EngineImpl.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 
 #include "src/kernel/EngineImpl.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"

+#include "simgrid/kernel/routing/NetZoneImpl.hpp"

 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Host.hpp"

-#include "src/kernel/routing/NetZoneImpl.hpp"

 #include "src/surf/StorageImpl.hpp"
 
 #include <algorithm>
 #include "src/surf/StorageImpl.hpp"
 
 #include <algorithm>

diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp
index 2603077..f896d7a 100644 (file)
--- a/src/kernel/routing/NetZoneImpl.cpp
+++ b/src/kernel/routing/NetZoneImpl.cpp
@@ -3,7 +3,7 @@
 /* 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. */
 
 /* 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 "src/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"

 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index a5dd13d..221feb0 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -8,6 +8,7 @@
 #include "instr/instr_interface.h"
 #include "mc/mc.h"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "instr/instr_interface.h"
 #include "mc/mc.h"
 #include "simgrid/kernel/routing/NetPoint.hpp"

+#include "simgrid/kernel/routing/NetZoneImpl.hpp"

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Mailbox.hpp"


@@ -15,7 +16,6 @@
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.h"
 #include "src/kernel/EngineImpl.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.h"
 #include "src/kernel/EngineImpl.hpp"

-#include "src/kernel/routing/NetZoneImpl.hpp"

 #include "src/surf/network_interface.hpp"
 #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
 
 #include "src/surf/network_interface.hpp"
 #include "surf/surf.hpp" // routing_platf. FIXME:KILLME. SOON
 

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 722b012..524628b 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -6,9 +6,9 @@
 #include "src/instr/instr_private.hpp"
 
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "src/instr/instr_private.hpp"
 
 #include "simgrid/kernel/routing/NetPoint.hpp"

+#include "simgrid/kernel/routing/NetZoneImpl.hpp"

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"

-#include "src/kernel/routing/NetZoneImpl.hpp"

 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.hpp"

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 9061aa7..3ed44de 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -23,9 +23,9 @@
 #include "simgrid/kernel/routing/FloydZone.hpp"
 #include "simgrid/kernel/routing/FullZone.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "simgrid/kernel/routing/FloydZone.hpp"
 #include "simgrid/kernel/routing/FullZone.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"

+#include "simgrid/kernel/routing/NetZoneImpl.hpp"

 #include "simgrid/kernel/routing/TorusZone.hpp"
 #include "simgrid/kernel/routing/VivaldiZone.hpp"
 #include "simgrid/kernel/routing/TorusZone.hpp"
 #include "simgrid/kernel/routing/VivaldiZone.hpp"

-#include "src/kernel/routing/NetZoneImpl.hpp"

 #include <string>
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 
 #include <string>
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index d63796f..a802be5 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -316,7 +316,6 @@ set(SURF_SRC
   src/kernel/routing/FullZone.cpp
   src/kernel/routing/NetPoint.cpp
   src/kernel/routing/NetZoneImpl.cpp
   src/kernel/routing/FullZone.cpp
   src/kernel/routing/NetPoint.cpp
   src/kernel/routing/NetZoneImpl.cpp

-  src/kernel/routing/NetZoneImpl.hpp

   src/kernel/routing/TorusZone.cpp
   src/kernel/routing/RoutedZone.cpp
   src/kernel/routing/VivaldiZone.cpp
   src/kernel/routing/TorusZone.cpp
   src/kernel/routing/RoutedZone.cpp
   src/kernel/routing/VivaldiZone.cpp


@@ -706,6 +705,7 @@ set(headers_to_install
   include/simgrid/kernel/routing/FloydZone.hpp
   include/simgrid/kernel/routing/FullZone.hpp
   include/simgrid/kernel/routing/NetPoint.hpp
   include/simgrid/kernel/routing/FloydZone.hpp
   include/simgrid/kernel/routing/FullZone.hpp
   include/simgrid/kernel/routing/NetPoint.hpp

+  include/simgrid/kernel/routing/NetZoneImpl.hpp

   include/simgrid/kernel/routing/RoutedZone.hpp
   include/simgrid/kernel/routing/TorusZone.hpp
   include/simgrid/kernel/routing/VivaldiZone.hpp  
   include/simgrid/kernel/routing/RoutedZone.hpp
   include/simgrid/kernel/routing/TorusZone.hpp
   include/simgrid/kernel/routing/VivaldiZone.hpp