From: Martin Quinson Date: Tue, 13 Dec 2016 08:55:07 +0000 (+0100) Subject: start renaming AS to NetZone X-Git-Tag: v3_14~60 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a22eb0ac7d22d5beaa6e33adf8f85c28dac59024 start renaming AS to NetZone These things are obviously not Autonomous Systems as in Internet: they form a hierarchy... That's an intrusive change ongoing, but we want the best for SimGrid, don't we? --- diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 552b4b0de6..f45db53728 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/EngineImpl.hpp" -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" #include namespace simgrid { diff --git a/src/kernel/routing/AsCluster.cpp b/src/kernel/routing/ClusterZone.cpp similarity index 99% rename from src/kernel/routing/AsCluster.cpp rename to src/kernel/routing/ClusterZone.cpp index 548ef8129d..520ac663e7 100644 --- a/src/kernel/routing/AsCluster.cpp +++ b/src/kernel/routing/ClusterZone.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. */ -#include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/ClusterZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsCluster.hpp b/src/kernel/routing/ClusterZone.hpp similarity index 96% rename from src/kernel/routing/AsCluster.hpp rename to src/kernel/routing/ClusterZone.hpp index 14d07c8d3f..8f08d195ef 100644 --- a/src/kernel/routing/AsCluster.hpp +++ b/src/kernel/routing/ClusterZone.hpp @@ -8,7 +8,7 @@ #include -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/routing/AsDijkstra.cpp b/src/kernel/routing/DijkstraZone.cpp similarity index 99% rename from src/kernel/routing/AsDijkstra.cpp rename to src/kernel/routing/DijkstraZone.cpp index af507338ff..10a5cc93b6 100644 --- a/src/kernel/routing/AsDijkstra.cpp +++ b/src/kernel/routing/DijkstraZone.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. */ -#include "src/kernel/routing/AsDijkstra.hpp" +#include "src/kernel/routing/DijkstraZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsDijkstra.hpp b/src/kernel/routing/DijkstraZone.hpp similarity index 97% rename from src/kernel/routing/AsDijkstra.hpp rename to src/kernel/routing/DijkstraZone.hpp index 95e89b734b..34c2d0e40e 100644 --- a/src/kernel/routing/AsDijkstra.hpp +++ b/src/kernel/routing/DijkstraZone.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_DIJKSTRA_HPP_ #define SURF_ROUTING_DIJKSTRA_HPP_ -#include "src/kernel/routing/AsRoutedGraph.hpp" +#include "src/kernel/routing/RoutedZone.hpp" typedef struct graph_node_data { int id; diff --git a/src/kernel/routing/AsClusterDragonfly.cpp b/src/kernel/routing/DragonflyZone.cpp similarity index 99% rename from src/kernel/routing/AsClusterDragonfly.cpp rename to src/kernel/routing/DragonflyZone.cpp index 11cbc8baf9..1ce8275dd8 100644 --- a/src/kernel/routing/AsClusterDragonfly.cpp +++ b/src/kernel/routing/DragonflyZone.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. */ -#include "src/kernel/routing/AsClusterDragonfly.hpp" +#include "src/kernel/routing/DragonflyZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsClusterDragonfly.hpp b/src/kernel/routing/DragonflyZone.hpp similarity index 98% rename from src/kernel/routing/AsClusterDragonfly.hpp rename to src/kernel/routing/DragonflyZone.hpp index 04aec20365..622945553f 100644 --- a/src/kernel/routing/AsClusterDragonfly.hpp +++ b/src/kernel/routing/DragonflyZone.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_ #define SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_ -#include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/ClusterZone.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/routing/AsNone.cpp b/src/kernel/routing/EmptyZone.cpp similarity index 94% rename from src/kernel/routing/AsNone.cpp rename to src/kernel/routing/EmptyZone.cpp index 5544222b95..50b9ac3ae3 100644 --- a/src/kernel/routing/AsNone.cpp +++ b/src/kernel/routing/EmptyZone.cpp @@ -7,7 +7,7 @@ #include #include -#include "src/kernel/routing/AsNone.hpp" +#include "src/kernel/routing/EmptyZone.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf"); diff --git a/src/kernel/routing/AsNone.hpp b/src/kernel/routing/EmptyZone.hpp similarity index 94% rename from src/kernel/routing/AsNone.hpp rename to src/kernel/routing/EmptyZone.hpp index 94dfa9a735..c7e5ec38e2 100644 --- a/src/kernel/routing/AsNone.hpp +++ b/src/kernel/routing/EmptyZone.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_NONE_HPP_ #define SURF_ROUTING_NONE_HPP_ -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/routing/AsClusterFatTree.cpp b/src/kernel/routing/FatTreeZone.cpp similarity index 99% rename from src/kernel/routing/AsClusterFatTree.cpp rename to src/kernel/routing/FatTreeZone.cpp index 47db2c398b..ef040f97fb 100644 --- a/src/kernel/routing/AsClusterFatTree.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -6,7 +6,7 @@ #include #include -#include "src/kernel/routing/AsClusterFatTree.hpp" +#include "src/kernel/routing/FatTreeZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsClusterFatTree.hpp b/src/kernel/routing/FatTreeZone.hpp similarity index 99% rename from src/kernel/routing/AsClusterFatTree.hpp rename to src/kernel/routing/FatTreeZone.hpp index 37690befde..91f2c54d31 100644 --- a/src/kernel/routing/AsClusterFatTree.hpp +++ b/src/kernel/routing/FatTreeZone.hpp @@ -6,7 +6,7 @@ #ifndef SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_ #define SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_ -#include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/ClusterZone.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/routing/AsFloyd.cpp b/src/kernel/routing/FloydZone.cpp similarity index 99% rename from src/kernel/routing/AsFloyd.cpp rename to src/kernel/routing/FloydZone.cpp index b9d098db3f..9a3333b176 100644 --- a/src/kernel/routing/AsFloyd.cpp +++ b/src/kernel/routing/FloydZone.cpp @@ -5,7 +5,7 @@ #include -#include "src/kernel/routing/AsFloyd.hpp" +#include "src/kernel/routing/FloydZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" #include "xbt/log.h" diff --git a/src/kernel/routing/AsFloyd.hpp b/src/kernel/routing/FloydZone.hpp similarity index 95% rename from src/kernel/routing/AsFloyd.hpp rename to src/kernel/routing/FloydZone.hpp index b5580e4ac7..1e5a87d48f 100644 --- a/src/kernel/routing/AsFloyd.hpp +++ b/src/kernel/routing/FloydZone.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_FLOYD_HPP_ #define SURF_ROUTING_FLOYD_HPP_ -#include "src/kernel/routing/AsRoutedGraph.hpp" +#include "src/kernel/routing/RoutedZone.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/routing/AsFull.cpp b/src/kernel/routing/FullZone.cpp similarity index 99% rename from src/kernel/routing/AsFull.cpp rename to src/kernel/routing/FullZone.cpp index eb84b0c392..2d5f73ea5c 100644 --- a/src/kernel/routing/AsFull.cpp +++ b/src/kernel/routing/FullZone.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. */ -#include "src/kernel/routing/AsFull.hpp" +#include "src/kernel/routing/FullZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsFull.hpp b/src/kernel/routing/FullZone.hpp similarity index 94% rename from src/kernel/routing/AsFull.hpp rename to src/kernel/routing/FullZone.hpp index 00dc02b9e3..ce252da0ca 100644 --- a/src/kernel/routing/AsFull.hpp +++ b/src/kernel/routing/FullZone.hpp @@ -6,7 +6,7 @@ #ifndef SIMGRID_ROUTING_FULL_HPP_ #define SIMGRID_ROUTING_FULL_HPP_ -#include "src/kernel/routing/AsRoutedGraph.hpp" +#include "src/kernel/routing/RoutedZone.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/routing/NetCard.hpp b/src/kernel/routing/NetCard.hpp index c42b6c9a34..3be88da83a 100644 --- a/src/kernel/routing/NetCard.hpp +++ b/src/kernel/routing/NetCard.hpp @@ -10,7 +10,7 @@ #include #include -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" /* #include #include diff --git a/src/kernel/routing/AsImpl.cpp b/src/kernel/routing/NetZoneImpl.cpp similarity index 99% rename from src/kernel/routing/AsImpl.cpp rename to src/kernel/routing/NetZoneImpl.cpp index d30d7866fd..5e6bd31676 100644 --- a/src/kernel/routing/AsImpl.cpp +++ b/src/kernel/routing/NetZoneImpl.cpp @@ -6,7 +6,7 @@ #include "xbt/log.h" #include "simgrid/s4u/host.hpp" -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsImpl.hpp b/src/kernel/routing/NetZoneImpl.hpp similarity index 100% rename from src/kernel/routing/AsImpl.hpp rename to src/kernel/routing/NetZoneImpl.hpp diff --git a/src/kernel/routing/AsRoutedGraph.cpp b/src/kernel/routing/RoutedZone.cpp similarity index 99% rename from src/kernel/routing/AsRoutedGraph.cpp rename to src/kernel/routing/RoutedZone.cpp index 7a9676830b..4c67d85908 100644 --- a/src/kernel/routing/AsRoutedGraph.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -9,7 +9,7 @@ #include "xbt/dynar.h" #include "xbt/graph.h" -#include "src/kernel/routing/AsRoutedGraph.hpp" +#include "src/kernel/routing/RoutedZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsRoutedGraph.hpp b/src/kernel/routing/RoutedZone.hpp similarity index 95% rename from src/kernel/routing/AsRoutedGraph.hpp rename to src/kernel/routing/RoutedZone.hpp index e5967d68c1..0ecf61526f 100644 --- a/src/kernel/routing/AsRoutedGraph.hpp +++ b/src/kernel/routing/RoutedZone.hpp @@ -6,7 +6,7 @@ #ifndef SIMGRID_ROUTING_GENERIC_HPP_ #define SIMGRID_ROUTING_GENERIC_HPP_ -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/routing/AsClusterTorus.cpp b/src/kernel/routing/TorusZone.cpp similarity index 99% rename from src/kernel/routing/AsClusterTorus.cpp rename to src/kernel/routing/TorusZone.cpp index 495f5bbc9f..7785d210a9 100644 --- a/src/kernel/routing/AsClusterTorus.cpp +++ b/src/kernel/routing/TorusZone.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. */ -#include "src/kernel/routing/AsClusterTorus.hpp" +#include "src/kernel/routing/TorusZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsClusterTorus.hpp b/src/kernel/routing/TorusZone.hpp similarity index 95% rename from src/kernel/routing/AsClusterTorus.hpp rename to src/kernel/routing/TorusZone.hpp index 8229fcc55d..d53af2ea76 100644 --- a/src/kernel/routing/AsClusterTorus.hpp +++ b/src/kernel/routing/TorusZone.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_ #define SURF_ROUTING_CLUSTER_TORUS_HPP_ -#include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/ClusterZone.hpp" namespace simgrid { namespace kernel { diff --git a/src/kernel/routing/AsVivaldi.cpp b/src/kernel/routing/VivaldiZone.cpp similarity index 98% rename from src/kernel/routing/AsVivaldi.cpp rename to src/kernel/routing/VivaldiZone.cpp index 216b7880a6..84bdcb39f5 100644 --- a/src/kernel/routing/AsVivaldi.cpp +++ b/src/kernel/routing/VivaldiZone.cpp @@ -7,7 +7,7 @@ #include -#include "src/kernel/routing/AsVivaldi.hpp" +#include "src/kernel/routing/VivaldiZone.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" diff --git a/src/kernel/routing/AsVivaldi.hpp b/src/kernel/routing/VivaldiZone.hpp similarity index 95% rename from src/kernel/routing/AsVivaldi.hpp rename to src/kernel/routing/VivaldiZone.hpp index c348ce0747..d757c9f55e 100644 --- a/src/kernel/routing/AsVivaldi.hpp +++ b/src/kernel/routing/VivaldiZone.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_VIVALDI_HPP_ #define SURF_ROUTING_VIVALDI_HPP_ -#include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/ClusterZone.hpp" namespace simgrid { namespace kernel { diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp index 96f3fff7d6..439771a049 100644 --- a/src/s4u/s4u_engine.cpp +++ b/src/s4u/s4u_engine.cpp @@ -15,7 +15,7 @@ #include "simgrid/simix.h" #include "simgrid/simix.h" #include "src/kernel/EngineImpl.hpp" -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index 0bf0be396e..b28c1e0612 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -8,7 +8,7 @@ #include "simgrid/s4u/engine.hpp" #include "simgrid/s4u/host.hpp" -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" #include "src/surf/xml/platf_private.hpp" #include "surf/surf.h" #include "xbt/graph.h" diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index b8b07effad..442574b29f 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -25,16 +25,16 @@ #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "src/kernel/routing/AsCluster.hpp" -#include "src/kernel/routing/AsClusterDragonfly.hpp" -#include "src/kernel/routing/AsClusterFatTree.hpp" -#include "src/kernel/routing/AsClusterTorus.hpp" -#include "src/kernel/routing/AsDijkstra.hpp" -#include "src/kernel/routing/AsFloyd.hpp" -#include "src/kernel/routing/AsFull.hpp" -#include "src/kernel/routing/AsImpl.hpp" -#include "src/kernel/routing/AsNone.hpp" -#include "src/kernel/routing/AsVivaldi.hpp" +#include "src/kernel/routing/ClusterZone.hpp" +#include "src/kernel/routing/DragonflyZone.hpp" +#include "src/kernel/routing/FatTreeZone.hpp" +#include "src/kernel/routing/TorusZone.hpp" +#include "src/kernel/routing/DijkstraZone.hpp" +#include "src/kernel/routing/FloydZone.hpp" +#include "src/kernel/routing/FullZone.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" +#include "src/kernel/routing/EmptyZone.hpp" +#include "src/kernel/routing/VivaldiZone.hpp" #include "src/kernel/routing/NetCard.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 63cbd5a002..0db638b501 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -10,7 +10,7 @@ #include #include "surf_interface.hpp" -#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" #include #include diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 9a03640437..e2f7c19df8 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -63,19 +63,6 @@ set(EXTRA_DIST src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp - src/kernel/routing/AsImpl.hpp - src/kernel/routing/AsCluster.hpp - src/kernel/routing/AsClusterFatTree.hpp - src/kernel/routing/AsClusterTorus.hpp - src/kernel/routing/AsClusterDragonfly.hpp - src/kernel/routing/AsDijkstra.hpp - src/kernel/routing/AsFloyd.hpp - src/kernel/routing/AsFull.hpp - src/kernel/routing/AsRoutedGraph.hpp - src/kernel/routing/AsNone.hpp - src/kernel/routing/AsVivaldi.hpp - src/kernel/routing/NetCard.hpp - src/surf/storage_interface.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp @@ -295,19 +282,31 @@ set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/ns3_simulator.cc ) set(SURF_SRC - src/kernel/routing/AsImpl.cpp - src/kernel/routing/AsCluster.cpp - src/kernel/routing/AsClusterFatTree.cpp - src/kernel/routing/AsClusterTorus.cpp - src/kernel/routing/AsClusterDragonfly.cpp - src/kernel/routing/AsDijkstra.cpp - src/kernel/routing/AsFloyd.cpp - src/kernel/routing/AsFull.cpp - src/kernel/routing/AsRoutedGraph.cpp - src/kernel/routing/AsNone.cpp - src/kernel/routing/AsVivaldi.cpp + src/kernel/routing/ClusterZone.cpp + src/kernel/routing/ClusterZone.hpp + src/kernel/routing/DijkstraZone.cpp + src/kernel/routing/DijkstraZone.hpp + src/kernel/routing/DragonflyZone.cpp + src/kernel/routing/DragonflyZone.hpp + src/kernel/routing/EmptyZone.cpp + src/kernel/routing/EmptyZone.hpp + src/kernel/routing/FatTreeZone.cpp + src/kernel/routing/FatTreeZone.hpp + src/kernel/routing/FloydZone.cpp + src/kernel/routing/FloydZone.hpp + src/kernel/routing/FullZone.cpp + src/kernel/routing/FullZone.hpp src/kernel/routing/NetCard.cpp - + src/kernel/routing/NetCard.hpp + src/kernel/routing/NetZoneImpl.cpp + src/kernel/routing/NetZoneImpl.hpp + src/kernel/routing/RoutedZone.cpp + src/kernel/routing/RoutedZone.hpp + src/kernel/routing/TorusZone.cpp + src/kernel/routing/TorusZone.hpp + src/kernel/routing/VivaldiZone.cpp + src/kernel/routing/VivaldiZone.hpp + src/kernel/EngineImpl.cpp src/kernel/EngineImpl.hpp