Merge branch 'torus'

diff --combined buildtools/Cmake/DefinePackages.cmake
index ae3a179,108d9fe..980f973
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -40,7 -40,6 +40,7 @@@ set(EXTRA_DIS
    src/smpi/colls/coll_tuned_topo.h
    src/smpi/private.h
    src/smpi/smpi_mpi_dt_private.h
 +  src/surf/plugins/energy.hpp
    src/surf/cpu_interface.hpp
    src/surf/cpu_ti.hpp
    src/surf/cpu_cas01.hpp
@@@ -68,6 -67,7 +68,7 @@@
    src/surf/surf_routing_private.hpp
    src/surf/surf_routing.hpp
    src/surf/surf_routing_cluster.hpp
+   src/surf/surf_routing_cluster_torus.hpp
    src/surf/surf_routing_dijkstra.hpp
    src/surf/surf_routing_floyd.hpp
    src/surf/surf_routing_full.hpp
@@@ -300,7 -300,6 +301,7 @@@ set(NS3_SR
    )
  
  set(SURF_SRC
 +  src/surf/plugins/energy.cpp
    src/surf/cpu_interface.cpp
    src/surf/cpu_ti.cpp
    src/surf/cpu_cas01.cpp
@@@ -322,6 -321,7 +323,7 @@@
    src/surf/surf_c_bindings.cpp
    src/surf/surf_routing.cpp  
    src/surf/surf_routing_cluster.cpp
+   src/surf/surf_routing_cluster_torus.cpp
    src/surf/surf_routing_dijkstra.cpp
    src/surf/surf_routing_floyd.cpp
    src/surf/surf_routing_full.cpp
@@@ -542,7 -542,6 +544,7 @@@ set(MC_SR
    )
  
  set(headers_to_install
 +  include/simgrid.h
    include/instr/instr.h
    include/msg/datatypes.h
    include/msg/msg.h
@@@ -552,7 -551,6 +554,7 @@@
    include/simgrid/modelchecker.h
    include/simgrid/platf.h
    include/simgrid/platf_generator.h
 +  include/simgrid/plugins.h
    include/simgrid/simix.h
    include/smpi/mpi.h
    include/smpi/smpi.h
@@@ -994,7 -992,6 +996,7 @@@ set(CMAKE_SOURCE_FILE
    buildtools/Cmake/Modules/FindGFortran.cmake
    buildtools/Cmake/Modules/FindGTnets.cmake
    buildtools/Cmake/Modules/FindGraphviz.cmake
 +  buildtools/Cmake/Modules/FindLibSigc++.cmake
    buildtools/Cmake/Modules/FindLibunwind.cmake
    buildtools/Cmake/Modules/FindLua51Simgrid.cmake
    buildtools/Cmake/Modules/FindNS3.cmake

diff --combined include/simgrid/platf.h
index 6232a15,f5f37fa..d894607
--- 1/include/simgrid/platf.h
--- 2/include/simgrid/platf.h
+++ b/include/simgrid/platf.h
@@@ -18,8 -18,7 +18,8 @@@ typedef struct RoutingEdge *sg_routing_
  
  XBT_PUBLIC(sg_routing_edge_t) sg_routing_edge_by_name_or_null(const char *name);
  
 -/** Defines whether a given resource is working or not */
 +/** @ingroup SURF_interface
 +* @brief Defines whether a given resource is working or not */
  typedef enum {
    SURF_RESOURCE_ON = 1,                   /**< Up & ready        */
    SURF_RESOURCE_OFF = 0                   /**< Down & broken     */
@@@ -44,6 -43,11 +44,11 @@@ typedef enum 
    SURF_PROCESS_ON_FAILURE_RESTART = 0
  } e_surf_process_on_failure_t;
  
+ typedef enum {
+   SURF_CLUSTER_FLAT = 1,
+   SURF_CLUSTER_TORUS = 0
+ } e_surf_cluster_topology_t;
+ 
  
  typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */
  
@@@ -202,6 -206,8 +207,8 @@@ typedef struct s_sg_platf_cluster_cbar
    double loopback_bw;
    double loopback_lat;
    double limiter_link;
+   e_surf_cluster_topology_t topology;
+   const char* topo_parameters;
    xbt_dict_t properties;
    const char* router_id;
    e_surf_link_sharing_policy_t sharing_policy;