Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/src/surf/AsCluster.cpp b/src/routing/AsCluster.cpp
similarity index 99%
rename from src/surf/AsCluster.cpp
rename to src/routing/AsCluster.cpp
index 100ff55..b885a6d 100644 (file)
--- a/src/surf/AsCluster.cpp
+++ b/src/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/surf/AsCluster.hpp"
+#include "src/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/surf/AsCluster.hpp b/src/routing/AsCluster.hpp
similarity index 97%
rename from src/surf/AsCluster.hpp
rename to src/routing/AsCluster.hpp
index 3e0493b..803524d 100644 (file)
--- a/src/surf/AsCluster.hpp
+++ b/src/routing/AsCluster.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_ROUTING_CLUSTER_HPP_
 #define SIMGRID_ROUTING_CLUSTER_HPP_
 
-#include "src/surf/AsImpl.hpp"
+#include "src/routing/AsImpl.hpp"
 
 namespace simgrid {
 namespace routing {

diff --git a/src/surf/AsClusterDragonfly.cpp b/src/routing/AsClusterDragonfly.cpp
similarity index 99%
rename from src/surf/AsClusterDragonfly.cpp
rename to src/routing/AsClusterDragonfly.cpp
index e3eff8c..c0a5bdf 100644 (file)
--- a/src/surf/AsClusterDragonfly.cpp
+++ b/src/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/surf/AsClusterDragonfly.hpp"
+#include "src/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/surf/AsClusterDragonfly.hpp b/src/routing/AsClusterDragonfly.hpp
similarity index 98%
rename from src/surf/AsClusterDragonfly.hpp
rename to src/routing/AsClusterDragonfly.hpp
index f587ae4..3e3c080 100644 (file)
--- a/src/surf/AsClusterDragonfly.hpp
+++ b/src/routing/AsClusterDragonfly.hpp
@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
 #define SURF_ROUTING_CLUSTER_DRAGONFLY_HPP_
 
-#include "src/surf/AsCluster.hpp"
+#include "src/routing/AsCluster.hpp"
 
 namespace simgrid {
   namespace routing {

diff --git a/src/surf/AsClusterFatTree.cpp b/src/routing/AsClusterFatTree.cpp
similarity index 99%
rename from src/surf/AsClusterFatTree.cpp
rename to src/routing/AsClusterFatTree.cpp
index 18df2ff..d6025d1 100644 (file)
--- a/src/surf/AsClusterFatTree.cpp
+++ b/src/routing/AsClusterFatTree.cpp
@@ -6,7 +6,7 @@
 #include <fstream>
 #include <sstream>
 
-#include "src/surf/AsClusterFatTree.hpp"
+#include "src/routing/AsClusterFatTree.hpp"
 #include "src/surf/network_interface.hpp"
 
 #include "xbt/lib.h"

diff --git a/src/surf/AsClusterFatTree.hpp b/src/routing/AsClusterFatTree.hpp
similarity index 99%
rename from src/surf/AsClusterFatTree.hpp
rename to src/routing/AsClusterFatTree.hpp
index 0b36185..31ef264 100644 (file)
--- a/src/surf/AsClusterFatTree.hpp
+++ b/src/routing/AsClusterFatTree.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_
 #define SIMGRID_ROUTING_CLUSTER_FAT_TREE_HPP_
 
-#include "src/surf/AsCluster.hpp"
+#include "src/routing/AsCluster.hpp"
 
 namespace simgrid {
 namespace routing {

diff --git a/src/surf/AsClusterTorus.cpp b/src/routing/AsClusterTorus.cpp
similarity index 99%
rename from src/surf/AsClusterTorus.cpp
rename to src/routing/AsClusterTorus.cpp
index acf6ebf..b5a9bcb 100644 (file)
--- a/src/surf/AsClusterTorus.cpp
+++ b/src/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/surf/AsClusterTorus.hpp"
+#include "src/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/surf/AsClusterTorus.hpp b/src/routing/AsClusterTorus.hpp
similarity index 96%
rename from src/surf/AsClusterTorus.hpp
rename to src/routing/AsClusterTorus.hpp
index 6571971..e3953fc 100644 (file)
--- a/src/surf/AsClusterTorus.hpp
+++ b/src/routing/AsClusterTorus.hpp
@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_CLUSTER_TORUS_HPP_
 #define SURF_ROUTING_CLUSTER_TORUS_HPP_
 
-#include "src/surf/AsCluster.hpp"
+#include "src/routing/AsCluster.hpp"
 
 namespace simgrid {
   namespace routing {

diff --git a/src/surf/AsDijkstra.cpp b/src/routing/AsDijkstra.cpp
similarity index 99%
rename from src/surf/AsDijkstra.cpp
rename to src/routing/AsDijkstra.cpp
index 377d2d3..b30fc83 100644 (file)
--- a/src/surf/AsDijkstra.cpp
+++ b/src/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/surf/AsDijkstra.hpp"
+#include "src/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/surf/AsDijkstra.hpp b/src/routing/AsDijkstra.hpp
similarity index 98%
rename from src/surf/AsDijkstra.hpp
rename to src/routing/AsDijkstra.hpp
index 7d315a7..e2e86d9 100644 (file)
--- a/src/surf/AsDijkstra.hpp
+++ b/src/routing/AsDijkstra.hpp
@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
 #define SURF_ROUTING_DIJKSTRA_HPP_
 
-#include "src/surf/AsRoutedGraph.hpp"
+#include "src/routing/AsRoutedGraph.hpp"
 
 typedef struct graph_node_data {
   int id;

diff --git a/src/surf/AsFloyd.cpp b/src/routing/AsFloyd.cpp
similarity index 99%
rename from src/surf/AsFloyd.cpp
rename to src/routing/AsFloyd.cpp
index 8c835e5..b7af52b 100644 (file)
--- a/src/surf/AsFloyd.cpp
+++ b/src/routing/AsFloyd.cpp
@@ -5,7 +5,7 @@
 
 #include "xbt/log.h"
 #include "xbt/dynar.h"
-#include "src/surf/AsFloyd.hpp"
+#include "src/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/surf/AsFloyd.hpp b/src/routing/AsFloyd.hpp
similarity index 95%
rename from src/surf/AsFloyd.hpp
rename to src/routing/AsFloyd.hpp
index 2cc4cf2..af0c5b7 100644 (file)
--- a/src/surf/AsFloyd.hpp
+++ b/src/routing/AsFloyd.hpp
@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_FLOYD_HPP_
 #define SURF_ROUTING_FLOYD_HPP_
 
-#include "src/surf/AsRoutedGraph.hpp"
+#include "src/routing/AsRoutedGraph.hpp"
 
 namespace simgrid {
 namespace routing {

diff --git a/src/surf/AsFull.cpp b/src/routing/AsFull.cpp
similarity index 99%
rename from src/surf/AsFull.cpp
rename to src/routing/AsFull.cpp
index 3b931a3..339b45c 100644 (file)
--- a/src/surf/AsFull.cpp
+++ b/src/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/surf/AsFull.hpp"
+#include "src/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/surf/AsFull.hpp b/src/routing/AsFull.hpp
similarity index 95%
rename from src/surf/AsFull.hpp
rename to src/routing/AsFull.hpp
index cfd7e5e..5ea60ff 100644 (file)
--- a/src/surf/AsFull.hpp
+++ b/src/routing/AsFull.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_ROUTING_FULL_HPP_
 #define SIMGRID_ROUTING_FULL_HPP_
 
-#include "src/surf/AsRoutedGraph.hpp"
+#include "src/routing/AsRoutedGraph.hpp"
 
 namespace simgrid {
 namespace routing {

diff --git a/src/surf/AsImpl.cpp b/src/routing/AsImpl.cpp
similarity index 99%
rename from src/surf/AsImpl.cpp
rename to src/routing/AsImpl.cpp
index 291a79b..c76003f 100644 (file)
--- a/src/surf/AsImpl.cpp
+++ b/src/routing/AsImpl.cpp
@@ -5,7 +5,7 @@
 
 #include "xbt/log.h"
 
-#include "src/surf/AsImpl.hpp"
+#include "src/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/surf/AsImpl.hpp b/src/routing/AsImpl.hpp
similarity index 100%
rename from src/surf/AsImpl.hpp
rename to src/routing/AsImpl.hpp

diff --git a/src/surf/AsNone.cpp b/src/routing/AsNone.cpp
similarity index 95%
rename from src/surf/AsNone.cpp
rename to src/routing/AsNone.cpp
index 3683fa3..8213101 100644 (file)
--- a/src/surf/AsNone.cpp
+++ b/src/routing/AsNone.cpp
@@ -7,7 +7,7 @@
 #include <xbt/graph.h>
 #include <xbt/log.h>
 
-#include "src/surf/AsNone.hpp"
+#include "src/routing/AsNone.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 

diff --git a/src/surf/AsNone.hpp b/src/routing/AsNone.hpp
similarity index 95%
rename from src/surf/AsNone.hpp
rename to src/routing/AsNone.hpp
index 30708f9..1490dd3 100644 (file)
--- a/src/surf/AsNone.hpp
+++ b/src/routing/AsNone.hpp
@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_NONE_HPP_
 #define SURF_ROUTING_NONE_HPP_
 
-#include "src/surf/AsImpl.hpp"
+#include "src/routing/AsImpl.hpp"
 
 namespace simgrid {
 namespace routing {

diff --git a/src/surf/AsRoutedGraph.cpp b/src/routing/AsRoutedGraph.cpp
similarity index 99%
rename from src/surf/AsRoutedGraph.cpp
rename to src/routing/AsRoutedGraph.cpp
index c849af3..7117c1d 100644 (file)
--- a/src/surf/AsRoutedGraph.cpp
+++ b/src/routing/AsRoutedGraph.cpp
@@ -9,7 +9,7 @@
 #include "xbt/dynar.h"
 #include "xbt/graph.h"
 
-#include "src/surf/AsRoutedGraph.hpp"
+#include "src/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/surf/AsRoutedGraph.hpp b/src/routing/AsRoutedGraph.hpp
similarity index 96%
rename from src/surf/AsRoutedGraph.hpp
rename to src/routing/AsRoutedGraph.hpp
index c5fb0ad..5e9b00f 100644 (file)
--- a/src/surf/AsRoutedGraph.hpp
+++ b/src/routing/AsRoutedGraph.hpp
@@ -6,7 +6,7 @@
 #ifndef SIMGRID_ROUTING_GENERIC_HPP_
 #define SIMGRID_ROUTING_GENERIC_HPP_
 
-#include "src/surf/AsImpl.hpp"
+#include "src/routing/AsImpl.hpp"
 
 namespace simgrid {
 namespace routing {

diff --git a/src/surf/AsVivaldi.cpp b/src/routing/AsVivaldi.cpp
similarity index 98%
rename from src/surf/AsVivaldi.cpp
rename to src/routing/AsVivaldi.cpp
index 9a3bf1a..d835dab 100644 (file)
--- a/src/surf/AsVivaldi.cpp
+++ b/src/routing/AsVivaldi.cpp
@@ -7,7 +7,7 @@
 
 #include <simgrid/s4u/host.hpp>
 
-#include "src/surf/AsVivaldi.hpp"
+#include "src/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/surf/AsVivaldi.hpp b/src/routing/AsVivaldi.hpp
similarity index 95%
rename from src/surf/AsVivaldi.hpp
rename to src/routing/AsVivaldi.hpp
index a2ba680..712db43 100644 (file)
--- a/src/surf/AsVivaldi.hpp
+++ b/src/routing/AsVivaldi.hpp
@@ -6,7 +6,7 @@
 #ifndef SURF_ROUTING_VIVALDI_HPP_
 #define SURF_ROUTING_VIVALDI_HPP_
 
-#include "src/surf/AsCluster.hpp"
+#include "src/routing/AsCluster.hpp"
 
 namespace simgrid {
 namespace routing {

diff --git a/src/simix/smx_vm.cpp b/src/simix/smx_vm.cpp
index f7b6c3e..073a9fb 100644 (file)
--- a/src/simix/smx_vm.cpp
+++ b/src/simix/smx_vm.cpp
@@ -147,10 +147,9 @@ void SIMIX_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst
  *
  * @param host the vm host to get_phys_host (a sg_host_t)
  */
-void *SIMIX_vm_get_pm(sg_host_t ind_vm)
+void *SIMIX_vm_get_pm(sg_host_t host)
 {
-  /* jump to vm_ws_get_pm(). this will return the vm name. */
-  return surf_vm_get_pm(ind_vm);
+  return surf_vm_get_pm(host);
 }
 
 /**
@@ -159,10 +158,9 @@ void *SIMIX_vm_get_pm(sg_host_t ind_vm)
  * @param host the vm host (a sg_host_t)
  * @param bound bound (a double)
  */
-void SIMIX_vm_set_bound(sg_host_t ind_vm, double bound)
+void SIMIX_vm_set_bound(sg_host_t host, double bound)
 {
-  /* jump to vm_ws_set_vm_bound(). */
-  surf_vm_set_bound(ind_vm, bound);
+  surf_vm_set_bound(host, bound);
 }
 
 /**
@@ -177,7 +175,6 @@ void SIMIX_vm_set_affinity(sg_host_t ind_vm, sg_host_t ind_pm, unsigned long mas
   /* make sure this at the MSG layer. */
   xbt_assert(SIMIX_vm_get_pm(ind_vm) == ind_pm);
 
-  /* jump to vm_ws_set_vm_affinity(). */
   surf_vm_set_affinity(ind_vm, ind_pm, mask);
 }
 

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index c52abda..84c9590 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -6,7 +6,7 @@
 
 #include "src/instr/instr_private.h"
 
-#include "src/surf/AsImpl.hpp"
+#include "src/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 56a02ef..8796ae5 100644 (file)
--- 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/surf/AsImpl.hpp"
-#include "src/surf/AsCluster.hpp"
-#include "src/surf/AsClusterTorus.hpp"
-#include "src/surf/AsClusterFatTree.hpp"
-#include "src/surf/AsClusterDragonfly.hpp"
-#include "src/surf/AsDijkstra.hpp"
-#include "src/surf/AsFloyd.hpp"
-#include "src/surf/AsFull.hpp"
-#include "src/surf/AsNone.hpp"
-#include "src/surf/AsVivaldi.hpp"
+#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"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index e79fbb0..233e665 100644 (file)
--- 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/surf/AsImpl.hpp"
+#include "src/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 274ff24..61983b4 100644 (file)
--- 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/surf/AsImpl.hpp"
+#include "src/routing/AsImpl.hpp"
 
 #include <float.h>
 #include <vector>

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 87bdcd2..5d27441 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -63,17 +63,17 @@ set(EXTRA_DIST
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp
 
-  src/surf/AsImpl.hpp
-  src/surf/AsCluster.hpp
-  src/surf/AsClusterFatTree.hpp
-  src/surf/AsClusterTorus.hpp
-  src/surf/AsClusterDragonfly.hpp
-  src/surf/AsDijkstra.hpp
-  src/surf/AsFloyd.hpp
-  src/surf/AsFull.hpp
-  src/surf/AsRoutedGraph.hpp
-  src/surf/AsNone.hpp
-  src/surf/AsVivaldi.hpp
+  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/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/surf/AsImpl.cpp
-  src/surf/AsCluster.cpp
-  src/surf/AsClusterFatTree.cpp
-  src/surf/AsClusterTorus.cpp
-  src/surf/AsClusterDragonfly.cpp
-  src/surf/AsDijkstra.cpp
-  src/surf/AsFloyd.cpp
-  src/surf/AsFull.cpp
-  src/surf/AsRoutedGraph.cpp
-  src/surf/AsNone.cpp
-  src/surf/AsVivaldi.cpp
+  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/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp