* 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 <simgrid/s4u/host.hpp>
namespace simgrid {
/* 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"
#include <unordered_map>
-#include "src/kernel/routing/AsImpl.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
namespace simgrid {
namespace kernel {
/* 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"
#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;
/* 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"
#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 {
#include <xbt/graph.h>
#include <xbt/log.h>
-#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");
#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 {
#include <fstream>
#include <sstream>
-#include "src/kernel/routing/AsClusterFatTree.hpp"
+#include "src/kernel/routing/FatTreeZone.hpp"
#include "src/kernel/routing/NetCard.hpp"
#include "src/surf/network_interface.hpp"
#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 {
#include <limits>
-#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"
#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 {
/* 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"
#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 {
#include <xbt/base.h>
#include <xbt/signal.hpp>
-#include "src/kernel/routing/AsImpl.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
/*
#include <float.h>
#include <vector>
#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"
#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"
#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 {
/* 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"
#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 {
#include <simgrid/s4u/host.hpp>
-#include "src/kernel/routing/AsVivaldi.hpp"
+#include "src/kernel/routing/VivaldiZone.hpp"
#include "src/kernel/routing/NetCard.hpp"
#include "src/surf/network_interface.hpp"
#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 {
#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
#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"
#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);
#include <xbt/signal.hpp>
#include "surf_interface.hpp"
-#include "src/kernel/routing/AsImpl.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
#include <float.h>
#include <vector>
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
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