Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'hypervisor' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into hypervisor
authorTakahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Fri, 28 Jun 2013 15:47:17 +0000 (17:47 +0200)
committerTakahiro Hirofuchi <t.hirofuchi+sg@aist.go.jp>
Fri, 28 Jun 2013 15:47:17 +0000 (17:47 +0200)
478 files changed:
.cproject [new file with mode: 0644]
.gitignore
COPYING
ChangeLog
INSTALL
README.coding
buildtools/Cmake/AddTests.cmake
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/MakeExe.cmake
buildtools/Cmake/MakeJava.cmake
buildtools/Cmake/MakeLib.cmake
buildtools/Cmake/MakeLibWin.cmake
buildtools/Cmake/Modules/FindPCRE.cmake [deleted file]
buildtools/Cmake/Modules/FindPcreWin.cmake [deleted file]
buildtools/Cmake/Modules/FindScala.cmake [new file with mode: 0644]
buildtools/Cmake/Option.cmake
buildtools/Cmake/PrintArgs.cmake
buildtools/Cmake/UnitTesting.cmake
buildtools/Cmake/src/simgrid.nsi.in
buildtools/jenkins/run.bat [new file with mode: 0644]
buildtools/jenkins/run.sh [new file with mode: 0644]
buildtools/jenkins/runmingw.sh [new file with mode: 0644]
buildtools/pipol/rc.debian
buildtools/pipol/rc.fedora
buildtools/pipol/rc.mac
buildtools/pipol/rc.ubuntu
doc/Doxyfile.in
doc/HelloWorld/CMakeLists.txt
doc/HelloWorld/FindPcreWin.cmake [deleted file]
doc/HelloWorld/README
doc/doxygen/inside_extending.doc
doc/doxygen/install.doc
doc/doxygen/module-msg.doc
doc/doxygen/options.doc
doc/doxygen/pls.doc
doc/msg-tuto-src/platforms/cloud.xml
doc/msg-tuto-src/platforms/g5k.xml
doc/msg-tuto-src/platforms/griffon.xml
doc/msg-tuto-src/platforms/peers.xml
doc/msg-tuto-src/platforms/platform.xml
examples/java/io/Node.java
examples/java/io/storage.xml
examples/java/master_slave_bypass/platform.xml
examples/java/master_slave_kill/platform.xml
examples/java/mutualExclusion/ring3.xml
examples/java/platform.xml
examples/lua/multi_matrix/quicksort_platform.xml
examples/msg/actions/NAS_LU_S_4/platform.xml
examples/msg/actions/actions.c
examples/msg/actions/actions.tesh
examples/msg/actions/homogeneous_3_hosts.xml
examples/msg/bittorrent/bittorrent.tesh
examples/msg/bittorrent/bittorrent_platfgen.c
examples/msg/bittorrent/connection.c
examples/msg/bittorrent/connection.h
examples/msg/bittorrent/messages.c
examples/msg/bittorrent/messages.h
examples/msg/bittorrent/peer.c
examples/msg/bittorrent/peer.h
examples/msg/chainsend/platform_chainsend.xml
examples/msg/gtnets/crosstraffic-p.xml
examples/msg/gtnets/dogbone-p.xml
examples/msg/gtnets/onelink-p.xml
examples/msg/gtnets/waxman-p.xml
examples/msg/icomms/small_platform.xml
examples/msg/io/file.c
examples/msg/io/file_unlink.c
examples/msg/io/io.tesh
examples/msg/masterslave/masterslave_failure.c
examples/msg/masterslave/masterslave_mailbox.c
examples/msg/masterslave/platform_clusters.xml
examples/msg/masterslave/platform_kill.xml
examples/msg/mc/CMakeLists.txt
examples/msg/mc/bugged1.tesh
examples/msg/mc/bugged1_liveness.c
examples/msg/mc/bugged1_liveness.tesh
examples/msg/mc/bugged2.tesh [new file with mode: 0644]
examples/msg/mc/chord/chord.c [moved from examples/msg/mc/chord/chord_liveness.c with 87% similarity]
examples/msg/mc/chord/chord_liveness.h [deleted file]
examples/msg/mc/chord/chord_neverjoin.tesh
examples/msg/mc/chord/chord_neverjoin_timeout_visited.tesh [new file with mode: 0644]
examples/msg/mc/chord/deploy_chord4.xml [moved from examples/msg/mc/chord/deploy_chord_liveness.xml with 52% similarity]
examples/msg/mc/chord/promela_chord_liveness [deleted file]
examples/msg/mc/deploy_bugged1_liveness.xml
examples/msg/mc/platform.xml
examples/msg/mc/test/snapshot_comparison_platform.xml
examples/msg/msg_platform.xml
examples/msg/ns3/3hosts_2links_p.xml
examples/msg/ns3/3links-p.xml
examples/msg/ns3/dogbone-p.xml
examples/msg/parallel_task/test_ptask_platform.xml
examples/msg/pastry/CMakeLists.txt [new file with mode: 0644]
examples/msg/pastry/pastry.c [new file with mode: 0644]
examples/msg/pastry/pastry.tesh [new file with mode: 0644]
examples/msg/pastry/pastry10.xml [new file with mode: 0644]
examples/msg/pastry/pastry_crosstraffic.tesh [new file with mode: 0644]
examples/msg/pmm/msg_pmm.c
examples/msg/properties/msg_prop.c
examples/msg/semaphores/CMakeLists.txt [new file with mode: 0644]
examples/msg/semaphores/synchro.c [new file with mode: 0644]
examples/msg/sendrecv/platform_sendrecv.xml
examples/msg/small_platform.xml
examples/msg/small_platform_with_failures.xml
examples/msg/small_platform_with_routers.xml
examples/msg/tracing/platform.xml
examples/platforms/bypassASroute.xml
examples/platforms/bypassRoute.xml
examples/platforms/cloud.xml
examples/platforms/cluster.xml
examples/platforms/cluster_and_one_host.xml
examples/platforms/cluster_no_backbone.xml
examples/platforms/cluster_routing_rulebased.xml [deleted file]
examples/platforms/clusters_routing_full.xml
examples/platforms/conf/gridpp_grid_2004.xml
examples/platforms/conf/lcg_sept2004_grid.xml
examples/platforms/config.xml
examples/platforms/content/storage_content.txt
examples/platforms/data_center.xml
examples/platforms/g5k.xml
examples/platforms/griffon.xml
examples/platforms/meta_cluster.xml
examples/platforms/multicore_machine.xml
examples/platforms/prop.xml
examples/platforms/routing_cluster.xml
examples/platforms/storage.xml
examples/platforms/syscoord/median_harvard.xml
examples/platforms/syscoord/median_meridian.xml
examples/platforms/syscoord/median_p2psim.xml
examples/platforms/two_peers.xml
examples/platforms/vivaldi.xml
examples/scala/CMakeLists.txt [new file with mode: 0644]
examples/scala/master_slave_bypass/CMakeLists.txt [new file with mode: 0644]
examples/scala/master_slave_bypass/FinalizeTask.scala [new file with mode: 0644]
examples/scala/master_slave_bypass/Master.scala [new file with mode: 0644]
examples/scala/master_slave_bypass/MsBypass.scala [new file with mode: 0644]
examples/scala/master_slave_bypass/Slave.scala [new file with mode: 0644]
examples/scala/master_slave_bypass/bypass.tesh [new file with mode: 0644]
examples/scala/master_slave_bypass/platform.xml [new file with mode: 0644]
examples/scala/master_slave_kill/CMakeLists.txt [new file with mode: 0644]
examples/scala/master_slave_kill/FinalizeTask.scala [new file with mode: 0644]
examples/scala/master_slave_kill/Master.scala [new file with mode: 0644]
examples/scala/master_slave_kill/MsKill.scala [new file with mode: 0644]
examples/scala/master_slave_kill/Slave.scala [new file with mode: 0644]
examples/scala/master_slave_kill/kill.tesh [new file with mode: 0644]
examples/scala/master_slave_kill/platform.xml [new file with mode: 0644]
examples/scala/masterslave/CMakeLists.txt [new file with mode: 0644]
examples/scala/masterslave/FinalizeTask.scala [new file with mode: 0644]
examples/scala/masterslave/Forwarder.scala [new file with mode: 0644]
examples/scala/masterslave/Master.scala [new file with mode: 0644]
examples/scala/masterslave/Masterslave.scala [new file with mode: 0644]
examples/scala/masterslave/README [new file with mode: 0644]
examples/scala/masterslave/Slave.scala [new file with mode: 0644]
examples/scala/masterslave/deploy.xml [new file with mode: 0644]
examples/scala/masterslave/masterslave.tesh [new file with mode: 0644]
examples/scala/masterslave/masterslaveDeployment.xml [new file with mode: 0644]
examples/scala/platform.xml [new file with mode: 0644]
examples/simdag/2clusters.xml
examples/simdag/faulty_host.xml
examples/simdag/goal/goal_test.c
examples/simdag/scheduling/simulacrum_7_hosts.xml
examples/simdag/two_hosts.xml
examples/smpi/CMakeLists.txt
examples/smpi/replay/actions_allgatherv.txt [new file with mode: 0644]
examples/smpi/replay/actions_gather.txt [new file with mode: 0644]
examples/smpi/replay/actions_reducescatter.txt [new file with mode: 0644]
examples/smpi/replay/replay_platform.xml
examples/smpi/replay/smpi_replay.tesh
include/msg/datatypes.h
include/msg/msg.h
include/simgrid/platf.h
include/simgrid/simix.h
include/smpi/smpi.h
include/surf/simgrid_dtd.h
include/surf/surfxml_parse.h
include/xbt/config.h
include/xbt/file_stat.h [deleted file]
src/bindings/java/jmsg.c
src/bindings/java/jmsg.h
src/bindings/java/jmsg_as.c [new file with mode: 0644]
src/bindings/java/jmsg_as.h [new file with mode: 0644]
src/bindings/java/jmsg_file.c
src/bindings/java/jmsg_file.h
src/bindings/java/jmsg_host.c
src/bindings/java/jmsg_host.h
src/bindings/java/jmsg_synchro.c
src/bindings/java/jmsg_synchro.h
src/bindings/java/jmsg_vm.c
src/bindings/java/jmsg_vm.h
src/bindings/java/org/simgrid/msg/As.java [new file with mode: 0644]
src/bindings/java/org/simgrid/msg/File.java
src/bindings/java/org/simgrid/msg/Host.java
src/bindings/java/org/simgrid/msg/Msg.java
src/bindings/java/org/simgrid/msg/Process.java
src/bindings/java/org/simgrid/msg/Semaphore.java [new file with mode: 0644]
src/bindings/java/smx_context_cojava.c
src/bindings/lua/lua_platf.c
src/include/mc/datatypes.h
src/include/simgrid/sg_config.h
src/include/smpi/smpi_interface.h
src/include/surf/surf.h
src/include/xbt/xbt_os_time.h
src/instr/instr_config.c
src/instr/instr_private.h
src/mc/mc_checkpoint.c
src/mc/mc_compare.c
src/mc/mc_dpor.c
src/mc/mc_global.c
src/mc/mc_liveness.c
src/mc/mc_pair.c
src/mc/mc_private.h
src/mc/mc_request.c
src/mc/memory_map.c
src/msg/msg_environment.c
src/msg/msg_host.c
src/msg/msg_io.c
src/msg/msg_process.c
src/msg/msg_synchro.c [new file with mode: 0644]
src/simdag/sd_daxloader.c
src/simdag/sd_dotloader.c
src/simgrid/sg_config.c
src/simix/smx_context.c
src/simix/smx_context_raw.c
src/simix/smx_context_sysv.c
src/simix/smx_deployment.c
src/simix/smx_global.c
src/simix/smx_host.c
src/simix/smx_host_private.h
src/simix/smx_io.c
src/simix/smx_io_private.h
src/simix/smx_network.c
src/simix/smx_private.h
src/simix/smx_smurf.c
src/simix/smx_smurf_private.h
src/simix/smx_synchro.c
src/simix/smx_user.c
src/smpi/colls/allgather-2dmesh.c
src/smpi/colls/allgather-3dmesh.c
src/smpi/colls/allgather-GB.c
src/smpi/colls/allgather-NTSLR-NB.c
src/smpi/colls/allgather-NTSLR.c
src/smpi/colls/allgather-RDB.c [deleted file]
src/smpi/colls/allgather-SMP-NTS.c
src/smpi/colls/allgather-SMP-simple.c [deleted file]
src/smpi/colls/allgather-bruck.c
src/smpi/colls/allgather-loosely-lr.c
src/smpi/colls/allgather-lr.c
src/smpi/colls/allgather-ompi-neighborexchange.c [new file with mode: 0644]
src/smpi/colls/allgather-pair.c
src/smpi/colls/allgather-rdb.c
src/smpi/colls/allgather-rhv.c
src/smpi/colls/allgather-ring.c
src/smpi/colls/allgather-smp-simple.c
src/smpi/colls/allgather-spreading-simple.c
src/smpi/colls/allgatherv-GB.c [new file with mode: 0644]
src/smpi/colls/allgatherv-mpich-rdb.c [new file with mode: 0644]
src/smpi/colls/allgatherv-ompi-bruck.c [new file with mode: 0644]
src/smpi/colls/allgatherv-ompi-neighborexchange.c [new file with mode: 0644]
src/smpi/colls/allgatherv-pair.c [new file with mode: 0644]
src/smpi/colls/allgatherv-ring.c [new file with mode: 0644]
src/smpi/colls/allreduce-NTS.c
src/smpi/colls/allreduce-lr.c
src/smpi/colls/allreduce-ompi-ring-segmented.c [new file with mode: 0644]
src/smpi/colls/allreduce-rab-rdb.c
src/smpi/colls/allreduce-rab-reduce-scatter.c [changed mode: 0755->0644]
src/smpi/colls/allreduce-rab-rsag.c
src/smpi/colls/allreduce-rab1.c
src/smpi/colls/allreduce-rab2.c
src/smpi/colls/allreduce-rdb.c
src/smpi/colls/allreduce-redbcast.c
src/smpi/colls/allreduce-smp-binomial-pipeline.c
src/smpi/colls/allreduce-smp-binomial.c
src/smpi/colls/allreduce-smp-rdb.c
src/smpi/colls/allreduce-smp-rsag-lr.c
src/smpi/colls/allreduce-smp-rsag-rab.c
src/smpi/colls/allreduce-smp-rsag.c
src/smpi/colls/alltoall-2dmesh.c
src/smpi/colls/alltoall-3dmesh.c
src/smpi/colls/alltoall-bruck.c
src/smpi/colls/alltoall-pair-light-barrier.c
src/smpi/colls/alltoall-pair-mpi-barrier.c
src/smpi/colls/alltoall-pair-one-barrier.c
src/smpi/colls/alltoall-pair.c
src/smpi/colls/alltoall-rdb.c
src/smpi/colls/alltoall-ring-light-barrier.c
src/smpi/colls/alltoall-ring-mpi-barrier.c
src/smpi/colls/alltoall-ring-one-barrier.c
src/smpi/colls/alltoall-ring.c
src/smpi/colls/alltoall-simple.c
src/smpi/colls/alltoallv-bruck.c [new file with mode: 0644]
src/smpi/colls/alltoallv-pair-light-barrier.c [new file with mode: 0644]
src/smpi/colls/alltoallv-pair-mpi-barrier.c [new file with mode: 0644]
src/smpi/colls/alltoallv-pair-one-barrier.c [new file with mode: 0644]
src/smpi/colls/alltoallv-pair.c [new file with mode: 0644]
src/smpi/colls/alltoallv-ring-light-barrier.c [new file with mode: 0644]
src/smpi/colls/alltoallv-ring-mpi-barrier.c [new file with mode: 0644]
src/smpi/colls/alltoallv-ring-one-barrier.c [new file with mode: 0644]
src/smpi/colls/alltoallv-ring.c [new file with mode: 0644]
src/smpi/colls/barrier-ompi.c [new file with mode: 0644]
src/smpi/colls/bcast-NTSB.c
src/smpi/colls/bcast-NTSL-Isend.c
src/smpi/colls/bcast-NTSL.c
src/smpi/colls/bcast-SMP-binary.c
src/smpi/colls/bcast-SMP-binomial.c
src/smpi/colls/bcast-SMP-linear.c
src/smpi/colls/bcast-TSB.c [deleted file]
src/smpi/colls/bcast-arrival-nb.c
src/smpi/colls/bcast-arrival-pattern-aware-wait.c
src/smpi/colls/bcast-arrival-pattern-aware.c
src/smpi/colls/bcast-arrival-scatter.c
src/smpi/colls/bcast-binomial-tree.c
src/smpi/colls/bcast-flattree-pipeline.c
src/smpi/colls/bcast-flattree.c
src/smpi/colls/bcast-ompi-pipeline.c [new file with mode: 0644]
src/smpi/colls/bcast-ompi-split-bintree.c [new file with mode: 0644]
src/smpi/colls/bcast-scatter-LR-allgather.c
src/smpi/colls/bcast-scatter-rdb-allgather.c
src/smpi/colls/coll_tuned_topo.c [new file with mode: 0644]
src/smpi/colls/coll_tuned_topo.h [new file with mode: 0644]
src/smpi/colls/colls.h
src/smpi/colls/colls_global.c [new file with mode: 0644]
src/smpi/colls/colls_private.h [new file with mode: 0644]
src/smpi/colls/gather-ompi.c [new file with mode: 0644]
src/smpi/colls/reduce-NTSL.c
src/smpi/colls/reduce-arrival-pattern-aware.c
src/smpi/colls/reduce-binomial.c
src/smpi/colls/reduce-flat-tree.c
src/smpi/colls/reduce-ompi.c [new file with mode: 0644]
src/smpi/colls/reduce-scatter-gather.c
src/smpi/colls/reduce_scatter-mpich.c [new file with mode: 0644]
src/smpi/colls/reduce_scatter-ompi.c [new file with mode: 0644]
src/smpi/colls/scatter-ompi.c [new file with mode: 0644]
src/smpi/colls/smpi_mpich_selector.c [new file with mode: 0644]
src/smpi/colls/smpi_openmpi_selector.c [new file with mode: 0644]
src/smpi/colls/star-reduction.c [deleted file]
src/smpi/private.h
src/smpi/smpi_base.c
src/smpi/smpi_bench.c
src/smpi/smpi_coll.c
src/smpi/smpi_f77.c
src/smpi/smpi_global.c
src/smpi/smpi_mpi.c
src/smpi/smpi_mpi_dt.c
src/smpi/smpi_mpi_dt_private.h
src/smpi/smpi_pmpi.c
src/smpi/smpi_replay.c
src/smpi/smpiff.in
src/smpi/smpirun.in
src/surf/cpu_cas01.c
src/surf/cpu_ti.c
src/surf/instr_routing.c
src/surf/network.c
src/surf/new_model.c
src/surf/simgrid.dtd
src/surf/simgrid_dtd.c
src/surf/storage.c
src/surf/storage_private.h
src/surf/surf.c
src/surf/surf_private.h
src/surf/surf_routing.c
src/surf/surf_routing_dijkstra.c
src/surf/surf_routing_private.h
src/surf/surf_routing_rulebased.c [deleted file]
src/surf/surf_routing_vivaldi.c
src/surf/surfxml_parse.c
src/surf/workstation.c
src/xbt/automaton/parserPromela.tab.cacc
src/xbt/automaton/parserPromela.tab.hacc
src/xbt/config.c
src/xbt/dynar.c
src/xbt/graph.c
src/xbt/log.c
src/xbt/mmalloc/mm_diff.c
src/xbt/parmap.c
src/xbt/xbt_os_time.c
teshsuite/msg/get_sender_p.xml
teshsuite/msg/pid_p.xml
teshsuite/msg/trace/platform.xml
teshsuite/msg/trace/platform_trace.xml
teshsuite/simdag/availability/simulacrum_7_hosts.xml
teshsuite/simdag/basic_platform.xml
teshsuite/simdag/network/mxn/platform_4p_1switch.xml
teshsuite/simdag/network/p2p/platform_2p_1bb.xml
teshsuite/simdag/network/p2p/platform_2p_1fl.xml
teshsuite/simdag/network/p2p/platform_2p_1sl.xml
teshsuite/simdag/network/p2p/platform_2p_1switch.xml
teshsuite/simdag/network/platform_2p_1sl.xml
teshsuite/simdag/partask/platform_2p_1sl.xml
teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
teshsuite/simdag/platforms/CMakeLists.txt
teshsuite/simdag/platforms/Dijkstra.xml
teshsuite/simdag/platforms/Evaluate_get_route_time.c
teshsuite/simdag/platforms/Evaluate_parse_time.c
teshsuite/simdag/platforms/Two_clusters_rulebased.xml [deleted file]
teshsuite/simdag/platforms/basic_parsing_test.tesh
teshsuite/simdag/platforms/clusterA.xml
teshsuite/simdag/platforms/clusterB.xml
teshsuite/simdag/platforms/flatifier.c
teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
teshsuite/simdag/platforms/four_hosts_floyd.xml
teshsuite/simdag/platforms/four_hosts_floyd_bis.xml
teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml
teshsuite/simdag/platforms/one_cluster.xml
teshsuite/simdag/platforms/one_cluster_file.xml
teshsuite/simdag/platforms/one_cluster_foreach.xml
teshsuite/simdag/platforms/one_cluster_fullduplex.xml
teshsuite/simdag/platforms/one_cluster_one_host.xml
teshsuite/simdag/platforms/one_cluster_one_host_random.xml
teshsuite/simdag/platforms/one_cluster_properties_foreach.xml
teshsuite/simdag/platforms/one_cluster_properties_override.xml
teshsuite/simdag/platforms/one_cluster_router_id.xml
teshsuite/simdag/platforms/one_host.xml
teshsuite/simdag/platforms/one_host_availability.xml
teshsuite/simdag/platforms/one_host_properties.xml
teshsuite/simdag/platforms/one_host_state_file.xml
teshsuite/simdag/platforms/one_host_state_off.xml
teshsuite/simdag/platforms/one_host_state_on.xml
teshsuite/simdag/platforms/one_host_trace_file.xml
teshsuite/simdag/platforms/one_host_trace_inside.xml
teshsuite/simdag/platforms/one_link_availability.xml
teshsuite/simdag/platforms/one_link_fatpipe.xml
teshsuite/simdag/platforms/one_link_shared.xml
teshsuite/simdag/platforms/one_link_state_file.xml
teshsuite/simdag/platforms/properties.xml
teshsuite/simdag/platforms/random.xml
teshsuite/simdag/platforms/route_override.xml
teshsuite/simdag/platforms/test_of_is_router.xml
teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
teshsuite/simdag/platforms/two_clusters.xml
teshsuite/simdag/platforms/two_clusters_one_name.xml
teshsuite/simdag/platforms/two_clusters_router_id.xml
teshsuite/simdag/platforms/two_clusters_symmetric.xml
teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS.xml
teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml
teshsuite/simdag/platforms/two_hosts_multi_hop.xml
teshsuite/simdag/platforms/two_hosts_one_link.xml
teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml
teshsuite/smpi/CMakeLists.txt
teshsuite/smpi/allgather_coll.c [new file with mode: 0644]
teshsuite/smpi/allgather_coll.tesh [new file with mode: 0644]
teshsuite/smpi/allgatherv_coll.c [new file with mode: 0644]
teshsuite/smpi/allgatherv_coll.tesh [new file with mode: 0644]
teshsuite/smpi/allreduce_coll.c [new file with mode: 0644]
teshsuite/smpi/allreduce_coll.tesh [new file with mode: 0644]
teshsuite/smpi/alltoall_basic.c
teshsuite/smpi/alltoall_coll.c [new file with mode: 0644]
teshsuite/smpi/alltoall_coll.tesh [new file with mode: 0644]
teshsuite/smpi/alltoallv_coll.c [moved from teshsuite/smpi/alltoallv.c with 52% similarity]
teshsuite/smpi/alltoallv_coll.tesh [new file with mode: 0644]
teshsuite/smpi/barrier.c
teshsuite/smpi/barrier_coll.tesh [new file with mode: 0644]
teshsuite/smpi/bcast_coll.c [new file with mode: 0644]
teshsuite/smpi/bcast_coll.tesh [new file with mode: 0644]
teshsuite/smpi/gather_coll.c [new file with mode: 0644]
teshsuite/smpi/gather_coll.tesh [new file with mode: 0644]
teshsuite/smpi/mpich-test/coll/redscat.c
teshsuite/smpi/mpich-test/coll/runtests
teshsuite/smpi/mpich-test/env/gtime.c
teshsuite/smpi/mpich-test/pt2pt/isndrcv2.c
teshsuite/smpi/mpich-test/pt2pt/sendrecv.c
teshsuite/smpi/reduce_coll.c [new file with mode: 0644]
teshsuite/smpi/reduce_coll.tesh [new file with mode: 0644]
teshsuite/smpi/reduce_scatter_coll.c [new file with mode: 0644]
teshsuite/smpi/reduce_scatter_coll.tesh [new file with mode: 0644]
teshsuite/smpi/scatter_coll.tesh [new file with mode: 0644]
teshsuite/xbt/CMakeLists.txt
teshsuite/xbt/mmalloc_32.tesh
teshsuite/xbt/parmap_test.c [new file with mode: 0644]
teshsuite/xbt/parmap_test.tesh [new file with mode: 0644]
testsuite/surf/platform.xml
testsuite/xbt/parmap_bench.c
tools/CMakeLists.txt
tools/check_dist_archive
tools/check_dist_archive.exclude
tools/platf_route_rulebased2full.py [new file with mode: 0755]
tools/sg_xml_unit_converter.py [new file with mode: 0644]
tools/tesh/run_context.c

diff --git a/.cproject b/.cproject
new file mode 100644 (file)
index 0000000..2d167a8
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 5.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage2">
+       <storageModule moduleId="org.eclipse.cdt.core.settings">
+               <cconfiguration id="cdt.managedbuild.toolchain.gnu.base.1353180652">
+                       <storageModule externalCElementFile="cdt.managedbuild.toolchain.gnu.base.1353180652_org.eclipse.cdt.core.settings" id="cdt.managedbuild.toolchain.gnu.base.1353180652" name="Default"/>
+                       <storageModule externalCElementFile="cdt.managedbuild.toolchain.gnu.base.1353180652_cdtBuildSystem" version="4.0.0"/>
+                       <storageModule externalCElementFile="cdt.managedbuild.toolchain.gnu.base.1353180652_org.eclipse.cdt.core.externalSettings"/>
+               </cconfiguration>
+       </storageModule>
+       <storageModule moduleId="org.eclipse.cdt.core.pathentry">
+               <pathentry kind="mac" name="main" path="" value="smpi_simulated_main"/>
+               <pathentry include="/usr/include/lua5.1" kind="inc" path="" system="true"/>
+               <pathentry include="/usr/include" kind="inc" path="" system="true"/>
+               <pathentry base-path="simgrid" include="include" kind="inc" path="" system="true"/>
+               <pathentry base-path="simgrid" include="src/include" kind="inc" path="" system="true"/>
+               <pathentry base-path="simgrid" include="src" kind="inc" path="" system="true"/>
+               <pathentry excluding="**/CMakeFiles/" kind="out" path=""/>
+               <pathentry kind="src" path=""/>
+       </storageModule>
+       <storageModule moduleId="cdtBuildSystem" version="4.0.0">
+               <project id="simgrid.null.697056024" name="simgrid"/>
+       </storageModule>
+       <storageModule moduleId="refreshScope" versionNumber="2">
+               <configuration configurationName="Default">
+                       <resource resourceType="PROJECT" workspacePath="/simgrid"/>
+               </configuration>
+       </storageModule>
+       <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+       <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+       <storageModule moduleId="scannerConfiguration">
+               <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+                       <buildOutputProvider>
+                               <openAction enabled="true" filePath=""/>
+                               <parser enabled="true"/>
+                       </buildOutputProvider>
+                       <scannerInfoProvider id="specsFile">
+                               <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="/usr/bin/gcc" useDefault="true"/>
+                               <parser enabled="true"/>
+                       </scannerInfoProvider>
+               </profile>
+               <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+                       <buildOutputProvider>
+                               <openAction enabled="true" filePath=""/>
+                               <parser enabled="true"/>
+                       </buildOutputProvider>
+                       <scannerInfoProvider id="makefileGenerator">
+                               <runAction arguments="-f ${project_name}_scd.mk" command="/usr/bin/make" useDefault="true"/>
+                               <parser enabled="true"/>
+                       </scannerInfoProvider>
+               </profile>
+               <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1353180652;cdt.managedbuild.toolchain.gnu.base.1353180652.1797514135;cdt.managedbuild.tool.gnu.c.compiler.base.2037544368;cdt.managedbuild.tool.gnu.c.compiler.input.1851803849">
+                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="/usr/bin/gcc" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="makefileGenerator">
+                                       <runAction arguments="-f ${project_name}_scd.mk" command="/usr/bin/make" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+               </scannerConfigBuildInfo>
+               <scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.1353180652;cdt.managedbuild.toolchain.gnu.base.1353180652.1797514135;cdt.managedbuild.tool.gnu.cpp.compiler.base.1129818443;cdt.managedbuild.tool.gnu.cpp.compiler.input.500761747">
+                       <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="specsFile">
+                                       <runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="/usr/bin/gcc" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+                       <profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+                               <buildOutputProvider>
+                                       <openAction enabled="true" filePath=""/>
+                                       <parser enabled="true"/>
+                               </buildOutputProvider>
+                               <scannerInfoProvider id="makefileGenerator">
+                                       <runAction arguments="-f ${project_name}_scd.mk" command="/usr/bin/make" useDefault="true"/>
+                                       <parser enabled="true"/>
+                               </scannerInfoProvider>
+                       </profile>
+               </scannerConfigBuildInfo>
+       </storageModule>
+</cproject>
index 47a2888..8ed5023 100644 (file)
@@ -104,7 +104,6 @@ doc/simgrid_modules.map
 
 ################################################
 ### Specific of project 
-.cproject
 .project
 .settings/
 .anjuta
@@ -144,12 +143,6 @@ examples/msg/tracing/volume
 examples/msg/io/file
 examples/msg/io/file_unlink
 examples/msg/mc/bugged3
-examples/msg/mc/random_test
-examples/msg/mc/bugged1_for_liveness
-examples/msg/mc/bugged1_while_liveness
-examples/msg/mc/centralized_liveness_deadlock
-examples/msg/mc/test/test_heap_comparison
-examples/msg/mc/chord_liveness
 examples/msg/mc/test/snapshot_comparison1
 examples/msg/mc/test/snapshot_comparison2
 examples/msg/mc/test/snapshot_comparison3
@@ -239,6 +232,13 @@ examples/msg/mc/centralized_liveness
 
 src/replay/replay
 src/testall
+teshsuite/smpi/allgather_coll
+teshsuite/smpi/allgatherv_coll
+teshsuite/smpi/allreduce_coll
+teshsuite/smpi/alltoall_coll
+teshsuite/smpi/alltoallv_coll
+teshsuite/smpi/bcast_coll
+teshsuite/smpi/reduce_coll
 teshsuite/smpi/allreduce
 teshsuite/smpi/alltoall2
 teshsuite/smpi/alltoall_basic
@@ -401,8 +401,10 @@ teshsuite/smpi/mpich-test/pt2pt/waitall2
 teshsuite/smpi/mpich-test/pt2pt/waitall3
 teshsuite/smpi/mpich-test/pt2pt/waitall4
 teshsuite/smpi/mpich-test/pt2pt/waitany
+teshsuite/msg/pid
 teshsuite/msg/get_sender
 teshsuite/msg/trace/test_trace_integration
+teshsuite/simdag/availability/availability_test
 teshsuite/simdag/basic0
 teshsuite/simdag/basic1
 teshsuite/simdag/basic2
@@ -431,6 +433,7 @@ teshsuite/xbt/log_large_test
 teshsuite/xbt/parallel_log_crashtest
 testsuite/xbt/parmap_bench
 teshsuite/xbt/mmalloc_test
+teshsuite/xbt/parmap_test
 testsuite/run_tests
 testsuite/simdag/sd_test
 testsuite/surf/lmm_usage
diff --git a/COPYING b/COPYING
index 98b0223..3870bb5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -14,30 +14,6 @@ The SimGrid logo is distributed under the CC-BY-SA license.
 
 =========================================================================
 
-We have embeded pcre 8.12 library into the windows installer.
-
-PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-Release 8 of PCRE is distributed under the terms of the "BSD" licence.
-The basic library functions are written in C and are freestanding. Also
-included in the distribution is a set of C++ wrapper functions.
-
-/*
-*      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-*      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-*      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-*      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-*      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-*      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-*      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-*      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-*      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-*      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-*      POSSIBILITY OF SUCH DAMAGE.
-*/
-
-==========================================================================
-
 The file src/xbt/snprintf.c contains this license text:
 
 /*
index 2f30967..c6c0132 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,16 +4,23 @@ SimGrid (3.10) NOT RELEASED; urgency=low
  * Our own implementation of getline is renamed xbt_getline, and gets
    used even if the OS provide a getline(). This should reduce the
    configuration complexity by using the same code on all platforms.
+ * new xbt_cfg_elm_boolean type
 
  Java:
  * Reintegrate Java to the main archive as desynchronizing these
    package is not acceptable anymore (Java is now considered stable)
+ * Add explicit synchronization facilities through semaphores
  * Bugfix: Task.setDataSize() only changed the C world, not the value
    cached in the Java world
 
+ MSG:
+ * Dramatically change the way files are handled. API and internals changed, but
+   this part of MSG was not considered as production grade either.
+ * Add explicit synchronization facilities through semaphores
+
  SMPI:
- * SMPI is not built as a separate library anymore, it's now included in
-   libsimgrid.
+ * SMPI is now included directly in the libsimgrid as the windows
+   linker dont forces us on splitting it anymore.
  * Improvements of the SMPI replay tool:
    - Most of the collective communications are now rooted in the same process as
      in the original application.
@@ -22,6 +29,11 @@ SimGrid (3.10) NOT RELEASED; urgency=low
    - The replay tool now supports traces produce either by TAU or a modified
      version of MPE.
    - Bug Fix: the compute part of the reduce action is now taken into account.
+ * smpirun generates the hostfile if needed (with given hostcount and platform)
+
+ PLATFORM:
+ * Handle units for values (10ms, 10kiloflops, 10Bps, ...)
+ * Remove rule based routing (no more pcre dependency)
 
 -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
diff --git a/INSTALL b/INSTALL
index 4953f2b..bb8150c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -45,7 +45,6 @@ SimGrid archives do not have any firm dependencies.
 
 If you want to compile, you must have installed perl and cmake version 2.6 or
 above.
-In order to improve memory management you should install libpcre.
 
 If you want to compile the java bindings, you have to have a java compiler, and
 the jni.h header file (available from the JDK).
index e48b67f..35c9a55 100644 (file)
@@ -32,6 +32,16 @@ The tree is not split on projects, but on file finality:
  examples/ -> Supposed to be copy/pastable by the user, so keep it clear and
                 avoid any kind of trick. In particular, do only include the
                 public headers here.
+
+ teshsuite/ -> The more test the better. Put in there any strange test
+              doing things that the users are not supposed to do,
+              just to see if our framework is robust to incorrect and
+              unusual behaviors. All tests written in this section
+              should leverage our tesh(1) utility.
+ testsuite/ -> Old test suite, that should be converted to tesh and
+               moved to teshsuite at some point.
+
 **
 ** Indentation standard
 **
@@ -174,6 +184,13 @@ investigating the portability of the thing to windows.
       cmake -Denable_compile_optimizations=ON \
             -Denable_compile_warnings=ON
 
+* Your commit message should follow the git habits, explained eg here:
+  http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+
+* When you add/remove files, and/or make changes in the lists of files to build,
+  please check that "make distcheck" still succeeds.  This is needed to ensure
+  that the generated archive is consistent.
+
 * If you want to debug memory allocation problems, here are a few hints:
   - disable compiler optimizations, to have better backtraces;
   - disable the mallocators, or it will be hard to match malloc's with
@@ -191,3 +208,4 @@ investigating the portability of the thing to windows.
   deactivate the whole logging mechanism, switching to printfs
   instead. SimGrid becomes incredibly verbose when doing so, but it
   you let you fixing the dynars.
+  
\ No newline at end of file
index 1b3dda1..55fe3bd 100644 (file)
@@ -58,6 +58,7 @@ if(NOT enable_memcheck)
       ADD_TEST(xbt-mmalloc-64                    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/mmalloc_64.tesh)
     ENDIF()
   ENDIF()
+  ADD_TEST(xbt-parmap                           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/parmap_test.tesh)
 
   # BEGIN CONTEXTS FACTORY
   ADD_TEST(tesh-msg-get-sender-thread           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
@@ -369,6 +370,63 @@ if(NOT enable_memcheck)
       ADD_TEST(smpi-tracing-ptp                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)
       ADD_TEST(smpi-replay                      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/smpi_replay.tesh)
     endif()
+
+
+    FOREACH (GATHER_COLL default ompi mpich ompi_basic_linear ompi_linear_sync ompi_binomial)
+        ADD_TEST(smpi-gather-coll-${GATHER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/gather:${GATHER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/gather_coll.tesh)
+    ENDFOREACH()
+    
+    FOREACH (ALLGATHER_COLL default  2dmesh 3dmesh bruck GB loosely_lr lr
+                           NTSLR NTSLR_NB pair rdb  rhv ring SMP_NTS
+                           smp_simple spreading_simple ompi mpich ompi_neighborexchange)
+        ADD_TEST(smpi-allgather-coll-${ALLGATHER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/allgather:${ALLGATHER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allgather_coll.tesh)
+    ENDFOREACH()
+    
+    FOREACH (ALLGATHERV_COLL default GB pair ring ompi mpich ompi_neighborexchange ompi_bruck)
+        ADD_TEST(smpi-allgatherv-coll-${ALLGATHERV_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/allgatherv:${ALLGATHERV_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allgatherv_coll.tesh)
+    ENDFOREACH()
+    
+    FOREACH (ALLREDUCE_COLL default lr NTS rab1 rab2 rab_rdb
+                           rab_rsag rdb smp_binomial smp_binomial_pipeline
+                           smp_rdb smp_rsag smp_rsag_lr smp_rsag_rab redbcast ompi mpich ompi_ring_segmented)
+        ADD_TEST(smpi-allreduce-coll-${ALLREDUCE_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/allreduce:${ALLREDUCE_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allreduce_coll.tesh)
+    ENDFOREACH()
+    
+    FOREACH (ALLTOALL_COLL 2dmesh 3dmesh pair pair_one_barrier pair_light_barrier
+                          pair_mpi_barrier rdb ring ring_light_barrier
+                          ring_mpi_barrier ring_one_barrier
+                          simple bruck basic_linear ompi)
+        ADD_TEST(smpi-alltoall-coll-${ALLTOALL_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/alltoall:${ALLTOALL_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/alltoall_coll.tesh)
+    ENDFOREACH()
+    
+    FOREACH (ALLTOALLV_COLL default pair pair_light_barrier pair_mpi_barrier
+                           pair_one_barrier  ring ring_light_barrier
+                           ring_mpi_barrier ring_one_barrier bruck ompi)
+        ADD_TEST(smpi-alltoallv-coll-${ALLTOALLV_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/alltoallv:${ALLTOALLV_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/alltoallv_coll.tesh)
+    ENDFOREACH()
+    
+    FOREACH (BCAST_COLL default arrival_nb arrival_pattern_aware arrival_pattern_aware_wait arrival_scatter
+                       binomial_tree flattree flattree_pipeline NTSB NTSL NTSL_Isend scatter_LR_allgather
+                       scatter_rdb_allgather SMP_binary SMP_binomial SMP_linear ompi mpich ompi_split_bintree ompi_pipeline)
+               ADD_TEST(smpi-bcast-coll-${BCAST_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/bcast:${BCAST_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast_coll.tesh)
+    ENDFOREACH()
+    
+    FOREACH (REDUCE_COLL default arrival_pattern_aware binomial flat_tree NTSL scatter_gather ompi mpich ompi_chain ompi_binary ompi_basic_linear ompi_binomial ompi_in_order_binary)
+        ADD_TEST(smpi-reduce-coll-${REDUCE_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/reduce:${REDUCE_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce_coll.tesh)
+    ENDFOREACH()
+
+    FOREACH (REDUCE_SCATTER_COLL default  ompi mpich ompi_basic_recursivehalving ompi_ring mpich_noncomm mpich_pair mpich_rdb)
+        ADD_TEST(smpi-reduce_scatter-coll-${REDUCE_SCATTER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/reduce_scatter:${REDUCE_SCATTER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce_scatter_coll.tesh)
+    ENDFOREACH()
+
+    FOREACH (SCATTER_COLL default  ompi mpich ompi_basic_linear ompi_binomial)
+        ADD_TEST(smpi-scatter-coll-${SCATTER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/scatter:${SCATTER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/scatter_coll.tesh)
+    ENDFOREACH()
+
+    FOREACH (BARRIER_COLL default  ompi mpich ompi_basic_linear ompi_tree ompi_bruck ompi_recursivedoubling ompi_doublering)
+        ADD_TEST(smpi-barrier-coll-${BARRIER_COLL} ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg smpi/barrier:${BARRIER_COLL} --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/barrier_coll.tesh)
+    ENDFOREACH()
+
   endif()
 
   # END TESH TESTS
@@ -407,44 +465,26 @@ if(NOT enable_memcheck)
     endif()
   endif()
 
+  # Scala examples
+  if(enable_scala)
+    set(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/scala/:${SIMGRID_JAR}:${SCALA_JARS}")
+    ADD_TEST(scala-bypass                        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/scala --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/scala ${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_bypass/bypass.tesh)
+    ADD_TEST(scala-kill                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/scala --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/scala ${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_kill/kill.tesh)
+    ADD_TEST(scala-masterslave                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/scala --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/scala ${CMAKE_HOME_DIRECTORY}/examples/scala/masterslave/masterslave.tesh)
+  endif()
+
   # examples/msg/mc
   if(HAVE_MC)
-    ADD_TEST(mc-bugged1-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
-    ADD_TEST(mc-centralized-thread              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
     if(CONTEXT_UCONTEXT)
       ADD_TEST(mc-bugged1-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
-      ADD_TEST(mc-centralized-ucontext          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
+      ADD_TEST(mc-bugged2-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
       if(PROCESSOR_x86_64) # liveness model-checking works only on 64bits (for now ...)
-        ADD_TEST(mc-bugged1-liveness-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness.tesh)
-        ADD_TEST(mc-chord-neverjoin-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc/chord --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/chord chord_neverjoin.tesh)
-        ADD_TEST(mc-test-snapshot-comparison1     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc/test --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/test snapshot_comparison1.tesh)
-        ADD_TEST(mc-test-snapshot-comparison2     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc/test --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/test snapshot_comparison2.tesh)
-        ADD_TEST(mc-test-snapshot-comparison3     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc/test --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/test snapshot_comparison3.tesh)
-        ADD_TEST(mc-test-snapshot-comparison4     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc/test --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/test snapshot_comparison4.tesh)
-        ADD_TEST(mc-test-snapshot-comparison5     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc/test --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/test snapshot_comparison5.tesh)
+        ADD_TEST(mc-bugged1-liveness-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness.tesh)
       endif()
     endif()
     if(HAVE_RAWCTX)
       ADD_TEST(mc-bugged1-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
-      ADD_TEST(mc-centralized-raw               ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
-    endif()
-  endif()
-
-  ###
-  ### Declare that we know that some tests are broken
-  ###
-
-  # Those tests are broken : set to "fail" for release v3.6
-  if(release)
-    if(HAVE_MC)
-      set_tests_properties(mc-bugged1-thread PROPERTIES WILL_FAIL true)
-      set_tests_properties(mc-centralized-thread PROPERTIES WILL_FAIL true)
-      if(CONTEXT_UCONTEXT)
-        set_tests_properties(mc-centralized-ucontext PROPERTIES WILL_FAIL true)
-      endif()
-      if(HAVE_RAWCTX)
-        set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true)
-      endif()
+      ADD_TEST(mc-bugged2-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
     endif()
   endif()
 
index a5bec10..4727446 100644 (file)
@@ -68,11 +68,6 @@ include(TestBigEndian)
 TEST_BIG_ENDIAN(BIGENDIAN)
 
 include(FindGraphviz)
-if(WIN32)
-  include(FindPcreWin)
-else()
-  include(FindPCRE)
-endif()
 
 set(HAVE_GTNETS 0)
 if(enable_gtnets)
@@ -89,6 +84,11 @@ if(enable_java)
   message("-- [Java] JNI include dirs: ${JNI_INCLUDE_DIRS}")
   set(HAVE_Java 1)
 endif()
+if(enable_scala)
+  find_package(Scala REQUIRED)
+  message("-- [Scala] scalac found: ${SCALA_COMPILE}")
+  set(HAVE_Scala 1)
+endif()
 if(enable_lua)
   include(FindLua51Simgrid)
 endif()
@@ -771,6 +771,7 @@ configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in"                "${CMAKE_
 
 set(top_srcdir "${CMAKE_HOME_DIRECTORY}")
 set(srcdir "${CMAKE_HOME_DIRECTORY}/src")
+set(bindir "${CMAKE_BINARY_DIR}")
 
 ### Script used when simgrid is installed
 set(exec_prefix ${CMAKE_INSTALL_PREFIX})
@@ -855,6 +856,9 @@ else()
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_alltoall.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_alltoall.txt COPYONLY)
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_alltoallv.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_alltoallv.txt COPYONLY)
   configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_waitall.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_waitall.txt COPYONLY)
+  configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_reducescatter.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_reducescatter.txt COPYONLY)
+  configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_gather.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_gather.txt COPYONLY)
+  configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_allgatherv.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_allgatherv.txt COPYONLY)
   configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile COPYONLY)
 
   set(generated_files_to_clean
index 84cb6cc..8803ef8 100644 (file)
@@ -37,6 +37,8 @@ set(EXTRA_DIST
   src/smpi/README
   src/smpi/colls/COPYRIGHTS
   src/smpi/colls/colls.h
+  src/smpi/colls/colls_private.h
+  src/smpi/colls/coll_tuned_topo.h
   src/smpi/private.h
   src/smpi/smpi_mpi_dt_private.h
   src/surf/cpu_ti_private.h
@@ -109,9 +111,12 @@ set(SMPI_SRC
   src/smpi/smpi_mpi_dt.c
   src/smpi/smpi_pmpi.c
   src/smpi/smpi_replay.c
-  #src/smpi/colls/allgather-2dmesh.c
-  #src/smpi/colls/allgather-3dmesh.c
-  #src/smpi/colls/allgather-bruck.c
+  src/smpi/colls/smpi_openmpi_selector.c
+  src/smpi/colls/smpi_mpich_selector.c
+  src/smpi/colls/colls_global.c
+  src/smpi/colls/allgather-2dmesh.c
+  src/smpi/colls/allgather-3dmesh.c
+  src/smpi/colls/allgather-bruck.c
   src/smpi/colls/allgather-GB.c
   src/smpi/colls/allgather-loosely-lr.c
   src/smpi/colls/allgather-lr.c
@@ -119,28 +124,34 @@ set(SMPI_SRC
   src/smpi/colls/allgather-NTSLR-NB.c
   src/smpi/colls/allgather-pair.c
   src/smpi/colls/allgather-rdb.c
-  src/smpi/colls/allgather-RDB.c
   src/smpi/colls/allgather-rhv.c
   src/smpi/colls/allgather-ring.c
   src/smpi/colls/allgather-SMP-NTS.c
   src/smpi/colls/allgather-smp-simple.c
-  src/smpi/colls/allgather-SMP-simple.c
   src/smpi/colls/allgather-spreading-simple.c
+  src/smpi/colls/allgather-ompi-neighborexchange.c
+  src/smpi/colls/allgatherv-GB.c  
+  src/smpi/colls/allgatherv-pair.c
+  src/smpi/colls/allgatherv-ring.c
+  src/smpi/colls/allgatherv-ompi-neighborexchange.c
+  src/smpi/colls/allgatherv-ompi-bruck.c
+  src/smpi/colls/allgatherv-mpich-rdb.c
   src/smpi/colls/allreduce-lr.c
   src/smpi/colls/allreduce-NTS.c
   src/smpi/colls/allreduce-rab1.c
   src/smpi/colls/allreduce-rab2.c
-  #src/smpi/colls/allreduce-rab-rdb.c
+  src/smpi/colls/allreduce-rab-rdb.c
   #src/smpi/colls/allreduce-rab-reduce-scatter.c
   src/smpi/colls/allreduce-rab-rsag.c
   src/smpi/colls/allreduce-rdb.c
   src/smpi/colls/allreduce-redbcast.c
   src/smpi/colls/allreduce-smp-binomial.c
-  #src/smpi/colls/allreduce-smp-binomial-pipeline.c
+  src/smpi/colls/allreduce-smp-binomial-pipeline.c
   src/smpi/colls/allreduce-smp-rdb.c
   src/smpi/colls/allreduce-smp-rsag.c
   src/smpi/colls/allreduce-smp-rsag-lr.c
   src/smpi/colls/allreduce-smp-rsag-rab.c
+  src/smpi/colls/allreduce-ompi-ring-segmented.c
   src/smpi/colls/alltoall-2dmesh.c
   src/smpi/colls/alltoall-3dmesh.c
   #src/smpi/colls/alltoall-bruck.c
@@ -154,6 +165,15 @@ set(SMPI_SRC
   src/smpi/colls/alltoall-ring-mpi-barrier.c
   src/smpi/colls/alltoall-ring-one-barrier.c
   src/smpi/colls/alltoall-simple.c
+  src/smpi/colls/alltoallv-pair.c   
+  src/smpi/colls/alltoallv-pair-light-barrier.c
+  src/smpi/colls/alltoallv-pair-mpi-barrier.c
+  src/smpi/colls/alltoallv-pair-one-barrier.c 
+  src/smpi/colls/alltoallv-ring.c
+  src/smpi/colls/alltoallv-ring-light-barrier.c
+  src/smpi/colls/alltoallv-ring-mpi-barrier.c
+  src/smpi/colls/alltoallv-ring-one-barrier.c
+  src/smpi/colls/alltoallv-bruck.c
   src/smpi/colls/bcast-arrival-nb.c
   src/smpi/colls/bcast-arrival-pattern-aware.c
   src/smpi/colls/bcast-arrival-pattern-aware-wait.c
@@ -169,13 +189,20 @@ set(SMPI_SRC
   src/smpi/colls/bcast-SMP-binary.c
   src/smpi/colls/bcast-SMP-binomial.c
   src/smpi/colls/bcast-SMP-linear.c
-  src/smpi/colls/bcast-TSB.c
+  src/smpi/colls/coll_tuned_topo.c
+  src/smpi/colls/bcast-ompi-split-bintree.c
+  src/smpi/colls/bcast-ompi-pipeline.c
   src/smpi/colls/reduce-arrival-pattern-aware.c
   src/smpi/colls/reduce-binomial.c
   src/smpi/colls/reduce-flat-tree.c
   src/smpi/colls/reduce-NTSL.c
   src/smpi/colls/reduce-scatter-gather.c
-  src/smpi/colls/star-reduction.c
+  src/smpi/colls/reduce-ompi.c
+  src/smpi/colls/gather-ompi.c
+  src/smpi/colls/reduce_scatter-ompi.c
+  src/smpi/colls/reduce_scatter-mpich.c
+  src/smpi/colls/scatter-ompi.c
+  src/smpi/colls/barrier-ompi.c
   )
 
 if(SMPI_F2C)
@@ -278,7 +305,6 @@ set(SURF_SRC
   src/surf/surf_routing_full.c
   src/surf/surf_routing_generic.c
   src/surf/surf_routing_none.c
-  src/surf/surf_routing_rulebased.c
   src/surf/surf_routing_vivaldi.c
   src/surf/surfxml_parse.c
   src/surf/surfxml_parseplatf.c
@@ -323,6 +349,7 @@ set(MSG_SRC
   src/msg/msg_io.c
   src/msg/msg_mailbox.c
   src/msg/msg_process.c
+  src/msg/msg_synchro.c
   src/msg/msg_task.c
   src/msg/msg_vm.c
   )
@@ -386,6 +413,8 @@ set(BINDINGS_SRC
 set(JMSG_C_SRC
   src/bindings/java/jmsg.c
   src/bindings/java/jmsg.h
+  src/bindings/java/jmsg_as.c
+  src/bindings/java/jmsg_as.h
   src/bindings/java/jmsg_comm.c
   src/bindings/java/jmsg_comm.h
   src/bindings/java/jmsg_file.c
@@ -411,6 +440,7 @@ set(JMSG_C_SRC
 )
 
 set(JMSG_JAVA_SRC
+  src/bindings/java/org/simgrid/msg/As.java    
   src/bindings/java/org/simgrid/msg/Comm.java
   src/bindings/java/org/simgrid/msg/File.java
   src/bindings/java/org/simgrid/msg/Host.java
@@ -420,6 +450,7 @@ set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/msg/Msg.java
   src/bindings/java/org/simgrid/msg/MsgException.java
   src/bindings/java/org/simgrid/msg/Mutex.java
+  src/bindings/java/org/simgrid/msg/Semaphore.java
   src/bindings/java/org/simgrid/msg/NativeException.java
   src/bindings/java/org/simgrid/msg/Process.java
   src/bindings/java/org/simgrid/msg/ProcessKilledError.java
@@ -525,7 +556,6 @@ set(headers_to_install
   include/xbt/dynar.h
   include/xbt/ex.h
   include/xbt/fifo.h
-  include/xbt/file_stat.h
   include/xbt/function_types.h
   include/xbt/graph.h
   include/xbt/graphxml.h
@@ -608,7 +638,6 @@ set(simgrid_sources
   ${SIMGRID_SRC}
   ${SIMIX_SRC}
   ${SURF_SRC}
-  ${TRACING_SRC}
   ${XBT_SRC}
   )
 
@@ -695,7 +724,6 @@ set(DOC_SOURCES
 
   doc/HelloWorld/CMakeLists.txt
   doc/HelloWorld/HelloWorld.c
-  doc/HelloWorld/FindPcreWin.cmake
   doc/HelloWorld/README
 
   doc/doxygen/FAQ.doc
@@ -831,6 +859,7 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/CMakeLists.txt
   examples/msg/actions/CMakeLists.txt
   examples/msg/bittorrent/CMakeLists.txt
+  examples/msg/chainsend/CMakeLists.txt
   examples/msg/chord/CMakeLists.txt
   examples/msg/cloud/CMakeLists.txt
   examples/msg/gpu/CMakeLists.txt
@@ -843,15 +872,20 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/migration/CMakeLists.txt
   examples/msg/ns3/CMakeLists.txt
   examples/msg/parallel_task/CMakeLists.txt
+  examples/msg/pastry/CMakeLists.txt
   examples/msg/pmm/CMakeLists.txt
   examples/msg/priority/CMakeLists.txt
   examples/msg/properties/CMakeLists.txt
+  examples/msg/semaphores/CMakeLists.txt
   examples/msg/sendrecv/CMakeLists.txt
-  examples/msg/chainsend/CMakeLists.txt
   examples/msg/start_kill_time/CMakeLists.txt
   examples/msg/suspend/CMakeLists.txt
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/CMakeLists.txt
+  examples/scala/CMakeLists.txt
+  examples/scala/master_slave_bypass/CMakeLists.txt
+  examples/scala/master_slave_kill/CMakeLists.txt
+  examples/scala/masterslave/CMakeLists.txt
   examples/simdag/CMakeLists.txt
   examples/simdag/dax/CMakeLists.txt
   examples/simdag/dot/CMakeLists.txt
@@ -869,20 +903,20 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/msg/CMakeLists.txt
   teshsuite/msg/trace/CMakeLists.txt
   teshsuite/simdag/CMakeLists.txt
+  teshsuite/simdag/availability/CMakeLists.txt
   teshsuite/simdag/network/CMakeLists.txt
   teshsuite/simdag/network/mxn/CMakeLists.txt
   teshsuite/simdag/network/p2p/CMakeLists.txt
   teshsuite/simdag/partask/CMakeLists.txt
   teshsuite/simdag/platforms/CMakeLists.txt
-  teshsuite/simdag/availability/CMakeLists.txt
-  teshsuite/xbt/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
   teshsuite/smpi/mpich-test/CMakeLists.txt
-  teshsuite/smpi/mpich-test/env/CMakeLists.txt
   teshsuite/smpi/mpich-test/coll/CMakeLists.txt
   teshsuite/smpi/mpich-test/context/CMakeLists.txt
+  teshsuite/smpi/mpich-test/env/CMakeLists.txt
   teshsuite/smpi/mpich-test/profile/CMakeLists.txt
   teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt
+  teshsuite/xbt/CMakeLists.txt
   )
 
 set(TOOLS_CMAKEFILES_TXT
@@ -918,10 +952,9 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Modules/FindLibunwind.cmake
   buildtools/Cmake/Modules/FindLua51Simgrid.cmake
   buildtools/Cmake/Modules/FindNS3.cmake
-  buildtools/Cmake/Modules/FindPCRE.cmake
-  buildtools/Cmake/Modules/FindPcreWin.cmake
   buildtools/Cmake/Modules/FindRngStream.cmake
   buildtools/Cmake/Modules/FindRubySimgrid.cmake
+  buildtools/Cmake/Modules/FindScala.cmake
   buildtools/Cmake/Modules/FindSimGrid.cmake
   buildtools/Cmake/Modules/FindValgrind.cmake
   buildtools/Cmake/Option.cmake
@@ -963,7 +996,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cluster.xml
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_no_backbone.xml
-  examples/platforms/cluster_routing_rulebased.xml
   examples/platforms/clusters_routing_full.xml
   examples/platforms/conf/gridpp_grid_2004.conf
   examples/platforms/conf/gridpp_grid_2004.xml
index 9cf775f..92c7005 100644 (file)
@@ -10,29 +10,6 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools)
 ##################################################################
 
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/)
-
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/availability)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/env)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/coll)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/context)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/profile)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/pt2pt)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace)
-
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/async)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/bittorrent)
@@ -52,38 +29,68 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/startKillTime)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/suspend)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/java/tracing)
 
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/properties)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/actions)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/migration)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chainsend)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/suspend)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/priority)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/icomms)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chainsend)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/chord)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/pmm)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time)
-
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/io)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/cloud)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gpu)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/icomms)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/io)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/mc)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/migration)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/ns3)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/pastry)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/pmm)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/priority)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/properties)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/semaphores)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/suspend)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/msg/tracing)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_bypass)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/master_slave_kill)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/scala/masterslave)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dax)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/goal)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/goal)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/metaxml)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/smpi/MM)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/availability)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/coll)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/context)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/env)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/profile)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich-test/pt2pt)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/xbt)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
+
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/graphicator/)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
index f9037de..86d7dd3 100644 (file)
@@ -6,23 +6,31 @@ include(UseJava)
 #
 add_library(SG_java SHARED ${JMSG_C_SRC})
 set_target_properties(SG_java PROPERTIES VERSION ${libSG_java_version})
-get_target_property(COMMON_INCLUDES SG_java INCLUDE_DIRECTORIES)
-if (COMMON_INCLUDES)
-  set_target_properties(SG_java PROPERTIES
-    INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+if (CMAKE_VERSION VERSION_LESS "2.8.8")
+  include_directories(${JNI_INCLUDE_DIRS})
+
+  message(WARNING "[Java] Try to workaround missing feature in older CMake.  You should better update CMake to version 2.8.8 or above.")
+  get_directory_property(CHECK_INCLUDES INCLUDE_DIRECTORIES)
 else()
-  set_target_properties(SG_java PROPERTIES
-    INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
-endif()
-add_dependencies(SG_java simgrid)
+  get_target_property(COMMON_INCLUDES SG_java INCLUDE_DIRECTORIES)
+  if (COMMON_INCLUDES)
+    set_target_properties(SG_java PROPERTIES
+      INCLUDE_DIRECTORIES "${COMMON_INCLUDES};${JNI_INCLUDE_DIRS}")
+  else()
+    set_target_properties(SG_java PROPERTIES
+      INCLUDE_DIRECTORIES "${JNI_INCLUDE_DIRS}")
+  endif()
+  add_dependencies(SG_java simgrid)
 
-get_target_property(CHECK_INCLUDES SG_java INCLUDE_DIRECTORIES)
+  get_target_property(CHECK_INCLUDES SG_java INCLUDE_DIRECTORIES)
+endif()
 message("-- [Java] SG_java includes: ${CHECK_INCLUDES}")
 
+target_link_libraries(SG_java simgrid)
+
 if(WIN32)
-  get_target_property(SIMGRID_LIB_NAME_NAME SG_java LIBRARY_OUTPUT_NAME)
   set_target_properties(SG_java PROPERTIES
-    LINK_FLAGS "-Wl,--subsystem,windows,--kill-at ${SIMGRID_LIB_NAME}"
+    LINK_FLAGS "-Wl,--subsystem,windows,--kill-at"
     PREFIX "")
   find_path(PEXPORTS_PATH NAMES pexports.exe PATHS NO_DEFAULT_PATHS)
   message(STATUS "pexports: ${PEXPORTS_PATH}")
@@ -30,8 +38,6 @@ if(WIN32)
     add_custom_command(TARGET SG_java POST_BUILD
       COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java.dll > ${CMAKE_BINARY_DIR}/SG_java.def)
   endif(PEXPORTS_PATH)
-else()
-  target_link_libraries(SG_java simgrid)
 endif()
 
 # Rules to build simgrid.jar
@@ -83,6 +89,7 @@ add_custom_command(
           ${CMAKE_HOME_DIRECTORY}/COPYING
           ${CMAKE_HOME_DIRECTORY}/ChangeLog
           ${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java
+          ${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1
   COMMAND ${CMAKE_COMMAND} -E remove_directory "NATIVE"
   COMMAND ${CMAKE_COMMAND} -E make_directory "${JSG_BUNDLE}"
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/lib/${LIBSIMGRID_SO}" "${JSG_BUNDLE}"
@@ -92,6 +99,7 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/COPYING" "${JSG_BUNDLE}"
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/ChangeLog" "${JSG_BUNDLE}"
   COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/ChangeLog.SimGrid-java" "${JSG_BUNDLE}"
+  COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_HOME_DIRECTORY}/LICENSE-LGPL-2.1" "${JSG_BUNDLE}"
   COMMAND ${JAVA_ARCHIVE} -uvmf ${MANIFEST_FILE} ${SIMGRID_JAR} "NATIVE"
   COMMAND ${CMAKE_COMMAND} -E remove ${SIMGRID_JAR}_finalized
   COMMAND ${CMAKE_COMMAND} -E touch ${SIMGRID_JAR}_finalized
index 0c8e76f..93ace1d 100644 (file)
@@ -38,7 +38,7 @@ endif()
 
 # Compute the dependencies of SimGrid
 #####################################
-set(SIMGRID_DEP "-lm -lpcre")
+set(SIMGRID_DEP "-lm")
 
 if(pthread)
   if(${CONTEXT_THREADS})
index 081c6e0..206ab5c 100644 (file)
@@ -24,7 +24,7 @@ else()
     )
 endif()
 
-set(SIMGRID_DEP "-lws2_32 -L${PATH_PCRE_LIB} -L${PATH_PTHREAD_LIB} -lm -lpcre -lpthreadGC2")
+set(SIMGRID_DEP "-lws2_32 -L${PATH_PTHREAD_LIB} -lm -lpthreadGC2")
 
 if(ARCH_32_BITS)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
deleted file mode 100644 (file)
index 2e46c9b..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-find_library(PATH_PCRE_LIB
-  NAMES pcre
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{LD_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES lib/ GnuWin32/lib
-  PATHS
-  /opt
-  /opt/local
-  /opt/csw
-  /sw
-  /usr)
-
-find_path(PATH_PCRE_H "pcre.h"
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{LD_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES include/ GnuWin32/include
-  PATHS
-  /opt
-  /opt/local
-  /opt/csw
-  /sw
-  /usr)
-
-message(STATUS "Looking for pcre.h")
-if(PATH_PCRE_H)
-  message(STATUS "Looking for pcre.h - found")
-else()
-  message(STATUS "Looking for pcre.h - not found")
-endif()
-
-message(STATUS "Looking for lib pcre")
-if(PATH_PCRE_LIB)
-  message(STATUS "Looking for lib pcre - found")
-else()
-  message(STATUS "Looking for lib pcre - not found")
-endif()
-
-if(PATH_PCRE_LIB AND PATH_PCRE_H)
-  string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATH_PCRE_LIB "${PATH_PCRE_LIB}")
-  string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-  include_directories(${PATH_PCRE_H})
-  link_directories(${PATH_PCRE_LIB})
-else()
-  message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
-endif()
-
-set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
-
-mark_as_advanced(PATH_PCRE_H)
-mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
diff --git a/buildtools/Cmake/Modules/FindPcreWin.cmake b/buildtools/Cmake/Modules/FindPcreWin.cmake
deleted file mode 100644 (file)
index 8f454fb..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# LIB libpcre.dll
-find_library(PATH_PCRE_LIB
-  NAMES pcre
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES bin/ GnuWin32/bin
-  )
-
-find_path(PATH_PCRE_H "pcre.h"
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES include/ GnuWin32/include
-  )
-
-message(STATUS "Looking for pcre.h")
-if(PATH_PCRE_H)
-  message(STATUS "Looking for pcre.h - found")
-else()
-  message(STATUS "Looking for pcre.h - not found")
-endif()
-
-message(STATUS "Looking for lib pcre")
-if(PATH_PCRE_LIB)
-  message(STATUS "Looking for lib pcre - found")
-else()
-  message(STATUS "Looking for lib pcre - not found")
-endif()
-
-if(PATH_PCRE_LIB AND PATH_PCRE_H)
-  string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-  string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}")
-  if(NOT operation)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
-  endif()
-else()
-  message(FATAL_ERROR "Please install the pcre package before using SimGrid.")
-endif()
-
-set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
-
-mark_as_advanced(PATH_PCRE_H)
-mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
diff --git a/buildtools/Cmake/Modules/FindScala.cmake b/buildtools/Cmake/Modules/FindScala.cmake
new file mode 100644 (file)
index 0000000..777527a
--- /dev/null
@@ -0,0 +1,21 @@
+
+find_program(SCALA_COMPILE
+  NAMES scalac
+  PATH_SUFFIXES bin/
+  PATHS
+  /opt
+  /opt/local
+  /opt/csw
+  /sw
+  /usr
+  )
+
+message(STATUS "Looking for scalac")
+if(SCALA_COMPILE)
+  message(STATUS "Looking for scalac - found")
+else()
+  message(STATUS "Looking for scalac - not found")
+endif()
+
+set(SCALA_JARS "/usr/share/java/scala-compiler.jar:/usr/share/java/scala-library.jar:/usr/share/java/scalap.jar:/usr/share/java/scala/jline.jar:/usr/share/java/jansi.jar")
+
index 2df5821..76622f5 100644 (file)
@@ -21,6 +21,7 @@ option(enable_debug "Set NDEBUG flag" on)
 option(enable_gtnets "Whether gtnets model is activated." off)
 option(enable_ns3    "Whether ns3 model is activated." off)
 option(enable_java   "Whether the Java bindings are activated." off)
+option(enable_scala  "Whether the Scala bindings are activated." off)
 option(enable_lua    "Whether the lua bindings are activated." off)
 option(enable_compile_warnings "Whether compilation warnings should be turned into errors." off)
 option(enable_maintainer_mode "Whether flex and flexml files should be rebuilt." off)
@@ -46,6 +47,10 @@ else()
   option(enable_smpi "Whether SMPI in included in library." on)
 endif()
 
+if(enable_scala AND NOT enable_java)
+  message(WARNING "For using scala you must turn java on with command:\ncmake -Denable_java=on .")
+endif()
+
 mark_as_advanced(HAVE_SSH)
 mark_as_advanced(HAVE_RSYNC)
 mark_as_advanced(BIBTEX2HTML_PATH)
index c1393b9..fa0fa1f 100644 (file)
@@ -106,6 +106,7 @@ if(NOT APPLE AND NOT WIN32)
   message("        NS-3 path ...........: ${ns3_path}")
 endif()
 message("        Compile Java ........: ${HAVE_Java}")
+message("        Compile Scala........: ${HAVE_Scala}")
 message("        Compile Lua .........: ${HAVE_LUA}")
 message("        Compile Smpi ........: ${HAVE_SMPI}")
 message("        Compile Smpi f77 ....: ${SMPI_F2C}")
index 4351f1b..7800769 100644 (file)
@@ -12,7 +12,6 @@ set(TEST_CFILES
   src/xbt/xbt_strbuff.c
   src/xbt/xbt_sha.c
   src/xbt/config.c
-  src/xbt/parmap.c
   )
 set(TEST_UNITS
   ${CMAKE_CURRENT_BINARY_DIR}/src/cunit_unit.c
@@ -25,7 +24,6 @@ set(TEST_UNITS
   ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_strbuff_unit.c
   ${CMAKE_CURRENT_BINARY_DIR}/src/xbt_sha_unit.c
   ${CMAKE_CURRENT_BINARY_DIR}/src/config_unit.c
-  ${CMAKE_CURRENT_BINARY_DIR}/src/parmap_unit.c
 
   ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_units_main.c
   )
index da7aeb4..1323865 100644 (file)
@@ -163,8 +163,6 @@ Section "Examples" ExamplesSection
        file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\deployment_masterslave_forwarder.xml\r
        file @CMAKE_HOME_DIRECTORY@\examples\msg\msg_platform.xml\r
        file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\CMakeLists.txt\r
-       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake\r
-\r
 \r
        # create shortcuts in the start menu programs directory\r
        CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\"\r
@@ -172,16 +170,6 @@ Section "Examples" ExamplesSection
        createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\MasterSlave project.lnk"  "$INSTDIR\examples\MasterSlave"\r
        \r
 SectionEnd\r
-Section "Pcre library" PCRESection     \r
-       # install pcre library\r
-       CreateDirectory $INSTDIR\GnuWin32\r
-       setOutPath $INSTDIR\GnuWin32\r
-       file /r "@PCRE_LIBRARY_PATH@\lib"\r
-       file /r "@PCRE_LIBRARY_PATH@\include"\r
-       file /r "@PCRE_LIBRARY_PATH@\bin"\r
-       file /r "@PCRE_LIBRARY_PATH@\man"\r
-       file /r "@PCRE_LIBRARY_PATH@\share"\r
-SectionEnd\r
 \r
 Section "Java Bindings" JavaSection    \r
        # install java library and examples\r
@@ -230,7 +218,6 @@ Section "SMPI Library" SMPISection
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\hostfile\r
        file @CMAKE_HOME_DIRECTORY@\examples\msg\small_platform_with_routers.xml\r
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\CMakeLists.txt\r
-       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake\r
 SectionEnd\r
 \r
 # default section start\r
@@ -250,8 +237,6 @@ section
        # Set Variables\r
        WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR\r
        WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
-       WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32\r
-       WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION "8.21"\r
        \r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"\r
@@ -268,25 +253,22 @@ LangString DESC_LibSection                ${LANG_ENGLISH} "Install Simgrid libraries with ass
 LangString DESC_BinSection             ${LANG_ENGLISH} "Install some useful tools for Simgrid."\r
 LangString DESC_DocSection             ${LANG_ENGLISH} "Generated (doxygen) documentation."\r
 LangString DESC_ExamplesSection ${LANG_ENGLISH} "Simgrid's HelloWorld example and some classical platforms."\r
-LangString DESC_PCRESection    ${LANG_ENGLISH} "Install the PCRE and PCREPOSIX libraries for SimGrid."\r
 LangString DESC_JAVASection    ${LANG_ENGLISH} "Install the Java binding and examples."\r
 LangString DESC_SMPISection    ${LANG_ENGLISH} "Install the SMPI library, headers, and examples."\r
 \r
 \r
-LangString DESC_LibSection             ${LANG_FRENCH}  "Installer les librairies Simgrid et leurs Entêtes."\r
+LangString DESC_LibSection             ${LANG_FRENCH}  "Installer les librairies Simgrid et leurs Enttes."\r
 LangString DESC_BinSection             ${LANG_FRENCH}  "Installer les outils optionnels."\r
 LangString DESC_DocSection             ${LANG_FRENCH}  "Installer la documentation."\r
 LangString DESC_ExamplesSection ${LANG_FRENCH}         "Installer un exemple 'HelloWorld' et des fichiers de plate-formes types."\r
-LangString DESC_PCRESection    ${LANG_FRENCH}  "Installer les librairies PCRE et PCREPOSIX for SimGrid."\r
 LangString DESC_JAVASection    ${LANG_FRENCH}  "Installer la librairie Simgrid-java et les exemples."\r
-LangString DESC_SMPISection    ${LANG_FRENCH}  "Installer la librairie SMPI, ses en-têtes, et ses exemples."\r
+LangString DESC_SMPISection    ${LANG_FRENCH}  "Installer la librairie SMPI, ses en-ttes, et ses exemples."\r
 \r
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
   !insertmacro MUI_DESCRIPTION_TEXT ${LibSection}              $(DESC_LibSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${BinSection}              $(DESC_BinSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${DocSection}              $(DESC_DocSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${ExamplesSection}         $(DESC_ExamplesSection)\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${PCRESection}             $(DESC_PCRESection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${JAVASection}             $(DESC_JAVASection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SMPISection}             $(DESC_SMPISection)\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
@@ -394,14 +376,9 @@ section "Uninstall"
        RMDir  /r "$INSTDIR\examples"\r
        RMDir  /r "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        \r
-       # delete PCRE\r
-       RMDir   /r "$INSTDIR\GnuWin32"\r
-       \r
        # Delete variable\r
        DeleteRegValue ${env_hkcu} SIMGRID_ROOT\r
        DeleteRegValue ${env_hkcu} SIMGRID_VERSION\r
-       DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH\r
-       DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION\r
     DeleteRegKey HKCU "SOFTWARE\SimGrid"\r
     \r
     # delete JAVA-bindings\r
diff --git a/buildtools/jenkins/run.bat b/buildtools/jenkins/run.bat
new file mode 100644 (file)
index 0000000..867f69c
--- /dev/null
@@ -0,0 +1 @@
+c:\mingw\msys\1.0\bin\sh -login .\buildtools\Jenkins\runmingw.sh %1 %2
diff --git a/buildtools/jenkins/run.sh b/buildtools/jenkins/run.sh
new file mode 100644 (file)
index 0000000..fe5a509
--- /dev/null
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+WORKSPACE=$1
+build_mode=$2
+
+rm -rf $WORKSPACE/build
+rm -rf $WORKSPACE/install
+
+mkdir $WORKSPACE/build
+mkdir $WORKSPACE/install
+cd $WORKSPACE/build
+
+cmake $WORKSPACE
+make dist
+tar xzf `cat VERSION`.tar.gz
+cd `cat VERSION`
+
+if [ "$build_mode" = "Debug" ]
+then
+cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_compile_warnings=ON .
+fi
+
+if [ "$build_mode" = "ModelChecker" ]
+then
+cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=ON -Denable_lua=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON .
+fi
+
+if [ "$build_mode" = "DynamicAnalysis" ]
+then
+cmake -Denable_lua=OFF -Denable_java=ON -Denable_tracing=ON -Denable_smpi=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON -Denable_lib_static=OFF -Denable_model-checking=OFF -Denable_latency_bound_tracking=OFF -Denable_gtnets=OFF -Denable_jedule=OFF -Denable_mallocators=OFF -Denable_memcheck=ON .
+fi
+
+make
+
+TRES=0
+
+ctest -T test --no-compress-output || true
+if [ -f Testing/TAG ] ; then
+   /usr/bin/xsltproc $WORKSPACE/buildtools/jenkins/ctest2junit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > CTestResults.xml
+   mv CTestResults.xml $WORKSPACE
+fi
+
+if [ "$build_mode" = "Debug" ]
+then
+cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_compile_warnings=ON .
+fi
+
+if [ "$build_mode" = "ModelChecker" ]
+then
+cmake -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=ON -Denable_lua=ON -Denable_compile_optimizations=OFF -Denable_compile_warnings=ON .
+fi
+
+if [ "$build_mode" = "DynamicAnalysis" ]
+then
+  ctest -D ContinuousStart
+  ctest -D ContinuousConfigure
+  ctest -D ContinuousBuild
+  ctest -D ContinuousMemCheck
+  ctest -D ContinuousSubmit
+fi
+
+ctest -D ContinuousStart
+ctest -D ContinuousConfigure
+ctest -D ContinuousBuild
+ctest -D ContinuousTest
+ctest -D ContinuousSubmit
+
+rm -rf `cat VERSION`
diff --git a/buildtools/jenkins/runmingw.sh b/buildtools/jenkins/runmingw.sh
new file mode 100644 (file)
index 0000000..dc901e8
--- /dev/null
@@ -0,0 +1,22 @@
+#!c:\mingw\msys\1.0\bin\sh -login
+
+WORKSPACE=$1
+build_mode=$2
+
+rm -rf $WORKSPACE/build
+rm -rf $WORKSPACE/install
+mkdir $WORKSPACE/build
+mkdir $WORKSPACE/install
+cd $WORKSPACE/build
+
+if [ "$build_mode" = "Debug" ]
+then
+cmake -G "MSYS Makefiles" ..
+fi
+
+if [ "$build_mode" = "ModelChecker" ]
+then
+cmake -G "MSYS Makefiles" -Denable_model-checking=ON -Denable_compile_optimizations=OFF ..
+fi
+
+make
index 7cdb9c5..5fd8a96 100644 (file)
@@ -11,7 +11,6 @@ sudo aptitude -y install git
 sudo aptitude -y install git-core
 sudo aptitude -y install graphviz-dev graphviz
 sudo aptitude -y install liblua5.1-dev lua5.1
-sudo aptitude -y install libpcre3-dev
 sudo aptitude -y install libunwind7-dev
 sudo aptitude -y install make
 sudo aptitude -y install valgrind
index 8088a64..35f9832 100644 (file)
@@ -14,7 +14,6 @@ sudo yum -y -q install wget
 sudo yum -y -q install perl
 sudo yum -y -q install graphviz-dev graphviz
 sudo yum -y -q install f2c
-sudo yum -y -q install pcre-devel pcre-static
 sudo yum -y -q install git-core
 sudo yum -y -q install ruby ruby-devel
 sudo yum -y -q install libunwind libunwind-devel
index c14e3ea..9fc740a 100644 (file)
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 #sudo port install wget
-#sudo port install pcre
 #sudo port install gcc46
 #sudo port install graphviz-devel
 #sudo port install lua
index 534e321..cfd59e3 100644 (file)
@@ -10,7 +10,6 @@ sudo apt-get -y -qq install gcc
 sudo apt-get -y -qq install git-core
 sudo apt-get -y -qq install graphviz-dev graphviz
 sudo apt-get -y -qq install liblua5.1-dev lua5.1
-sudo apt-get -y -qq install libpcre3-dev
 sudo apt-get -y -qq install libunwind7-dev
 sudo apt-get -y -qq install make
 sudo apt-get -y -qq install perl
index 4b9d212..104b4ee 100644 (file)
@@ -131,7 +131,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the
 # path to strip.
 
-STRIP_FROM_PATH        = @srcdir@
+STRIP_FROM_PATH        = @top_srcdir@
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
 # the path mentioned in the documentation of a class, which tells
@@ -690,6 +690,7 @@ INPUT                  = doxygen/index.doc \
                            index-API.doc \
                          @top_srcdir@/doc/doxygen/logcategories.doc \
                          @top_srcdir@/src/instr/ \
+                         @bindir@/include \
                          @top_srcdir@/include/ \
                          @top_srcdir@/include/msg \
                          @top_srcdir@/include/xbt \
@@ -700,7 +701,8 @@ INPUT                  = doxygen/index.doc \
                          @top_srcdir@/src/surf/ \
                          @top_srcdir@/src/msg/ \
                          @top_srcdir@/src/simdag \
-                         @top_srcdir@/src/simix
+                         @top_srcdir@/src/simix \
+                         @bindir@/src
 
 
 ###################################################
index 99c2b58..02d42f5 100644 (file)
@@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 2.8)
 ### Need to set rc ccompiler before enable language
 if(WIN32)
   SET(CMAKE_RC_COMPILER "windres")
-  set(LIBRARIES_DEP simgrid pcre ws2_32 pthread)
+  set(LIBRARIES_DEP simgrid ws2_32 pthread)
 else()
-  set(LIBRARIES_DEP simgrid pcre pthread)
+  set(LIBRARIES_DEP simgrid pthread)
 endif()
 
 project(MY_SIMGRID_PROJECT C)
@@ -17,7 +17,6 @@ set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
 ###############################
 # Test the build dependencies #
 ###############################
-include(FindPcreWin.cmake)
 message(STATUS "Looking for lib Simgrid")
 if("$ENV{SIMGRID_ROOT}" STREQUAL "")
   message(STATUS "Looking for lib Simgrid - Not found")
diff --git a/doc/HelloWorld/FindPcreWin.cmake b/doc/HelloWorld/FindPcreWin.cmake
deleted file mode 100644 (file)
index d4628ea..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# LIB libpcre.dll
-find_library(PATH_PCRE_LIB
-  NAMES pcre
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES bin/ GnuWin32/bin
-  )
-
-find_path(PATH_PCRE_H "pcre.h"
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES include/ GnuWin32/include
-  )
-
-message(STATUS "Looking for pcre.h")
-if(PATH_PCRE_H)
-  message(STATUS "Looking for pcre.h - found")
-else()
-  message(STATUS "Looking for pcre.h - not found")
-endif()
-
-message(STATUS "Looking for lib pcre")
-if(PATH_PCRE_LIB)
-  message(STATUS "Looking for lib pcre - found")
-else()
-  message(STATUS "Looking for lib pcre - not found")
-endif()
-
-if(PATH_PCRE_LIB AND PATH_PCRE_H)
-  string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-  string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}")
-  if(NOT operation)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
-  endif()
-  string(REGEX REPLACE "/libpcre.dll" "" PATH_PCRE_LIB  "${PATH_PCRE_LIB}")
-  link_directories(${PATH_PCRE_LIB})
-else()
-  message(FATAL_ERROR "Please install the pcre package before using SimGrid.")
-endif()
-
-mark_as_advanced(PATH_PCRE_H)
-mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
index 43b88f7..67b0585 100644 (file)
@@ -15,9 +15,6 @@ This is a very simple example to explain how to compile with simgrid.
        The example source file.
 - CMakeLists.txt
        It allows to configure the project.
-- FindPCRE.cmake
-       Simgrid needs pcre regular expression.
-       This finds and links to the pcre library (Normally included into Simgrid directory "GnuWin32").
 - README
        This explaination.
        
@@ -27,7 +24,7 @@ This is a very simple example to explain how to compile with simgrid.
 - Edit CMakeLists.txt :
        * In the Targets section add those two lines:
                add_executable(TARGET_NAME SOURCES)
-               target_link_libraries(TARGET_NAME simgrid pcre
+               target_link_libraries(TARGET_NAME simgrid) 
        * It creates a target called 'TARGET_NAME.exe' with the sources 'SOURCES'.
 - To initialize your project, you'll need to run 'cmake -G"Unix Makefiles" <path_to_HelloWorld_project>.'
 - To build you project, run "cmake ." 
index 554ab17..f7c796b 100644 (file)
@@ -2,9 +2,9 @@
 \page inside_extending Extending SimGrid 
 
 We start to put TAGS in simgrid source code for having tutorials to see where is the important parts ans steps to create:
-\li a new MSG functions or a new API.
-\li a new model in surf.
-\li new tags in xml files
+\li \ref simgrid_dev_guide_api
+\li \ref simgrid_dev_guide_model
+\li \ref simgrid_dev_guide_tag
 
 \section simgrid_dev_guide_api How to add a new MSG function?
 Search for expression \"TUTORIAL: New API\".
index e48785c..8867f4c 100644 (file)
@@ -86,8 +86,7 @@ have access to your architecture to build SimGrid on it.
 
 SimGrid only uses very standard tools: 
   @li C compiler, C++ compiler, make and friends.
-  @li perl (but you may try to go without it) and libpcre (but we are
-      working on removing this dependency)
+  @li perl (but you may try to go without it)
   @li We use cmake to configure our compilation 
       (<a href="http://www.cmake.org/cmake/resources/software.html">download page</a>).
       You need cmake version 2.8 or higher. You may want to use ccmake
@@ -442,8 +441,6 @@ compiling a source file. There are:
 \verbatim
 - HelloWorld.c         The example source file.
 - CMakeLists.txt       It allows to configure the project.
-- FindPCRE.cmake       This finds and links to the pcre library (Normally included
-                        into Simgrid directory "GnuWin32").
 - README               This explaination.
 \endverbatim
 
@@ -469,8 +466,8 @@ create a target with the same name of the source.
 ################
 #It creates a target called 'TARGET_NAME.exe' with the sources 'SOURCES'
 add_executable(TARGET_NAME SOURCES)
-#Links TARGET_NAME with simgrid and pcre
-target_link_libraries(TARGET_NAME simgrid pcre)
+#Links TARGET_NAME with simgrid
+target_link_libraries(TARGET_NAME simgrid)
 \endverbatim
 \li To initialize and build your project, you'll need to run
 \verbatim
index 2241a15..d652b97 100644 (file)
@@ -29,6 +29,7 @@ us before digging into these badly documented internal modules).
    - \ref msg_file_management
    - \ref msg_task_usage
    - \ref msg_VMs
+   - \ref msg_synchro
    - \ref msg_trace_driven
    - \ref MSG_examples
    - \ref msg_deprecated_functions
@@ -92,6 +93,14 @@ details).
  *         by a process to execute, communicate or otherwise handle some task.
  */
 
+/** @defgroup msg_synchro Explicit Synchronization Functions
+ *  @ingroup MSG_API
+ *  @brief This section describes several explicit synchronization
+ *         mechanisms existing in MSG: semaphores (#msg_sem_t) and friends.
+ *
+ * In some situations, these things are very helpful to synchronize processes without message exchanges.
+ */
+
 /** @defgroup msg_VMs VMs
  *  @ingroup MSG_API
  *  @brief This section describes the interface created to mimic IaaS clouds.
index 02f6728..5f9a58f 100644 (file)
@@ -173,7 +173,7 @@ price of a reduced numerical precision.
 By default, Surf computes the analytical models sequentially to share their
 resources and update their actions. It is possible to run them in parallel,
 using the \b surf/nthreads item (default value: 1). If you use a
-negative value, the amount of available cores is automatically
+negative or null value, the amount of available cores is automatically
 detected  and used instead.
 
 Depending on the workload of the models and their complexity, you may get a
@@ -401,8 +401,8 @@ If you are using the \c ucontext or \c raw context factories, you can
 request to execute the user code in parallel. Several threads are
 launched, each of them handling as much user contexts at each run. To
 actiave this, set the \b contexts/nthreads item to the amount of
-cores that you have in your computer (or -1 to have the amount of cores
-auto-detected).
+cores that you have in your computer (or lower than 1 to have 
+the amount of cores auto-detected).
 
 Even if you asked several worker threads using the previous option,
 you can request to start the parallel execution (and pay the
index 2ce0e11..c52f5f8 100644 (file)
@@ -195,7 +195,6 @@ Configuration of package `simgrid' on arch (=4):
        Compile Lua    :
        Compile Smpi   :        OFF
        Compile Static :        OFF
-       Compile pcre   :        AUTO
 
        Maintainer mode:        OFF
        Supernovae mode:        OFF
@@ -205,7 +204,7 @@ Configuration of package `simgrid' on arch (=4):
        Latency bound  :        OFF
         Graphviz mode  :
 
-       Simgrid dependencies:   -lm -lpcre -lpthread -lns3 -lrt
+       Simgrid dependencies:   -lm -lpthread -lns3 -lrt
        Smpi dependencies   :
 
        INSTALL_PREFIX:         /usr/local
index df5a882..c2bd2e7 100644 (file)
@@ -1,24 +1,23 @@
-<?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 <config id="General">
-       <prop id="network/coordinates" value="yes"></prop>
+       <prop id="network/coordinates" value="yes"/>
 </config>
 
-<AS  id="AS0"  routing="Vivaldi">
+<AS id="AS0" routing="Vivaldi">
    
-   <AS  id="AS1_dc1"  routing="RuleBased">
+   <AS id="AS1_dc1" routing="Full">
    <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : rule based, because of its regularity-->    
            <!-- 3 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted because not a part of the production platform  -->
             <!-- clusters -->
-            <cluster id="AS1_cb1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" power="5.2297E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-           <link   id="link_dc1_cb1" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS1_cb1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+           <link id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
 
-           <cluster id="AS1_cb2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" power="8.8925E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-           <link   id="link_dc1_cb2" bandwidth="1.25E9" latency="1.0E-4"/>
+           <cluster id="AS1_cb2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+           <link id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS1_cb3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-           <link   id="link_dc1_cb3" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS1_cb3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+           <link id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>
  
             <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
             <AS id="gw_AS1_dc1" routing="Floyd">
                     <router id="gw_dc1_maindist"/>
                     <router id="gw_dc1_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4" />
+                    <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4"/>
                     <!-- links -->
-                    <link id="dc1_horizdist_maindist"        bandwidth="1.25E9" latency="1.0E-4"/>        
-                    <link id="dc1_maindist_entranceroom"        bandwidth="1.25E9" latency="1.0E-4"/>  
-                        <link id="dc1_entranceroom_ISP"        bandwidth="1.25E9" latency="1.0E-4"/>  
+                    <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
+                    <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
+                        <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>  
                     <!-- links to router relationships -->
                     <route src="gw_dc1_horizdist" dst="gw_dc1_maindist"><link_ctn id="dc1_horizdist_maindist"/></route>
                     <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom"><link_ctn id="dc1_maindist_entranceroom"/></route>
             </AS>
            
             <!-- internal routes between clusters -->
-            <ASroute src="AS1_cb(.*)" dst="AS1_cb(.*)" gw_src="cb$1src-AS1_cb$1src_router.dc1.acloud.com" gw_dst="cb$1dst-AS1_cb$1dst_router.dc1.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc1_cb$1src"/>
-                    <link_ctn id="link_dc1_cb$1dst"/>
+            <ASroute src="AS1_cb1" dst="AS1_cb1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb1"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="AS1_cb1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb3"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="AS1_cb3" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb3"/>
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb3" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb2" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS1_cb(.*)" dst="gw_AS1_(.*)" gw_src="cb$1src-AS1_cb$1src_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc1_cb$1src"/>
+            <ASroute src="AS1_cb1" dst="gw_AS1_dc1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="gw_AS1_dc1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="gw_AS1_dc1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute> 
-            <ASroute dst="AS1_cb(.*)" src="gw_AS1_(.*)" gw_dst="cb$1dst-AS1_cb$1dst_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc1_cb$1dst"/>
+            <ASroute dst="AS1_cb1" src="gw_AS1_dc1" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute dst="AS1_cb3" src="gw_AS1_dc1" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute dst="AS1_cb2" src="gw_AS1_dc1" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute>    
    </AS>
 
-   <AS  id="AS2_dc2"  routing="RuleBased">
+   <AS id="AS2_dc2" routing="Full">
    <!--bigger tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : rule based, because of its regularity-->   
             <!-- 6 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted because not a part of the production platform  -->
             <!-- clusters -->
-            <cluster id="AS2_cb1" prefix="cb1-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb1" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb1" prefix="cb1-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc2_cb1" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb2" prefix="cb2-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb2" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb2" prefix="cb2-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc2_cb2" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb3" prefix="cb3-" suffix=".dc2.acloud.com" radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb3" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb3" prefix="cb3-" suffix=".dc2.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc2_cb3" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb4" prefix="cb4-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb4" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb4" prefix="cb4-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc2_cb4" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb5" prefix="cb5-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb5" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb5" prefix="cb5-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc2_cb5" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb6" prefix="cb6-" suffix=".dc2.acloud.com" radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb6" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb6" prefix="cb6-" suffix=".dc2.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc2_cb6" bandwidth="1.25GBps" latency="100us"/>
 
             <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
             <AS id="gw_AS2_dc2" routing="Floyd">
                     <router id="gw_dc2_maindist"/>
                     <router id="gw_dc2_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4" />
+                    <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4"/>
                     <!-- links -->
-                    <link id="dc2_horizdist_maindist"        bandwidth="1.25E9" latency="1.0E-4"/>        
-                    <link id="dc2_maindist_entranceroom"        bandwidth="1.25E9" latency="1.0E-4"/>  
-                        <link id="dc2_entranceroom_ISP"        bandwidth="1.25E9" latency="1.0E-4"/>  
+                    <link id="dc2_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
+                    <link id="dc2_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
+                        <link id="dc2_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>  
                     <!-- links to router relationships -->
                     <route src="gw_dc2_horizdist" dst="gw_dc2_maindist"><link_ctn id="dc2_horizdist_maindist"/></route>
                     <route src="gw_dc2_maindist" dst="gw_dc2_entranceroom"><link_ctn id="dc2_maindist_entranceroom"/></route>
             </AS>
             
             <!-- internal routes between clusters -->
-            <ASroute src="AS2_cb(.*)" dst="AS2_cb(.*)" gw_src="cb$1src-AS2_cb$1src_router.dc2.acloud.com" gw_dst="cb$1dst-AS2_cb$1dst_router.dc2.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc2_cb$1src"/>
-                    <link_ctn id="link_dc2_cb$1dst"/>
+            <ASroute src="AS2_cb6" dst="AS2_cb6" gw_src="cb6-AS2_cb6_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb6"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="AS2_cb6" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb4"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="AS2_cb4" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb4"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb6" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb4" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb5" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb6" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb4" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb5" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb6" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb4" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb5" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb3" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb6" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb4" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb5" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb3" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb1" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS2_cb(.*)" dst="gw_AS2_(.*)" gw_src="cb$1src-AS2_cb$1src_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc2_cb$1src"/>
+            <ASroute src="AS2_cb6" dst="gw_AS2_dc2" gw_src="cb6-AS2_cb6_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="gw_AS2_dc2" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="gw_AS2_dc2" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="gw_AS2_dc2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="gw_AS2_dc2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="gw_AS2_dc2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute> 
-            <ASroute dst="AS2_cb(.*)" src="gw_AS2_(.*)" gw_dst="cb$1dst-AS2_cb$1dst_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc2_cb$1dst"/>
+            <ASroute dst="AS2_cb6" src="gw_AS2_dc2" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute dst="AS2_cb4" src="gw_AS2_dc2" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute dst="AS2_cb5" src="gw_AS2_dc2" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute dst="AS2_cb2" src="gw_AS2_dc2" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute dst="AS2_cb3" src="gw_AS2_dc2" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute dst="AS2_cb1" src="gw_AS2_dc2" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute> 
    </AS>
 
-   <AS  id="AS3_dc3"  routing="RuleBased">  
+   <AS id="AS3_dc3" routing="Full">  
    <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : rule based, because of its regularity-->    
             <!-- 4 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted because not a part of the production platform  -->
             <!-- clusters -->
-            <cluster id="AS3_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" power="5.2297E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc3_cb1" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS3_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc3_cb1" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS3_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" power="8.8925E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc3_cb2" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS3_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc3_cb2" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS3_cb3" prefix="cb3-" suffix=".dc3.acloud.com"  radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc3_cb3" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS3_cb3" prefix="cb3-" suffix=".dc3.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc3_cb3" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS3_cb4" prefix="cb4-" suffix=".dc3.acloud.com" radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc3_cb4" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS3_cb4" prefix="cb4-" suffix=".dc3.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <link id="link_dc3_cb4" bandwidth="1.25GBps" latency="100us"/>
 
             <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
             <AS id="gw_AS3_dc3" routing="Floyd">
                     <router id="gw_dc3_maindist"/>
                     <router id="gw_dc3_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS3_dc3" coordinates="6.0 5.7 6.6" />
+                    <router id="router_AS3_dc3" coordinates="6.0 5.7 6.6"/>
                     <!-- links -->
-                    <link id="dc3_horizdist_maindist"        bandwidth="1.25E9" latency="1.0E-4"/>        
-                    <link id="dc3_maindist_entranceroom"        bandwidth="1.25E9" latency="1.0E-4"/>  
-                        <link id="dc3_entranceroom_ISP"        bandwidth="1.25E9" latency="1.0E-4"/>  
+                    <link id="dc3_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
+                    <link id="dc3_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
+                        <link id="dc3_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>  
                     <!-- links to router relationships -->
                     <route src="gw_dc3_horizdist" dst="gw_dc3_maindist"><link_ctn id="dc3_horizdist_maindist"/></route>
                     <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom"><link_ctn id="dc3_maindist_entranceroom"/></route>
             </AS>
             
             <!-- internal routes between clusters -->
-            <ASroute src="AS3_cb(.*)" dst="AS3_cb(.*)" gw_src="cb$1src-AS3_cb$1src_router.dc3.acloud.com" gw_dst="cb$1dst-AS3_cb$1dst_router.dc3.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc3_cb$1src"/>
-                    <link_ctn id="link_dc3_cb$1dst"/>
+            <ASroute src="AS3_cb3" dst="AS3_cb3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb3"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb2"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="AS3_cb2" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb2"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb2" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb1" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb2" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb1" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb4" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS3_cb(.*)" dst="gw_AS3_(.*)" gw_src="cb$1src-AS3_cb$1src_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc3_cb$1src"/>
+            <ASroute src="AS3_cb3" dst="gw_AS3_dc3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="gw_AS3_dc3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="gw_AS3_dc3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="gw_AS3_dc3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>
-            <ASroute dst="AS3_cb(.*)" src="gw_AS3_(.*)" gw_dst="cb$1dst-AS3_cb$1dst_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc3_cb$1dst"/>
+            <ASroute dst="AS3_cb3" src="gw_AS3_dc3" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute dst="AS3_cb2" src="gw_AS3_dc3" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute dst="AS3_cb1" src="gw_AS3_dc3" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute dst="AS3_cb4" src="gw_AS3_dc3" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>  
    </AS>
               
index 9d20e6c..81e4582 100644 (file)
@@ -1,7 +1,6 @@
-<?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-       <AS id="AS_grid5000" routing="Floyd" >
+       <AS id="AS_grid5000" routing="Floyd">
                <AS id="AS_interne" routing="Floyd">
                        <router id="lille"/>
                        <router id="paris"/>
                        <router id="toulouse"/>
                        <router id="sophia"/>
 
-                       <link id="Lille_Paris"        bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Paris_Nancy"        bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Paris_Rennes"       bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Paris_Lyon"         bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Bordeaux_Lyon"      bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Lyon_Grenoble"      bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Lyon_Marseille"     bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Marseille_Sophia"   bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Marseille_Toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-
-               <route src="lille"     dst="paris"     ><link_ctn id="Lille_Paris"/></route>
-               <route src="paris"     dst="nancy"     ><link_ctn id="Paris_Nancy"/></route>
-               <route src="paris"     dst="rennes"    ><link_ctn id="Paris_Rennes"/></route>
-               <route src="paris"     dst="lyon"      ><link_ctn id="Paris_Lyon"/></route>
-               <route src="bordeaux"  dst="lyon"      ><link_ctn id="Bordeaux_Lyon"/></route>
-               <route src="lyon"      dst="grenoble"  ><link_ctn id="Lyon_Grenoble"/></route>
-               <route src="lyon"      dst="marseille" ><link_ctn id="Lyon_Marseille"/></route>
-               <route src="marseille" dst="sophia"    ><link_ctn id="Marseille_Sophia"/></route>
-               <route src="marseille" dst="toulouse"  ><link_ctn id="Marseille_Toulouse"/></route>
+                       <link id="Lille_Paris" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Paris_Nancy" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Paris_Rennes" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Paris_Lyon" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Bordeaux_Lyon" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Lyon_Grenoble" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Lyon_Marseille" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Marseille_Sophia" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Marseille_Toulouse" bandwidth="1.25GBps" latency="100us"/>
+
+               <route src="lille" dst="paris"><link_ctn id="Lille_Paris"/></route>
+               <route src="paris" dst="nancy"><link_ctn id="Paris_Nancy"/></route>
+               <route src="paris" dst="rennes"><link_ctn id="Paris_Rennes"/></route>
+               <route src="paris" dst="lyon"><link_ctn id="Paris_Lyon"/></route>
+               <route src="bordeaux" dst="lyon"><link_ctn id="Bordeaux_Lyon"/></route>
+               <route src="lyon" dst="grenoble"><link_ctn id="Lyon_Grenoble"/></route>
+               <route src="lyon" dst="marseille"><link_ctn id="Lyon_Marseille"/></route>
+               <route src="marseille" dst="sophia"><link_ctn id="Marseille_Sophia"/></route>
+               <route src="marseille" dst="toulouse"><link_ctn id="Marseille_Toulouse"/></route>
                </AS>
-               <AS id="AS_bordeaux" routing="RuleBased" >
-                       <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
-                               radical="1-51" power="5.2297E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_bordeplage" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
-                               radical="1-93" power="8.8925E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_bordereau" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
-                               radical="1-10" power="13.357E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_borderline" bandwidth="1.25E9" latency="1.0E-4"/>
+               <AS id="AS_bordeaux" routing="Full">
+                       <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr" radical="1-51" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_bordeplage" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr" radical="1-93" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_bordereau" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr" radical="1-10" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_borderline" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_bordeaux" routing="Full">
                                <router id="gw_bordeaux"/>
                        </AS>
-                       <link   id="link_gw_bordeaux" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.bordeaux.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_bordeaux" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_bordereau" dst="AS_bordereau" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordereau"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="AS_bordereau" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordeplage"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="AS_bordeplage" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordeplage"/>
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_bordereau" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_bordeplage" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_borderline" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_bordereau" dst="gw_AS_bordeaux" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="gw_AS_bordeaux" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="gw_AS_bordeaux" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.bordeaux.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_bordeaux" dst="AS_bordereau" gw_src="gw_bordeaux" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="gw_AS_bordeaux" dst="AS_bordeplage" gw_src="gw_bordeaux" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="gw_AS_bordeaux" dst="AS_borderline" gw_src="gw_bordeaux" gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_grenoble" routing="RuleBased" >
-                       <cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr"
-                               radical="1-12" power="23.681E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_adonis" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_edel" prefix="edel-" suffix=".grenoble.grid5000.fr"
-                               radical="1-72" power="23.492E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_edel" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr"
-                               radical="1-34" power="21.175E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_genepi" bandwidth="1.25E9" latency="1.0E-4"/>
+               <AS id="AS_grenoble" routing="Full">
+                       <cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr" radical="1-12" power="23.681Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_adonis" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_edel" prefix="edel-" suffix=".grenoble.grid5000.fr" radical="1-72" power="23.492Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_edel" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr" radical="1-34" power="21.175Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_genepi" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_grenoble" routing="Full">
                                <router id="gw_grenoble"/>
                        </AS>
-                       <link   id="link_gw_grenoble" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.grenoble.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_grenoble" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_adonis" dst="AS_adonis" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_adonis"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="AS_adonis" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_genepi"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="AS_genepi" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_genepi"/>
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_adonis" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_genepi" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_edel" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="edel-AS_edel_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_adonis" dst="gw_AS_grenoble" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="gw_AS_grenoble" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="gw_AS_grenoble" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.grenoble.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_grenoble" dst="AS_adonis" gw_src="gw_grenoble" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="gw_AS_grenoble" dst="AS_genepi" gw_src="gw_grenoble" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="gw_AS_grenoble" dst="AS_edel" gw_src="gw_grenoble" gw_dst="edel-AS_edel_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_lille" routing="RuleBased" >
-                       <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-                               radical="1-26" power="8.9618E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_chicon" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_chimint" prefix="chimint-" suffix=".lille.grid5000.fr"
-                               radical="1-20" power="23.531E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_chimint" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
-                               radical="1-46" power="22.270E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_chinqchint" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr"
-                               radical="1-8" power="24.473E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_chirloute" bandwidth="1.25E9" latency="1.0E-4"/>
+               <AS id="AS_lille" routing="Full">
+                       <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr" radical="1-26" power="8.9618Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_chicon" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_chimint" prefix="chimint-" suffix=".lille.grid5000.fr" radical="1-20" power="23.531Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_chimint" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr" radical="1-46" power="22.27Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_chinqchint" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr" radical="1-8" power="24.473Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_chirloute" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_lille" routing="Full">
                                <router id="gw_lille"/>
                        </AS>
-                       <link   id="link_gw_lille" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.lille.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_lille" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_chinqchint" dst="AS_chinqchint" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chinqchint"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="AS_chinqchint" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chirloute"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="AS_chirloute" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chirloute"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chinqchint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chirloute" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chimint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chinqchint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chirloute" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chimint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chicon" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chicon-AS_chicon_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_chinqchint" dst="gw_AS_lille" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="gw_AS_lille" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="gw_AS_lille" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="gw_AS_lille" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.lille.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_lille" dst="AS_chinqchint" gw_src="gw_lille" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chirloute" gw_src="gw_lille" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chimint" gw_src="gw_lille" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chicon" gw_src="gw_lille" gw_dst="chicon-AS_chicon_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_lyon" routing="RuleBased" >
-                       <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
-                               radical="1-56" power="4.7233E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_capricorne" bandwidth="1.25E9" latency="1.0E-4"/>
+               <AS id="AS_lyon" routing="Full">
+                       <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr" radical="1-56" power="4.7233Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_capricorne" bandwidth="1.25GBps" latency="100us"/>
 
-                       <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
-                               radical="1-79" power="5.6693E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_sagittaire" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr" radical="1-79" power="5.6693Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_sagittaire" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_lyon" routing="Full">
                                <router id="gw_lyon"/>
                        </AS>
-                       <link   id="link_gw_lyon" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_lyon" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_sagittaire" dst="AS_sagittaire" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_sagittaire"/>
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="AS_sagittaire" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_capricorne"/>
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="AS_capricorne" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="capricorne-AS_capricorne_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_capricorne"/>
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_sagittaire" dst="gw_AS_lyon" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="gw_lyon" symmetrical="NO">
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="gw_AS_lyon" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="gw_lyon" symmetrical="NO">
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_lyon" dst="AS_sagittaire" gw_src="gw_lyon" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="gw_AS_lyon" dst="AS_capricorne" gw_src="gw_lyon" gw_dst="capricorne-AS_capricorne_router.lyon.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_nancy" routing="RuleBased" >
-                       <AS id="AS_graphene" routing="RuleBased" >
-                               <cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="1-39" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="40-74" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="75-104" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="105-144" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+               <AS id="AS_nancy" routing="Full">
+                       <AS id="AS_graphene" routing="Full">
+                               <cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="1-39" power="16.673Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="40-74" power="16.673Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="75-104" power="16.673Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="105-144" power="16.673Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
 
                                <AS id="gw_AS_graphene" routing="Full">
                                        <router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
                                </AS>
-                               <link id="switch-graphene" bandwidth="1250000000" latency="5E-4"/>
+                               <link id="switch-graphene" bandwidth="1.25GBps" latency="500us"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgraphene4" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                               </ASroute><ASroute src="AS_sgraphene2" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene2" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene3" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene3_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene3" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene3_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene1" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene1_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="graphene-AS_graphene_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgraphene4" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene2" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <AS id="AS_griffon" routing="RuleBased" >
-                               <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="1-29,58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="61-92" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+                               </AS>
+                       <link id="link_graphene" bandwidth="1.25GBps" latency="100us"/>
+
+                       <AS id="AS_griffon" routing="Full">
+                               <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="1-29,58-60" power="20.678Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="30-57" power="20.678Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="61-92" power="20.678Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
 
                                <AS id="gw_AS_griffon" routing="Full">
                                        <router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
                                </AS>
-                               <link id="switch-griffon" bandwidth="1250000000" latency="5E-4"/>
+                               <link id="switch-griffon" bandwidth="1.25GBps" latency="500us"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgriffon1" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                               </ASroute><ASroute src="AS_sgriffon2" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon2" dst="AS_sgriffon2" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon2" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon3" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon3_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="griffon-AS_griffon_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgriffon1" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon2" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
+                               </AS>
+                       <link id="link_griffon" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_nancy" routing="Full">
                                <router id="gw_nancy"/>
                        </AS>
-                       <link   id="link_gw_nancy" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_nancy" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_graphene" dst="AS_graphene" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_graphene"/>
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="AS_graphene" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_griffon"/>
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="AS_griffon" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_griffon"/>
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_graphene" dst="gw_AS_nancy" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="gw_nancy" symmetrical="NO">
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="gw_AS_nancy" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="gw_nancy" symmetrical="NO">
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_nancy" dst="AS_graphene" gw_src="gw_nancy" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="gw_AS_nancy" dst="AS_griffon" gw_src="gw_nancy" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_orsay" routing="RuleBased" >
-                       <AS id="AS_gdx" routing="RuleBased" >
-                               <cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="1-36" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="37-72" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="73-108" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="109-144" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="145-180" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="193-216" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="217-252" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="253-288" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="289-310" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="181-186" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="187-192" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+               <AS id="AS_orsay" routing="Full">
+                       <AS id="AS_gdx" routing="Full">
+                               <cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="1-36" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="37-72" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="73-108" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="109-144" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="145-180" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="193-216" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="217-252" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="253-288" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="289-310" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="181-186" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="187-192" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
 
                                <AS id="gw_AS_gdx" routing="Full">
                                        <router id="gdx-AS_gdx_router.orsay.grid5000.fr"/>
                                </AS>
-                               <link id="switch-gdx" bandwidth="1250000000" latency="5E-4"/>
+                               <link id="switch-gdx" bandwidth="1.25GBps" latency="500us"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
+                               <ASroute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear02.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear02.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear04.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="gdx-AS_gdx_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
+                               <ASroute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
+                               </AS>
+                       <link id="link_gdx" bandwidth="1.25GBps" latency="100us"/>
 
-                       <cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr"
-                               radical="1-30" power="4.7144E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_netgdx" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr" radical="1-30" power="4.7144Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_netgdx" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_orsay" routing="Full">
                                <router id="gw_orsay"/>
                        </AS>
-                       <link   id="link_gw_orsay" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.orsay.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_orsay" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_netgdx" dst="AS_netgdx" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_netgdx"/>
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="AS_netgdx" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_gdx"/>
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="AS_gdx" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_gdx"/>
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_netgdx" dst="gw_AS_orsay" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="gw_orsay" symmetrical="NO">
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="gw_AS_orsay" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gw_orsay" symmetrical="NO">
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.orsay.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_orsay" dst="AS_netgdx" gw_src="gw_orsay" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="gw_AS_orsay" dst="AS_gdx" gw_src="gw_orsay" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_rennes" routing="RuleBased" >
-                       <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
-                               radical="1-64" power="21.496E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_paradent" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
-                               radical="1-33" power="12.910E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_paramount" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
-                               radical="1-25" power="30.130E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_parapide" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr"
-                               radical="1-40" power="27.391E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_parapluie" bandwidth="1.25E9" latency="1.0E-4"/>
+               <AS id="AS_rennes" routing="Full">
+                       <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr" radical="1-64" power="21.496Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_paradent" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr" radical="1-33" power="12.91Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_paramount" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr" radical="1-25" power="30.13Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_parapide" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr" radical="1-40" power="27.391Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_parapluie" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_rennes" routing="Full">
                                <router id="gw_rennes"/>
                        </AS>
-                       <link   id="link_gw_rennes" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.rennes.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_rennes" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_paradent" dst="AS_paradent" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paradent"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="AS_paradent" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapluie"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="AS_parapluie" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapluie"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_paradent" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_parapluie" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_parapide" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_paradent" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_parapluie" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_parapide" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_paramount" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="paramount-AS_paramount_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_paradent" dst="gw_AS_rennes" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="gw_AS_rennes" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="gw_AS_rennes" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="gw_AS_rennes" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.rennes.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_rennes" dst="AS_paradent" gw_src="gw_rennes" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_parapluie" gw_src="gw_rennes" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_parapide" gw_src="gw_rennes" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_paramount" gw_src="gw_rennes" gw_dst="paramount-AS_paramount_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_sophia" routing="RuleBased" >
-                       <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
-                               radical="1-56" power="7.7318E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_helios" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
-                               radical="1-50" power="8.9388E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_sol" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
-                               radical="1-45" power="23.530E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_suno" bandwidth="1.25E9" latency="1.0E-4"/>
+               <AS id="AS_sophia" routing="Full">
+                       <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr" radical="1-56" power="7.7318Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_helios" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr" radical="1-50" power="8.9388Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_sol" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr" radical="1-45" power="23.53Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_suno" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_sophia" routing="Full">
                                <router id="gw_sophia"/>
                        </AS>
-                       <link   id="link_gw_sophia" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.sophia.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_sophia" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_sol" dst="AS_sol" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_sol"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="AS_sol" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_helios"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="AS_helios" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_helios"/>
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_sol" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_helios" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_suno" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="suno-AS_suno_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_sol" dst="gw_AS_sophia" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="gw_AS_sophia" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="gw_AS_sophia" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.sophia.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_sophia" dst="AS_sol" gw_src="gw_sophia" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="gw_AS_sophia" dst="AS_helios" gw_src="gw_sophia" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="gw_AS_sophia" dst="AS_suno" gw_src="gw_sophia" gw_dst="suno-AS_suno_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_toulouse" routing="RuleBased" >
-                       <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
-                               radical="1-80" power="9.5674E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_pastel" bandwidth="1.25E9" latency="1.0E-4"/>
+               <AS id="AS_toulouse" routing="Full">
+                       <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr" radical="1-80" power="9.5674Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_pastel" bandwidth="1.25GBps" latency="100us"/>
 
-                       <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
-                               radical="1-52" power="5.1143E9" bw="1.25E8" lat="1.0E-4"
-                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                       <link   id="link_violette" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr" radical="1-52" power="5.1143Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_violette" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_toulouse" routing="Full">
                                <router id="gw_toulouse"/>
                        </AS>
-                       <link   id="link_gw_toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_toulouse" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_pastel" dst="AS_pastel" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_pastel"/>
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="AS_pastel" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_violette"/>
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="AS_violette" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="violette-AS_violette_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_violette"/>
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_pastel" dst="gw_AS_toulouse" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="gw_toulouse" symmetrical="NO">
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="gw_AS_toulouse" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="gw_toulouse" symmetrical="NO">
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_toulouse" dst="AS_pastel" gw_src="gw_toulouse" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="gw_AS_toulouse" dst="AS_violette" gw_src="gw_toulouse" gw_dst="violette-AS_violette_router.toulouse.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
                </AS>
index 1ecc498..b6f5d8f 100644 (file)
@@ -4,16 +4,16 @@
 <AS  id="AS_griffon"  routing="Full">
        
      <cluster id="griffon_cluster_cabinet1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="1-29,58,59,60" power="286087" bw="1.25e8" lat="2.4e-5"
-           bb_bw="1.25e9" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> 
+           radical="1-29,58,59,60" power="286.087kf" bw="125MBps" lat="24us"
+           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> 
      <cluster id="griffon_cluster_cabinet2" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="30-57" power="286087" bw="1.25e8" lat="2.4e-5
-           bb_bw="1.25e9" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>    
+           radical="30-57" power="286.087kf" bw="125MBps" lat="24us
+           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>    
      <cluster id="griffon_cluster_cabinet3" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="61-92" power="286087" bw="1.25e8" lat="2.4e-5
-           bb_bw="1.25e9" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+           radical="61-92" power="286.087kf" bw="125MBps" lat="24us
+           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
 
-     <link id="backbone" bandwidth="1.25e9" latency="2.4e-5" sharing_policy="SHARED"/>
+     <link id="backbone" bandwidth="1.25GBps" latency="24us" sharing_policy="SHARED"/>
        
      <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet2" 
         gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr" 
index 5158ac2..f705d0a 100644 (file)
 </config>
 
        <AS  id="AS0"  routing="Vivaldi">
-               <peer id="peer-0" coordinates="25.5 9.4 1.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-0" coordinates="25.5 9.4 1.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-1" coordinates="-12.7 -9.9 2.1 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-1" coordinates="-12.7 -9.9 2.1 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-2" coordinates="-15.7 9.9 14.7 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-2" coordinates="-15.7 9.9 14.7 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-3" coordinates="27.1 7.2 19.2 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-3" coordinates="27.1 7.2 19.2 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-4" coordinates="11.4 10.7 24.8 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-4" coordinates="11.4 10.7 24.8 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-5" coordinates="27.1 14.9 0.3 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-5" coordinates="27.1 14.9 0.3 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-6" coordinates="110.1 31.2 43.7 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-6" coordinates="110.1 31.2 43.7 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-7" coordinates="-21.2 -25.2 4.1 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-7" coordinates="-21.2 -25.2 4.1 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-8" coordinates="-2.3 1.1 12.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-8" coordinates="-2.3 1.1 12.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-9" coordinates="16.8 -11.1 15.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-9" coordinates="16.8 -11.1 15.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-10" coordinates="-6.8 1.6 0.3 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-10" coordinates="-6.8 1.6 0.3 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-11" coordinates="23.0 -4.1 1.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-11" coordinates="23.0 -4.1 1.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-12" coordinates="29.9 -9.2 0.2 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-12" coordinates="29.9 -9.2 0.2 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-13" coordinates="-2.2 7.2 11.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-13" coordinates="-2.2 7.2 11.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-14" coordinates="26.1 -61.9 144.7 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-14" coordinates="26.1 -61.9 144.7 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-15" coordinates="-39.4 1.1 0.6 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-15" coordinates="-39.4 1.1 0.6 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-16" coordinates="26.5 -15.1 0.3 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-16" coordinates="26.5 -15.1 0.3 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-17" coordinates="15.0 -0.5 34.5 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-17" coordinates="15.0 -0.5 34.5 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-18" coordinates="16.5 11.5 19.2 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-18" coordinates="16.5 11.5 19.2 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-19" coordinates="-37.9 85.0 69.8 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-19" coordinates="-37.9 85.0 69.8 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-20" coordinates="-2.6 19.4 6.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-20" coordinates="-2.6 19.4 6.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-21" coordinates="-104.4 -162.5 1.7 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-21" coordinates="-104.4 -162.5 1.7 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-22" coordinates="-41.8 -30.9 5.8 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-22" coordinates="-41.8 -30.9 5.8 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-23" coordinates="-9.9 10.4 1.9 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-23" coordinates="-9.9 10.4 1.9 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-24" coordinates="8.5 15.3 31.9 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-24" coordinates="8.5 15.3 31.9 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-25" coordinates="6.0 -12.6 7.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-25" coordinates="6.0 -12.6 7.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-26" coordinates="89.6 26.1 17.9 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-26" coordinates="89.6 26.1 17.9 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-27" coordinates="13.9 -31.4 8.2 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-27" coordinates="13.9 -31.4 8.2 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-28" coordinates="13.6 10.0 25.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-28" coordinates="13.6 10.0 25.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-29" coordinates="32.2 34.0 104.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-29" coordinates="32.2 34.0 104.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-30" coordinates="23.5 21.2 24.5 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-30" coordinates="23.5 21.2 24.5 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-31" coordinates="-27.0 -12.1 4.8 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-31" coordinates="-27.0 -12.1 4.8 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-32" coordinates="18.4 -4.5 1.2 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-32" coordinates="18.4 -4.5 1.2 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-33" coordinates="109.3 253.6 2.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-33" coordinates="109.3 253.6 2.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-34" coordinates="16.5 9.4 4.2 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-34" coordinates="16.5 9.4 4.2 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-35" coordinates="-35.9 -42.6 1.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-35" coordinates="-35.9 -42.6 1.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-36" coordinates="30.4 18.9 3.5 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-36" coordinates="30.4 18.9 3.5 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-37" coordinates="-23.1 -7.6 39.9 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-37" coordinates="-23.1 -7.6 39.9 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-38" coordinates="135.5 -21.0 83.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-38" coordinates="135.5 -21.0 83.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-39" coordinates="17.5 6.7 18.8 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-39" coordinates="17.5 6.7 18.8 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-40" coordinates="22.3 13.6 21.7 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-40" coordinates="22.3 13.6 21.7 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-41" coordinates="-2.5 8.3 7.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-41" coordinates="-2.5 8.3 7.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-42" coordinates="-10.3 -8.8 2.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-42" coordinates="-10.3 -8.8 2.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-43" coordinates="142.5 63.5 0.3 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-43" coordinates="142.5 63.5 0.3 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-44" coordinates="5.1 -2.9 10.6 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-44" coordinates="5.1 -2.9 10.6 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-45" coordinates="-18.4 23.5 8.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-45" coordinates="-18.4 23.5 8.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-46" coordinates="-26.3 -3.2 7.1 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-46" coordinates="-26.3 -3.2 7.1 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-47" coordinates="-21.6 11.6 89.2 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-47" coordinates="-21.6 11.6 89.2 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-48" coordinates="-44.3 17.0 0.5 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-48" coordinates="-44.3 17.0 0.5 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-49" coordinates="-59.8 -16.8 1.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-49" coordinates="-59.8 -16.8 1.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-50" coordinates="23.9 35.4 8.1 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-50" coordinates="23.9 35.4 8.1 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-51" coordinates="22.9 10.1 8.9 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-51" coordinates="22.9 10.1 8.9 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-52" coordinates="27.6 25.7 0.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-52" coordinates="27.6 25.7 0.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-53" coordinates="9.5 13.3 10.3 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-53" coordinates="9.5 13.3 10.3 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-54" coordinates="-34.2 20.0 1.8 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-54" coordinates="-34.2 20.0 1.8 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-55" coordinates="-58.7 -11.7 2.1 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-55" coordinates="-58.7 -11.7 2.1 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-56" coordinates="-40.3 -27.4 0.3 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-56" coordinates="-40.3 -27.4 0.3 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-57" coordinates="19.7 -15.1 3.5 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-57" coordinates="19.7 -15.1 3.5 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-58" coordinates="8.4 17.5 32.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-58" coordinates="8.4 17.5 32.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-59" coordinates="25.1 8.8 16.6 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-59" coordinates="25.1 8.8 16.6 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-60" coordinates="25.3 13.9 21.8 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-60" coordinates="25.3 13.9 21.8 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-61" coordinates="29.5 -58.9 17.0 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-61" coordinates="29.5 -58.9 17.0 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-62" coordinates="-48.1 -6.8 0.3 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-62" coordinates="-48.1 -6.8 0.3 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-63" coordinates="-17.2 -1.2 0.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-63" coordinates="-17.2 -1.2 0.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-64" coordinates="10.6 18.7 33.4 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-64" coordinates="10.6 18.7 33.4 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-65" coordinates="1.9 -3.5 2.5 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-65" coordinates="1.9 -3.5 2.5 " power="730Mf"
+               bw_in="13.38MBps" bw_out="1.024MBps" lat="500us" />
 
-               <peer id="peer-66" coordinates="-3.6 1.6 6.7 " power="730000000.0"
-               bw_in="13380000" bw_out="1024000" lat="5E-4" />
+               <peer id="peer-66" coordinates="-3.6 1.6 6.7 " power="730Mf"
+               bw_in=&