From: Martin Quinson Date: Sun, 31 Jul 2016 08:52:43 +0000 (+0200) Subject: move parts of the kernel to the right subdir X-Git-Tag: v3_14~689 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/831de10adaaf8910940aa280e2ac2dd075b5ffe5 move parts of the kernel to the right subdir --- diff --git a/src/synchro/Synchro.cpp b/src/kernel/activity/Synchro.cpp similarity index 93% rename from src/synchro/Synchro.cpp rename to src/kernel/activity/Synchro.cpp index 92be33db37..da79e88d34 100644 --- a/src/synchro/Synchro.cpp +++ b/src/kernel/activity/Synchro.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/synchro/Synchro.h" +#include "src/kernel/activity/Synchro.h" simgrid::simix::Synchro::Synchro() { diff --git a/src/synchro/Synchro.h b/src/kernel/activity/Synchro.h similarity index 100% rename from src/synchro/Synchro.h rename to src/kernel/activity/Synchro.h diff --git a/src/synchro/SynchroComm.cpp b/src/kernel/activity/SynchroComm.cpp similarity index 98% rename from src/synchro/SynchroComm.cpp rename to src/kernel/activity/SynchroComm.cpp index 283e925a3c..a0058b1c90 100644 --- a/src/synchro/SynchroComm.cpp +++ b/src/kernel/activity/SynchroComm.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/synchro/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" #include "src/surf/surf_interface.hpp" #include "src/simix/smx_network_private.h" #include "simgrid/modelchecker.h" diff --git a/src/synchro/SynchroComm.hpp b/src/kernel/activity/SynchroComm.hpp similarity index 98% rename from src/synchro/SynchroComm.hpp rename to src/kernel/activity/SynchroComm.hpp index eb88c49491..264d598818 100644 --- a/src/synchro/SynchroComm.hpp +++ b/src/kernel/activity/SynchroComm.hpp @@ -7,7 +7,7 @@ #define _SIMIX_SYNCHRO_COMM_HPP #include "surf/surf.h" -#include "src/synchro/Synchro.h" +#include "src/kernel/activity/Synchro.h" typedef enum { SIMIX_COMM_SEND, diff --git a/src/synchro/SynchroExec.cpp b/src/kernel/activity/SynchroExec.cpp similarity index 97% rename from src/synchro/SynchroExec.cpp rename to src/kernel/activity/SynchroExec.cpp index 5fad86a5b6..6ec1d18573 100644 --- a/src/synchro/SynchroExec.cpp +++ b/src/kernel/activity/SynchroExec.cpp @@ -5,7 +5,7 @@ #include -#include "src/synchro/SynchroExec.hpp" +#include "src/kernel/activity/SynchroExec.hpp" #include "src/surf/surf_interface.hpp" #include "src/simix/smx_host_private.h" diff --git a/src/synchro/SynchroExec.hpp b/src/kernel/activity/SynchroExec.hpp similarity index 95% rename from src/synchro/SynchroExec.hpp rename to src/kernel/activity/SynchroExec.hpp index 232ff6a1ae..b9747b8341 100644 --- a/src/synchro/SynchroExec.hpp +++ b/src/kernel/activity/SynchroExec.hpp @@ -7,7 +7,7 @@ #define _SIMIX_SYNCHRO_EXEC_HPP #include "surf/surf.h" -#include "src/synchro/Synchro.h" +#include "src/kernel/activity/Synchro.h" namespace simgrid { namespace simix { diff --git a/src/synchro/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp similarity index 97% rename from src/synchro/SynchroIo.cpp rename to src/kernel/activity/SynchroIo.cpp index 4c77129538..05a7245e52 100644 --- a/src/synchro/SynchroIo.cpp +++ b/src/kernel/activity/SynchroIo.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/synchro/SynchroIo.hpp" +#include "src/kernel/activity/SynchroIo.hpp" #include "src/surf/surf_interface.hpp" #include "src/simix/popping_private.h" #include "src/simix/smx_private.h" diff --git a/src/synchro/SynchroIo.hpp b/src/kernel/activity/SynchroIo.hpp similarity index 93% rename from src/synchro/SynchroIo.hpp rename to src/kernel/activity/SynchroIo.hpp index 202b63511c..ef9213d407 100644 --- a/src/synchro/SynchroIo.hpp +++ b/src/kernel/activity/SynchroIo.hpp @@ -7,7 +7,7 @@ #define _SIMIX_SYNCHRO_IO_HPP #include "surf/surf.h" -#include "src/synchro/Synchro.h" +#include "src/kernel/activity/Synchro.h" namespace simgrid { namespace simix { diff --git a/src/synchro/SynchroRaw.cpp b/src/kernel/activity/SynchroRaw.cpp similarity index 95% rename from src/synchro/SynchroRaw.cpp rename to src/kernel/activity/SynchroRaw.cpp index 02e37dba7f..8fc2551eae 100644 --- a/src/synchro/SynchroRaw.cpp +++ b/src/kernel/activity/SynchroRaw.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/synchro/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" #include "src/surf/surf_interface.hpp" #include "src/simix/smx_synchro_private.h" diff --git a/src/synchro/SynchroRaw.hpp b/src/kernel/activity/SynchroRaw.hpp similarity index 94% rename from src/synchro/SynchroRaw.hpp rename to src/kernel/activity/SynchroRaw.hpp index d2ff8895e2..05914c05d2 100644 --- a/src/synchro/SynchroRaw.hpp +++ b/src/kernel/activity/SynchroRaw.hpp @@ -7,7 +7,7 @@ #define _SIMIX_SYNCHRO_RAW_HPP #include "surf/surf.h" -#include "src/synchro/Synchro.h" +#include "src/kernel/activity/Synchro.h" namespace simgrid { namespace simix { diff --git a/src/synchro/SynchroSleep.cpp b/src/kernel/activity/SynchroSleep.cpp similarity index 97% rename from src/synchro/SynchroSleep.cpp rename to src/kernel/activity/SynchroSleep.cpp index 63415740b6..c82a720f70 100644 --- a/src/synchro/SynchroSleep.cpp +++ b/src/kernel/activity/SynchroSleep.cpp @@ -7,7 +7,7 @@ #include -#include "src/synchro/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" #include "src/surf/surf_interface.hpp" #include "src/simix/popping_private.h" #include "src/simix/smx_process_private.h" diff --git a/src/synchro/SynchroSleep.hpp b/src/kernel/activity/SynchroSleep.hpp similarity index 94% rename from src/synchro/SynchroSleep.hpp rename to src/kernel/activity/SynchroSleep.hpp index 749195cd74..1b838feb81 100644 --- a/src/synchro/SynchroSleep.hpp +++ b/src/kernel/activity/SynchroSleep.hpp @@ -7,7 +7,7 @@ #define _SIMIX_SYNCHRO_SLEEP_HPP #include "surf/surf.h" -#include "src/synchro/Synchro.h" +#include "src/kernel/activity/Synchro.h" namespace simgrid { namespace simix { diff --git a/src/routing/AsCluster.cpp b/src/kernel/routing/AsCluster.cpp similarity index 99% rename from src/routing/AsCluster.cpp rename to src/kernel/routing/AsCluster.cpp index b885a6dbd0..10ef461a3c 100644 --- a/src/routing/AsCluster.cpp +++ b/src/kernel/routing/AsCluster.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/routing/AsCluster.hpp" +#include "src/kernel/routing/AsCluster.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"); diff --git a/src/routing/AsCluster.hpp b/src/kernel/routing/AsCluster.hpp similarity index 96% rename from src/routing/AsCluster.hpp rename to src/kernel/routing/AsCluster.hpp index 803524d5ed..4b747b1b21 100644 --- a/src/routing/AsCluster.hpp +++ b/src/kernel/routing/AsCluster.hpp @@ -6,7 +6,7 @@ #ifndef SIMGRID_ROUTING_CLUSTER_HPP_ #define SIMGRID_ROUTING_CLUSTER_HPP_ -#include "src/routing/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" namespace simgrid { namespace routing { diff --git a/src/routing/AsClusterDragonfly.cpp b/src/kernel/routing/AsClusterDragonfly.cpp similarity index 99% rename from src/routing/AsClusterDragonfly.cpp rename to src/kernel/routing/AsClusterDragonfly.cpp index 2c9453e1e1..0a2f42f59a 100644 --- a/src/routing/AsClusterDragonfly.cpp +++ b/src/kernel/routing/AsClusterDragonfly.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/routing/AsClusterDragonfly.hpp" +#include "src/kernel/routing/AsClusterDragonfly.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area diff --git a/src/routing/AsClusterDragonfly.hpp b/src/kernel/routing/AsClusterDragonfly.hpp similarity index 98% rename from src/routing/AsClusterDragonfly.hpp rename to src/kernel/routing/AsClusterDragonfly.hpp index 3e3c0809f4..e275d6752c 100644 --- a/src/routing/AsClusterDragonfly.hpp +++ b/src/kernel/routing/AsClusterDragonfly.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_ #define SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_ -#include "src/routing/AsCluster.hpp" +#include "src/kernel/routing/AsCluster.hpp" namespace simgrid { namespace routing { diff --git a/src/routing/AsClusterFatTree.cpp b/src/kernel/routing/AsClusterFatTree.cpp similarity index 99% rename from src/routing/AsClusterFatTree.cpp rename to src/kernel/routing/AsClusterFatTree.cpp index d6025d10c1..9b07520ce6 100644 --- a/src/routing/AsClusterFatTree.cpp +++ b/src/kernel/routing/AsClusterFatTree.cpp @@ -6,7 +6,7 @@ #include #include -#include "src/routing/AsClusterFatTree.hpp" +#include "src/kernel/routing/AsClusterFatTree.hpp" #include "src/surf/network_interface.hpp" #include "xbt/lib.h" diff --git a/src/routing/AsClusterFatTree.hpp b/src/kernel/routing/AsClusterFatTree.hpp similarity index 99% rename from src/routing/AsClusterFatTree.hpp rename to src/kernel/routing/AsClusterFatTree.hpp index 31ef2645b6..6854f63378 100644 --- a/src/routing/AsClusterFatTree.hpp +++ b/src/kernel/routing/AsClusterFatTree.hpp @@ -6,7 +6,7 @@ #ifndef SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_ #define SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_ -#include "src/routing/AsCluster.hpp" +#include "src/kernel/routing/AsCluster.hpp" namespace simgrid { namespace routing { diff --git a/src/routing/AsClusterTorus.cpp b/src/kernel/routing/AsClusterTorus.cpp similarity index 99% rename from src/routing/AsClusterTorus.cpp rename to src/kernel/routing/AsClusterTorus.cpp index b5a9bcbcae..2a11c9a0ad 100644 --- a/src/routing/AsClusterTorus.cpp +++ b/src/kernel/routing/AsClusterTorus.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/routing/AsClusterTorus.hpp" +#include "src/kernel/routing/AsClusterTorus.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area diff --git a/src/routing/AsClusterTorus.hpp b/src/kernel/routing/AsClusterTorus.hpp similarity index 95% rename from src/routing/AsClusterTorus.hpp rename to src/kernel/routing/AsClusterTorus.hpp index e3953fc441..b3b61ed079 100644 --- a/src/routing/AsClusterTorus.hpp +++ b/src/kernel/routing/AsClusterTorus.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_ #define SURF_ROUTING_CLUSTER_TORUS_HPP_ -#include "src/routing/AsCluster.hpp" +#include "src/kernel/routing/AsCluster.hpp" namespace simgrid { namespace routing { diff --git a/src/routing/AsDijkstra.cpp b/src/kernel/routing/AsDijkstra.cpp similarity index 99% rename from src/routing/AsDijkstra.cpp rename to src/kernel/routing/AsDijkstra.cpp index b30fc836fc..98b87195e1 100644 --- a/src/routing/AsDijkstra.cpp +++ b/src/kernel/routing/AsDijkstra.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/routing/AsDijkstra.hpp" +#include "src/kernel/routing/AsDijkstra.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); diff --git a/src/routing/AsDijkstra.hpp b/src/kernel/routing/AsDijkstra.hpp similarity index 97% rename from src/routing/AsDijkstra.hpp rename to src/kernel/routing/AsDijkstra.hpp index e2e86d9f36..cf313b5972 100644 --- a/src/routing/AsDijkstra.hpp +++ b/src/kernel/routing/AsDijkstra.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_DIJKSTRA_HPP_ #define SURF_ROUTING_DIJKSTRA_HPP_ -#include "src/routing/AsRoutedGraph.hpp" +#include "src/kernel/routing/AsRoutedGraph.hpp" typedef struct graph_node_data { int id; diff --git a/src/routing/AsFloyd.cpp b/src/kernel/routing/AsFloyd.cpp similarity index 99% rename from src/routing/AsFloyd.cpp rename to src/kernel/routing/AsFloyd.cpp index b7af52b32b..87ca9652cd 100644 --- a/src/routing/AsFloyd.cpp +++ b/src/kernel/routing/AsFloyd.cpp @@ -5,7 +5,7 @@ #include "xbt/log.h" #include "xbt/dynar.h" -#include "src/routing/AsFloyd.hpp" +#include "src/kernel/routing/AsFloyd.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); diff --git a/src/routing/AsFloyd.hpp b/src/kernel/routing/AsFloyd.hpp similarity index 95% rename from src/routing/AsFloyd.hpp rename to src/kernel/routing/AsFloyd.hpp index af0c5b7309..3f53c96456 100644 --- a/src/routing/AsFloyd.hpp +++ b/src/kernel/routing/AsFloyd.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_FLOYD_HPP_ #define SURF_ROUTING_FLOYD_HPP_ -#include "src/routing/AsRoutedGraph.hpp" +#include "src/kernel/routing/AsRoutedGraph.hpp" namespace simgrid { namespace routing { diff --git a/src/routing/AsFull.cpp b/src/kernel/routing/AsFull.cpp similarity index 99% rename from src/routing/AsFull.cpp rename to src/kernel/routing/AsFull.cpp index 339b45c833..d2c6438171 100644 --- a/src/routing/AsFull.cpp +++ b/src/kernel/routing/AsFull.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/routing/AsFull.hpp" +#include "src/kernel/routing/AsFull.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf"); diff --git a/src/routing/AsFull.hpp b/src/kernel/routing/AsFull.hpp similarity index 94% rename from src/routing/AsFull.hpp rename to src/kernel/routing/AsFull.hpp index 5ea60ff3a5..bf7668b92a 100644 --- a/src/routing/AsFull.hpp +++ b/src/kernel/routing/AsFull.hpp @@ -6,7 +6,7 @@ #ifndef SIMGRID_ROUTING_FULL_HPP_ #define SIMGRID_ROUTING_FULL_HPP_ -#include "src/routing/AsRoutedGraph.hpp" +#include "src/kernel/routing/AsRoutedGraph.hpp" namespace simgrid { namespace routing { diff --git a/src/routing/AsImpl.cpp b/src/kernel/routing/AsImpl.cpp similarity index 99% rename from src/routing/AsImpl.cpp rename to src/kernel/routing/AsImpl.cpp index c76003f7b2..40c940052d 100644 --- a/src/routing/AsImpl.cpp +++ b/src/kernel/routing/AsImpl.cpp @@ -5,7 +5,7 @@ #include "xbt/log.h" -#include "src/routing/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header XBT_LOG_NEW_DEFAULT_SUBCATEGORY(AsImpl,surf, "Implementation of S4U autonomous systems"); diff --git a/src/routing/AsImpl.hpp b/src/kernel/routing/AsImpl.hpp similarity index 100% rename from src/routing/AsImpl.hpp rename to src/kernel/routing/AsImpl.hpp diff --git a/src/routing/AsNone.cpp b/src/kernel/routing/AsNone.cpp similarity index 95% rename from src/routing/AsNone.cpp rename to src/kernel/routing/AsNone.cpp index 8213101ae1..41c6272bac 100644 --- a/src/routing/AsNone.cpp +++ b/src/kernel/routing/AsNone.cpp @@ -7,7 +7,7 @@ #include #include -#include "src/routing/AsNone.hpp" +#include "src/kernel/routing/AsNone.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf"); diff --git a/src/routing/AsNone.hpp b/src/kernel/routing/AsNone.hpp similarity index 94% rename from src/routing/AsNone.hpp rename to src/kernel/routing/AsNone.hpp index 1490dd3ca0..f711f51029 100644 --- a/src/routing/AsNone.hpp +++ b/src/kernel/routing/AsNone.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_NONE_HPP_ #define SURF_ROUTING_NONE_HPP_ -#include "src/routing/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" namespace simgrid { namespace routing { diff --git a/src/routing/AsRoutedGraph.cpp b/src/kernel/routing/AsRoutedGraph.cpp similarity index 99% rename from src/routing/AsRoutedGraph.cpp rename to src/kernel/routing/AsRoutedGraph.cpp index 7117c1dcff..090c63d66a 100644 --- a/src/routing/AsRoutedGraph.cpp +++ b/src/kernel/routing/AsRoutedGraph.cpp @@ -9,7 +9,7 @@ #include "xbt/dynar.h" #include "xbt/graph.h" -#include "src/routing/AsRoutedGraph.hpp" +#include "src/kernel/routing/AsRoutedGraph.hpp" #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/routing/AsRoutedGraph.hpp b/src/kernel/routing/AsRoutedGraph.hpp similarity index 95% rename from src/routing/AsRoutedGraph.hpp rename to src/kernel/routing/AsRoutedGraph.hpp index 5e9b00fbe9..89dc2e2772 100644 --- a/src/routing/AsRoutedGraph.hpp +++ b/src/kernel/routing/AsRoutedGraph.hpp @@ -6,7 +6,7 @@ #ifndef SIMGRID_ROUTING_GENERIC_HPP_ #define SIMGRID_ROUTING_GENERIC_HPP_ -#include "src/routing/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" namespace simgrid { namespace routing { diff --git a/src/routing/AsVivaldi.cpp b/src/kernel/routing/AsVivaldi.cpp similarity index 98% rename from src/routing/AsVivaldi.cpp rename to src/kernel/routing/AsVivaldi.cpp index d835dabffe..964ee76c36 100644 --- a/src/routing/AsVivaldi.cpp +++ b/src/kernel/routing/AsVivaldi.cpp @@ -7,7 +7,7 @@ #include -#include "src/routing/AsVivaldi.hpp" +#include "src/kernel/routing/AsVivaldi.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf"); diff --git a/src/routing/AsVivaldi.hpp b/src/kernel/routing/AsVivaldi.hpp similarity index 94% rename from src/routing/AsVivaldi.hpp rename to src/kernel/routing/AsVivaldi.hpp index 712db43d71..adf5ba1e94 100644 --- a/src/routing/AsVivaldi.hpp +++ b/src/kernel/routing/AsVivaldi.hpp @@ -6,7 +6,7 @@ #ifndef SURF_ROUTING_VIVALDI_HPP_ #define SURF_ROUTING_VIVALDI_HPP_ -#include "src/routing/AsCluster.hpp" +#include "src/kernel/routing/AsCluster.hpp" namespace simgrid { namespace routing { diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 01eee91eb2..c068886e94 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -20,12 +20,12 @@ #include "mc/mc.h" #include "src/mc/mc_protocol.h" -#include "src/synchro/Synchro.h" -#include "src/synchro/SynchroIo.hpp" -#include "src/synchro/SynchroComm.hpp" -#include "src/synchro/SynchroRaw.hpp" -#include "src/synchro/SynchroSleep.hpp" -#include "src/synchro/SynchroExec.hpp" +#include "src/kernel/activity/Synchro.h" +#include "src/kernel/activity/SynchroIo.hpp" +#include "src/kernel/activity/SynchroComm.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroExec.hpp" #if HAVE_MC #include "src/mc/mc_request.h" diff --git a/src/mc/mc_state.h b/src/mc/mc_state.h index bcb13df641..81e2e34758 100644 --- a/src/mc/mc_state.h +++ b/src/mc/mc_state.h @@ -15,11 +15,11 @@ #include #include "src/simix/smx_private.h" -#include "src/synchro/SynchroIo.hpp" -#include "src/synchro/SynchroComm.hpp" -#include "src/synchro/SynchroRaw.hpp" -#include "src/synchro/SynchroSleep.hpp" -#include "src/synchro/SynchroExec.hpp" +#include "src/kernel/activity/SynchroIo.hpp" +#include "src/kernel/activity/SynchroComm.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroExec.hpp" #include "src/mc/mc_snapshot.h" #include "src/mc/mc_record.h" #include "src/mc/Transition.hpp" diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 817cbdbbad..1dea62571a 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -21,8 +21,8 @@ #include "xbt/config.h" #include "src/instr/instr_private.h" -#include "src/synchro/SynchroExec.hpp" -#include "src/synchro/SynchroComm.hpp" +#include "src/kernel/activity/SynchroExec.hpp" +#include "src/kernel/activity/SynchroComm.hpp" SG_BEGIN_DECL() diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index 7ecda54eb4..00493b8caa 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -25,7 +25,7 @@ #include "xbt/ex.h" #include "mc/mc.h" #include "src/simix/smx_host_private.h" -#include "src/synchro/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" #include diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp index 1e59de2aa4..1f3750d823 100644 --- a/src/simix/popping.cpp +++ b/src/simix/popping.cpp @@ -11,11 +11,11 @@ #include "src/mc/mc_private.h" #endif -#include "src/synchro/SynchroExec.hpp" -#include "src/synchro/SynchroComm.hpp" -#include "src/synchro/SynchroSleep.hpp" -#include "src/synchro/SynchroRaw.hpp" -#include "src/synchro/SynchroIo.hpp" +#include "src/kernel/activity/SynchroExec.hpp" +#include "src/kernel/activity/SynchroComm.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroIo.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix, "Popping part of SIMIX (transmuting from user request into kernel handlers)"); diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index d63e2cb89b..b035b1fda2 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -25,11 +25,11 @@ #include "src/mc/mc_replay.h" #include "simgrid/sg_config.h" -#include "src/synchro/SynchroExec.hpp" -#include "src/synchro/SynchroComm.hpp" -#include "src/synchro/SynchroSleep.hpp" -#include "src/synchro/SynchroIo.hpp" -#include "src/synchro/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroExec.hpp" +#include "src/kernel/activity/SynchroComm.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroIo.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" #if HAVE_MC #include "src/mc/mc_private.h" diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index cf5a4c1fa1..caae036197 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -12,8 +12,8 @@ #include "src/surf/virtual_machine.hpp" #include "src/surf/HostImpl.hpp" -#include "src/synchro/SynchroExec.hpp" -#include "src/synchro/SynchroComm.hpp" +#include "src/kernel/activity/SynchroExec.hpp" +#include "src/kernel/activity/SynchroComm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h index 7088c8e42b..4505f989b3 100644 --- a/src/simix/smx_host_private.h +++ b/src/simix/smx_host_private.h @@ -14,7 +14,7 @@ #include "simgrid/simix.h" #include "popping_private.h" -#include "src/synchro/SynchroExec.hpp" +#include "src/kernel/activity/SynchroExec.hpp" SG_BEGIN_DECL() diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 8b2818cba3..a9c34d080d 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -16,7 +16,7 @@ #include "src/surf/surf_interface.hpp" #include "smx_private.h" -#include "src/synchro/SynchroIo.hpp" +#include "src/kernel/activity/SynchroIo.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)"); diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index f35e70135a..792a7a7983 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -19,7 +19,7 @@ #include "xbt/dict.h" #include "simgrid/s4u/mailbox.hpp" -#include "src/synchro/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); diff --git a/src/simix/smx_process.cpp b/src/simix/smx_process.cpp index 6c03b4bb63..6218716f6f 100644 --- a/src/simix/smx_process.cpp +++ b/src/simix/smx_process.cpp @@ -26,9 +26,9 @@ #include "src/mc/mc_replay.h" #include "src/mc/Client.hpp" #include "src/msg/msg_private.h" -#include "src/synchro/SynchroSleep.hpp" -#include "src/synchro/SynchroRaw.hpp" -#include "src/synchro/SynchroIo.hpp" +#include "src/kernel/activity/SynchroSleep.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroIo.hpp" #ifdef HAVE_SMPI #include "src/smpi/private.h" diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp index 830515003f..bdda6028bc 100644 --- a/src/simix/smx_synchro.cpp +++ b/src/simix/smx_synchro.cpp @@ -10,7 +10,7 @@ #include #include -#include "src/synchro/SynchroRaw.hpp" +#include "src/kernel/activity/SynchroRaw.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)"); diff --git a/src/smpi/smpi_base.cpp b/src/smpi/smpi_base.cpp index effd3eb4cc..61b11ef8d8 100644 --- a/src/smpi/smpi_base.cpp +++ b/src/smpi/smpi_base.cpp @@ -19,7 +19,7 @@ #include "simgrid/sg_config.h" #include "colls/colls.h" -#include "src/synchro/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_base, smpi, "Logging specific to SMPI (base)"); diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp index 5103d0361f..0d90ef26f7 100644 --- a/src/smpi/smpi_global.cpp +++ b/src/smpi/smpi_global.cpp @@ -15,7 +15,7 @@ #include "simgrid/sg_config.h" #include "src/mc/mc_replay.h" #include "src/msg/msg_private.h" -#include "src/synchro/SynchroComm.hpp" +#include "src/kernel/activity/SynchroComm.hpp" #include /* DBL_MAX */ #include diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index 84c959067e..2fe419f921 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -6,7 +6,7 @@ #include "src/instr/instr_private.h" -#include "src/routing/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include "simgrid/s4u/engine.hpp" #include "surf/surf.h" #include "src/surf/xml/platf_private.hpp" diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 1a90883272..57e5b7f5e9 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -23,16 +23,16 @@ #include "src/surf/network_interface.hpp" #include "surf/surf_routing.h" // FIXME: brain dead public header -#include "src/routing/AsImpl.hpp" -#include "src/routing/AsCluster.hpp" -#include "src/routing/AsClusterTorus.hpp" -#include "src/routing/AsClusterFatTree.hpp" -#include "src/routing/AsClusterDragonfly.hpp" -#include "src/routing/AsDijkstra.hpp" -#include "src/routing/AsFloyd.hpp" -#include "src/routing/AsFull.hpp" -#include "src/routing/AsNone.hpp" -#include "src/routing/AsVivaldi.hpp" +#include "src/kernel/routing/AsImpl.hpp" +#include "src/kernel/routing/AsCluster.hpp" +#include "src/kernel/routing/AsClusterTorus.hpp" +#include "src/kernel/routing/AsClusterFatTree.hpp" +#include "src/kernel/routing/AsClusterDragonfly.hpp" +#include "src/kernel/routing/AsDijkstra.hpp" +#include "src/kernel/routing/AsFloyd.hpp" +#include "src/kernel/routing/AsFull.hpp" +#include "src/kernel/routing/AsNone.hpp" +#include "src/kernel/routing/AsVivaldi.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 233e665ba7..857e69d022 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -15,7 +15,7 @@ #include "simgrid/sg_config.h" #include "storage_interface.hpp" -#include "src/routing/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp index 61983b46bd..420557e3be 100644 --- a/src/surf/surf_routing.hpp +++ b/src/surf/surf_routing.hpp @@ -12,7 +12,7 @@ #include "surf_interface.hpp" #include "src/surf/xml/platf_private.hpp" // FIXME: including this here is pure madness. KILKILKIL XML. -#include "src/routing/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include #include diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 5b9e5938cf..2699169b01 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -31,12 +31,12 @@ set(EXTRA_DIST src/simix/smx_private.h src/simix/smx_process_private.h src/simix/smx_synchro_private.h - src/synchro/Synchro.h - src/synchro/SynchroComm.hpp - src/synchro/SynchroExec.hpp - src/synchro/SynchroIo.hpp - src/synchro/SynchroSleep.hpp - src/synchro/SynchroRaw.hpp + src/kernel/activity/Synchro.h + src/kernel/activity/SynchroComm.hpp + src/kernel/activity/SynchroExec.hpp + src/kernel/activity/SynchroIo.hpp + src/kernel/activity/SynchroSleep.hpp + src/kernel/activity/SynchroRaw.hpp src/smpi/README src/smpi/colls/coll_tuned_topo.h src/smpi/colls/colls.h @@ -63,17 +63,17 @@ set(EXTRA_DIST src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp - src/routing/AsImpl.hpp - src/routing/AsCluster.hpp - src/routing/AsClusterFatTree.hpp - src/routing/AsClusterTorus.hpp - src/routing/AsClusterDragonfly.hpp - src/routing/AsDijkstra.hpp - src/routing/AsFloyd.hpp - src/routing/AsFull.hpp - src/routing/AsRoutedGraph.hpp - src/routing/AsNone.hpp - src/routing/AsVivaldi.hpp + 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/surf/storage_interface.hpp src/surf/storage_n11.hpp @@ -289,17 +289,17 @@ set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/ns3_simulator.cc ) set(SURF_SRC - src/routing/AsImpl.cpp - src/routing/AsCluster.cpp - src/routing/AsClusterFatTree.cpp - src/routing/AsClusterTorus.cpp - src/routing/AsClusterDragonfly.cpp - src/routing/AsDijkstra.cpp - src/routing/AsFloyd.cpp - src/routing/AsFull.cpp - src/routing/AsRoutedGraph.cpp - src/routing/AsNone.cpp - src/routing/AsVivaldi.cpp + 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/surf/cpu_cas01.cpp src/surf/cpu_interface.cpp @@ -352,12 +352,12 @@ set(SIMIX_SRC src/simix/smx_synchro.cpp src/simix/smx_vm.cpp src/simix/popping.cpp - src/synchro/Synchro.cpp - src/synchro/SynchroComm.cpp - src/synchro/SynchroExec.cpp - src/synchro/SynchroSleep.cpp - src/synchro/SynchroRaw.cpp - src/synchro/SynchroIo.cpp + src/kernel/activity/Synchro.cpp + src/kernel/activity/SynchroComm.cpp + src/kernel/activity/SynchroExec.cpp + src/kernel/activity/SynchroSleep.cpp + src/kernel/activity/SynchroRaw.cpp + src/kernel/activity/SynchroIo.cpp ${SIMIX_GENERATED_SRC} )