From 120a17a595bd3d7636a031ddaa5dc372826dba66 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Fri, 5 May 2017 22:13:55 +0200 Subject: [PATCH] Update all our XML files + next XML version will be 4.1, not 5 --- doc/msg-tuto-src/deployment0.xml | 20 +- doc/msg-tuto-src/deployment1.xml | 8 +- doc/msg-tuto-src/deployment2.xml | 6 +- doc/msg-tuto-src/deployment3.xml | 14 +- doc/msg-tuto-src/deployment_general.xml | 6 +- examples/java/app/bittorrent/bittorrent.xml | 34 +- .../app/centralizedmutex/centralizedmutex.xml | 14 +- .../java/app/masterworker/masterworker.xml | 34 +- examples/java/dht/chord/chord.xml | 42 +- examples/java/dht/kademlia/kademlia.xml | 18 +- .../process/startkilltime/startkilltime.xml | 26 +- examples/java/task/priority/priority.xml | 10 +- examples/msg/actions-comm/actions-comm_d.xml | 8 +- .../msg/actions-comm/actions-comm_split_d.xml | 12 +- .../msg/actions-storage/actions-storage_d.xml | 4 +- .../msg/app-bittorrent/app-bittorrent_d.xml | 34 +- .../msg/app-chainsend/app-chainsend_d.xml | 38 +- .../app-masterworker-multicore_d.xml | 32 +- .../app-masterworker-vivaldi_d.xml | 68 +- .../app-masterworker/app-masterworker_d.xml | 28 +- examples/msg/app-pingpong/app-pingpong_d.xml | 10 +- examples/msg/async-wait/async-wait2_d.xml | 12 +- examples/msg/async-wait/async-wait3_d.xml | 12 +- examples/msg/async-wait/async-wait4_d.xml | 12 +- examples/msg/async-wait/async-wait_d.xml | 12 +- .../msg/async-waitall/async-waitall_d.xml | 12 +- .../msg/async-waitany/async-waitany_d.xml | 16 +- examples/msg/async-yield/async-yield_d.xml | 10 +- examples/msg/dht-chord/dht-chord_d.xml | 42 +- examples/msg/dht-kademlia/dht-kademlia_d.xml | 54 +- examples/msg/energy-onoff/platform_onoff.xml | 6 +- examples/msg/io-remote/io-remote_d.xml | 18 +- examples/msg/mc/deploy_bugged1.xml | 18 +- examples/msg/mc/deploy_bugged1_liveness.xml | 12 +- .../mc/deploy_bugged1_liveness_visited.xml | 12 +- examples/msg/mc/deploy_bugged2.xml | 14 +- examples/msg/mc/deploy_bugged2_liveness.xml | 12 +- examples/msg/mc/deploy_bugged3.xml | 14 +- examples/msg/mc/deploy_centralized_mutex.xml | 12 +- examples/msg/mc/deploy_electric_fence.xml | 14 +- examples/msg/mc/platform.xml | 6 +- examples/msg/network-ns3/3hosts_2links_d.xml | 10 +- examples/msg/network-ns3/3links-timer_d.xml | 42 +- examples/msg/network-ns3/3links_d.xml | 26 +- examples/msg/network-ns3/crosstraffic_d.xml | 34 +- examples/msg/network-ns3/dogbone_d.xml | 18 +- examples/msg/network-ns3/one_cluster_d.xml | 10 +- examples/msg/network-ns3/onelink_d.xml | 10 +- examples/msg/network-ns3/two_clusters_d.xml | 10 +- .../platform-properties_d.xml | 12 +- .../msg/process-startkilltime/baseline_d.xml | 6 +- examples/msg/process-startkilltime/kill_d.xml | 14 +- .../msg/process-startkilltime/start_d.xml | 26 +- .../process-startkilltime/start_kill_d.xml | 26 +- .../msg/task-priority/task-priority_d.xml | 10 +- examples/platforms/bypassASroute.xml | 18 +- examples/platforms/bypassRoute.xml | 18 +- examples/platforms/cloud.xml | 236 +++--- examples/platforms/cluster.xml | 2 +- examples/platforms/cluster_and_one_host.xml | 14 +- examples/platforms/cluster_dragonfly.xml | 6 +- examples/platforms/cluster_fat_tree.xml | 6 +- examples/platforms/cluster_no_backbone.xml | 6 +- examples/platforms/cluster_torus.xml | 6 +- examples/platforms/config.xml | 6 +- examples/platforms/config_tracing.xml | 6 +- examples/platforms/crosstraffic.xml | 6 +- examples/platforms/data_center.xml | 26 +- examples/platforms/dogbone.xml | 6 +- examples/platforms/energy_cluster.xml | 2 +- examples/platforms/energy_platform.xml | 6 +- examples/platforms/faulty_host.xml | 6 +- examples/platforms/g5k.xml | 670 +++++++++--------- examples/platforms/griffon.xml | 18 +- examples/platforms/meta_cluster.xml | 18 +- examples/platforms/multicore_machine.xml | 6 +- examples/platforms/onelink.xml | 6 +- examples/platforms/prop.xml | 22 +- examples/platforms/routing_cluster.xml | 18 +- examples/platforms/routing_none.xml | 6 +- examples/platforms/simulacrum_7_hosts.xml | 6 +- examples/platforms/small_platform.xml | 6 +- examples/platforms/small_platform_fatpipe.xml | 6 +- .../small_platform_one_link_routes.xml | 6 +- .../small_platform_with_failures.xml | 6 +- .../platforms/small_platform_with_routers.xml | 6 +- examples/platforms/storage/remote_io.xml | 6 +- examples/platforms/storage/storage.xml | 6 +- examples/platforms/three_multicore_hosts.xml | 6 +- examples/platforms/two_clusters.xml | 10 +- examples/platforms/two_hosts.xml | 6 +- .../platforms/two_hosts_platform_shared.xml | 6 +- .../two_hosts_platform_with_availability.xml | 6 +- ...ts_platform_with_availability_included.xml | 6 +- examples/platforms/two_peers.xml | 6 +- examples/platforms/vivaldi.xml | 6 +- .../s4u/actions-comm/s4u_actions-comm_d.xml | 6 +- .../actions-comm/s4u_actions-comm_split_d.xml | 12 +- .../actions-storage/s4u_actions-storage_d.xml | 4 +- .../s4u/actor-create/s4u_actor-create_d.xml | 6 +- .../s4u_app-masterworker_d.xml | 28 +- examples/s4u/dht-chord/s4u_dht-chord_d.xml | 32 +- .../generate_multiple_deployment.sh | 8 +- .../deployment_masterslave_mailbox_smpi.xml | 36 +- src/smpi/smpirun.in | 18 +- src/surf/xml/simgrid.dtd | 2 +- src/surf/xml/surfxml_sax_cb.cpp | 43 +- .../mc/mutex-handling/mutex-handling_d.xml | 12 +- .../trace_integration/test-hbp1-c0s0-c0s1.xml | 6 +- .../trace_integration/test-hbp1-c0s0-c1s0.xml | 6 +- .../trace_integration/test-hbp1-c0s1-c0s2.xml | 6 +- .../trace_integration/test-hbp1-c0s1-c2s2.xml | 6 +- .../trace_integration/test-hbp1-c0s2-c1s0.xml | 6 +- .../trace_integration/test-hbp1-c0s2-c1s1.xml | 6 +- .../trace_integration/test-hbp1-c1s1-c1s2.xml | 6 +- .../trace_integration/test-hbp1-c1s1-c3s2.xml | 6 +- .../test-hbp1.0-hbp1.0-hbp1.0.xml | 14 +- .../test-hbp1.0-hbp3.0-hbp4.0.xml | 14 +- .../trace_integration/test-hbp1.5-hbp1.5.xml | 10 +- .../trace_integration/test-hbp2.5-hbp1.5.xml | 10 +- .../flatifier/bogus_missing_gateway.tesh | 4 +- teshsuite/simdag/is-router/is-router.tesh | 2 +- teshsuite/simdag/platforms/Dijkstra.xml | 6 +- .../platforms/bogus_disk_attachment.xml | 6 +- .../platforms/bogus_missing_dst_gateway.xml | 18 +- .../platforms/bogus_missing_src_gateway.xml | 18 +- .../platforms/bogus_two_hosts_asymetric.xml | 6 +- .../simdag/platforms/four_hosts_floyd.xml | 6 +- .../simdag/platforms/host_attributes.xml | 6 +- .../simdag/platforms/link_attributes.xml | 6 +- teshsuite/simdag/platforms/one_cluster.xml | 6 +- .../platforms/one_cluster_fullduplex.xml | 6 +- .../platforms/one_cluster_multicore.xml | 6 +- .../platforms/one_cluster_router_id.xml | 6 +- .../simdag/platforms/platform_2p_1bb.xml | 6 +- .../simdag/platforms/platform_2p_1fl.xml | 6 +- .../simdag/platforms/platform_2p_1sl.xml | 6 +- .../platforms/platform_2p_1sl_hetero.xml | 6 +- .../simdag/platforms/platform_2p_1switch.xml | 6 +- .../simdag/platforms/platform_4p_1switch.xml | 6 +- .../simdag/platforms/platform_include.xml | 6 +- teshsuite/simdag/platforms/properties.xml | 6 +- .../simdag/platforms/test_of_is_router.xml | 26 +- .../three_hosts_non_symmetric_route.xml | 6 +- teshsuite/simdag/platforms/two_clusters.xml | 10 +- .../platforms/two_clusters_one_name.xml | 10 +- .../platforms/two_clusters_router_id.xml | 14 +- .../simdag/platforms/two_hosts_multi_hop.xml | 6 +- .../simdag/platforms/two_hosts_one_link.xml | 6 +- .../two_hosts_one_link_fullduplex.xml | 6 +- teshsuite/smpi/bug-17132/bug-17132.tesh | 2 +- .../smpi/privatization/privatization.tesh | 2 +- .../privatization/privatization_dlopen.tesh | 2 +- tools/simgrid_update_xml.pl | 29 +- 154 files changed, 1444 insertions(+), 1408 deletions(-) diff --git a/doc/msg-tuto-src/deployment0.xml b/doc/msg-tuto-src/deployment0.xml index 4746b97a3e..a9fe0365de 100644 --- a/doc/msg-tuto-src/deployment0.xml +++ b/doc/msg-tuto-src/deployment0.xml @@ -1,8 +1,8 @@ - - - + + + @@ -11,11 +11,11 @@ - - - - - - - + + + + + + + diff --git a/doc/msg-tuto-src/deployment1.xml b/doc/msg-tuto-src/deployment1.xml index 04dd2ebfc2..2286d864b9 100644 --- a/doc/msg-tuto-src/deployment1.xml +++ b/doc/msg-tuto-src/deployment1.xml @@ -1,10 +1,10 @@ - - - + + + - + diff --git a/doc/msg-tuto-src/deployment2.xml b/doc/msg-tuto-src/deployment2.xml index de5170efeb..99a9fcad83 100644 --- a/doc/msg-tuto-src/deployment2.xml +++ b/doc/msg-tuto-src/deployment2.xml @@ -1,9 +1,9 @@ - - + + - + diff --git a/doc/msg-tuto-src/deployment3.xml b/doc/msg-tuto-src/deployment3.xml index 3c86f5bcbf..c602a27cf0 100644 --- a/doc/msg-tuto-src/deployment3.xml +++ b/doc/msg-tuto-src/deployment3.xml @@ -1,19 +1,19 @@ - - + + - - + + - - + + - + diff --git a/doc/msg-tuto-src/deployment_general.xml b/doc/msg-tuto-src/deployment_general.xml index 6afc3c89e6..adbb7cb3e5 100644 --- a/doc/msg-tuto-src/deployment_general.xml +++ b/doc/msg-tuto-src/deployment_general.xml @@ -1,9 +1,9 @@ - - + + - + diff --git a/examples/java/app/bittorrent/bittorrent.xml b/examples/java/app/bittorrent/bittorrent.xml index e65416f3f0..df70dfb429 100644 --- a/examples/java/app/bittorrent/bittorrent.xml +++ b/examples/java/app/bittorrent/bittorrent.xml @@ -1,39 +1,39 @@ - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/java/app/centralizedmutex/centralizedmutex.xml b/examples/java/app/centralizedmutex/centralizedmutex.xml index 4d4bcb8e9d..da816b5059 100644 --- a/examples/java/app/centralizedmutex/centralizedmutex.xml +++ b/examples/java/app/centralizedmutex/centralizedmutex.xml @@ -1,15 +1,15 @@ - - + + - - + + - - + + - + diff --git a/examples/java/app/masterworker/masterworker.xml b/examples/java/app/masterworker/masterworker.xml index f632a5da13..0a96f6cd87 100644 --- a/examples/java/app/masterworker/masterworker.xml +++ b/examples/java/app/masterworker/masterworker.xml @@ -1,32 +1,32 @@ - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/java/dht/chord/chord.xml b/examples/java/dht/chord/chord.xml index 39875d483f..2434d41a85 100644 --- a/examples/java/dht/chord/chord.xml +++ b/examples/java/dht/chord/chord.xml @@ -1,62 +1,62 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/java/dht/kademlia/kademlia.xml b/examples/java/dht/kademlia/kademlia.xml index 2b113e8362..748558ffd6 100644 --- a/examples/java/dht/kademlia/kademlia.xml +++ b/examples/java/dht/kademlia/kademlia.xml @@ -1,27 +1,27 @@ - + - + - + - + - + - + - + - + - + diff --git a/examples/java/process/startkilltime/startkilltime.xml b/examples/java/process/startkilltime/startkilltime.xml index 638968651d..0310fc02e3 100644 --- a/examples/java/process/startkilltime/startkilltime.xml +++ b/examples/java/process/startkilltime/startkilltime.xml @@ -1,22 +1,22 @@ - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/java/task/priority/priority.xml b/examples/java/task/priority/priority.xml index 92a83dae5f..26b16414b7 100644 --- a/examples/java/task/priority/priority.xml +++ b/examples/java/task/priority/priority.xml @@ -1,12 +1,12 @@ - - + + - - + + - + diff --git a/examples/msg/actions-comm/actions-comm_d.xml b/examples/msg/actions-comm/actions-comm_d.xml index 8a5602edf7..dbecc0b978 100644 --- a/examples/msg/actions-comm/actions-comm_d.xml +++ b/examples/msg/actions-comm/actions-comm_d.xml @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/examples/msg/actions-comm/actions-comm_split_d.xml b/examples/msg/actions-comm/actions-comm_split_d.xml index 846270df05..831c9e0cac 100644 --- a/examples/msg/actions-comm/actions-comm_split_d.xml +++ b/examples/msg/actions-comm/actions-comm_split_d.xml @@ -1,14 +1,14 @@ - - - + - - + + - + diff --git a/examples/msg/actions-storage/actions-storage_d.xml b/examples/msg/actions-storage/actions-storage_d.xml index d2eb6821bc..3f52ae60c1 100644 --- a/examples/msg/actions-storage/actions-storage_d.xml +++ b/examples/msg/actions-storage/actions-storage_d.xml @@ -1,5 +1,5 @@ - - + + diff --git a/examples/msg/app-bittorrent/app-bittorrent_d.xml b/examples/msg/app-bittorrent/app-bittorrent_d.xml index 3836bde110..5460ab1a9d 100644 --- a/examples/msg/app-bittorrent/app-bittorrent_d.xml +++ b/examples/msg/app-bittorrent/app-bittorrent_d.xml @@ -1,39 +1,39 @@ - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/app-chainsend/app-chainsend_d.xml b/examples/msg/app-chainsend/app-chainsend_d.xml index dd83afe682..73ab26bbd2 100644 --- a/examples/msg/app-chainsend/app-chainsend_d.xml +++ b/examples/msg/app-chainsend/app-chainsend_d.xml @@ -1,36 +1,36 @@ - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/app-masterworker/app-masterworker-multicore_d.xml b/examples/msg/app-masterworker/app-masterworker-multicore_d.xml index e8ce4f9a26..cf8c0eb226 100644 --- a/examples/msg/app-masterworker/app-masterworker-multicore_d.xml +++ b/examples/msg/app-masterworker/app-masterworker-multicore_d.xml @@ -1,30 +1,30 @@ - - - + + + - + - + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml b/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml index 11d28ff11f..cd7a4f444a 100644 --- a/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml +++ b/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml @@ -1,57 +1,57 @@ - - - + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/app-masterworker/app-masterworker_d.xml b/examples/msg/app-masterworker/app-masterworker_d.xml index 869db93152..feadead6cd 100644 --- a/examples/msg/app-masterworker/app-masterworker_d.xml +++ b/examples/msg/app-masterworker/app-masterworker_d.xml @@ -1,27 +1,27 @@ - - - + + + - + - + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/app-pingpong/app-pingpong_d.xml b/examples/msg/app-pingpong/app-pingpong_d.xml index af7b1e3274..c0fdc23b7d 100644 --- a/examples/msg/app-pingpong/app-pingpong_d.xml +++ b/examples/msg/app-pingpong/app-pingpong_d.xml @@ -1,11 +1,11 @@ - + - + - - + + - + diff --git a/examples/msg/async-wait/async-wait2_d.xml b/examples/msg/async-wait/async-wait2_d.xml index 6e731068cd..1e49112af9 100644 --- a/examples/msg/async-wait/async-wait2_d.xml +++ b/examples/msg/async-wait/async-wait2_d.xml @@ -1,19 +1,19 @@ - - - + + + - + - + - + diff --git a/examples/msg/async-wait/async-wait3_d.xml b/examples/msg/async-wait/async-wait3_d.xml index 27c1d209fb..f1ef12d94e 100644 --- a/examples/msg/async-wait/async-wait3_d.xml +++ b/examples/msg/async-wait/async-wait3_d.xml @@ -1,19 +1,19 @@ - - - + + + - + - + - + diff --git a/examples/msg/async-wait/async-wait4_d.xml b/examples/msg/async-wait/async-wait4_d.xml index 939d62e426..84ca7e6a15 100644 --- a/examples/msg/async-wait/async-wait4_d.xml +++ b/examples/msg/async-wait/async-wait4_d.xml @@ -1,20 +1,20 @@ - - - + + + - + - + - + diff --git a/examples/msg/async-wait/async-wait_d.xml b/examples/msg/async-wait/async-wait_d.xml index f72618e9ce..e385572019 100644 --- a/examples/msg/async-wait/async-wait_d.xml +++ b/examples/msg/async-wait/async-wait_d.xml @@ -1,19 +1,19 @@ - - - + + + - + - + - + diff --git a/examples/msg/async-waitall/async-waitall_d.xml b/examples/msg/async-waitall/async-waitall_d.xml index 51f03d1590..6f122c2988 100644 --- a/examples/msg/async-waitall/async-waitall_d.xml +++ b/examples/msg/async-waitall/async-waitall_d.xml @@ -1,15 +1,15 @@ - - - + + + - + - + - + diff --git a/examples/msg/async-waitany/async-waitany_d.xml b/examples/msg/async-waitany/async-waitany_d.xml index 1972e413cf..2e680c4c3f 100644 --- a/examples/msg/async-waitany/async-waitany_d.xml +++ b/examples/msg/async-waitany/async-waitany_d.xml @@ -1,21 +1,21 @@ - - - + + + - + - + - - + + - + diff --git a/examples/msg/async-yield/async-yield_d.xml b/examples/msg/async-yield/async-yield_d.xml index 0b1b17a4f4..b1ab776f57 100644 --- a/examples/msg/async-yield/async-yield_d.xml +++ b/examples/msg/async-yield/async-yield_d.xml @@ -1,10 +1,10 @@ - - + + - - + + - + diff --git a/examples/msg/dht-chord/dht-chord_d.xml b/examples/msg/dht-chord/dht-chord_d.xml index f31fb7bc46..b698648349 100644 --- a/examples/msg/dht-chord/dht-chord_d.xml +++ b/examples/msg/dht-chord/dht-chord_d.xml @@ -1,62 +1,62 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/dht-kademlia/dht-kademlia_d.xml b/examples/msg/dht-kademlia/dht-kademlia_d.xml index a63e6c9af6..e199776298 100644 --- a/examples/msg/dht-kademlia/dht-kademlia_d.xml +++ b/examples/msg/dht-kademlia/dht-kademlia_d.xml @@ -1,72 +1,72 @@ - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/energy-onoff/platform_onoff.xml b/examples/msg/energy-onoff/platform_onoff.xml index 58be9ca6fd..b0423a987a 100644 --- a/examples/msg/energy-onoff/platform_onoff.xml +++ b/examples/msg/energy-onoff/platform_onoff.xml @@ -1,7 +1,7 @@ - - + + @@ -40,5 +40,5 @@ - + diff --git a/examples/msg/io-remote/io-remote_d.xml b/examples/msg/io-remote/io-remote_d.xml index 0bda8f8e30..838ab3d3ea 100644 --- a/examples/msg/io-remote/io-remote_d.xml +++ b/examples/msg/io-remote/io-remote_d.xml @@ -1,24 +1,24 @@ - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/mc/deploy_bugged1.xml b/examples/msg/mc/deploy_bugged1.xml index 4333fd73a9..1f4b2a7c4b 100644 --- a/examples/msg/mc/deploy_bugged1.xml +++ b/examples/msg/mc/deploy_bugged1.xml @@ -1,16 +1,16 @@ - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/mc/deploy_bugged1_liveness.xml b/examples/msg/mc/deploy_bugged1_liveness.xml index 08b755e74e..3d6b31c5e4 100644 --- a/examples/msg/mc/deploy_bugged1_liveness.xml +++ b/examples/msg/mc/deploy_bugged1_liveness.xml @@ -1,11 +1,11 @@ - - - + + + - - + + - + diff --git a/examples/msg/mc/deploy_bugged1_liveness_visited.xml b/examples/msg/mc/deploy_bugged1_liveness_visited.xml index 911865f386..af31561c40 100644 --- a/examples/msg/mc/deploy_bugged1_liveness_visited.xml +++ b/examples/msg/mc/deploy_bugged1_liveness_visited.xml @@ -1,11 +1,11 @@ - - - + + + - - + + - + diff --git a/examples/msg/mc/deploy_bugged2.xml b/examples/msg/mc/deploy_bugged2.xml index c6dbe05b90..c95f94bcf7 100644 --- a/examples/msg/mc/deploy_bugged2.xml +++ b/examples/msg/mc/deploy_bugged2.xml @@ -1,13 +1,13 @@ - - + + - - + + - - + + - + diff --git a/examples/msg/mc/deploy_bugged2_liveness.xml b/examples/msg/mc/deploy_bugged2_liveness.xml index 51ea5bf320..e1b845cd39 100644 --- a/examples/msg/mc/deploy_bugged2_liveness.xml +++ b/examples/msg/mc/deploy_bugged2_liveness.xml @@ -1,11 +1,11 @@ - - - + + + - - + + - + diff --git a/examples/msg/mc/deploy_bugged3.xml b/examples/msg/mc/deploy_bugged3.xml index c6dbe05b90..c95f94bcf7 100644 --- a/examples/msg/mc/deploy_bugged3.xml +++ b/examples/msg/mc/deploy_bugged3.xml @@ -1,13 +1,13 @@ - - + + - - + + - - + + - + diff --git a/examples/msg/mc/deploy_centralized_mutex.xml b/examples/msg/mc/deploy_centralized_mutex.xml index a22bda15f1..89ba1a2de3 100644 --- a/examples/msg/mc/deploy_centralized_mutex.xml +++ b/examples/msg/mc/deploy_centralized_mutex.xml @@ -1,10 +1,10 @@ - - + + - - - - + + + + diff --git a/examples/msg/mc/deploy_electric_fence.xml b/examples/msg/mc/deploy_electric_fence.xml index cf7d227d49..1926770de7 100644 --- a/examples/msg/mc/deploy_electric_fence.xml +++ b/examples/msg/mc/deploy_electric_fence.xml @@ -1,13 +1,13 @@ - - + + - - + + - - + + - + diff --git a/examples/msg/mc/platform.xml b/examples/msg/mc/platform.xml index 3149f5c4bb..29d062c526 100644 --- a/examples/msg/mc/platform.xml +++ b/examples/msg/mc/platform.xml @@ -1,7 +1,7 @@ - - + + @@ -18,5 +18,5 @@ - + diff --git a/examples/msg/network-ns3/3hosts_2links_d.xml b/examples/msg/network-ns3/3hosts_2links_d.xml index a360912ef8..1d7171d069 100644 --- a/examples/msg/network-ns3/3hosts_2links_d.xml +++ b/examples/msg/network-ns3/3hosts_2links_d.xml @@ -1,12 +1,12 @@ - - + + - - + + - + diff --git a/examples/msg/network-ns3/3links-timer_d.xml b/examples/msg/network-ns3/3links-timer_d.xml index c9727c3a7b..cc0e18aa5f 100644 --- a/examples/msg/network-ns3/3links-timer_d.xml +++ b/examples/msg/network-ns3/3links-timer_d.xml @@ -1,44 +1,44 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/network-ns3/3links_d.xml b/examples/msg/network-ns3/3links_d.xml index 9ae01af3ea..2bb2b03c7d 100644 --- a/examples/msg/network-ns3/3links_d.xml +++ b/examples/msg/network-ns3/3links_d.xml @@ -1,28 +1,28 @@ - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/network-ns3/crosstraffic_d.xml b/examples/msg/network-ns3/crosstraffic_d.xml index 91ce4790b8..cc69bd78db 100644 --- a/examples/msg/network-ns3/crosstraffic_d.xml +++ b/examples/msg/network-ns3/crosstraffic_d.xml @@ -1,36 +1,36 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/network-ns3/dogbone_d.xml b/examples/msg/network-ns3/dogbone_d.xml index cf3068b693..150a99ac03 100644 --- a/examples/msg/network-ns3/dogbone_d.xml +++ b/examples/msg/network-ns3/dogbone_d.xml @@ -1,20 +1,20 @@ - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/network-ns3/one_cluster_d.xml b/examples/msg/network-ns3/one_cluster_d.xml index 9eab752e5f..4c0f7bc333 100644 --- a/examples/msg/network-ns3/one_cluster_d.xml +++ b/examples/msg/network-ns3/one_cluster_d.xml @@ -1,12 +1,12 @@ - - + + - - + + - + diff --git a/examples/msg/network-ns3/onelink_d.xml b/examples/msg/network-ns3/onelink_d.xml index 4bc51076f5..2a2d4b299d 100644 --- a/examples/msg/network-ns3/onelink_d.xml +++ b/examples/msg/network-ns3/onelink_d.xml @@ -1,12 +1,12 @@ - - + + - - + + - + diff --git a/examples/msg/network-ns3/two_clusters_d.xml b/examples/msg/network-ns3/two_clusters_d.xml index db540cbbf2..c104b21a4c 100644 --- a/examples/msg/network-ns3/two_clusters_d.xml +++ b/examples/msg/network-ns3/two_clusters_d.xml @@ -1,12 +1,12 @@ - - + + - - + + - + diff --git a/examples/msg/platform-properties/platform-properties_d.xml b/examples/msg/platform-properties/platform-properties_d.xml index 98d35908b8..f4c76b92a1 100644 --- a/examples/msg/platform-properties/platform-properties_d.xml +++ b/examples/msg/platform-properties/platform-properties_d.xml @@ -1,10 +1,10 @@ - - - + + + - - - + + + diff --git a/examples/msg/process-startkilltime/baseline_d.xml b/examples/msg/process-startkilltime/baseline_d.xml index bc19db1195..e24ccedf13 100644 --- a/examples/msg/process-startkilltime/baseline_d.xml +++ b/examples/msg/process-startkilltime/baseline_d.xml @@ -1,8 +1,8 @@ - + - + - + diff --git a/examples/msg/process-startkilltime/kill_d.xml b/examples/msg/process-startkilltime/kill_d.xml index a85e3f67a0..6d7d312410 100644 --- a/examples/msg/process-startkilltime/kill_d.xml +++ b/examples/msg/process-startkilltime/kill_d.xml @@ -1,13 +1,13 @@ - - + + - - + + - - + + - + diff --git a/examples/msg/process-startkilltime/start_d.xml b/examples/msg/process-startkilltime/start_d.xml index 6819164ed6..3d6934b178 100644 --- a/examples/msg/process-startkilltime/start_d.xml +++ b/examples/msg/process-startkilltime/start_d.xml @@ -1,22 +1,22 @@ - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/process-startkilltime/start_kill_d.xml b/examples/msg/process-startkilltime/start_kill_d.xml index 318c5fe46a..7292ca2fbb 100644 --- a/examples/msg/process-startkilltime/start_kill_d.xml +++ b/examples/msg/process-startkilltime/start_kill_d.xml @@ -1,22 +1,22 @@ - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/examples/msg/task-priority/task-priority_d.xml b/examples/msg/task-priority/task-priority_d.xml index 3d8f51371b..5d15f2b87f 100644 --- a/examples/msg/task-priority/task-priority_d.xml +++ b/examples/msg/task-priority/task-priority_d.xml @@ -1,12 +1,12 @@ - - + + - - + + - + diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml index 37b973acee..ea93cd3740 100644 --- a/examples/platforms/bypassASroute.xml +++ b/examples/platforms/bypassASroute.xml @@ -1,7 +1,7 @@ - - + + @@ -12,21 +12,21 @@ - + - - + + - - + + - + - + diff --git a/examples/platforms/bypassRoute.xml b/examples/platforms/bypassRoute.xml index 4b99bccaf7..072fe3a956 100644 --- a/examples/platforms/bypassRoute.xml +++ b/examples/platforms/bypassRoute.xml @@ -1,17 +1,17 @@ - - - + + + - + - + @@ -60,12 +60,12 @@ - + - + - - + + diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml index fe0774bd8c..82672eaf46 100644 --- a/examples/platforms/cloud.xml +++ b/examples/platforms/cloud.xml @@ -1,8 +1,8 @@ - - - + + + @@ -18,7 +18,7 @@ - + @@ -39,51 +39,51 @@ - + - - - + - - + - - - + + + - - + - - + - - + - - + - - + - - + + - + @@ -108,7 +108,7 @@ - + @@ -130,137 +130,137 @@ - + - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + + - + @@ -278,7 +278,7 @@ - + @@ -299,73 +299,73 @@ - + - - - + - - + - - + - - + - - + - + - - + - - + - - + - - + - - + - - + - - + - - + - - - + + + diff --git a/examples/platforms/cluster.xml b/examples/platforms/cluster.xml index db66bf0d8f..628427b129 100644 --- a/examples/platforms/cluster.xml +++ b/examples/platforms/cluster.xml @@ -1,6 +1,6 @@ - + - + - + diff --git a/examples/platforms/cluster_no_backbone.xml b/examples/platforms/cluster_no_backbone.xml index 249f7ccb4e..c3acb30446 100644 --- a/examples/platforms/cluster_no_backbone.xml +++ b/examples/platforms/cluster_no_backbone.xml @@ -1,6 +1,6 @@ - + - + - + diff --git a/examples/platforms/cluster_torus.xml b/examples/platforms/cluster_torus.xml index 8fb7a06794..1f9c8c0960 100644 --- a/examples/platforms/cluster_torus.xml +++ b/examples/platforms/cluster_torus.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml index fe25716dfc..3bd41a531f 100644 --- a/examples/platforms/config.xml +++ b/examples/platforms/config.xml @@ -1,6 +1,6 @@ - + @@ -10,7 +10,7 @@ - + @@ -23,5 +23,5 @@ - + diff --git a/examples/platforms/config_tracing.xml b/examples/platforms/config_tracing.xml index 84fa6bc8ea..38b306b636 100644 --- a/examples/platforms/config_tracing.xml +++ b/examples/platforms/config_tracing.xml @@ -1,6 +1,6 @@ - + @@ -11,7 +11,7 @@ - + @@ -117,5 +117,5 @@ - + diff --git a/examples/platforms/crosstraffic.xml b/examples/platforms/crosstraffic.xml index 50c09d22dd..dedcff8ab0 100644 --- a/examples/platforms/crosstraffic.xml +++ b/examples/platforms/crosstraffic.xml @@ -1,11 +1,11 @@ - + - + @@ -17,5 +17,5 @@ - + diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml index 807b0a0c8c..95e8167088 100644 --- a/examples/platforms/data_center.xml +++ b/examples/platforms/data_center.xml @@ -1,8 +1,8 @@ - - - + + + - + @@ -41,24 +41,24 @@ - + - - - + - - + - - - + + + diff --git a/examples/platforms/dogbone.xml b/examples/platforms/dogbone.xml index 26a1a9949b..65879331f0 100644 --- a/examples/platforms/dogbone.xml +++ b/examples/platforms/dogbone.xml @@ -1,7 +1,7 @@ - - + + @@ -50,5 +50,5 @@ - + diff --git a/examples/platforms/energy_cluster.xml b/examples/platforms/energy_cluster.xml index 0d15f719f2..680a30e28c 100644 --- a/examples/platforms/energy_cluster.xml +++ b/examples/platforms/energy_cluster.xml @@ -1,6 +1,6 @@ - + diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml index d1ca0ff79f..0af3e71fc5 100644 --- a/examples/platforms/energy_platform.xml +++ b/examples/platforms/energy_platform.xml @@ -1,7 +1,7 @@ - - + + @@ -31,5 +31,5 @@ - + diff --git a/examples/platforms/faulty_host.xml b/examples/platforms/faulty_host.xml index bcb382caa9..60dc58aca0 100644 --- a/examples/platforms/faulty_host.xml +++ b/examples/platforms/faulty_host.xml @@ -1,9 +1,9 @@ - - + + - + diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml index 9a8ae89758..234b305cfe 100644 --- a/examples/platforms/g5k.xml +++ b/examples/platforms/g5k.xml @@ -1,5 +1,6 @@ + - - - + + @@ -63,8 +63,8 @@ - - + + @@ -74,36 +74,36 @@ - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + @@ -113,36 +113,36 @@ - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + @@ -155,174 +155,174 @@ - + - + - + - - + + - - + + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - + - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - - + + - - + + - - + + @@ -335,235 +335,235 @@ - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - - + + - - + + - + @@ -576,51 +576,51 @@ - + - + - + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - - + + - - + + - + @@ -630,86 +630,86 @@ - + - + - + - - + + - - + + - + - + - - + + - - + + - - + + - + - + - + - + - + - + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/examples/platforms/griffon.xml b/examples/platforms/griffon.xml index 69ac6e4dbc..8aeb17601c 100644 --- a/examples/platforms/griffon.xml +++ b/examples/platforms/griffon.xml @@ -1,7 +1,7 @@ - - + + @@ -14,20 +14,20 @@ - - - + - - + - - + + diff --git a/examples/platforms/meta_cluster.xml b/examples/platforms/meta_cluster.xml index 98d6c228d7..e30ce55d42 100644 --- a/examples/platforms/meta_cluster.xml +++ b/examples/platforms/meta_cluster.xml @@ -1,29 +1,29 @@ - - - + + + - + - + - + - + - - + + diff --git a/examples/platforms/multicore_machine.xml b/examples/platforms/multicore_machine.xml index 93134dc42b..68c0e2178f 100644 --- a/examples/platforms/multicore_machine.xml +++ b/examples/platforms/multicore_machine.xml @@ -1,7 +1,7 @@ - - + + - + diff --git a/examples/platforms/onelink.xml b/examples/platforms/onelink.xml index 2a86803c49..4682e74ce2 100644 --- a/examples/platforms/onelink.xml +++ b/examples/platforms/onelink.xml @@ -1,7 +1,7 @@ - - + + @@ -11,5 +11,5 @@ - + diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml index eb22be66fd..fdf39cf84e 100644 --- a/examples/platforms/prop.xml +++ b/examples/platforms/prop.xml @@ -1,21 +1,21 @@ - + - + - - + + - - + + - - + + @@ -24,7 +24,7 @@ - + @@ -44,6 +44,6 @@ - - + + diff --git a/examples/platforms/routing_cluster.xml b/examples/platforms/routing_cluster.xml index a5e242e058..872b303993 100644 --- a/examples/platforms/routing_cluster.xml +++ b/examples/platforms/routing_cluster.xml @@ -1,6 +1,6 @@ - + - - + + @@ -29,9 +29,9 @@ l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \ - + - + @@ -48,12 +48,12 @@ l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \ - + - + - - + + diff --git a/examples/platforms/routing_none.xml b/examples/platforms/routing_none.xml index 01da662b46..5cd432cccf 100644 --- a/examples/platforms/routing_none.xml +++ b/examples/platforms/routing_none.xml @@ -1,8 +1,8 @@ - + - + @@ -13,5 +13,5 @@ - + diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml index 9c4185069c..3887685f76 100644 --- a/examples/platforms/simulacrum_7_hosts.xml +++ b/examples/platforms/simulacrum_7_hosts.xml @@ -1,11 +1,11 @@ - + - + @@ -109,6 +109,6 @@ - + diff --git a/examples/platforms/small_platform.xml b/examples/platforms/small_platform.xml index 0f6c5f50f7..576fa7b8d1 100644 --- a/examples/platforms/small_platform.xml +++ b/examples/platforms/small_platform.xml @@ -1,7 +1,7 @@ - - + + @@ -190,5 +190,5 @@ - + diff --git a/examples/platforms/small_platform_fatpipe.xml b/examples/platforms/small_platform_fatpipe.xml index cf056b5223..6376744eb6 100644 --- a/examples/platforms/small_platform_fatpipe.xml +++ b/examples/platforms/small_platform_fatpipe.xml @@ -1,7 +1,7 @@ - - + + @@ -24,5 +24,5 @@ - + diff --git a/examples/platforms/small_platform_one_link_routes.xml b/examples/platforms/small_platform_one_link_routes.xml index 0be82e2e09..faaad678ee 100644 --- a/examples/platforms/small_platform_one_link_routes.xml +++ b/examples/platforms/small_platform_one_link_routes.xml @@ -1,7 +1,7 @@ - - + + @@ -70,5 +70,5 @@ - + diff --git a/examples/platforms/small_platform_with_failures.xml b/examples/platforms/small_platform_with_failures.xml index 6dc6f93444..a19986ca70 100644 --- a/examples/platforms/small_platform_with_failures.xml +++ b/examples/platforms/small_platform_with_failures.xml @@ -1,7 +1,7 @@ - - + + @@ -66,5 +66,5 @@ - + diff --git a/examples/platforms/small_platform_with_routers.xml b/examples/platforms/small_platform_with_routers.xml index 91f619c3c5..688d71c01b 100644 --- a/examples/platforms/small_platform_with_routers.xml +++ b/examples/platforms/small_platform_with_routers.xml @@ -1,7 +1,7 @@ - - + + @@ -144,5 +144,5 @@ - + diff --git a/examples/platforms/storage/remote_io.xml b/examples/platforms/storage/remote_io.xml index 3caa9db0e7..b654b9cd19 100644 --- a/examples/platforms/storage/remote_io.xml +++ b/examples/platforms/storage/remote_io.xml @@ -1,11 +1,11 @@ - + - + @@ -56,5 +56,5 @@ - + diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml index 6372351c88..449438eb81 100644 --- a/examples/platforms/storage/storage.xml +++ b/examples/platforms/storage/storage.xml @@ -1,11 +1,11 @@ - + - + @@ -46,5 +46,5 @@ - + diff --git a/examples/platforms/three_multicore_hosts.xml b/examples/platforms/three_multicore_hosts.xml index cbc9f00ab1..0b237dafbf 100644 --- a/examples/platforms/three_multicore_hosts.xml +++ b/examples/platforms/three_multicore_hosts.xml @@ -1,7 +1,7 @@ - - + + @@ -17,5 +17,5 @@ - + diff --git a/examples/platforms/two_clusters.xml b/examples/platforms/two_clusters.xml index bc8567845a..29ec619177 100644 --- a/examples/platforms/two_clusters.xml +++ b/examples/platforms/two_clusters.xml @@ -1,6 +1,6 @@ - + - + @@ -31,9 +31,9 @@ node-10.acme.org node-19.acme.org --> - - - + + diff --git a/examples/platforms/two_hosts.xml b/examples/platforms/two_hosts.xml index 2aebc985da..b6d03ba236 100644 --- a/examples/platforms/two_hosts.xml +++ b/examples/platforms/two_hosts.xml @@ -1,7 +1,7 @@ - - + + @@ -10,7 +10,7 @@ - + 1.0 0.5 diff --git a/examples/platforms/two_hosts_platform_shared.xml b/examples/platforms/two_hosts_platform_shared.xml index 23e1d82e9f..362f8a8b3e 100644 --- a/examples/platforms/two_hosts_platform_shared.xml +++ b/examples/platforms/two_hosts_platform_shared.xml @@ -1,7 +1,7 @@ - - + + @@ -16,5 +16,5 @@ - + diff --git a/examples/platforms/two_hosts_platform_with_availability.xml b/examples/platforms/two_hosts_platform_with_availability.xml index c9d6e49432..217b7a327f 100644 --- a/examples/platforms/two_hosts_platform_with_availability.xml +++ b/examples/platforms/two_hosts_platform_with_availability.xml @@ -1,12 +1,12 @@ - - + + - + diff --git a/examples/platforms/two_hosts_platform_with_availability_included.xml b/examples/platforms/two_hosts_platform_with_availability_included.xml index 3eb160fff2..b6fc4190f2 100644 --- a/examples/platforms/two_hosts_platform_with_availability_included.xml +++ b/examples/platforms/two_hosts_platform_with_availability_included.xml @@ -1,6 +1,6 @@ - + 0.0 1.0 11.0 0.5 @@ -16,14 +16,14 @@ 20.0 0.4 - + - + diff --git a/examples/platforms/two_peers.xml b/examples/platforms/two_peers.xml index 92ac5d5937..723632668a 100644 --- a/examples/platforms/two_peers.xml +++ b/examples/platforms/two_peers.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml index f93727d9e4..2bb79ed12f 100644 --- a/examples/platforms/vivaldi.xml +++ b/examples/platforms/vivaldi.xml @@ -1,7 +1,7 @@ - - + + @@ -42,5 +42,5 @@ - + diff --git a/examples/s4u/actions-comm/s4u_actions-comm_d.xml b/examples/s4u/actions-comm/s4u_actions-comm_d.xml index cce14e3924..4e597fc828 100644 --- a/examples/s4u/actions-comm/s4u_actions-comm_d.xml +++ b/examples/s4u/actions-comm/s4u_actions-comm_d.xml @@ -1,6 +1,6 @@ - - - + + + diff --git a/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml b/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml index a88cf278f0..71d521a212 100644 --- a/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml +++ b/examples/s4u/actions-comm/s4u_actions-comm_split_d.xml @@ -1,14 +1,14 @@ - - - + - - + + - + diff --git a/examples/s4u/actions-storage/s4u_actions-storage_d.xml b/examples/s4u/actions-storage/s4u_actions-storage_d.xml index d2eb6821bc..3f52ae60c1 100644 --- a/examples/s4u/actions-storage/s4u_actions-storage_d.xml +++ b/examples/s4u/actions-storage/s4u_actions-storage_d.xml @@ -1,5 +1,5 @@ - - + + diff --git a/examples/s4u/actor-create/s4u_actor-create_d.xml b/examples/s4u/actor-create/s4u_actor-create_d.xml index 6cdc3da1da..11e719b75b 100644 --- a/examples/s4u/actor-create/s4u_actor-create_d.xml +++ b/examples/s4u/actor-create/s4u_actor-create_d.xml @@ -1,6 +1,6 @@ - + - + - + diff --git a/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml b/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml index 869db93152..feadead6cd 100644 --- a/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml +++ b/examples/s4u/app-masterworker/s4u_app-masterworker_d.xml @@ -1,27 +1,27 @@ - - - + + + - + - + - - + + - - + + - - + + - - + + - + diff --git a/examples/s4u/dht-chord/s4u_dht-chord_d.xml b/examples/s4u/dht-chord/s4u_dht-chord_d.xml index 26e2b17397..d2af449509 100644 --- a/examples/s4u/dht-chord/s4u_dht-chord_d.xml +++ b/examples/s4u/dht-chord/s4u_dht-chord_d.xml @@ -1,44 +1,44 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - \ No newline at end of file + + diff --git a/examples/smpi/replay_multiple/generate_multiple_deployment.sh b/examples/smpi/replay_multiple/generate_multiple_deployment.sh index 58e2a0ea9b..e454081f3f 100755 --- a/examples/smpi/replay_multiple/generate_multiple_deployment.sh +++ b/examples/smpi/replay_multiple/generate_multiple_deployment.sh @@ -114,7 +114,7 @@ APPLICATIONTMP=$(echo ${PROC_ARGS}|cut -d' ' -f2 -s) cat > ${APPLICATIONTMP} < - + APPLICATIONHEAD ##---- cache hostnames of hostfile--------------- @@ -168,7 +168,7 @@ if [ -n "${DESCRIPTIONFILE}" ] && [ -f "${DESCRIPTIONFILE}" ]; then ## hostfile has less than i lines. ##---------------------------------------------------------- -##---- generate tags------------------------------ +##---- generate tags------------------------------ do if [ -n "${HOSTFILE}" ]; then j=$(( ${NUMPROCS} % ${NUMHOSTS} +1)) @@ -180,13 +180,13 @@ if [ -n "${DESCRIPTIONFILE}" ] && [ -f "${DESCRIPTIONFILE}" ]; then host="${hostname}" fi - echo " " >> ${APPLICATIONTMP} + echo " " >> ${APPLICATIONTMP} echo " " >> ${APPLICATIONTMP} echo " " >> ${APPLICATIONTMP} echo " " >> ${APPLICATIONTMP} echo " " >> ${APPLICATIONTMP} - echo " " >> ${APPLICATIONTMP} + echo " " >> ${APPLICATIONTMP} NUMPROCS=$(( ${NUMPROCS} +1)) done # return IFS back to newline for "for" loop diff --git a/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml b/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml index e879f74557..75266f9df7 100644 --- a/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml +++ b/examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml @@ -1,39 +1,39 @@ - - - + + + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index ac444b7075..a8c75e1290 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -323,7 +323,7 @@ if [ -z "${NUMPROCS}" ] ; then fi if [ ${NUMPROCS} -gt ${hostfile_procs} ] ; then - echo "You requested to use ${NUMPROCS} processes, but there is only ${hostfile_procs} processes in your hostfile..." >&2 + echo "You requested to use ${NUMPROCS} ranks, but there is only ${hostfile_procs} processes in your hostfile..." >&2 fi ##-------------------------------- DEFAULT or SPECIFIED PLATFORM -------------------------------------- @@ -333,8 +333,8 @@ if [ -z "${PLATFORM}" ]; then cat > ${PLATFORMTMP} < - - + + PLATFORMHEAD i=${NUMPROCS} @@ -360,7 +360,7 @@ PLATFORMHEAD done cat >> ${PLATFORMTMP} < + PLATFORMFOOT @@ -375,7 +375,7 @@ APPLICATIONTMP="$(mktemp smpitmp-appXXXXXX)" cat > ${APPLICATIONTMP} < - + APPLICATIONHEAD ##---- cache hostnames of hostfile--------------- @@ -415,7 +415,7 @@ fi set -- $hostnames -##---- generate tags------------------------------ +##---- generate tags------------------------------ #prepare arguments at once for ARG in $PROC_ARGS; do XML_ARGS="${XML_ARGS}"" @@ -427,12 +427,12 @@ do j=$(( $i % ${hostfile_procs} + 1 )) host=$(eval "echo \${$j}") - ##---- optional display of ranks to process mapping + ##---- optional display of ranks to actor mapping if [ ${MAPOPT} = 1 ]; then echo "[rank $i] -> $host" fi - echo " + echo " " >> ${APPLICATIONTMP} if [ ${REPLAY} = 1 ]; then @@ -444,7 +444,7 @@ do else echo ${XML_ARGS} >> ${APPLICATIONTMP} fi - echo " " >> ${APPLICATIONTMP} + echo " " >> ${APPLICATIONTMP} done cat >> ${APPLICATIONTMP} < can be used as a synonym for the now deprecated - an be used as a synonym for the now deprecated - an be used as a synonym for the now deprecated diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 466f8d2aa6..d59eeb0523 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -446,16 +446,30 @@ void STag_surfxml_platform() { "Use simgrid_update_xml to update your file automatically. " "This program is installed automatically with SimGrid, or " "available in the tools/ directory of the source archive."); - xbt_assert((version >= 4.0), "******* FILE %s IS TOO OLD (v:%.1f) *********\n " - "Changes introduced in SimGrid 3.13:\n" - " - 'power' attribute of hosts (and others) got renamed to 'speed'.\n" - " - In , attribute kind=\"POWER\" is now kind=\"SPEED\".\n" - " - DOCTYPE now point to the rignt URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\n" - " - speed, bandwidth and latency attributes now MUST have an explicit unit (f, Bps, s by default)" - "\n\n" - "Use simgrid_update_xml to update your file automatically. " - "This program is installed automatically with SimGrid, or " - "available in the tools/ directory of the source archive.",surf_parsed_filename, version); + xbt_assert((version >= 4.0), + "******* FILE %s IS TOO OLD (v:%.1f) *********\n " + "Changes introduced in SimGrid 3.13:\n" + " - 'power' attribute of hosts (and others) got renamed to 'speed'.\n" + " - In , attribute kind=\"POWER\" is now kind=\"SPEED\".\n" + " - DOCTYPE now point to the rignt URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\n" + " - speed, bandwidth and latency attributes now MUST have an explicit unit (f, Bps, s by default)" + "\n\n" + "Use simgrid_update_xml to update your file automatically. " + "This program is installed automatically with SimGrid, or " + "available in the tools/ directory of the source archive.", + surf_parsed_filename, version); + if (version < 4.1) { + XBT_INFO("You're using a v%.1f XML file (%s) while the current standard is v4.1 " + "That's fine, the new version is backward compatible. \n\n" + "Use simgrid_update_xml to update your file automatically. " + "This program is installed automatically with SimGrid, or " + "available in the tools/ directory of the source archive.", + version, surf_parsed_filename); + } + xbt_assert(version <= 4.1, "******* FILE %s COMES FROM THE FUTURE (v:%.1f) *********\n " + "The most recent formalism that this version of SimGrid understands is v4.1.\n" + "Please update your code, or use another, more adapted, file.", + surf_parsed_filename, version); sg_platf_begin(); } @@ -471,8 +485,8 @@ void STag_surfxml_host(){ void STag_surfxml_prop() { if (ZONE_TAG) { // We need to retrieve the most recently opened zone - XBT_DEBUG("Set Zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value); - simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_AS_id); + XBT_DEBUG("Set zone property %s -> %s", A_surfxml_prop_id, A_surfxml_prop_value); + simgrid::s4u::NetZone* netzone = simgrid::s4u::Engine::instance()->netzoneByNameOrNull(A_surfxml_zone_id); netzone->setProperty(A_surfxml_prop_id, A_surfxml_prop_value); } @@ -936,7 +950,7 @@ void ETag_surfxml_AS(){ } void STag_surfxml_zone(){ parse_after_config(); - ZONE_TAG = 1; + ZONE_TAG = 1; s_sg_platf_AS_cbarg_t AS = { A_surfxml_zone_id, (int)A_surfxml_zone_routing}; sg_platf_new_AS_begin(&AS); @@ -950,7 +964,8 @@ void STag_surfxml_config(){ xbt_assert(current_property_set == nullptr, "Someone forgot to reset the property set to nullptr in its closing tag (or XML malformed)"); XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); if (_sg_cfg_init_status == 2) { - surf_parse_error("All tags must be given before any platform elements (such as , , , , etc)."); + surf_parse_error("All tags must be given before any platform elements (such as , , , " + ", etc)."); } } void ETag_surfxml_config(){ diff --git a/teshsuite/mc/mutex-handling/mutex-handling_d.xml b/teshsuite/mc/mutex-handling/mutex-handling_d.xml index f1325de94b..d6eb805e60 100644 --- a/teshsuite/mc/mutex-handling/mutex-handling_d.xml +++ b/teshsuite/mc/mutex-handling/mutex-handling_d.xml @@ -1,11 +1,11 @@ - - - + + + - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml index 68c4ccc583..b761bdbf59 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml index d12fc7b598..aa093e31c0 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml index 6ae2f4ed74..a919a7395f 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml index 4c9a178f85..28c048a768 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml index 33087be338..a6ee0c0d73 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml index 028b9a1dd6..2bf91a18aa 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml index 8beb1c23f3..cd8c9c05ee 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml index c412fe1028..4fd1842b55 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml index b4a9f57a41..4d2d81a494 100644 --- a/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml @@ -1,16 +1,16 @@ - - + + - - + + - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml index 504497c286..7de0dc6231 100644 --- a/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml @@ -1,16 +1,16 @@ - - + + - - + + - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml index aaa2f6cf53..b31e3cab72 100644 --- a/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml +++ b/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml @@ -1,12 +1,12 @@ - - + + - - + + - + diff --git a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml index 163924b2db..004873453d 100644 --- a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml +++ b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml @@ -1,12 +1,12 @@ - - + + - - + + - + diff --git a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh index 6a28da60ad..b45ef48654 100644 --- a/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh +++ b/teshsuite/simdag/flatifier/bogus_missing_gateway.tesh @@ -1,11 +1,11 @@ ! expect signal SIGABRT $ ${bindir:=.}/flatifier ../platforms/bogus_missing_src_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:14: ASroute gw_src='nod-cluster_router.cluster.us' does name a node. +> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_src_gateway.xml:14: zoneRoute gw_src='nod-cluster_router.cluster.us' does name a node. > [ 0.000000] [0:maestro@] Exiting now ! expect signal SIGABRT $ ${bindir:=.}/flatifier ../platforms/bogus_missing_dst_gateway.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. -> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:14: ASroute gw_dst='neud-grappe_router.grappe.fr' does name a node. +> [ 0.000000] [0:maestro@] Parse error at ../platforms/bogus_missing_dst_gateway.xml:14: zoneRoute gw_dst='neud-grappe_router.grappe.fr' does name a node. > [ 0.000000] [0:maestro@] Exiting now diff --git a/teshsuite/simdag/is-router/is-router.tesh b/teshsuite/simdag/is-router/is-router.tesh index 6039c371b3..80d0a67b51 100644 --- a/teshsuite/simdag/is-router/is-router.tesh +++ b/teshsuite/simdag/is-router/is-router.tesh @@ -14,7 +14,6 @@ $ ${bindir:=.}/is-router ${srcdir}/teshsuite/simdag/platforms/test_of_is_router. > - Seen: "host09". Type: host > - Seen: "host10". Type: host > NetCards count: 21 -> - Seen: "AS". Type: netzone > - Seen: "AS0". Type: netzone > - Seen: "AS1". Type: netzone > - Seen: "AS2". Type: netzone @@ -35,3 +34,4 @@ $ ${bindir:=.}/is-router ${srcdir}/teshsuite/simdag/platforms/test_of_is_router. > - Seen: "router3". Type: router > - Seen: "router4". Type: router > - Seen: "router5". Type: router +> - Seen: "zone". Type: netzone diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/simdag/platforms/Dijkstra.xml index d04c636bcf..cf18d7b06d 100644 --- a/teshsuite/simdag/platforms/Dijkstra.xml +++ b/teshsuite/simdag/platforms/Dijkstra.xml @@ -1,7 +1,7 @@ - - + + @@ -32,5 +32,5 @@ - + diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml index d038fc1a4f..d13d47015d 100644 --- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml +++ b/teshsuite/simdag/platforms/bogus_disk_attachment.xml @@ -1,9 +1,9 @@ - + - + @@ -15,5 +15,5 @@ - + diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml index d297f04c3f..c754f89d49 100644 --- a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml +++ b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml @@ -1,18 +1,18 @@ - - - + + + - - + + - + - + - - + + diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml index b935300e5e..8de74a8782 100644 --- a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml +++ b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml @@ -1,18 +1,18 @@ - - - + + + - - + + - + - + - - + + diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml index ec5230632a..34eb3f27b6 100644 --- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml +++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml @@ -1,10 +1,10 @@ - + - + @@ -17,5 +17,5 @@ - + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/simdag/platforms/four_hosts_floyd.xml index 3e851a68a2..eaa710ad7a 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd.xml @@ -1,7 +1,7 @@ - - + + @@ -24,5 +24,5 @@ - + diff --git a/teshsuite/simdag/platforms/host_attributes.xml b/teshsuite/simdag/platforms/host_attributes.xml index b0d28e0674..daedebb2df 100644 --- a/teshsuite/simdag/platforms/host_attributes.xml +++ b/teshsuite/simdag/platforms/host_attributes.xml @@ -1,7 +1,7 @@ - - + + @@ -11,7 +11,7 @@ - + 0.0 1.0 diff --git a/teshsuite/simdag/platforms/link_attributes.xml b/teshsuite/simdag/platforms/link_attributes.xml index 62bc33dcc8..9e037aec7e 100644 --- a/teshsuite/simdag/platforms/link_attributes.xml +++ b/teshsuite/simdag/platforms/link_attributes.xml @@ -1,12 +1,12 @@ - - + + - + diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml index 29c7984a7b..fc8e1cdc42 100644 --- a/teshsuite/simdag/platforms/one_cluster.xml +++ b/teshsuite/simdag/platforms/one_cluster.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml index d998894386..c44fa11ea7 100644 --- a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml +++ b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/simdag/platforms/one_cluster_multicore.xml b/teshsuite/simdag/platforms/one_cluster_multicore.xml index 18de9474b3..7c1d08eea5 100644 --- a/teshsuite/simdag/platforms/one_cluster_multicore.xml +++ b/teshsuite/simdag/platforms/one_cluster_multicore.xml @@ -1,7 +1,7 @@ - - + + - + diff --git a/teshsuite/simdag/platforms/one_cluster_router_id.xml b/teshsuite/simdag/platforms/one_cluster_router_id.xml index 3682739d33..fa52d2bd3e 100644 --- a/teshsuite/simdag/platforms/one_cluster_router_id.xml +++ b/teshsuite/simdag/platforms/one_cluster_router_id.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/simdag/platforms/platform_2p_1bb.xml b/teshsuite/simdag/platforms/platform_2p_1bb.xml index d996cbcc84..fc9eae42c8 100644 --- a/teshsuite/simdag/platforms/platform_2p_1bb.xml +++ b/teshsuite/simdag/platforms/platform_2p_1bb.xml @@ -1,7 +1,7 @@ - - + + @@ -13,5 +13,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_2p_1fl.xml b/teshsuite/simdag/platforms/platform_2p_1fl.xml index 12d217454e..9f76670b84 100644 --- a/teshsuite/simdag/platforms/platform_2p_1fl.xml +++ b/teshsuite/simdag/platforms/platform_2p_1fl.xml @@ -1,7 +1,7 @@ - - + + @@ -10,5 +10,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_2p_1sl.xml b/teshsuite/simdag/platforms/platform_2p_1sl.xml index ed3396e407..bc4740ac2e 100644 --- a/teshsuite/simdag/platforms/platform_2p_1sl.xml +++ b/teshsuite/simdag/platforms/platform_2p_1sl.xml @@ -1,7 +1,7 @@ - - + + @@ -10,5 +10,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml index c0d1e78340..db1e5b8da6 100644 --- a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml +++ b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml @@ -1,7 +1,7 @@ - - + + @@ -10,5 +10,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_2p_1switch.xml b/teshsuite/simdag/platforms/platform_2p_1switch.xml index 34286fc98d..2082b8ae9f 100644 --- a/teshsuite/simdag/platforms/platform_2p_1switch.xml +++ b/teshsuite/simdag/platforms/platform_2p_1switch.xml @@ -1,7 +1,7 @@ - - + + @@ -14,5 +14,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_4p_1switch.xml b/teshsuite/simdag/platforms/platform_4p_1switch.xml index e14dbf1e24..bc4167930b 100644 --- a/teshsuite/simdag/platforms/platform_4p_1switch.xml +++ b/teshsuite/simdag/platforms/platform_4p_1switch.xml @@ -1,7 +1,7 @@ - - + + @@ -43,5 +43,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_include.xml b/teshsuite/simdag/platforms/platform_include.xml index d73a133809..fa5cede5b9 100644 --- a/teshsuite/simdag/platforms/platform_include.xml +++ b/teshsuite/simdag/platforms/platform_include.xml @@ -1,8 +1,8 @@ - - + + - + diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml index 28dfd08334..d1d276034b 100644 --- a/teshsuite/simdag/platforms/properties.xml +++ b/teshsuite/simdag/platforms/properties.xml @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + - + diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml index 70d10ce573..c20f45e6bd 100644 --- a/teshsuite/simdag/platforms/test_of_is_router.xml +++ b/teshsuite/simdag/platforms/test_of_is_router.xml @@ -1,31 +1,31 @@ - - - + + + - - + + - - + + - - + + - - + + - - + + diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml index b37590cff3..e34b492997 100644 --- a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml +++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml @@ -1,7 +1,7 @@ - - + + @@ -23,5 +23,5 @@ - + diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml index 962dbd7f86..afd0e81114 100644 --- a/teshsuite/simdag/platforms/two_clusters.xml +++ b/teshsuite/simdag/platforms/two_clusters.xml @@ -1,7 +1,7 @@ - - + + - - - + + diff --git a/teshsuite/simdag/platforms/two_clusters_one_name.xml b/teshsuite/simdag/platforms/two_clusters_one_name.xml index 0625fd317f..dc50aa110b 100644 --- a/teshsuite/simdag/platforms/two_clusters_one_name.xml +++ b/teshsuite/simdag/platforms/two_clusters_one_name.xml @@ -1,7 +1,7 @@ - - + + @@ -10,9 +10,9 @@ - - - + + diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/simdag/platforms/two_clusters_router_id.xml index b6cd8620db..43d4e46243 100644 --- a/teshsuite/simdag/platforms/two_clusters_router_id.xml +++ b/teshsuite/simdag/platforms/two_clusters_router_id.xml @@ -1,7 +1,7 @@ - - + + - + - - + + - - + + diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml index 15a3b024b3..bb440446fd 100644 --- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml +++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml @@ -1,7 +1,7 @@ - - + + @@ -14,5 +14,5 @@ - + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml index 56e7e4b174..afef580b6e 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml @@ -1,7 +1,7 @@ - - + + @@ -10,5 +10,5 @@ - + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml index 515fd537bc..750ac91e12 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml @@ -1,7 +1,7 @@ - - + + @@ -13,5 +13,5 @@ - + diff --git a/teshsuite/smpi/bug-17132/bug-17132.tesh b/teshsuite/smpi/bug-17132/bug-17132.tesh index 728b8f3a43..597628b9b8 100644 --- a/teshsuite/smpi/bug-17132/bug-17132.tesh +++ b/teshsuite/smpi/bug-17132/bug-17132.tesh @@ -1,3 +1,3 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -np 16 -platform ../../../examples/platforms/small_platform.xml -hostfile ../hostfile ${bindir:=.}/bug-17132 --cfg=smpi/simulate-computation:no --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning -> You requested to use 16 processes, but there is only 5 processes in your hostfile... +> You requested to use 16 ranks, but there is only 5 processes in your hostfile... > Walltime = 0.468274 diff --git a/teshsuite/smpi/privatization/privatization.tesh b/teshsuite/smpi/privatization/privatization.tesh index 60a4c6d071..42d8bf3ec7 100644 --- a/teshsuite/smpi/privatization/privatization.tesh +++ b/teshsuite/smpi/privatization/privatization.tesh @@ -2,4 +2,4 @@ p Test privatization ! setenv LD_LIBRARY_PATH=../../lib ! timeout 5 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 32 ${bindir:=.}/privatization --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:1 --log=simix_context.thres:error -> You requested to use 32 processes, but there is only 5 processes in your hostfile... +> You requested to use 32 ranks, but there is only 5 processes in your hostfile... diff --git a/teshsuite/smpi/privatization/privatization_dlopen.tesh b/teshsuite/smpi/privatization/privatization_dlopen.tesh index 82551884a9..ced2221bae 100644 --- a/teshsuite/smpi/privatization/privatization_dlopen.tesh +++ b/teshsuite/smpi/privatization/privatization_dlopen.tesh @@ -2,4 +2,4 @@ p Test privatization with dlopen ! setenv LD_LIBRARY_PATH=../../lib ! timeout 5 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 32 ${bindir:=.}/privatization --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:dlopen --log=simix_context.thres:error -> You requested to use 32 processes, but there is only 5 processes in your hostfile... +> You requested to use 32 ranks, but there is only 5 processes in your hostfile... diff --git a/tools/simgrid_update_xml.pl b/tools/simgrid_update_xml.pl index a67fcab931..006c1d7758 100755 --- a/tools/simgrid_update_xml.pl +++ b/tools/simgrid_update_xml.pl @@ -87,7 +87,7 @@ Several tags were renamed (for sake of XML sanity): =back -=item B Introduced in SimGrid 3.13 (this is the current version) +=item B Introduced in SimGrid 3.13 =over 4 @@ -123,6 +123,21 @@ Units are now mandatory in attributes. USE THE SCRIPT sg_xml_unit_converter.py T =back +=item B Introduced in SimGrid 3.16 (this is the current version) + +=over 4 + +=item + +Rename a few tags, but in a backward-compatible manner: the old names are still accepted. + + AS -> zone + ASroute -> zoneRoute + bypassAsRoute -> bypassZoneRoute + process -> actor + +=back + =back =head1 AUTHORS @@ -142,7 +157,7 @@ under the terms of GNU LGPL (v2.1) license. use strict; my $fromversion=-1; -my $toversion=4; +my $toversion=4.1; my $filename = $ARGV[0] or die "Usage: simgrid_update_xml.pl file_to_convert.xml\nPlease provide an XML to convert as a parameter.\n"; open INPUT, "$filename" or die "Cannot open input file $filename: $!\n"; @@ -164,10 +179,10 @@ while (defined($line = )) { $fromversion = 0; print "$filename was using version 0\n"; next if !$line =~ /\S/; - } elsif ($line =~ s///) { + } elsif ($line =~ s///) { $fromversion = $1; if ($fromversion == $toversion) { - die "Input platform file $filename is already conformant to version $fromversion. This should be a no-op.\n"; + warn "Input platform file $filename is already conformant to version $fromversion. This should be a no-op.\n"; } if ($fromversion > $toversion) { die "Input platform file $filename is more recent than this script (file version: $fromversion; script version: $toversion)\n"; @@ -225,6 +240,12 @@ while (defined($line = )) { $line =~ s/\bpower\b/speed/g; $line =~ s/\bkind="POWER"/kind="SPEED"/g; } + if ($fromversion < 4.1) { + $line =~ s/\bAS\b/zone/g; + $line =~ s/\bASroute\b/zoneRoute/g; + $line =~ s/\bbypassAsRoute\b/bypassZoneRoute/g; + $line =~ s/\bprocess\b/actor/g; + } $output_string .= "$line\n"; } -- 2.20.1