Install some kernel header files for the users' plugins and more

diff --git a/ChangeLog b/ChangeLog
index ac45cc6..e1d7461 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,10 @@ SimGrid (3.19) NOT RELEASED YET (target: March 20 2018, 16:15:27 UTC)
  - Execution->setHost() can be called after start() to migrate it.
  - Comm::test_any() is now implemented.
  - s4u::Actor now has onCreation() and onDestruction() signals.
  - Execution->setHost() can be called after start() to migrate it.
  - Comm::test_any() is now implemented.
  - s4u::Actor now has onCreation() and onDestruction() signals.

+ - Install some kernel header files for the users' plugins and more.
+   Warning, their API is really not stable yet.
+    include/simgrid/kernel/resource/{Action,Resource,Model}.hpp
+    include/simgrid/kernel/routing/*Zone.hpp

 
  XBT
  - Remove XBT_LOG_CONNECT, it should be useless nowadays.
 
  XBT
  - Remove XBT_LOG_CONNECT, it should be useless nowadays.

diff --git a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp
index bc36f0f..f4a0b0b 100644 (file)
--- a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp
+++ b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.cpp
@@ -3,9 +3,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/ClusterZone.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"

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

-#include "src/kernel/routing/ClusterZone.hpp"
-#include "src/kernel/routing/DragonflyZone.hpp"

 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 

diff --git a/src/kernel/resource/Action.hpp b/include/simgrid/kernel/resource/Action.hpp
similarity index 94%
rename from src/kernel/resource/Action.hpp
rename to include/simgrid/kernel/resource/Action.hpp
index ef60eae..6154a67 100644 (file)
--- a/src/kernel/resource/Action.hpp
+++ b/include/simgrid/kernel/resource/Action.hpp
@@ -59,7 +59,7 @@ public:
    * @param cost The cost of the Action
    * @param failed If the action is impossible (e.g.: execute something on a switched off host)
    */
    * @param cost The cost of the Action
    * @param failed If the action is impossible (e.g.: execute something on a switched off host)
    */

-  Action(simgrid::kernel::resource::Model * model, double cost, bool failed);
+  Action(simgrid::kernel::resource::Model* model, double cost, bool failed);

 
   /**
    * @brief Action constructor
 
   /**
    * @brief Action constructor


@@ -69,7 +69,7 @@ public:
    * @param failed If the action is impossible (e.g.: execute something on a switched off host)
    * @param var The lmm variable associated to this Action if it is part of a LMM component
    */
    * @param failed If the action is impossible (e.g.: execute something on a switched off host)
    * @param var The lmm variable associated to this Action if it is part of a LMM component
    */

-  Action(simgrid::kernel::resource::Model * model, double cost, bool failed, kernel::lmm::Variable* var);
+  Action(simgrid::kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var);

 
   virtual ~Action();
 
 
   virtual ~Action();
 


@@ -189,12 +189,12 @@ private:
 
 public:
   virtual void updateRemainingLazy(double now) { THROW_IMPOSSIBLE; };
 
 public:
   virtual void updateRemainingLazy(double now) { THROW_IMPOSSIBLE; };

-  void heapInsert(heap_type & heap, double key, Action::Type hat);
-  void heapRemove(heap_type & heap);
-  void heapUpdate(heap_type & heap, double key, Action::Type hat);
+  void heapInsert(heap_type& heap, double key, Action::Type hat);
+  void heapRemove(heap_type& heap);
+  void heapUpdate(heap_type& heap, double key, Action::Type hat);

   void clearHeapHandle() { heapHandle_ = boost::none; }
   kernel::lmm::Variable* getVariable() const { return variable_; }
   void clearHeapHandle() { heapHandle_ = boost::none; }
   kernel::lmm::Variable* getVariable() const { return variable_; }

-  void setVariable(kernel::lmm::Variable * var) { variable_ = var; }
+  void setVariable(kernel::lmm::Variable* var) { variable_ = var; }

   double getLastUpdate() const { return lastUpdate_; }
   void refreshLastUpdate() { lastUpdate_ = surf_get_clock(); }
   double getLastValue() const { return lastValue_; }
   double getLastUpdate() const { return lastUpdate_; }
   void refreshLastUpdate() { lastUpdate_ = surf_get_clock(); }
   double getLastValue() const { return lastValue_; }


@@ -208,7 +208,7 @@ protected:
 typedef Action::ActionList ActionList;
 typedef Action::ActionLmmList ActionLmmList;
 typedef Action::ActionLmmList* ActionLmmListPtr;
 typedef Action::ActionList ActionList;
 typedef Action::ActionLmmList ActionLmmList;
 typedef Action::ActionLmmList* ActionLmmListPtr;

-} // namespace surf
-} // namespace simgrid
+} // namespace resource
+} // namespace kernel

 } // namespace simgrid
 #endif
 } // namespace simgrid
 #endif

diff --git a/src/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp
similarity index 97%
rename from src/kernel/resource/Model.hpp
rename to include/simgrid/kernel/resource/Model.hpp
index f1123d6..5855dda 100644 (file)
--- a/src/kernel/resource/Model.hpp
+++ b/include/simgrid/kernel/resource/Model.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_KERNEL_RESOURCE_MODEL_HPP
 #define SIMGRID_KERNEL_RESOURCE_MODEL_HPP
 
 #ifndef SIMGRID_KERNEL_RESOURCE_MODEL_HPP
 #define SIMGRID_KERNEL_RESOURCE_MODEL_HPP
 

-#include "src/kernel/resource/Action.hpp"
+#include <simgrid/kernel/resource/Action.hpp>

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


@@ -94,7 +94,7 @@ private:
   heap_type actionHeap_;
 };
 
   heap_type actionHeap_;
 };
 

-} // namespace surf
-} // namespace simgrid
+} // namespace resource
+} // namespace kernel

 } // namespace simgrid
 #endif
 } // namespace simgrid
 #endif

diff --git a/src/kernel/resource/Resource.hpp b/include/simgrid/kernel/resource/Resource.hpp
similarity index 97%
rename from src/kernel/resource/Resource.hpp
rename to include/simgrid/kernel/resource/Resource.hpp
index c8eb5c6..f70ea2d 100644 (file)
--- a/src/kernel/resource/Resource.hpp
+++ b/include/simgrid/kernel/resource/Resource.hpp
@@ -25,7 +25,7 @@ public:
    * @param name The name of the Resource
    * @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
    */
    * @param name The name of the Resource
    * @param constraint The lmm constraint associated to this Resource if it is part of a LMM component
    */

-  Resource(Model * model, const std::string& name, lmm::Constraint* constraint);
+  Resource(Model* model, const std::string& name, lmm::Constraint* constraint);

 
   virtual ~Resource();
 
 
   virtual ~Resource();
 

diff --git a/src/kernel/routing/ClusterZone.hpp b/include/simgrid/kernel/routing/ClusterZone.hpp
similarity index 97%
rename from src/kernel/routing/ClusterZone.hpp
rename to include/simgrid/kernel/routing/ClusterZone.hpp
index a9a7866..2e2cbfe 100644 (file)
--- a/src/kernel/routing/ClusterZone.hpp
+++ b/include/simgrid/kernel/routing/ClusterZone.hpp
@@ -6,9 +6,9 @@
 #ifndef SIMGRID_ROUTING_CLUSTER_HPP_
 #define SIMGRID_ROUTING_CLUSTER_HPP_
 
 #ifndef SIMGRID_ROUTING_CLUSTER_HPP_
 #define SIMGRID_ROUTING_CLUSTER_HPP_
 

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

 
 

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

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


@@ -94,8 +94,8 @@ public:
   bool hasLoopback_              = false;
   unsigned int linkCountPerNode_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
 };
   bool hasLoopback_              = false;
   unsigned int linkCountPerNode_ = 1; /* may be 1 (if only a private link), 2 or 3 (if limiter and loopback) */
 };

-}
-}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 #endif /* SIMGRID_ROUTING_CLUSTER_HPP_ */
 
 #endif /* SIMGRID_ROUTING_CLUSTER_HPP_ */

diff --git a/src/kernel/routing/DijkstraZone.hpp b/include/simgrid/kernel/routing/DijkstraZone.hpp
similarity index 86%
rename from src/kernel/routing/DijkstraZone.hpp
rename to include/simgrid/kernel/routing/DijkstraZone.hpp
index 001eb42..2304ed6 100644 (file)
--- a/src/kernel/routing/DijkstraZone.hpp
+++ b/include/simgrid/kernel/routing/DijkstraZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. 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. */
 
 /* 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. */


@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
 #define SURF_ROUTING_DIJKSTRA_HPP_
 
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
 #define SURF_ROUTING_DIJKSTRA_HPP_
 

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

 
 struct s_graph_node_data_t {
   int id;
 
 struct s_graph_node_data_t {
   int id;


@@ -28,7 +28,8 @@ namespace routing {
  *  The path between components is computed each time you request it,
  *  using the Dijkstra algorithm. A cache can be used to reduce the computation.
  *
  *  The path between components is computed each time you request it,
  *  using the Dijkstra algorithm. A cache can be used to reduce the computation.
  *

- *  This result in rather small platform file, very fast initialization, and very low memory requirements, but somehow long path resolution times.
+ *  This result in rather small platform file, very fast initialization, and very low memory requirements, but somehow
+ * long path resolution times.

  */
 class XBT_PRIVATE DijkstraZone : public RoutedZone {
 public:
  */
 class XBT_PRIVATE DijkstraZone : public RoutedZone {
 public:


@@ -54,13 +55,13 @@ public:
   void addRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
                 std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical) override;
 
   void addRoute(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
                 std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical) override;
 

-  xbt_graph_t routeGraph_  = nullptr; /* xbt_graph */
+  xbt_graph_t routeGraph_ = nullptr;           /* xbt_graph */

   std::map<int, xbt_node_t> graphNodeMap_;     /* map */
   bool cached_;                                /* cache mode */
   std::map<int, std::vector<int>> routeCache_; /* use in cache mode */
 };
   std::map<int, xbt_node_t> graphNodeMap_;     /* map */
   bool cached_;                                /* cache mode */
   std::map<int, std::vector<int>> routeCache_; /* use in cache mode */
 };

-}
-}
-} // namespaces
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 #endif /* SURF_ROUTING_DIJKSTRA_HPP_ */
 
 #endif /* SURF_ROUTING_DIJKSTRA_HPP_ */

diff --git a/src/kernel/routing/DragonflyZone.hpp b/include/simgrid/kernel/routing/DragonflyZone.hpp
similarity index 96%
rename from src/kernel/routing/DragonflyZone.hpp
rename to include/simgrid/kernel/routing/DragonflyZone.hpp
index 492613b..bf389a4 100644 (file)
--- a/src/kernel/routing/DragonflyZone.hpp
+++ b/include/simgrid/kernel/routing/DragonflyZone.hpp
@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
 #define SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
 
 #ifndef SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
 #define SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
 

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

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


@@ -84,7 +84,7 @@ private:
   unsigned int numLinksperLink_     = 1; // splitduplex -> 2, only for local link
   DragonflyRouter** routers_        = nullptr;
 };
   unsigned int numLinksperLink_     = 1; // splitduplex -> 2, only for local link
   DragonflyRouter** routers_        = nullptr;
 };

-}
-}
-}
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 #endif
 #endif

diff --git a/src/kernel/routing/EmptyZone.hpp b/include/simgrid/kernel/routing/EmptyZone.hpp
similarity index 94%
rename from src/kernel/routing/EmptyZone.hpp
rename to include/simgrid/kernel/routing/EmptyZone.hpp
index 2ec0d85..eb8898e 100644 (file)
--- a/src/kernel/routing/EmptyZone.hpp
+++ b/include/simgrid/kernel/routing/EmptyZone.hpp
@@ -32,8 +32,8 @@ public:
   void getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* /*nodes*/,
                 std::map<std::string, xbt_edge_t>* /*edges*/) override;
 };
   void getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* /*nodes*/,
                 std::map<std::string, xbt_edge_t>* /*edges*/) override;
 };

-}
-}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 #endif /* SURF_ROUTING_NONE_HPP_ */
 
 #endif /* SURF_ROUTING_NONE_HPP_ */

diff --git a/src/kernel/routing/FatTreeZone.hpp b/include/simgrid/kernel/routing/FatTreeZone.hpp
similarity index 96%
rename from src/kernel/routing/FatTreeZone.hpp
rename to include/simgrid/kernel/routing/FatTreeZone.hpp
index 73e313a..27bd621 100644 (file)
--- a/src/kernel/routing/FatTreeZone.hpp
+++ b/include/simgrid/kernel/routing/FatTreeZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2018. 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. */
 
 /* 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. */


@@ -6,7 +6,7 @@
 #ifndef SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_
 #define SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_
 
 #ifndef SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_
 #define SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_
 

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

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


@@ -139,8 +139,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);
 };

-}
-}
-} // namespaces
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 #endif
 
 #endif

diff --git a/src/kernel/routing/FloydZone.hpp b/include/simgrid/kernel/routing/FloydZone.hpp
similarity index 88%
rename from src/kernel/routing/FloydZone.hpp
rename to include/simgrid/kernel/routing/FloydZone.hpp
index c7479c2..8f67c09 100644 (file)
--- a/src/kernel/routing/FloydZone.hpp
+++ b/include/simgrid/kernel/routing/FloydZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. 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. */
 
 /* 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. */


@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_FLOYD_HPP_
 #define SURF_ROUTING_FLOYD_HPP_
 
 #ifndef SURF_ROUTING_FLOYD_HPP_
 #define SURF_ROUTING_FLOYD_HPP_
 

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

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


@@ -38,8 +38,8 @@ private:
   double* costTable_;
   RouteCreationArgs** linkTable_;
 };
   double* costTable_;
   RouteCreationArgs** linkTable_;
 };

-}
-}
-} // namespaces
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 #endif /* SURF_ROUTING_FLOYD_HPP_ */
 
 #endif /* SURF_ROUTING_FLOYD_HPP_ */

diff --git a/src/kernel/routing/FullZone.hpp b/include/simgrid/kernel/routing/FullZone.hpp
similarity index 87%
rename from src/kernel/routing/FullZone.hpp
rename to include/simgrid/kernel/routing/FullZone.hpp
index d92e444..a969f3b 100644 (file)
--- a/src/kernel/routing/FullZone.hpp
+++ b/include/simgrid/kernel/routing/FullZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. 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. */
 
 /* 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. */


@@ -6,7 +6,7 @@
 #ifndef SIMGRID_ROUTING_FULL_HPP_
 #define SIMGRID_ROUTING_FULL_HPP_
 
 #ifndef SIMGRID_ROUTING_FULL_HPP_
 #define SIMGRID_ROUTING_FULL_HPP_
 

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

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


@@ -31,8 +31,8 @@ public:
 
   RouteCreationArgs** routingTable_ = nullptr;
 };
 
   RouteCreationArgs** routingTable_ = nullptr;
 };

-}
-}
-} // namespaces
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 #endif /* SIMGRID_ROUTING_FULL_HPP_ */
 
 #endif /* SIMGRID_ROUTING_FULL_HPP_ */

diff --git a/src/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp
similarity index 94%
rename from src/kernel/routing/NetPoint.hpp
rename to include/simgrid/kernel/routing/NetPoint.hpp
index ee02d4a..8810824 100644 (file)
--- a/src/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 <src/kernel/routing/NetZoneImpl.hpp>

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


@@ -50,9 +50,9 @@ private:
   NetPoint::Type componentType_;
   NetZoneImpl* netzone_;
 };
   NetPoint::Type componentType_;
   NetZoneImpl* netzone_;
 };

-}
-}
-}
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 XBT_PUBLIC sg_netpoint_t sg_netpoint_by_name_or_null(const char* name);
 
 
 XBT_PUBLIC sg_netpoint_t sg_netpoint_by_name_or_null(const char* name);
 

diff --git a/src/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp
similarity index 97%
rename from src/kernel/routing/RoutedZone.hpp
rename to include/simgrid/kernel/routing/RoutedZone.hpp
index 1a874b0..168dbda 100644 (file)
--- a/src/kernel/routing/RoutedZone.hpp
+++ b/include/simgrid/kernel/routing/RoutedZone.hpp
@@ -64,9 +64,9 @@ protected:
                            kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                            std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical);
 };
                            kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                            std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical);
 };

-}
-}
-} // namespace
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 extern "C" {
 XBT_PRIVATE xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name,
 
 extern "C" {
 XBT_PRIVATE xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name,

diff --git a/src/kernel/routing/TorusZone.hpp b/include/simgrid/kernel/routing/TorusZone.hpp
similarity index 82%
rename from src/kernel/routing/TorusZone.hpp
rename to include/simgrid/kernel/routing/TorusZone.hpp
index ac04e68..463f654 100644 (file)
--- a/src/kernel/routing/TorusZone.hpp
+++ b/include/simgrid/kernel/routing/TorusZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2018. 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. */
 
 /* 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. */


@@ -6,7 +6,8 @@
 #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_
 #define SURF_ROUTING_CLUSTER_TORUS_HPP_
 
 #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_
 #define SURF_ROUTING_CLUSTER_TORUS_HPP_
 

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

 #include <vector>
 
 namespace simgrid {
 #include <vector>
 
 namespace simgrid {


@@ -28,7 +29,7 @@ public:
 private:
   std::vector<unsigned int> dimensions_;
 };
 private:
   std::vector<unsigned int> dimensions_;
 };

-}
-}
-}
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 #endif
 #endif

diff --git a/src/kernel/routing/VivaldiZone.hpp b/include/simgrid/kernel/routing/VivaldiZone.hpp
similarity index 91%
rename from src/kernel/routing/VivaldiZone.hpp
rename to include/simgrid/kernel/routing/VivaldiZone.hpp
index 794fe7a..ccec349 100644 (file)
--- a/src/kernel/routing/VivaldiZone.hpp
+++ b/include/simgrid/kernel/routing/VivaldiZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. 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. */
 
 /* 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. */


@@ -6,7 +6,8 @@
 #ifndef SURF_ROUTING_VIVALDI_HPP_
 #define SURF_ROUTING_VIVALDI_HPP_
 
 #ifndef SURF_ROUTING_VIVALDI_HPP_
 #define SURF_ROUTING_VIVALDI_HPP_
 

-#include "src/kernel/routing/ClusterZone.hpp"
+#include <simgrid/kernel/routing/ClusterZone.hpp>
+#include <xbt/Extendable.hpp>

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


@@ -60,9 +61,9 @@ public:
 
   std::vector<double> coords;
 };
 
   std::vector<double> coords;
 };

-}
-}
-}
-} // namespace
+} // namespace vivaldi
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid

 
 #endif /* SURF_ROUTING_VIVALDI_HPP_ */
 
 #endif /* SURF_ROUTING_VIVALDI_HPP_ */

diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index 37ec994..ebd4cb8 100644 (file)
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -6,7 +6,7 @@
 /* SimGrid Lua bindings                                                     */
 
 #include "lua_private.hpp"
 /* SimGrid Lua bindings                                                     */
 
 #include "lua_private.hpp"

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

 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include <cctype>
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include <cctype>

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index 455dffe..c500387 100644 (file)
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -1,12 +1,11 @@
-/* Copyright (c) 2010-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2010-2018. 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. */
 
 
 /* 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/NetPoint.hpp"

 #include "simgrid_config.h"
 #include "src/instr/instr_private.hpp"
 #include "simgrid_config.h"
 #include "src/instr/instr_private.hpp"

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

 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_private.hpp"
 #include "surf/surf.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/surf_private.hpp"
 #include "surf/surf.hpp"

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index c8c4895..52cc45d 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -1,11 +1,11 @@
-/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2016-2018. 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 "src/kernel/EngineImpl.hpp"
 
 /* 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/EngineImpl.hpp"

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

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

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

 #include "src/kernel/routing/NetZoneImpl.hpp"
 #include "src/surf/StorageImpl.hpp"
 
 #include "src/kernel/routing/NetZoneImpl.hpp"
 #include "src/surf/StorageImpl.hpp"
 

diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index e811dd1..954704f 100644 (file)
--- a/src/kernel/activity/CommImpl.cpp
+++ b/src/kernel/activity/CommImpl.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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 "src/kernel/activity/CommImpl.hpp"
 
 /* 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/activity/CommImpl.hpp"

-#include "src/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Action.hpp"

 
 #include "simgrid/modelchecker.h"
 #include "src/mc/mc_replay.hpp"
 
 #include "simgrid/modelchecker.h"
 #include "src/mc/mc_replay.hpp"

diff --git a/src/kernel/activity/SleepImpl.cpp b/src/kernel/activity/SleepImpl.cpp
index c8f76b3..ec7d083 100644 (file)
--- a/src/kernel/activity/SleepImpl.cpp
+++ b/src/kernel/activity/SleepImpl.cpp
@@ -5,9 +5,9 @@
 
 #include "simgrid/s4u/Host.hpp"
 
 
 #include "simgrid/s4u/Host.hpp"
 

+#include "simgrid/kernel/resource/Action.hpp"

 #include "src/kernel/activity/SleepImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 #include "src/kernel/activity/SleepImpl.hpp"
 #include "src/kernel/context/Context.hpp"

-#include "src/kernel/resource/Action.hpp"

 
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/popping_private.hpp"
 
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/popping_private.hpp"

diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp
index 5d7c25d..33b8c68 100644 (file)
--- a/src/kernel/activity/SynchroIo.cpp
+++ b/src/kernel/activity/SynchroIo.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. 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 "src/kernel/activity/SynchroIo.hpp"
 
 /* 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/activity/SynchroIo.hpp"

-#include "src/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Action.hpp"

 #include "src/simix/smx_private.hpp"
 #include "src/surf/surf_interface.hpp"
 
 #include "src/simix/smx_private.hpp"
 #include "src/surf/surf_interface.hpp"
 

diff --git a/src/kernel/activity/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp
index 3d60634..e0911fe 100644 (file)
--- a/src/kernel/activity/SynchroRaw.cpp
+++ b/src/kernel/activity/SynchroRaw.cpp
@@ -4,7 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/activity/SynchroRaw.hpp"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/activity/SynchroRaw.hpp"

-#include "src/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Action.hpp"

 #include "src/simix/smx_synchro_private.hpp"
 #include "src/surf/surf_interface.hpp"
 
 #include "src/simix/smx_synchro_private.hpp"
 #include "src/surf/surf_interface.hpp"
 

diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp
index c64d4d6..c37a5aa 100644 (file)
--- a/src/kernel/lmm/maxmin.hpp
+++ b/src/kernel/lmm/maxmin.hpp
@@ -6,14 +6,15 @@
 #ifndef SURF_MAXMIN_HPP
 #define SURF_MAXMIN_HPP
 
 #ifndef SURF_MAXMIN_HPP
 #define SURF_MAXMIN_HPP
 

+#include "simgrid/kernel/resource/Action.hpp"

 #include "src/internal_config.h"
 #include "src/internal_config.h"

-#include "src/kernel/resource/Action.hpp"

 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 #include "xbt/asserts.h"
 #include "xbt/mallocator.h"
 #include "xbt/misc.h"
 #include "xbt/utility.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "surf/surf.hpp"
 #include "xbt/asserts.h"
 #include "xbt/mallocator.h"
 #include "xbt/misc.h"
 #include "xbt/utility.hpp"

+

 #include <boost/intrusive/list.hpp>
 #include <cmath>
 #include <limits>
 #include <boost/intrusive/list.hpp>
 #include <cmath>
 #include <limits>

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index fac7b4a..0484060 100644 (file)
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.cpp
@@ -3,9 +3,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 "src/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Model.hpp"

 #include "src/kernel/lmm/maxmin.hpp"
 #include "src/kernel/lmm/maxmin.hpp"

-#include "src/kernel/resource/Model.hpp"

 
 XBT_LOG_NEW_CATEGORY(kernel, "Logging specific to the internals of SimGrid");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");
 
 XBT_LOG_NEW_CATEGORY(kernel, "Logging specific to the internals of SimGrid");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");

diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index 5d518ef..c078cbb 100644 (file)
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.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/resource/Model.hpp"
+#include "simgrid/kernel/resource/Model.hpp"

 #include "src/kernel/lmm/maxmin.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(resource);
 #include "src/kernel/lmm/maxmin.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(resource);

diff --git a/src/kernel/resource/Resource.cpp b/src/kernel/resource/Resource.cpp
index ff87ae8..ef78365 100644 (file)
--- a/src/kernel/resource/Resource.cpp
+++ b/src/kernel/resource/Resource.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/resource/Resource.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"

 #include "src/kernel/lmm/maxmin.hpp" // Constraint
 #include "src/surf/surf_interface.hpp"
 
 #include "src/kernel/lmm/maxmin.hpp" // Constraint
 #include "src/surf/surf_interface.hpp"
 

diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp
index 33e0863..58d8a72 100644 (file)
--- a/src/kernel/routing/ClusterZone.cpp
+++ b/src/kernel/routing/ClusterZone.cpp
@@ -1,11 +1,11 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
 
 
 /* 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/ClusterZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
-#include "src/kernel/routing/RoutedZone.hpp"
+#include "simgrid/kernel/routing/ClusterZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/RoutedZone.hpp"

 #include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
 #include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");

diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp
index 214a02f..0224455 100644 (file)
--- a/src/kernel/routing/DijkstraZone.cpp
+++ b/src/kernel/routing/DijkstraZone.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
 
 
 /* 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/DijkstraZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/DijkstraZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"

 #include "src/surf/network_interface.hpp"
 
 #include <cfloat>
 #include "src/surf/network_interface.hpp"
 
 #include <cfloat>

diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp
index 6b6f2c7..438320c 100644 (file)
--- a/src/kernel/routing/DragonflyZone.cpp
+++ b/src/kernel/routing/DragonflyZone.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2018. 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. */
 
 
 /* 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/DragonflyZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"

 #include "src/surf/network_interface.hpp"
 
 #include <boost/algorithm/string/classification.hpp>
 #include "src/surf/network_interface.hpp"
 
 #include <boost/algorithm/string/classification.hpp>

diff --git a/src/kernel/routing/EmptyZone.cpp b/src/kernel/routing/EmptyZone.cpp
index f4b386a..8615cfd 100644 (file)
--- a/src/kernel/routing/EmptyZone.cpp
+++ b/src/kernel/routing/EmptyZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
 
 /* 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. */


@@ -7,7 +7,7 @@
 #include <xbt/graph.h>
 #include <xbt/log.h>
 
 #include <xbt/graph.h>
 #include <xbt/log.h>
 

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

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 

diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp
index e8732f1..ad33b99 100644 (file)
--- a/src/kernel/routing/FatTreeZone.cpp
+++ b/src/kernel/routing/FatTreeZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2018. 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. */
 
 /* 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. */


@@ -7,8 +7,8 @@
 #include <sstream>
 #include <string>
 
 #include <sstream>
 #include <string>
 

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

 #include "src/surf/network_interface.hpp"
 
 #include <boost/algorithm/string/classification.hpp>
 #include "src/surf/network_interface.hpp"
 
 #include <boost/algorithm/string/classification.hpp>

diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp
index 3095394..8f14b40 100644 (file)
--- a/src/kernel/routing/FloydZone.cpp
+++ b/src/kernel/routing/FloydZone.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
 
 
 /* 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/FloydZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/FloydZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"

 #include "src/surf/network_interface.hpp"
 #include "xbt/log.h"
 
 #include "src/surf/network_interface.hpp"
 #include "xbt/log.h"
 

diff --git a/src/kernel/routing/FullZone.cpp b/src/kernel/routing/FullZone.cpp
index ddcaf3d..e83fda3 100644 (file)
--- a/src/kernel/routing/FullZone.cpp
+++ b/src/kernel/routing/FullZone.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
 
 
 /* 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/FullZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/FullZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"

 #include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
 #include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");

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

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

diff --git a/src/kernel/routing/NetZoneImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp
index 775bff4..2603077 100644 (file)
--- a/src/kernel/routing/NetZoneImpl.cpp
+++ b/src/kernel/routing/NetZoneImpl.cpp
@@ -1,12 +1,12 @@
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. 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 "src/kernel/routing/NetZoneImpl.hpp"
 
 /* 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/NetPoint.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/NetPoint.hpp"

 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
 
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
 

diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp
index 5c573be..1e4854a 100644 (file)
--- a/src/kernel/routing/RoutedZone.cpp
+++ b/src/kernel/routing/RoutedZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2018. 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. */
 
 /* 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. */


@@ -8,8 +8,8 @@
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
 
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
 

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

 #include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
 #include "src/surf/network_interface.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");

diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp
index 1d01cc9..0e45b81 100644 (file)
--- a/src/kernel/routing/TorusZone.cpp
+++ b/src/kernel/routing/TorusZone.cpp
@@ -1,11 +1,12 @@
-/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2014-2018. 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. */
 
 
 /* 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/TorusZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/TorusZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"

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

+

 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <string>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <string>

diff --git a/src/kernel/routing/VivaldiZone.cpp b/src/kernel/routing/VivaldiZone.cpp
index 5a0cfd4..bfdcbc2 100644 (file)
--- a/src/kernel/routing/VivaldiZone.cpp
+++ b/src/kernel/routing/VivaldiZone.cpp
@@ -1,17 +1,16 @@
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. 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. */
 
 
 /* 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 <boost/algorithm/string.hpp>
-
+#include "simgrid/kernel/routing/VivaldiZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.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/NetPoint.hpp"
-#include "src/kernel/routing/VivaldiZone.hpp"

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

+#include <boost/algorithm/string.hpp>
+

 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
 
 namespace simgrid {
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
 
 namespace simgrid {

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 542eb68..a5dd13d 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -1,12 +1,13 @@
 /* s4u::Engine Simulation Engine and global functions. */
 
 /* s4u::Engine Simulation Engine and global functions. */
 

-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. 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 "instr/instr_interface.h"
 #include "mc/mc.h"
 
 /* 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 "instr/instr_interface.h"
 #include "mc/mc.h"

+#include "simgrid/kernel/routing/NetPoint.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"


@@ -14,7 +15,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/NetPoint.hpp"

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

diff --git a/src/s4u/s4u_host.cpp b/src/s4u/s4u_host.cpp
index 2e25a3d..38b14b2 100644 (file)
--- a/src/s4u/s4u_host.cpp
+++ b/src/s4u/s4u_host.cpp
@@ -9,11 +9,11 @@
 
 #include <map>
 
 
 #include <map>
 

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

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

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

 #include "src/msg/msg_private.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.hpp"
 #include "src/msg/msg_private.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_private.hpp"

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index e4f6989..bff05a5 100644 (file)
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -5,10 +5,10 @@
 
 #include "xbt/log.h"
 
 
 #include "xbt/log.h"
 

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

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

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

 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");

diff --git a/src/s4u/s4u_storage.cpp b/src/s4u/s4u_storage.cpp
index 5ce0f07..e437850 100644 (file)
--- a/src/s4u/s4u_storage.cpp
+++ b/src/s4u/s4u_storage.cpp
@@ -3,12 +3,12 @@
 /* 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/resource/Resource.hpp"

 #include "simgrid/msg.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.hpp"
 #include "simgrid/msg.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Storage.hpp"
 #include "simgrid/simix.hpp"

-#include "src/kernel/resource/Resource.hpp"

 #include "src/plugins/file_system/FileSystem.hpp"
 #include "src/surf/StorageImpl.hpp"
 #include <unordered_map>
 #include "src/plugins/file_system/FileSystem.hpp"
 #include "src/surf/StorageImpl.hpp"
 #include <unordered_map>

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index da60d2d..24034d4 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -4,10 +4,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simdag_private.hpp"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simdag_private.hpp"

+#include "simgrid/kernel/resource/Action.hpp"

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.h"
 #include "src/include/instr/instr_interface.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.h"
 #include "src/include/instr/instr_interface.h"

-#include "src/kernel/resource/Action.hpp"

 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index e8ea892..0c38c67 100644 (file)
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. 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. */
 
 /* 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. */


@@ -12,7 +12,7 @@
 #include "xbt/Extendable.hpp"
 #include "xbt/dict.h"
 
 #include "xbt/Extendable.hpp"
 #include "xbt/dict.h"
 

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

 #include "src/simix/smx_host_private.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/cpu_interface.hpp"
 #include "src/simix/smx_host_private.hpp"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/cpu_interface.hpp"

diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp
index 6575a18..1f3d170 100644 (file)
--- a/src/surf/StorageImpl.hpp
+++ b/src/surf/StorageImpl.hpp
@@ -7,12 +7,13 @@
 #include <xbt/base.h>
 #include <xbt/signal.hpp>
 
 #include <xbt/base.h>
 #include <xbt/signal.hpp>
 

+#include "simgrid/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Model.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"

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

-#include "src/kernel/resource/Action.hpp"
-#include "src/kernel/resource/Model.hpp"
-#include "src/kernel/resource/Resource.hpp"

 #include "src/surf/PropertyHolder.hpp"
 #include "surf_interface.hpp"
 #include "src/surf/PropertyHolder.hpp"
 #include "surf_interface.hpp"

+

 #include <map>
 
 #ifndef STORAGE_INTERFACE_HPP_
 #include <map>
 
 #ifndef STORAGE_INTERFACE_HPP_

diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp
index 47ad57f..131a0a8 100644 (file)
--- a/src/surf/cpu_interface.hpp
+++ b/src/surf/cpu_interface.hpp
@@ -6,10 +6,10 @@
 #ifndef SURF_CPU_INTERFACE_HPP_
 #define SURF_CPU_INTERFACE_HPP_
 
 #ifndef SURF_CPU_INTERFACE_HPP_
 #define SURF_CPU_INTERFACE_HPP_
 

+#include "simgrid/kernel/resource/Model.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"

 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"

-#include "src/kernel/resource/Model.hpp"
-#include "src/kernel/resource/Resource.hpp"

 
 #include <list>
 
 
 #include <list>
 

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 05c22a1..722b012 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -5,9 +5,9 @@
 
 #include "src/instr/instr_private.hpp"
 
 
 #include "src/instr/instr_private.hpp"
 

+#include "simgrid/kernel/routing/NetPoint.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/NetPoint.hpp"

 #include "src/kernel/routing/NetZoneImpl.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "src/kernel/routing/NetZoneImpl.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index 8863627..373bc7a 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -6,13 +6,14 @@
 #ifndef SURF_NETWORK_INTERFACE_HPP_
 #define SURF_NETWORK_INTERFACE_HPP_
 
 #ifndef SURF_NETWORK_INTERFACE_HPP_
 #define SURF_NETWORK_INTERFACE_HPP_
 

+#include "simgrid/kernel/resource/Model.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"

 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "simgrid/s4u/Link.hpp"
 #include "src/kernel/lmm/maxmin.hpp"

-#include "src/kernel/resource/Model.hpp"
-#include "src/kernel/resource/Resource.hpp"

 #include "src/surf/PropertyHolder.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "xbt/base.h"
 #include "src/surf/PropertyHolder.hpp"
 #include "src/surf/surf_interface.hpp"
 #include "xbt/base.h"

+

 #include <list>
 #include <unordered_map>
 
 #include <list>
 #include <unordered_map>
 

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 05f1e9c..b49a92f 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -21,12 +21,11 @@
 #include "network_ns3.hpp"
 #include "ns3/ns3_simulator.hpp"
 
 #include "network_ns3.hpp"
 #include "ns3/ns3_simulator.hpp"
 

-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/kernel/routing/NetPoint.hpp"
-
+#include "simgrid/kernel/routing/NetPoint.hpp"

 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/plugins/energy.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/NetZone.hpp"

+#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
 

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index da184ba..9061aa7 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -15,17 +15,17 @@
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
 
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
 

-#include "src/kernel/routing/ClusterZone.hpp"
-#include "src/kernel/routing/DijkstraZone.hpp"
-#include "src/kernel/routing/DragonflyZone.hpp"
-#include "src/kernel/routing/EmptyZone.hpp"
-#include "src/kernel/routing/FatTreeZone.hpp"
-#include "src/kernel/routing/FloydZone.hpp"
-#include "src/kernel/routing/FullZone.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/ClusterZone.hpp"
+#include "simgrid/kernel/routing/DijkstraZone.hpp"
+#include "simgrid/kernel/routing/DragonflyZone.hpp"
+#include "simgrid/kernel/routing/EmptyZone.hpp"
+#include "simgrid/kernel/routing/FatTreeZone.hpp"
+#include "simgrid/kernel/routing/FloydZone.hpp"
+#include "simgrid/kernel/routing/FullZone.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/TorusZone.hpp"
+#include "simgrid/kernel/routing/VivaldiZone.hpp"

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

-#include "src/kernel/routing/TorusZone.hpp"
-#include "src/kernel/routing/VivaldiZone.hpp"

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

diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp
index 10fac18..d242419 100644 (file)
--- a/src/surf/storage_n11.cpp
+++ b/src/surf/storage_n11.cpp
@@ -4,10 +4,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "storage_n11.hpp"
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "storage_n11.hpp"

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

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "src/kernel/lmm/maxmin.hpp"

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

 #include "xbt/utility.hpp"
 #include <cmath> /*ceil*/
 
 #include "xbt/utility.hpp"
 #include <cmath> /*ceil*/
 

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 54f61e8..00c2e12 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -5,11 +5,11 @@
 
 #include "surf_interface.hpp"
 #include "mc/mc.h"
 
 #include "surf_interface.hpp"
 #include "mc/mc.h"

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

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.h"
 #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 #include "src/kernel/lmm/maxmin.hpp"   // Constraint
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.h"
 #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
 #include "src/kernel/lmm/maxmin.hpp"   // Constraint

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

 #include "src/surf/HostImpl.hpp"
 #include "xbt/utility.hpp"
 
 #include "src/surf/HostImpl.hpp"
 #include "xbt/utility.hpp"
 

diff --git a/src/surf/trace_mgr_test.cpp b/src/surf/trace_mgr_test.cpp
index 22eb441..fc8601a 100644 (file)
--- a/src/surf/trace_mgr_test.cpp
+++ b/src/surf/trace_mgr_test.cpp
@@ -9,7 +9,7 @@ bool init_unit_test(); // boost forget to give this prototype on NetBSD, which d
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
 
 #define BOOST_TEST_NO_MAIN
 #include <boost/test/unit_test.hpp>
 

-#include "src/kernel/resource/Resource.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"

 #include "src/surf/surf_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 
 #include "src/surf/surf_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index d3a1168..21662cf 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -1,11 +1,11 @@
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2018. 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. */
 
 
 /* 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/NetPoint.hpp"

 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/sg_config.h"

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

 #include "src/surf/network_interface.hpp"
 #include "xbt/file.hpp"
 
 #include "src/surf/network_interface.hpp"
 #include "xbt/file.hpp"
 

diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp
index cd94fdc..21b2947 100644 (file)
--- a/teshsuite/simdag/flatifier/flatifier.cpp
+++ b/teshsuite/simdag/flatifier/flatifier.cpp
@@ -1,16 +1,14 @@
-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2018. 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 <xbt/xbt_os_time.h>
 
 
 /* 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 <xbt/xbt_os_time.h>
 

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

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

-

 #include "simgrid/simdag.h"
 #include "simgrid/simdag.h"

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

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

diff --git a/teshsuite/simdag/is-router/is-router.cpp b/teshsuite/simdag/is-router/is-router.cpp
index 88b6530..5442286 100644 (file)
--- a/teshsuite/simdag/is-router/is-router.cpp
+++ b/teshsuite/simdag/is-router/is-router.cpp
@@ -1,12 +1,13 @@
-/* Copyright (c) 2008-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2008-2018. 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. */
 
 
 /* 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/NetPoint.hpp"

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

-#include "src/kernel/routing/NetPoint.hpp"
+

 #include <algorithm>
 #include <cstdio>
 
 #include <algorithm>
 #include <cstdio>
 

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index f0e541d..d63796f 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -297,24 +297,6 @@ endif()
 set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cpp )
 
 set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cpp )
 

-set(KERNEL_HEADERS
-  src/kernel/resource/Action.hpp
-  src/kernel/resource/Model.hpp
-  src/kernel/resource/Resource.hpp
-
-  src/kernel/routing/ClusterZone.hpp
-  src/kernel/routing/DijkstraZone.hpp
-  src/kernel/routing/DragonflyZone.hpp
-  src/kernel/routing/EmptyZone.hpp
-  src/kernel/routing/FatTreeZone.hpp
-  src/kernel/routing/FloydZone.hpp
-  src/kernel/routing/FullZone.hpp
-  src/kernel/routing/NetPoint.hpp
-  src/kernel/routing/RoutedZone.hpp
-  src/kernel/routing/TorusZone.hpp
-  src/kernel/routing/VivaldiZone.hpp  
-)
-

 set(SURF_SRC
   src/kernel/lmm/fair_bottleneck.cpp
   src/kernel/lmm/lagrange.cpp
 set(SURF_SRC
   src/kernel/lmm/fair_bottleneck.cpp
   src/kernel/lmm/lagrange.cpp


@@ -678,7 +660,6 @@ set(MC_SRC
 set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install
 set(MC_SIMGRID_MC_SRC  src/mc/checker/simgrid_mc.cpp)
 
 set(headers_to_install

-  ${KERNEL_HEADERS}

 
   include/simgrid/chrono.hpp
   include/simgrid/plugins/dvfs.h
 
   include/simgrid/chrono.hpp
   include/simgrid/plugins/dvfs.h


@@ -712,6 +693,23 @@ set(headers_to_install
   include/simgrid/s4u/Storage.hpp  
   include/simgrid/s4u/VirtualMachine.hpp  
   include/simgrid/s4u.hpp
   include/simgrid/s4u/Storage.hpp  
   include/simgrid/s4u/VirtualMachine.hpp  
   include/simgrid/s4u.hpp

+
+  include/simgrid/kernel/resource/Action.hpp
+  include/simgrid/kernel/resource/Model.hpp
+  include/simgrid/kernel/resource/Resource.hpp
+
+  include/simgrid/kernel/routing/ClusterZone.hpp
+  include/simgrid/kernel/routing/DijkstraZone.hpp
+  include/simgrid/kernel/routing/DragonflyZone.hpp
+  include/simgrid/kernel/routing/EmptyZone.hpp
+  include/simgrid/kernel/routing/FatTreeZone.hpp
+  include/simgrid/kernel/routing/FloydZone.hpp
+  include/simgrid/kernel/routing/FullZone.hpp
+  include/simgrid/kernel/routing/NetPoint.hpp
+  include/simgrid/kernel/routing/RoutedZone.hpp
+  include/simgrid/kernel/routing/TorusZone.hpp
+  include/simgrid/kernel/routing/VivaldiZone.hpp  
+

   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_main.h
   include/smpi/mpi.h
   include/smpi/smpi.h
   include/smpi/smpi_main.h

diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 9a20723..01e0885 100644 (file)
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -64,7 +64,6 @@ endif()
 foreach(file ${headers_to_install}  ${generated_headers_to_install})
   get_filename_component(location ${file} PATH)
   string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}")
 foreach(file ${headers_to_install}  ${generated_headers_to_install})
   get_filename_component(location ${file} PATH)
   string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" location "${location}")

-  string(REPLACE "src/" "include/simgrid/" location "${location}") # For kernel headers

   install(FILES ${file} DESTINATION ${location})
 endforeach()
 
   install(FILES ${file} DESTINATION ${location})
 endforeach()