/* 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()
{
/* 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"
#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,
#include <simgrid/s4u/host.hpp>
-#include "src/synchro/SynchroExec.hpp"
+#include "src/kernel/activity/SynchroExec.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/simix/smx_host_private.h"
#define _SIMIX_SYNCHRO_EXEC_HPP
#include "surf/surf.h"
-#include "src/synchro/Synchro.h"
+#include "src/kernel/activity/Synchro.h"
namespace simgrid {
namespace simix {
/* 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"
#define _SIMIX_SYNCHRO_IO_HPP
#include "surf/surf.h"
-#include "src/synchro/Synchro.h"
+#include "src/kernel/activity/Synchro.h"
namespace simgrid {
namespace simix {
/* 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"
#define _SIMIX_SYNCHRO_RAW_HPP
#include "surf/surf.h"
-#include "src/synchro/Synchro.h"
+#include "src/kernel/activity/Synchro.h"
namespace simgrid {
namespace simix {
#include <simgrid/s4u/host.hpp>
-#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"
#define _SIMIX_SYNCHRO_SLEEP_HPP
#include "surf/surf.h"
-#include "src/synchro/Synchro.h"
+#include "src/kernel/activity/Synchro.h"
namespace simgrid {
namespace simix {
/* 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");
#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 {
/* 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
#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 {
#include <fstream>
#include <sstream>
-#include "src/routing/AsClusterFatTree.hpp"
+#include "src/kernel/routing/AsClusterFatTree.hpp"
#include "src/surf/network_interface.hpp"
#include "xbt/lib.h"
#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 {
/* 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
#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 {
/* 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");
#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;
#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");
#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 {
/* 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");
#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 {
#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");
#include <xbt/graph.h>
#include <xbt/log.h>
-#include "src/routing/AsNone.hpp"
+#include "src/kernel/routing/AsNone.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
#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 {
#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");
#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 {
#include <simgrid/s4u/host.hpp>
-#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");
#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 {
#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"
#include <simgrid_config.h>
#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"
#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()
#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 <simgrid/simix.hpp>
#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)");
#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"
#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");
#include "simgrid/simix.h"
#include "popping_private.h"
-#include "src/synchro/SynchroExec.hpp"
+#include "src/kernel/activity/SynchroExec.hpp"
SG_BEGIN_DECL()
#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)");
#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");
#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"
#include <xbt/ex.hpp>
#include <xbt/log.h>
-#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)");
#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)");
#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 <float.h> /* DBL_MAX */
#include <fstream>
#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"
#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);
#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");
#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 <float.h>
#include <vector>
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
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
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
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}
)