From e96591e449fee7a54bf3ecda31e85fb61df149c9 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 7 May 2013 09:31:59 +0200 Subject: [PATCH] Use correct capitalization for unit prefixes. --- doc/msg-tuto-src/platforms/cloud.xml | 26 +- doc/msg-tuto-src/platforms/g5k.xml | 80 +- doc/msg-tuto-src/platforms/peers.xml | 5000 ++++++++--------- doc/msg-tuto-src/platforms/platform.xml | 10 +- examples/java/io/storage.xml | 8 +- .../java/master_slave_bypass/platform.xml | 6 +- examples/java/master_slave_kill/platform.xml | 6 +- examples/java/mutualExclusion/ring3.xml | 6 +- examples/java/platform.xml | 244 +- .../lua/multi_matrix/quicksort_platform.xml | 12 +- examples/msg/actions/NAS_LU_S_4/platform.xml | 2 +- examples/msg/actions/homogeneous_3_hosts.xml | 6 +- examples/msg/chainsend/platform_chainsend.xml | 18 +- examples/msg/gtnets/crosstraffic-p.xml | 6 +- examples/msg/gtnets/dogbone-p.xml | 8 +- examples/msg/gtnets/onelink-p.xml | 6 +- examples/msg/gtnets/waxman-p.xml | 400 +- examples/msg/icomms/small_platform.xml | 8 +- .../msg/masterslave/platform_clusters.xml | 4 +- examples/msg/masterslave/platform_kill.xml | 4 +- examples/msg/mc/platform.xml | 8 +- .../mc/test/snapshot_comparison_platform.xml | 8 +- examples/msg/msg_platform.xml | 244 +- examples/msg/ns3/3hosts_2links_p.xml | 10 +- examples/msg/ns3/3links-p.xml | 12 +- examples/msg/ns3/dogbone-p.xml | 8 +- .../msg/parallel_task/test_ptask_platform.xml | 8 +- examples/msg/sendrecv/platform_sendrecv.xml | 4 +- examples/msg/small_platform.xml | 12 +- examples/msg/small_platform_with_failures.xml | 10 +- examples/msg/small_platform_with_routers.xml | 12 +- examples/msg/tracing/platform.xml | 10 +- examples/platforms/bypassASroute.xml | 6 +- examples/platforms/bypassRoute.xml | 8 +- examples/platforms/cloud.xml | 26 +- examples/platforms/cluster.xml | 2 +- examples/platforms/cluster_and_one_host.xml | 6 +- examples/platforms/cluster_no_backbone.xml | 2 +- .../platforms/cluster_routing_rulebased.xml | 22 +- examples/platforms/clusters_routing_full.xml | 4 +- examples/platforms/conf/gridpp_grid_2004.xml | 76 +- examples/platforms/conf/lcg_sept2004_grid.xml | 256 +- examples/platforms/config.xml | 4 +- examples/platforms/data_center.xml | 6 +- examples/platforms/meta_cluster.xml | 12 +- examples/platforms/multicore_machine.xml | 2 +- examples/platforms/prop.xml | 4 +- examples/platforms/routing_cluster.xml | 12 +- examples/platforms/storage.xml | 8 +- .../platforms/syscoord/median_harvard.xml | 452 +- .../platforms/syscoord/median_meridian.xml | 5000 ++++++++--------- examples/platforms/syscoord/median_p2psim.xml | 3480 ++++++------ examples/platforms/two_peers.xml | 4 +- examples/platforms/vivaldi.xml | 80 +- examples/simdag/2clusters.xml | 20 +- examples/simdag/faulty_host.xml | 4 +- .../simdag/scheduling/simulacrum_7_hosts.xml | 14 +- examples/simdag/two_hosts.xml | 4 +- examples/smpi/replay/replay_platform.xml | 12 +- src/surf/surfxml_parse.c | 22 +- teshsuite/msg/get_sender_p.xml | 2 +- teshsuite/msg/pid_p.xml | 2 +- .../availability/simulacrum_7_hosts.xml | 14 +- teshsuite/simdag/basic_platform.xml | 4 +- teshsuite/simdag/platforms/Dijkstra.xml | 4 +- .../platforms/Two_clusters_rulebased.xml | 4 +- teshsuite/simdag/platforms/clusterA.xml | 2 +- teshsuite/simdag/platforms/clusterB.xml | 2 +- .../platforms/four_hosts_Dijkstra_ns3.xml | 10 +- .../simdag/platforms/four_hosts_floyd.xml | 8 +- .../simdag/platforms/four_hosts_floyd_bis.xml | 10 +- .../simdag/platforms/four_hosts_floyd_ns3.xml | 12 +- teshsuite/simdag/platforms/one_cluster.xml | 2 +- .../simdag/platforms/one_cluster_file.xml | 2 +- .../simdag/platforms/one_cluster_foreach.xml | 2 +- .../platforms/one_cluster_fullduplex.xml | 2 +- .../simdag/platforms/one_cluster_one_host.xml | 4 +- .../one_cluster_properties_foreach.xml | 2 +- .../one_cluster_properties_override.xml | 4 +- .../platforms/one_cluster_router_id.xml | 2 +- teshsuite/simdag/platforms/one_host.xml | 2 +- .../platforms/one_host_availability.xml | 2 +- .../simdag/platforms/one_host_properties.xml | 2 +- .../simdag/platforms/one_host_state_file.xml | 2 +- .../simdag/platforms/one_host_state_off.xml | 2 +- .../simdag/platforms/one_host_state_on.xml | 2 +- .../simdag/platforms/one_host_trace_file.xml | 2 +- .../platforms/one_host_trace_inside.xml | 2 +- .../platforms/one_link_availability.xml | 2 +- .../simdag/platforms/one_link_fatpipe.xml | 2 +- .../simdag/platforms/one_link_shared.xml | 2 +- .../simdag/platforms/one_link_state_file.xml | 2 +- teshsuite/simdag/platforms/properties.xml | 2 +- teshsuite/simdag/platforms/route_override.xml | 4 +- .../simdag/platforms/test_of_is_router.xml | 20 +- .../three_hosts_non_symmetric_route.xml | 6 +- teshsuite/simdag/platforms/two_clusters.xml | 4 +- .../platforms/two_clusters_one_name.xml | 4 +- .../platforms/two_clusters_router_id.xml | 4 +- .../platforms/two_clusters_symmetric.xml | 4 +- .../platforms/two_hosts_asymetric_BOGUS.xml | 4 +- .../platforms/two_hosts_asymetric_BOGUS2.xml | 4 +- .../simdag/platforms/two_hosts_multi_hop.xml | 4 +- .../simdag/platforms/two_hosts_one_link.xml | 4 +- .../two_hosts_one_link_fullduplex.xml | 4 +- .../two_hosts_one_link_symmetrical.xml | 4 +- testsuite/surf/platform.xml | 4 +- tools/sg_xml_unit_converter.py | 14 +- 108 files changed, 7981 insertions(+), 7981 deletions(-) diff --git a/doc/msg-tuto-src/platforms/cloud.xml b/doc/msg-tuto-src/platforms/cloud.xml index 3833736a7d..cb0ee89f6c 100644 --- a/doc/msg-tuto-src/platforms/cloud.xml +++ b/doc/msg-tuto-src/platforms/cloud.xml @@ -11,13 +11,13 @@ - + - + - + @@ -56,22 +56,22 @@ - + - + - + - + - + - + @@ -110,16 +110,16 @@ - + - + - + - + diff --git a/doc/msg-tuto-src/platforms/g5k.xml b/doc/msg-tuto-src/platforms/g5k.xml index 9b05b5d4af..dae9a571e6 100644 --- a/doc/msg-tuto-src/platforms/g5k.xml +++ b/doc/msg-tuto-src/platforms/g5k.xml @@ -36,17 +36,17 @@ @@ -80,17 +80,17 @@ @@ -124,22 +124,22 @@ @@ -173,12 +173,12 @@ @@ -213,16 +213,16 @@ @@ -250,13 +250,13 @@ @@ -313,37 +313,37 @@ @@ -370,7 +370,7 @@ @@ -404,22 +404,22 @@ @@ -453,17 +453,17 @@ @@ -497,12 +497,12 @@ diff --git a/doc/msg-tuto-src/platforms/peers.xml b/doc/msg-tuto-src/platforms/peers.xml index 157aaed354..f705d0a691 100644 --- a/doc/msg-tuto-src/platforms/peers.xml +++ b/doc/msg-tuto-src/platforms/peers.xml @@ -7,7504 +7,7504 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/msg-tuto-src/platforms/platform.xml b/doc/msg-tuto-src/platforms/platform.xml index 0b0abe7866..552c92f55c 100644 --- a/doc/msg-tuto-src/platforms/platform.xml +++ b/doc/msg-tuto-src/platforms/platform.xml @@ -2,11 +2,11 @@ - - - - - + + + + + diff --git a/examples/java/io/storage.xml b/examples/java/io/storage.xml index 2b1ad7aa75..8036fa8cde 100644 --- a/examples/java/io/storage.xml +++ b/examples/java/io/storage.xml @@ -28,19 +28,19 @@ - + - + - + - + diff --git a/examples/java/master_slave_bypass/platform.xml b/examples/java/master_slave_bypass/platform.xml index 9c736a53d9..d0faf97219 100644 --- a/examples/java/master_slave_bypass/platform.xml +++ b/examples/java/master_slave_bypass/platform.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/examples/java/master_slave_kill/platform.xml b/examples/java/master_slave_kill/platform.xml index e8e2978950..a37f9c87fc 100644 --- a/examples/java/master_slave_kill/platform.xml +++ b/examples/java/master_slave_kill/platform.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/examples/java/mutualExclusion/ring3.xml b/examples/java/mutualExclusion/ring3.xml index 00a899cf14..b83584dee5 100644 --- a/examples/java/mutualExclusion/ring3.xml +++ b/examples/java/mutualExclusion/ring3.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/examples/java/platform.xml b/examples/java/platform.xml index 57c7292d2f..84db0e240f 100644 --- a/examples/java/platform.xml +++ b/examples/java/platform.xml @@ -2,96 +2,96 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -115,31 +115,31 @@ - + - - + + - - + + - + - + @@ -149,36 +149,36 @@ - + - + - + - + - + - + - + @@ -190,30 +190,30 @@ - - - + + + - + - - + + - + - + - + - + @@ -236,24 +236,24 @@ - + - - + + - + - + - + @@ -265,7 +265,7 @@ - + @@ -281,7 +281,7 @@ - + diff --git a/examples/lua/multi_matrix/quicksort_platform.xml b/examples/lua/multi_matrix/quicksort_platform.xml index 624bf238ba..0e57183aa1 100644 --- a/examples/lua/multi_matrix/quicksort_platform.xml +++ b/examples/lua/multi_matrix/quicksort_platform.xml @@ -3,13 +3,13 @@ - - - - - + + + + + - + diff --git a/examples/msg/actions/NAS_LU_S_4/platform.xml b/examples/msg/actions/NAS_LU_S_4/platform.xml index 3d5cb78059..ee95bf7c43 100644 --- a/examples/msg/actions/NAS_LU_S_4/platform.xml +++ b/examples/msg/actions/NAS_LU_S_4/platform.xml @@ -6,7 +6,7 @@ diff --git a/examples/msg/actions/homogeneous_3_hosts.xml b/examples/msg/actions/homogeneous_3_hosts.xml index 218447db21..58674673e3 100644 --- a/examples/msg/actions/homogeneous_3_hosts.xml +++ b/examples/msg/actions/homogeneous_3_hosts.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/examples/msg/chainsend/platform_chainsend.xml b/examples/msg/chainsend/platform_chainsend.xml index 700417d04c..3b6916f6dc 100644 --- a/examples/msg/chainsend/platform_chainsend.xml +++ b/examples/msg/chainsend/platform_chainsend.xml @@ -3,15 +3,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/examples/msg/gtnets/crosstraffic-p.xml b/examples/msg/gtnets/crosstraffic-p.xml index f1c0ce4fe9..da382f622c 100644 --- a/examples/msg/gtnets/crosstraffic-p.xml +++ b/examples/msg/gtnets/crosstraffic-p.xml @@ -7,10 +7,10 @@ --> - - + + - + diff --git a/examples/msg/gtnets/dogbone-p.xml b/examples/msg/gtnets/dogbone-p.xml index 343520dc7d..35e117b3bc 100644 --- a/examples/msg/gtnets/dogbone-p.xml +++ b/examples/msg/gtnets/dogbone-p.xml @@ -6,10 +6,10 @@ --> - - - - + + + + diff --git a/examples/msg/gtnets/onelink-p.xml b/examples/msg/gtnets/onelink-p.xml index f8bf324d4f..16ae96317e 100644 --- a/examples/msg/gtnets/onelink-p.xml +++ b/examples/msg/gtnets/onelink-p.xml @@ -7,10 +7,10 @@ 100MB, 5ms --> - - + + - + diff --git a/examples/msg/gtnets/waxman-p.xml b/examples/msg/gtnets/waxman-p.xml index 6c184d4c3e..25b02f3c5b 100644 --- a/examples/msg/gtnets/waxman-p.xml +++ b/examples/msg/gtnets/waxman-p.xml @@ -2,206 +2,206 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/msg/icomms/small_platform.xml b/examples/msg/icomms/small_platform.xml index 98b3b5fd88..481e3c237b 100644 --- a/examples/msg/icomms/small_platform.xml +++ b/examples/msg/icomms/small_platform.xml @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/examples/msg/masterslave/platform_clusters.xml b/examples/msg/masterslave/platform_clusters.xml index b52dfd381f..daed872131 100644 --- a/examples/msg/masterslave/platform_clusters.xml +++ b/examples/msg/masterslave/platform_clusters.xml @@ -3,11 +3,11 @@ diff --git a/examples/msg/masterslave/platform_kill.xml b/examples/msg/masterslave/platform_kill.xml index ba57a6b3b4..a3197132db 100644 --- a/examples/msg/masterslave/platform_kill.xml +++ b/examples/msg/masterslave/platform_kill.xml @@ -2,8 +2,8 @@ - - + + diff --git a/examples/msg/mc/platform.xml b/examples/msg/mc/platform.xml index ed9c3b88a6..00e89c1155 100644 --- a/examples/msg/mc/platform.xml +++ b/examples/msg/mc/platform.xml @@ -2,10 +2,10 @@ - - - - + + + + diff --git a/examples/msg/mc/test/snapshot_comparison_platform.xml b/examples/msg/mc/test/snapshot_comparison_platform.xml index a40669c0fe..cc4ea2c55b 100644 --- a/examples/msg/mc/test/snapshot_comparison_platform.xml +++ b/examples/msg/mc/test/snapshot_comparison_platform.xml @@ -2,10 +2,10 @@ - - - - + + + + diff --git a/examples/msg/msg_platform.xml b/examples/msg/msg_platform.xml index 57c7292d2f..84db0e240f 100644 --- a/examples/msg/msg_platform.xml +++ b/examples/msg/msg_platform.xml @@ -2,96 +2,96 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -115,31 +115,31 @@ - + - - + + - - + + - + - + @@ -149,36 +149,36 @@ - + - + - + - + - + - + - + @@ -190,30 +190,30 @@ - - - + + + - + - - + + - + - + - + - + @@ -236,24 +236,24 @@ - + - - + + - + - + - + @@ -265,7 +265,7 @@ - + @@ -281,7 +281,7 @@ - + diff --git a/examples/msg/ns3/3hosts_2links_p.xml b/examples/msg/ns3/3hosts_2links_p.xml index 2462a7ea35..83caaeae6e 100644 --- a/examples/msg/ns3/3hosts_2links_p.xml +++ b/examples/msg/ns3/3hosts_2links_p.xml @@ -6,12 +6,12 @@ - - - + + + - - + + diff --git a/examples/msg/ns3/3links-p.xml b/examples/msg/ns3/3links-p.xml index a7ea23bfd6..548490f451 100644 --- a/examples/msg/ns3/3links-p.xml +++ b/examples/msg/ns3/3links-p.xml @@ -12,12 +12,12 @@ --> - - - - - - + + + + + + diff --git a/examples/msg/ns3/dogbone-p.xml b/examples/msg/ns3/dogbone-p.xml index 6b1914b6c6..bfef6ad6e7 100644 --- a/examples/msg/ns3/dogbone-p.xml +++ b/examples/msg/ns3/dogbone-p.xml @@ -6,10 +6,10 @@ --> - - - - + + + + diff --git a/examples/msg/parallel_task/test_ptask_platform.xml b/examples/msg/parallel_task/test_ptask_platform.xml index ca9c5c37a0..cbcd074dd6 100644 --- a/examples/msg/parallel_task/test_ptask_platform.xml +++ b/examples/msg/parallel_task/test_ptask_platform.xml @@ -3,10 +3,10 @@ - - - - + + + + diff --git a/examples/msg/sendrecv/platform_sendrecv.xml b/examples/msg/sendrecv/platform_sendrecv.xml index ba1fa4df28..25d1cf385d 100644 --- a/examples/msg/sendrecv/platform_sendrecv.xml +++ b/examples/msg/sendrecv/platform_sendrecv.xml @@ -3,8 +3,8 @@ - - + + diff --git a/examples/msg/small_platform.xml b/examples/msg/small_platform.xml index 381acdac47..677a35d23b 100644 --- a/examples/msg/small_platform.xml +++ b/examples/msg/small_platform.xml @@ -3,13 +3,13 @@ - - - - - + + + + + - + diff --git a/examples/msg/small_platform_with_failures.xml b/examples/msg/small_platform_with_failures.xml index 572ebff643..7995a5ffb3 100644 --- a/examples/msg/small_platform_with_failures.xml +++ b/examples/msg/small_platform_with_failures.xml @@ -3,11 +3,11 @@ - - - - - + + + + + diff --git a/examples/msg/small_platform_with_routers.xml b/examples/msg/small_platform_with_routers.xml index e954f18f7b..ebc944db16 100644 --- a/examples/msg/small_platform_with_routers.xml +++ b/examples/msg/small_platform_with_routers.xml @@ -2,11 +2,11 @@ - - - - - + + + + + @@ -14,7 +14,7 @@ - + diff --git a/examples/msg/tracing/platform.xml b/examples/msg/tracing/platform.xml index 0b0abe7866..552c92f55c 100644 --- a/examples/msg/tracing/platform.xml +++ b/examples/msg/tracing/platform.xml @@ -2,11 +2,11 @@ - - - - - + + + + + diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml index 8918b9ab5d..7380d4f6b4 100644 --- a/examples/platforms/bypassASroute.xml +++ b/examples/platforms/bypassASroute.xml @@ -3,13 +3,13 @@ + radical="1" power="1Gf" bw="125MBps" lat="50us"/> + radical="2" power="1Gf" bw="125MBps" lat="50us"/> + radical="3" power="1Gf" bw="125MBps" lat="50us"/> diff --git a/examples/platforms/bypassRoute.xml b/examples/platforms/bypassRoute.xml index a4130ec91f..a5a1fb25ba 100644 --- a/examples/platforms/bypassRoute.xml +++ b/examples/platforms/bypassRoute.xml @@ -3,7 +3,7 @@ - + @@ -11,9 +11,9 @@ - - - + + + diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml index 3833736a7d..cb0ee89f6c 100644 --- a/examples/platforms/cloud.xml +++ b/examples/platforms/cloud.xml @@ -11,13 +11,13 @@ - + - + - + @@ -56,22 +56,22 @@ - + - + - + - + - + - + @@ -110,16 +110,16 @@ - + - + - + - + diff --git a/examples/platforms/cluster.xml b/examples/platforms/cluster.xml index 9da07c8b02..4b67f5b8f4 100644 --- a/examples/platforms/cluster.xml +++ b/examples/platforms/cluster.xml @@ -13,7 +13,7 @@ diff --git a/examples/platforms/cluster_and_one_host.xml b/examples/platforms/cluster_and_one_host.xml index b0056f8db9..179f4050cf 100644 --- a/examples/platforms/cluster_and_one_host.xml +++ b/examples/platforms/cluster_and_one_host.xml @@ -3,14 +3,14 @@ - + - + diff --git a/examples/platforms/cluster_no_backbone.xml b/examples/platforms/cluster_no_backbone.xml index b47fdb041c..f481a7b59d 100644 --- a/examples/platforms/cluster_no_backbone.xml +++ b/examples/platforms/cluster_no_backbone.xml @@ -16,6 +16,6 @@ + radical="0-262144" power="1Gf" bw="125MBps" lat="50us"/> diff --git a/examples/platforms/cluster_routing_rulebased.xml b/examples/platforms/cluster_routing_rulebased.xml index 1913df17e2..a1feaa024a 100644 --- a/examples/platforms/cluster_routing_rulebased.xml +++ b/examples/platforms/cluster_routing_rulebased.xml @@ -4,37 +4,37 @@ diff --git a/examples/platforms/clusters_routing_full.xml b/examples/platforms/clusters_routing_full.xml index 19bea241a3..b7bd013ab9 100644 --- a/examples/platforms/clusters_routing_full.xml +++ b/examples/platforms/clusters_routing_full.xml @@ -26,11 +26,11 @@ diff --git a/examples/platforms/conf/gridpp_grid_2004.xml b/examples/platforms/conf/gridpp_grid_2004.xml index 02a9b34cfe..af2d582016 100644 --- a/examples/platforms/conf/gridpp_grid_2004.xml +++ b/examples/platforms/conf/gridpp_grid_2004.xml @@ -52,23 +52,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -87,29 +87,29 @@ - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - + + + + - - - + + + @@ -123,7 +123,7 @@ - + diff --git a/examples/platforms/conf/lcg_sept2004_grid.xml b/examples/platforms/conf/lcg_sept2004_grid.xml index ff087fe7f3..fced84a585 100644 --- a/examples/platforms/conf/lcg_sept2004_grid.xml +++ b/examples/platforms/conf/lcg_sept2004_grid.xml @@ -2,74 +2,74 @@ - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -105,13 +105,13 @@ - - - + + + - - - + + + @@ -120,8 +120,8 @@ - - + + @@ -130,59 +130,59 @@ - - + + - - - - + + + + - + - - - - - + + + + + - + - + - + - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - - + + + + @@ -194,38 +194,38 @@ - - - - - - + + + + + + - - - - - + + + + + - - + + - - - + + + - - - + + + - - + + - + diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml index 9600ddf684..8f370186b1 100644 --- a/examples/platforms/config.xml +++ b/examples/platforms/config.xml @@ -12,8 +12,8 @@ - - + + diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml index 078f6596f4..86f7d2492a 100644 --- a/examples/platforms/data_center.xml +++ b/examples/platforms/data_center.xml @@ -10,11 +10,11 @@ - + - + - + diff --git a/examples/platforms/meta_cluster.xml b/examples/platforms/meta_cluster.xml index b4c6c9f0af..fc87589368 100644 --- a/examples/platforms/meta_cluster.xml +++ b/examples/platforms/meta_cluster.xml @@ -6,11 +6,11 @@ + power="1Gf" bw="125MBps" lat="100us" radical="1-10"/> + power="1Gf" bw="125MBps" lat="100us" radical="11-20"/> + power="1Gf" bw="125MBps" lat="100us" radical="21-30"/> @@ -18,11 +18,11 @@ + power="1Gf" bw="125MBps" lat="100us" radical="1-10"/> + power="1Gf" bw="125MBps" lat="100us" radical="11-20"/> + power="1Gf" bw="125MBps" lat="100us" radical="21-30"/> diff --git a/examples/platforms/multicore_machine.xml b/examples/platforms/multicore_machine.xml index 8770c09a6e..040ab7612e 100644 --- a/examples/platforms/multicore_machine.xml +++ b/examples/platforms/multicore_machine.xml @@ -2,6 +2,6 @@ - + diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml index 82ed9f41df..17246bbc15 100644 --- a/examples/platforms/prop.xml +++ b/examples/platforms/prop.xml @@ -22,12 +22,12 @@ - + - + diff --git a/examples/platforms/routing_cluster.xml b/examples/platforms/routing_cluster.xml index c9f89cda0e..52df8eb93f 100644 --- a/examples/platforms/routing_cluster.xml +++ b/examples/platforms/routing_cluster.xml @@ -18,16 +18,16 @@ l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \ - + - + - + @@ -37,16 +37,16 @@ l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \ - + - + - + diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml index 9b5eb5cc63..69516b8afa 100644 --- a/examples/platforms/storage.xml +++ b/examples/platforms/storage.xml @@ -32,19 +32,19 @@ - + - + - + - + diff --git a/examples/platforms/syscoord/median_harvard.xml b/examples/platforms/syscoord/median_harvard.xml index b916331472..a73f553609 100644 --- a/examples/platforms/syscoord/median_harvard.xml +++ b/examples/platforms/syscoord/median_harvard.xml @@ -7,682 +7,682 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/platforms/syscoord/median_meridian.xml b/examples/platforms/syscoord/median_meridian.xml index 157aaed354..f705d0a691 100644 --- a/examples/platforms/syscoord/median_meridian.xml +++ b/examples/platforms/syscoord/median_meridian.xml @@ -7,7504 +7,7504 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/platforms/syscoord/median_p2psim.xml b/examples/platforms/syscoord/median_p2psim.xml index 06a4e8b73d..80c5962c83 100644 --- a/examples/platforms/syscoord/median_p2psim.xml +++ b/examples/platforms/syscoord/median_p2psim.xml @@ -7,5224 +7,5224 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/platforms/two_peers.xml b/examples/platforms/two_peers.xml index ae0006e51b..7e4abae0c0 100644 --- a/examples/platforms/two_peers.xml +++ b/examples/platforms/two_peers.xml @@ -5,14 +5,14 @@ diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml index 3d5f75327c..49ada2e549 100644 --- a/examples/platforms/vivaldi.xml +++ b/examples/platforms/vivaldi.xml @@ -6,45 +6,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/simdag/2clusters.xml b/examples/simdag/2clusters.xml index e0d489261a..5fd252a307 100644 --- a/examples/simdag/2clusters.xml +++ b/examples/simdag/2clusters.xml @@ -2,16 +2,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/examples/simdag/faulty_host.xml b/examples/simdag/faulty_host.xml index 409f830e39..519ec448ea 100644 --- a/examples/simdag/faulty_host.xml +++ b/examples/simdag/faulty_host.xml @@ -2,9 +2,9 @@ - - + diff --git a/examples/simdag/scheduling/simulacrum_7_hosts.xml b/examples/simdag/scheduling/simulacrum_7_hosts.xml index 7217beebcd..0db92e86b3 100644 --- a/examples/simdag/scheduling/simulacrum_7_hosts.xml +++ b/examples/simdag/scheduling/simulacrum_7_hosts.xml @@ -2,13 +2,13 @@ - - - - - - - + + + + + + + diff --git a/examples/simdag/two_hosts.xml b/examples/simdag/two_hosts.xml index 868a00c351..00651923a0 100644 --- a/examples/simdag/two_hosts.xml +++ b/examples/simdag/two_hosts.xml @@ -2,8 +2,8 @@ - - + - - - - - + + + + + - + diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 95080a44d5..2cff0983c1 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -115,12 +115,12 @@ double surf_parse_get_bandwidth(const char *string) { "TBps", 1e12 }, { "GBps", 1e9 }, { "MBps", 1e6 }, - { "KBps", 1e3 }, + { "kBps", 1e3 }, { "Bps", 1.0 }, { "", 1.0 }, /* default unit is bytes ber second */ - { "tbps", 0.125 * 1e12 }, - { "gbps", 0.125 * 1e9 }, - { "mbps", 0.125 * 1e6 }, + { "Tbps", 0.125 * 1e12 }, + { "Gbps", 0.125 * 1e9 }, + { "Mbps", 0.125 * 1e6 }, { "kbps", 0.125 * 1e3 }, { "bps", 0.125 }, { NULL, 0 } @@ -132,19 +132,19 @@ double surf_parse_get_power(const char *string) { const struct unit_scale units[] = { { "yottaflops", 1e24 }, - { "yf", 1e24 }, + { "Yf", 1e24 }, { "zettaflops", 1e21 }, - { "zf", 1e21 }, + { "Zf", 1e21 }, { "exaflops", 1e18 }, - { "ef", 1e18 }, + { "Ef", 1e18 }, { "petaflops", 1e15 }, - { "pf", 1e15 }, + { "Pf", 1e15 }, { "teraflops", 1e12 }, - { "tf", 1e12 }, + { "Tf", 1e12 }, { "gigaflops", 1e9 }, - { "gf", 1e9 }, + { "Gf", 1e9 }, { "megaflops", 1e6 }, - { "mf", 1e6 }, + { "Mf", 1e6 }, { "kiloflops", 1e3 }, { "kf", 1e3 }, { "flops", 1.0 }, diff --git a/teshsuite/msg/get_sender_p.xml b/teshsuite/msg/get_sender_p.xml index aa5038e438..05064f07c2 100644 --- a/teshsuite/msg/get_sender_p.xml +++ b/teshsuite/msg/get_sender_p.xml @@ -3,7 +3,7 @@ - + diff --git a/teshsuite/msg/pid_p.xml b/teshsuite/msg/pid_p.xml index 3420773830..50cf472681 100644 --- a/teshsuite/msg/pid_p.xml +++ b/teshsuite/msg/pid_p.xml @@ -3,7 +3,7 @@ - + diff --git a/teshsuite/simdag/availability/simulacrum_7_hosts.xml b/teshsuite/simdag/availability/simulacrum_7_hosts.xml index e223044572..2e664a5419 100644 --- a/teshsuite/simdag/availability/simulacrum_7_hosts.xml +++ b/teshsuite/simdag/availability/simulacrum_7_hosts.xml @@ -2,13 +2,13 @@ - - - - - - - + + + + + + + diff --git a/teshsuite/simdag/basic_platform.xml b/teshsuite/simdag/basic_platform.xml index 8d639fdaee..b1aeab65a0 100644 --- a/teshsuite/simdag/basic_platform.xml +++ b/teshsuite/simdag/basic_platform.xml @@ -4,8 +4,8 @@ - - + + diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/simdag/platforms/Dijkstra.xml index 2ccc31a0a8..4df752ef18 100644 --- a/teshsuite/simdag/platforms/Dijkstra.xml +++ b/teshsuite/simdag/platforms/Dijkstra.xml @@ -4,8 +4,8 @@ - - + + diff --git a/teshsuite/simdag/platforms/Two_clusters_rulebased.xml b/teshsuite/simdag/platforms/Two_clusters_rulebased.xml index 9c125efb14..93d99265c8 100644 --- a/teshsuite/simdag/platforms/Two_clusters_rulebased.xml +++ b/teshsuite/simdag/platforms/Two_clusters_rulebased.xml @@ -4,11 +4,11 @@ diff --git a/teshsuite/simdag/platforms/clusterA.xml b/teshsuite/simdag/platforms/clusterA.xml index 4eebec7106..ab96c62046 100644 --- a/teshsuite/simdag/platforms/clusterA.xml +++ b/teshsuite/simdag/platforms/clusterA.xml @@ -1,5 +1,5 @@ diff --git a/teshsuite/simdag/platforms/clusterB.xml b/teshsuite/simdag/platforms/clusterB.xml index df7822a1ee..a1f69b330e 100644 --- a/teshsuite/simdag/platforms/clusterB.xml +++ b/teshsuite/simdag/platforms/clusterB.xml @@ -1,5 +1,5 @@ diff --git a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml index cba863bc30..1650a420b2 100644 --- a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml +++ b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml @@ -2,14 +2,14 @@ - - - - + + + + - + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/simdag/platforms/four_hosts_floyd.xml index 01f16f061f..e92b08750c 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd.xml @@ -2,10 +2,10 @@ - - - - + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml index 4c5d8c863d..b5d3a22622 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml @@ -2,11 +2,11 @@ - - - - - + + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml b/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml index 4c3ca7e4a2..1c0709c3fc 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml @@ -2,15 +2,15 @@ - - - - + + + + - - + + diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml index a6fc761faa..4476c9f31a 100644 --- a/teshsuite/simdag/platforms/one_cluster.xml +++ b/teshsuite/simdag/platforms/one_cluster.xml @@ -3,7 +3,7 @@ diff --git a/teshsuite/simdag/platforms/one_cluster_file.xml b/teshsuite/simdag/platforms/one_cluster_file.xml index 4be7cecbbc..5e061e85d4 100644 --- a/teshsuite/simdag/platforms/one_cluster_file.xml +++ b/teshsuite/simdag/platforms/one_cluster_file.xml @@ -3,7 +3,7 @@ diff --git a/teshsuite/simdag/platforms/one_cluster_foreach.xml b/teshsuite/simdag/platforms/one_cluster_foreach.xml index 3c04467c99..5303166c91 100644 --- a/teshsuite/simdag/platforms/one_cluster_foreach.xml +++ b/teshsuite/simdag/platforms/one_cluster_foreach.xml @@ -6,7 +6,7 @@ radical="0,2-4,6"/> - + diff --git a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml index b4e0ee246a..13d314c204 100644 --- a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml +++ b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml @@ -3,7 +3,7 @@ diff --git a/teshsuite/simdag/platforms/one_cluster_one_host.xml b/teshsuite/simdag/platforms/one_cluster_one_host.xml index 3e89d63b5a..82f5660b30 100644 --- a/teshsuite/simdag/platforms/one_cluster_one_host.xml +++ b/teshsuite/simdag/platforms/one_cluster_one_host.xml @@ -3,10 +3,10 @@ - + diff --git a/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml b/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml index 08f005c2f6..84f603af4e 100644 --- a/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml +++ b/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml @@ -5,7 +5,7 @@ radical="0,2-4,6"/> - + diff --git a/teshsuite/simdag/platforms/one_cluster_properties_override.xml b/teshsuite/simdag/platforms/one_cluster_properties_override.xml index 3171122da7..b53681b50f 100644 --- a/teshsuite/simdag/platforms/one_cluster_properties_override.xml +++ b/teshsuite/simdag/platforms/one_cluster_properties_override.xml @@ -5,14 +5,14 @@ radical="0,2-4,6"/> - + - + diff --git a/teshsuite/simdag/platforms/one_cluster_router_id.xml b/teshsuite/simdag/platforms/one_cluster_router_id.xml index d305ec1595..afa5b4fc87 100644 --- a/teshsuite/simdag/platforms/one_cluster_router_id.xml +++ b/teshsuite/simdag/platforms/one_cluster_router_id.xml @@ -3,7 +3,7 @@ diff --git a/teshsuite/simdag/platforms/one_host.xml b/teshsuite/simdag/platforms/one_host.xml index 13aa42ca80..700b0466db 100644 --- a/teshsuite/simdag/platforms/one_host.xml +++ b/teshsuite/simdag/platforms/one_host.xml @@ -2,6 +2,6 @@ - + diff --git a/teshsuite/simdag/platforms/one_host_availability.xml b/teshsuite/simdag/platforms/one_host_availability.xml index 38e0d0bc76..f00a4e7b3d 100644 --- a/teshsuite/simdag/platforms/one_host_availability.xml +++ b/teshsuite/simdag/platforms/one_host_availability.xml @@ -2,7 +2,7 @@ - diff --git a/teshsuite/simdag/platforms/one_host_properties.xml b/teshsuite/simdag/platforms/one_host_properties.xml index e224a8a058..e2063d8637 100644 --- a/teshsuite/simdag/platforms/one_host_properties.xml +++ b/teshsuite/simdag/platforms/one_host_properties.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_host_state_file.xml b/teshsuite/simdag/platforms/one_host_state_file.xml index e49f851e20..684f8a12b2 100644 --- a/teshsuite/simdag/platforms/one_host_state_file.xml +++ b/teshsuite/simdag/platforms/one_host_state_file.xml @@ -2,7 +2,7 @@ - diff --git a/teshsuite/simdag/platforms/one_host_state_off.xml b/teshsuite/simdag/platforms/one_host_state_off.xml index c34925a618..810b6398db 100644 --- a/teshsuite/simdag/platforms/one_host_state_off.xml +++ b/teshsuite/simdag/platforms/one_host_state_off.xml @@ -2,7 +2,7 @@ - diff --git a/teshsuite/simdag/platforms/one_host_state_on.xml b/teshsuite/simdag/platforms/one_host_state_on.xml index 5e3f51623f..0fdfcc468c 100644 --- a/teshsuite/simdag/platforms/one_host_state_on.xml +++ b/teshsuite/simdag/platforms/one_host_state_on.xml @@ -2,7 +2,7 @@ - diff --git a/teshsuite/simdag/platforms/one_host_trace_file.xml b/teshsuite/simdag/platforms/one_host_trace_file.xml index b015c80d55..5f5d4ad95d 100644 --- a/teshsuite/simdag/platforms/one_host_trace_file.xml +++ b/teshsuite/simdag/platforms/one_host_trace_file.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_host_trace_inside.xml b/teshsuite/simdag/platforms/one_host_trace_inside.xml index 06ebeaa0e8..8f7730bbb1 100644 --- a/teshsuite/simdag/platforms/one_host_trace_inside.xml +++ b/teshsuite/simdag/platforms/one_host_trace_inside.xml @@ -2,7 +2,7 @@ - + 0.0 1.0 diff --git a/teshsuite/simdag/platforms/one_link_availability.xml b/teshsuite/simdag/platforms/one_link_availability.xml index a4f82e17e5..76c95f01e1 100644 --- a/teshsuite/simdag/platforms/one_link_availability.xml +++ b/teshsuite/simdag/platforms/one_link_availability.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_link_fatpipe.xml b/teshsuite/simdag/platforms/one_link_fatpipe.xml index 795b51b2ce..7a3bd79cd8 100644 --- a/teshsuite/simdag/platforms/one_link_fatpipe.xml +++ b/teshsuite/simdag/platforms/one_link_fatpipe.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_link_shared.xml b/teshsuite/simdag/platforms/one_link_shared.xml index 7df49aa918..6bcccb363d 100644 --- a/teshsuite/simdag/platforms/one_link_shared.xml +++ b/teshsuite/simdag/platforms/one_link_shared.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_link_state_file.xml b/teshsuite/simdag/platforms/one_link_state_file.xml index 61d6efdece..6c6e35dcd2 100644 --- a/teshsuite/simdag/platforms/one_link_state_file.xml +++ b/teshsuite/simdag/platforms/one_link_state_file.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml index 4895cf2fac..504c75471c 100644 --- a/teshsuite/simdag/platforms/properties.xml +++ b/teshsuite/simdag/platforms/properties.xml @@ -11,6 +11,6 @@ - + diff --git a/teshsuite/simdag/platforms/route_override.xml b/teshsuite/simdag/platforms/route_override.xml index fd3440b493..9ea9e36d75 100644 --- a/teshsuite/simdag/platforms/route_override.xml +++ b/teshsuite/simdag/platforms/route_override.xml @@ -3,11 +3,11 @@ diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml index 4be79024dc..a0ee484be8 100644 --- a/teshsuite/simdag/platforms/test_of_is_router.xml +++ b/teshsuite/simdag/platforms/test_of_is_router.xml @@ -4,28 +4,28 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml index 1de4ab6b5f..a1aa7e74a7 100644 --- a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml +++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml index 15262a240e..e4f3a8a08d 100644 --- a/teshsuite/simdag/platforms/two_clusters.xml +++ b/teshsuite/simdag/platforms/two_clusters.xml @@ -5,11 +5,11 @@ diff --git a/teshsuite/simdag/platforms/two_clusters_one_name.xml b/teshsuite/simdag/platforms/two_clusters_one_name.xml index b979049138..82705078c1 100644 --- a/teshsuite/simdag/platforms/two_clusters_one_name.xml +++ b/teshsuite/simdag/platforms/two_clusters_one_name.xml @@ -4,11 +4,11 @@ diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/simdag/platforms/two_clusters_router_id.xml index f8c041d049..ed56047938 100644 --- a/teshsuite/simdag/platforms/two_clusters_router_id.xml +++ b/teshsuite/simdag/platforms/two_clusters_router_id.xml @@ -5,11 +5,11 @@ diff --git a/teshsuite/simdag/platforms/two_clusters_symmetric.xml b/teshsuite/simdag/platforms/two_clusters_symmetric.xml index 458eb66e30..9b24c0b9ef 100644 --- a/teshsuite/simdag/platforms/two_clusters_symmetric.xml +++ b/teshsuite/simdag/platforms/two_clusters_symmetric.xml @@ -4,11 +4,11 @@ diff --git a/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS.xml b/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS.xml index e89de274e6..f2c260c85e 100644 --- a/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS.xml +++ b/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS.xml @@ -9,8 +9,8 @@ two_hosts_asymetric.tesh) --> - - + + diff --git a/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml b/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml index e74a6bc0e6..7577cda354 100644 --- a/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml +++ b/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml @@ -9,8 +9,8 @@ two_hosts_asymetric.tesh) --> - - + + diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml index 84559bc012..6c4aba0e91 100644 --- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml +++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml @@ -2,8 +2,8 @@ - - + + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml index aaf159991d..c1845c5a6c 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml @@ -2,8 +2,8 @@ - - + + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml index af72d3b0e6..127f3104c5 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml @@ -2,8 +2,8 @@ - - + + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml index 10addf506f..a8b46d44e9 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml @@ -2,8 +2,8 @@ - - + + diff --git a/testsuite/surf/platform.xml b/testsuite/surf/platform.xml index ba29b4312c..b6c18bb7af 100644 --- a/testsuite/surf/platform.xml +++ b/testsuite/surf/platform.xml @@ -2,8 +2,8 @@ - - + + diff --git a/tools/sg_xml_unit_converter.py b/tools/sg_xml_unit_converter.py index 830e91fd62..5b53594932 100644 --- a/tools/sg_xml_unit_converter.py +++ b/tools/sg_xml_unit_converter.py @@ -46,16 +46,16 @@ for root, dirnames, filenames in os.walk(sys.argv[1]): power_formats = formats([( "1E0", "f"), ( "1E3", "kf"), - ( "1E6", "mf"), - ( "1E9", "gf"), - ("1E12", "tf"), - ("1E15", "pt"), - ("1E18", "ef"), - ("1E21", "zf")]) + ( "1E6", "Mf"), + ( "1E9", "Gf"), + ("1E12", "Tf"), + ("1E15", "Pt"), + ("1E18", "Ef"), + ("1E21", "Zf")]) xml = format(xml, power_formats, "power") bandwidth_formats = formats([( "1E0", "Bps"), - ( "1E3", "KBps"), + ( "1E3", "kBps"), ( "1E6", "MBps"), ( "1E9", "GBps"), ("1E12", "TBps")]) -- 2.20.1