From 8a30d839e791237688f68d4047fef5a30293dfc4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20B=C3=A9daride?= Date: Mon, 6 May 2013 10:09:23 +0200 Subject: [PATCH] Add unit support in xml files [#14422] --- doc/msg-tuto-src/platforms/cloud.xml | 70 +- doc/msg-tuto-src/platforms/g5k.xml | 252 +- doc/msg-tuto-src/platforms/griffon.xml | 14 +- doc/msg-tuto-src/platforms/peers.xml | 10000 ++++++++-------- doc/msg-tuto-src/platforms/platform.xml | 30 +- examples/java/io/storage.xml | 14 +- .../java/master_slave_bypass/platform.xml | 12 +- examples/java/master_slave_kill/platform.xml | 12 +- examples/java/mutualExclusion/ring3.xml | 12 +- examples/java/platform.xml | 564 +- .../lua/multi_matrix/quicksort_platform.xml | 40 +- examples/msg/actions/NAS_LU_S_4/platform.xml | 6 +- examples/msg/actions/homogeneous_3_hosts.xml | 14 +- examples/msg/chainsend/platform_chainsend.xml | 34 +- examples/msg/gtnets/crosstraffic-p.xml | 6 +- examples/msg/gtnets/dogbone-p.xml | 18 +- examples/msg/gtnets/onelink-p.xml | 6 +- examples/msg/gtnets/waxman-p.xml | 1200 +- examples/msg/icomms/small_platform.xml | 14 +- .../msg/masterslave/platform_clusters.xml | 10 +- examples/msg/masterslave/platform_kill.xml | 10 +- examples/msg/mc/platform.xml | 14 +- .../mc/test/snapshot_comparison_platform.xml | 14 +- examples/msg/msg_platform.xml | 564 +- examples/msg/ns3/3hosts_2links_p.xml | 10 +- examples/msg/ns3/3links-p.xml | 18 +- examples/msg/ns3/dogbone-p.xml | 18 +- .../msg/parallel_task/test_ptask_platform.xml | 20 +- examples/msg/sendrecv/platform_sendrecv.xml | 6 +- examples/msg/small_platform.xml | 38 +- examples/msg/small_platform_with_failures.xml | 34 +- examples/msg/small_platform_with_routers.xml | 38 +- examples/msg/tracing/platform.xml | 30 +- examples/platforms/bypassASroute.xml | 14 +- examples/platforms/bypassRoute.xml | 26 +- examples/platforms/cloud.xml | 70 +- examples/platforms/cluster.xml | 4 +- examples/platforms/cluster_and_one_host.xml | 6 +- examples/platforms/cluster_no_backbone.xml | 2 +- .../platforms/cluster_routing_rulebased.xml | 46 +- examples/platforms/clusters_routing_full.xml | 10 +- examples/platforms/conf/gridpp_grid_2004.xml | 118 +- examples/platforms/conf/lcg_sept2004_grid.xml | 390 +- examples/platforms/config.xml | 10 +- examples/platforms/data_center.xml | 18 +- examples/platforms/griffon.xml | 14 +- examples/platforms/meta_cluster.xml | 18 +- examples/platforms/multicore_machine.xml | 2 +- examples/platforms/prop.xml | 8 +- examples/platforms/routing_cluster.xml | 34 +- examples/platforms/storage.xml | 14 +- .../platforms/syscoord/median_harvard.xml | 904 +- .../platforms/syscoord/median_meridian.xml | 10000 ++++++++-------- examples/platforms/syscoord/median_p2psim.xml | 6960 +++++------ examples/platforms/two_peers.xml | 16 +- examples/platforms/vivaldi.xml | 80 +- examples/simdag/2clusters.xml | 50 +- examples/simdag/faulty_host.xml | 4 +- .../simdag/scheduling/simulacrum_7_hosts.xml | 58 +- examples/simdag/two_hosts.xml | 6 +- examples/smpi/replay/replay_platform.xml | 38 +- src/surf/surfxml_parse.c | 209 +- src/xbt/graph.c | 4 +- teshsuite/msg/get_sender_p.xml | 4 +- teshsuite/msg/pid_p.xml | 4 +- teshsuite/msg/trace/platform.xml | 2 +- teshsuite/msg/trace/platform_trace.xml | 2 +- .../availability/simulacrum_7_hosts.xml | 58 +- teshsuite/simdag/basic_platform.xml | 6 +- .../network/mxn/platform_4p_1switch.xml | 18 +- .../simdag/network/p2p/platform_2p_1bb.xml | 6 +- .../simdag/network/p2p/platform_2p_1fl.xml | 6 +- .../simdag/network/p2p/platform_2p_1sl.xml | 6 +- .../network/p2p/platform_2p_1switch.xml | 10 +- teshsuite/simdag/network/platform_2p_1sl.xml | 8 +- teshsuite/simdag/partask/platform_2p_1sl.xml | 6 +- .../simdag/partask/platform_2p_1sl_hetero.xml | 6 +- teshsuite/simdag/platforms/Dijkstra.xml | 14 +- .../platforms/Two_clusters_rulebased.xml | 10 +- teshsuite/simdag/platforms/clusterA.xml | 4 +- teshsuite/simdag/platforms/clusterB.xml | 4 +- .../platforms/four_hosts_Dijkstra_ns3.xml | 16 +- .../simdag/platforms/four_hosts_floyd.xml | 16 +- .../simdag/platforms/four_hosts_floyd_bis.xml | 22 +- .../simdag/platforms/four_hosts_floyd_ns3.xml | 16 +- teshsuite/simdag/platforms/one_cluster.xml | 4 +- .../simdag/platforms/one_cluster_file.xml | 4 +- .../simdag/platforms/one_cluster_foreach.xml | 6 +- .../platforms/one_cluster_fullduplex.xml | 4 +- .../simdag/platforms/one_cluster_one_host.xml | 8 +- .../platforms/one_cluster_one_host_random.xml | 2 +- .../one_cluster_properties_foreach.xml | 4 +- .../one_cluster_properties_override.xml | 6 +- .../platforms/one_cluster_router_id.xml | 4 +- 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 | 4 +- .../simdag/platforms/one_link_fatpipe.xml | 4 +- .../simdag/platforms/one_link_shared.xml | 4 +- .../simdag/platforms/one_link_state_file.xml | 4 +- teshsuite/simdag/platforms/properties.xml | 2 +- teshsuite/simdag/platforms/random.xml | 12 +- teshsuite/simdag/platforms/route_override.xml | 10 +- .../simdag/platforms/test_of_is_router.xml | 20 +- .../three_hosts_non_symmetric_route.xml | 12 +- teshsuite/simdag/platforms/two_clusters.xml | 10 +- .../platforms/two_clusters_one_name.xml | 10 +- .../platforms/two_clusters_router_id.xml | 10 +- .../platforms/two_clusters_symmetric.xml | 10 +- .../platforms/two_hosts_asymetric_BOGUS.xml | 8 +- .../platforms/two_hosts_asymetric_BOGUS2.xml | 12 +- .../simdag/platforms/two_hosts_multi_hop.xml | 10 +- .../simdag/platforms/two_hosts_one_link.xml | 6 +- .../two_hosts_one_link_fullduplex.xml | 6 +- .../two_hosts_one_link_symmetrical.xml | 10 +- testsuite/surf/platform.xml | 6 +- tools/sg_xml_unit_converter.py | 84 + 123 files changed, 16543 insertions(+), 16288 deletions(-) create mode 100644 tools/sg_xml_unit_converter.py diff --git a/doc/msg-tuto-src/platforms/cloud.xml b/doc/msg-tuto-src/platforms/cloud.xml index df5a88231c..3833736a7d 100644 --- a/doc/msg-tuto-src/platforms/cloud.xml +++ b/doc/msg-tuto-src/platforms/cloud.xml @@ -11,14 +11,14 @@ - - + + - - + + - - + + @@ -29,9 +29,9 @@ - - - + + + @@ -56,23 +56,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -83,9 +83,9 @@ - - - + + + @@ -110,17 +110,17 @@ - - + + - - + + - - + + - - + + @@ -131,9 +131,9 @@ - - - + + + diff --git a/doc/msg-tuto-src/platforms/g5k.xml b/doc/msg-tuto-src/platforms/g5k.xml index 9d20e6c973..9b05b5d4af 100644 --- a/doc/msg-tuto-src/platforms/g5k.xml +++ b/doc/msg-tuto-src/platforms/g5k.xml @@ -14,15 +14,15 @@ - - - - - - - - - + + + + + + + + + @@ -36,24 +36,24 @@ - + radical="1-51" power="5.2297gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-93" power="8.8925gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-10" power="13.357gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + - + radical="1-12" power="23.681gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-72" power="23.492gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-34" power="21.175gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + - + radical="1-26" power="8.9618gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-20" power="23.531gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-46" power="22.27gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-8" power="24.473gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + - + radical="1-56" power="4.7233gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-79" power="5.6693gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + + radical="1-39" power="16.673gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="40-74" power="16.673gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="75-104" power="16.673gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="105-144" power="16.673gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> - + - + + radical="1-29,58-60" power="20.678gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="30-57" power="20.678gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="61-92" power="20.678gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> - + - + - + + radical="1-36" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="37-72" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="73-108" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="109-144" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="145-180" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="193-216" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="217-252" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="253-288" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="289-310" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="181-186" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + radical="187-192" power="4.7153gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> - + - + - + radical="1-30" power="4.7144gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + - + radical="1-64" power="21.496gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-33" power="12.91gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-25" power="30.13gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-40" power="27.391gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + - + radical="1-56" power="7.7318gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-50" power="8.9388gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-45" power="23.53gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + - + radical="1-80" power="9.5674gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + radical="1-52" power="5.1143gf" bw="125MBps" lat="100us" + bb_bw="1.25GBps" bb_lat="100us"> + - + + radical="1-29,58,59,60" power="286.087kf" bw="125MBps" lat="24us" + bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> + radical="30-57" power="286.087kf" bw="125MBps" lat="24us" + bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> + radical="61-92" power="286.087kf" bw="125MBps" lat="24us" + bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/doc/msg-tuto-src/platforms/platform.xml b/doc/msg-tuto-src/platforms/platform.xml index 81a1d91fa3..0b0abe7866 100644 --- a/doc/msg-tuto-src/platforms/platform.xml +++ b/doc/msg-tuto-src/platforms/platform.xml @@ -2,21 +2,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/examples/java/io/storage.xml b/examples/java/io/storage.xml index 58fca8974e..2b1ad7aa75 100644 --- a/examples/java/io/storage.xml +++ b/examples/java/io/storage.xml @@ -28,25 +28,25 @@ - + - + - + - + - - - + + + diff --git a/examples/java/master_slave_bypass/platform.xml b/examples/java/master_slave_bypass/platform.xml index 776a31b11d..9c736a53d9 100644 --- a/examples/java/master_slave_bypass/platform.xml +++ b/examples/java/master_slave_bypass/platform.xml @@ -2,13 +2,13 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/examples/java/platform.xml b/examples/java/platform.xml index dd4de15600..57c7292d2f 100644 --- a/examples/java/platform.xml +++ b/examples/java/platform.xml @@ -2,288 +2,288 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/lua/multi_matrix/quicksort_platform.xml b/examples/lua/multi_matrix/quicksort_platform.xml index 3bf658fa62..624bf238ba 100644 --- a/examples/lua/multi_matrix/quicksort_platform.xml +++ b/examples/lua/multi_matrix/quicksort_platform.xml @@ -3,26 +3,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/examples/msg/actions/NAS_LU_S_4/platform.xml b/examples/msg/actions/NAS_LU_S_4/platform.xml index 94d6bc755a..3d5cb78059 100644 --- a/examples/msg/actions/NAS_LU_S_4/platform.xml +++ b/examples/msg/actions/NAS_LU_S_4/platform.xml @@ -6,9 +6,9 @@ + power="1.17gf" + bw="125MBps" lat="16.67us" + bb_bw="1.25GBps" bb_lat="16.67us"> diff --git a/examples/msg/actions/homogeneous_3_hosts.xml b/examples/msg/actions/homogeneous_3_hosts.xml index 68501505f3..218447db21 100644 --- a/examples/msg/actions/homogeneous_3_hosts.xml +++ b/examples/msg/actions/homogeneous_3_hosts.xml @@ -2,14 +2,14 @@ - - - - - - + + + + + + - + diff --git a/examples/msg/chainsend/platform_chainsend.xml b/examples/msg/chainsend/platform_chainsend.xml index 98febadbca..700417d04c 100644 --- a/examples/msg/chainsend/platform_chainsend.xml +++ b/examples/msg/chainsend/platform_chainsend.xml @@ -3,23 +3,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/examples/msg/gtnets/crosstraffic-p.xml b/examples/msg/gtnets/crosstraffic-p.xml index 5ee8a47ac3..f1c0ce4fe9 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 9041b9bc1a..343520dc7d 100644 --- a/examples/msg/gtnets/dogbone-p.xml +++ b/examples/msg/gtnets/dogbone-p.xml @@ -6,18 +6,18 @@ --> - - - - + + + + - - - - - + + + + + diff --git a/examples/msg/gtnets/onelink-p.xml b/examples/msg/gtnets/onelink-p.xml index b76e6cedc2..f8bf324d4f 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 10e0f94507..6c184d4c3e 100644 --- a/examples/msg/gtnets/waxman-p.xml +++ b/examples/msg/gtnets/waxman-p.xml @@ -2,606 +2,606 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/msg/icomms/small_platform.xml b/examples/msg/icomms/small_platform.xml index 1455f4c85f..98b3b5fd88 100644 --- a/examples/msg/icomms/small_platform.xml +++ b/examples/msg/icomms/small_platform.xml @@ -3,13 +3,13 @@ - - - - - - - + + + + + + + diff --git a/examples/msg/masterslave/platform_clusters.xml b/examples/msg/masterslave/platform_clusters.xml index d6f9f7101f..b52dfd381f 100644 --- a/examples/msg/masterslave/platform_clusters.xml +++ b/examples/msg/masterslave/platform_clusters.xml @@ -3,14 +3,14 @@ + radical="0-499" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> + radical="500-999" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> - + - - + + - - - + + + - - - - - - - + + + + + + + diff --git a/examples/msg/mc/test/snapshot_comparison_platform.xml b/examples/msg/mc/test/snapshot_comparison_platform.xml index a62a6e0334..a40669c0fe 100644 --- a/examples/msg/mc/test/snapshot_comparison_platform.xml +++ b/examples/msg/mc/test/snapshot_comparison_platform.xml @@ -2,13 +2,13 @@ - - - - - - - + + + + + + + diff --git a/examples/msg/msg_platform.xml b/examples/msg/msg_platform.xml index dd4de15600..57c7292d2f 100644 --- a/examples/msg/msg_platform.xml +++ b/examples/msg/msg_platform.xml @@ -2,288 +2,288 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/msg/ns3/3hosts_2links_p.xml b/examples/msg/ns3/3hosts_2links_p.xml index b6068e1291..2462a7ea35 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 a7e6848251..a7ea23bfd6 100644 --- a/examples/msg/ns3/3links-p.xml +++ b/examples/msg/ns3/3links-p.xml @@ -12,16 +12,16 @@ --> - - - - - - + + + + + + - - - + + + diff --git a/examples/msg/ns3/dogbone-p.xml b/examples/msg/ns3/dogbone-p.xml index 08eb81c1d7..6b1914b6c6 100644 --- a/examples/msg/ns3/dogbone-p.xml +++ b/examples/msg/ns3/dogbone-p.xml @@ -6,18 +6,18 @@ --> - - - - + + + + - - - - - + + + + + diff --git a/examples/msg/parallel_task/test_ptask_platform.xml b/examples/msg/parallel_task/test_ptask_platform.xml index 6132794da3..ca9c5c37a0 100644 --- a/examples/msg/parallel_task/test_ptask_platform.xml +++ b/examples/msg/parallel_task/test_ptask_platform.xml @@ -3,16 +3,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/examples/msg/sendrecv/platform_sendrecv.xml b/examples/msg/sendrecv/platform_sendrecv.xml index 82ba2f97e0..ba1fa4df28 100644 --- a/examples/msg/sendrecv/platform_sendrecv.xml +++ b/examples/msg/sendrecv/platform_sendrecv.xml @@ -3,9 +3,9 @@ - - - + + + diff --git a/examples/msg/small_platform.xml b/examples/msg/small_platform.xml index 9823e34576..381acdac47 100644 --- a/examples/msg/small_platform.xml +++ b/examples/msg/small_platform.xml @@ -3,25 +3,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/examples/msg/small_platform_with_failures.xml b/examples/msg/small_platform_with_failures.xml index 8041c4d245..572ebff643 100644 --- a/examples/msg/small_platform_with_failures.xml +++ b/examples/msg/small_platform_with_failures.xml @@ -3,23 +3,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/examples/msg/small_platform_with_routers.xml b/examples/msg/small_platform_with_routers.xml index fc3233f8c8..e954f18f7b 100644 --- a/examples/msg/small_platform_with_routers.xml +++ b/examples/msg/small_platform_with_routers.xml @@ -2,31 +2,31 @@ - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/examples/msg/tracing/platform.xml b/examples/msg/tracing/platform.xml index 81a1d91fa3..0b0abe7866 100644 --- a/examples/msg/tracing/platform.xml +++ b/examples/msg/tracing/platform.xml @@ -2,21 +2,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml index 3b6623c5bf..8918b9ab5d 100644 --- a/examples/platforms/bypassASroute.xml +++ b/examples/platforms/bypassASroute.xml @@ -3,18 +3,18 @@ + radical="1" power="1gf" bw="125MBps" lat="50us"/> + radical="2" power="1gf" bw="125MBps" lat="50us"/> + radical="3" power="1gf" bw="125MBps" lat="50us"/> - - - - + + + + - - + + - - - + + + - - - - - - - + + + + + + + @@ -46,7 +46,7 @@ - + - - + + - - + + - - + + @@ -29,9 +29,9 @@ - - - + + + @@ -56,23 +56,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -83,9 +83,9 @@ - - - + + + @@ -110,17 +110,17 @@ - - + + - - + + - - + + - - + + @@ -131,9 +131,9 @@ - - - + + + diff --git a/examples/platforms/cluster.xml b/examples/platforms/cluster.xml index 18db17a434..9da07c8b02 100644 --- a/examples/platforms/cluster.xml +++ b/examples/platforms/cluster.xml @@ -13,7 +13,7 @@ + radical="0-99" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> diff --git a/examples/platforms/cluster_and_one_host.xml b/examples/platforms/cluster_and_one_host.xml index 67a9430ca4..b0056f8db9 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 a5ac5140b4..b47fdb041c 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 1ab2accebe..1913df17e2 100644 --- a/examples/platforms/cluster_routing_rulebased.xml +++ b/examples/platforms/cluster_routing_rulebased.xml @@ -4,41 +4,41 @@ + radical="181-186" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="145-162" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="163-180" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="91-108" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="109-126" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="127-144" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="55-72" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="73-90" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="37-54" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="19-36" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> + radical="1-18" power="3.388gf" bw="125MBps" lat="17.8us" + bb_bw="125MBps" bb_lat="17.8us"/> - + + power="1gf" bw="125MBps" lat="50us" bb_bw="2.25GBps" + bb_lat="500us" /> + power="1gf" bw="125MBps" lat="50us" bb_bw="2.25GBps" + bb_lat="500us" /> - + diff --git a/examples/platforms/conf/gridpp_grid_2004.xml b/examples/platforms/conf/gridpp_grid_2004.xml index d7a79173fd..02a9b34cfe 100644 --- a/examples/platforms/conf/gridpp_grid_2004.xml +++ b/examples/platforms/conf/gridpp_grid_2004.xml @@ -49,27 +49,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -87,44 +87,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/conf/lcg_sept2004_grid.xml b/examples/platforms/conf/lcg_sept2004_grid.xml index c97214e352..ff087fe7f3 100644 --- a/examples/platforms/conf/lcg_sept2004_grid.xml +++ b/examples/platforms/conf/lcg_sept2004_grid.xml @@ -2,74 +2,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -105,133 +105,133 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml index 1c1827aa45..9600ddf684 100644 --- a/examples/platforms/config.xml +++ b/examples/platforms/config.xml @@ -12,12 +12,12 @@ - - + + - - - + + + diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml index 015e93422a..078f6596f4 100644 --- a/examples/platforms/data_center.xml +++ b/examples/platforms/data_center.xml @@ -10,12 +10,12 @@ - - - - - - + + + + + + @@ -28,9 +28,9 @@ - - - + + + diff --git a/examples/platforms/griffon.xml b/examples/platforms/griffon.xml index 1ecc49831a..b6f5d8fe3c 100644 --- a/examples/platforms/griffon.xml +++ b/examples/platforms/griffon.xml @@ -4,16 +4,16 @@ + radical="1-29,58,59,60" power="286.087kf" bw="125MBps" lat="24us" + bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> + radical="30-57" power="286.087kf" bw="125MBps" lat="24us" + bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> + radical="61-92" power="286.087kf" bw="125MBps" lat="24us" + bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/> - + + 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"/> - + + 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/prop.xml b/examples/platforms/prop.xml index ac206cab0c..82ed9f41df 100644 --- a/examples/platforms/prop.xml +++ b/examples/platforms/prop.xml @@ -22,20 +22,20 @@ - + - + - + - + diff --git a/examples/platforms/routing_cluster.xml b/examples/platforms/routing_cluster.xml index 0b64bb7e58..c9f89cda0e 100644 --- a/examples/platforms/routing_cluster.xml +++ b/examples/platforms/routing_cluster.xml @@ -18,42 +18,42 @@ l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \ - - - + + + - - + + - - + + - + - - - + + + - - + + - - + + - + - + - + - + - + - + - - - + + + diff --git a/examples/platforms/syscoord/median_harvard.xml b/examples/platforms/syscoord/median_harvard.xml index 80fab10082..b916331472 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 5158ac2ba3..157aaed354 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 70c37f9e92..06a4e8b73d 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 23e48d85be..ae0006e51b 100644 --- a/examples/platforms/two_peers.xml +++ b/examples/platforms/two_peers.xml @@ -5,16 +5,16 @@ + power="1.5gf" + bw_in="2.25GBps" + bw_out="2.25GBps" + lat="500us" /> + power="730mf" + bw_in="2.25GBps" + bw_out="2.25GBps" + lat="500us" /> diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml index adc9b9ae54..3d5f75327c 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 50d3651350..e0d489261a 100644 --- a/examples/simdag/2clusters.xml +++ b/examples/simdag/2clusters.xml @@ -2,31 +2,31 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/simdag/faulty_host.xml b/examples/simdag/faulty_host.xml index bc82e947ee..409f830e39 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 dc979c2bb5..7217beebcd 100644 --- a/examples/simdag/scheduling/simulacrum_7_hosts.xml +++ b/examples/simdag/scheduling/simulacrum_7_hosts.xml @@ -2,35 +2,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/simdag/two_hosts.xml b/examples/simdag/two_hosts.xml index 408737fc42..868a00c351 100644 --- a/examples/simdag/two_hosts.xml +++ b/examples/simdag/two_hosts.xml @@ -2,11 +2,11 @@ - - + - diff --git a/examples/smpi/replay/replay_platform.xml b/examples/smpi/replay/replay_platform.xml index 9823e34576..381acdac47 100644 --- a/examples/smpi/replay/replay_platform.xml +++ b/examples/smpi/replay/replay_platform.xml @@ -3,25 +3,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index fb6e217633..a8d507a706 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -49,6 +49,7 @@ double surf_parse_get_double(const char *string) { int ret = sscanf(string, "%lg", &res); if (ret != 1) surf_parse_error("%s is not a double", string); + //printf("Parsed double [%lg] %s\n", res, string); return res; } @@ -60,6 +61,174 @@ int surf_parse_get_int(const char *string) { return res; } +double surf_parse_get_time(const char *string) { + size_t len = strlen(string); + char* tmp = xbt_malloc(sizeof(char) * (len + 1)); + strcpy(tmp, string); + if (!strcmp(tmp + len - 2, "ps")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E-12; + } + if (!strcmp(tmp + len - 2, "ns")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E-9; + } + if (!strcmp(tmp + len - 2, "us")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E-6; + } + if (!strcmp(tmp + len - 2, "ms")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E-3; + } + if (!strcmp(tmp + len - 1, "s")) { + tmp[len-1] = 0; + return surf_parse_get_double(tmp); + } + if (!strcmp(tmp + len - 1, "m")) { + tmp[len-1] = 0; + return surf_parse_get_double(tmp) * 60; + } + if (!strcmp(tmp + len - 1, "h")) { + tmp[len-1] = 0; + return surf_parse_get_double(tmp) * 3600; + } + if (!strcmp(tmp + len - 1, "d")) { + tmp[len-1] = 0; + return surf_parse_get_double(tmp) * 86400; + } + if (!strcmp(tmp + len - 1, "w")) { + tmp[len-1] = 0; + return surf_parse_get_double(tmp) * 604800; + } + return surf_parse_get_double(tmp); +} + +double surf_parse_get_bandwidth(const char *string) { + size_t len = strlen(string); + char* tmp = xbt_malloc(sizeof(char) * (len + 1)); + strcpy(tmp, string); + if (!strcmp(tmp + len - 4, "KBps")) { + tmp[len-4] = 0; + return surf_parse_get_double(tmp) * 1E3; + } + if (!strcmp(tmp + len - 4, "MBps")) { + tmp[len-4] = 0; + return surf_parse_get_double(tmp) * 1E6; + } + if (!strcmp(tmp + len - 4, "GBps")) { + tmp[len-4] = 0; + return surf_parse_get_double(tmp) * 1E9; + } + if (!strcmp(tmp + len - 4, "TBps")) { + tmp[len-4] = 0; + return surf_parse_get_double(tmp) * 1E12; + } + if (!strcmp(tmp + len - 3, "Bps")) { + tmp[len-3] = 0; + return surf_parse_get_double(tmp); + } + if (!strcmp(tmp + len - 4, "kbps")) { + tmp[len-4] = 0; + return surf_parse_get_double(tmp) * 0.125 * 1E3; + } + if (!strcmp(tmp + len - 4, "mbps")) { + tmp[len-4] = 0; + return surf_parse_get_double(tmp) * 0.125 * 1E6; + } + if (!strcmp(tmp + len - 4, "gbps")) { + tmp[len-4] = 0; + return surf_parse_get_double(tmp) * 0.125 * 1E9; + } + if (!strcmp(tmp + len - 4, "tbps")) { + tmp[len-4] = 0; + return surf_parse_get_double(tmp) * 0.125 * 1E12; + } + if (!strcmp(tmp + len - 3, "bps")) { + tmp[len-3] = 0; + return surf_parse_get_double(tmp) * 0.125; + } + return surf_parse_get_double(tmp); +} + +double surf_parse_get_power(const char *string) { + size_t len = strlen(string); + char* tmp = xbt_malloc(sizeof(char) * (len + 1)); + strcpy(tmp, string); + if (!strcmp(tmp + len - 9, "kiloflops")) { + tmp[len-9] = 0; + return surf_parse_get_double(tmp) * 1E3; + } + if (!strcmp(tmp + len - 9, "megaflops")) { + tmp[len-9] = 0; + return surf_parse_get_double(tmp) * 1E6; + } + if (!strcmp(tmp + len - 9, "gigaflops")) { + tmp[len-9] = 0; + return surf_parse_get_double(tmp) * 1E9; + } + if (!strcmp(tmp + len - 9, "teraflops")) { + tmp[len-9] = 0; + return surf_parse_get_double(tmp) * 1E12; + } + if (!strcmp(tmp + len - 9, "petaflops")) { + tmp[len-9] = 0; + return surf_parse_get_double(tmp) * 1E15; + } + if (!strcmp(tmp + len - 9, "exaflops")) { + tmp[len-9] = 0; + return surf_parse_get_double(tmp) * 1E18; + } + if (!strcmp(tmp + len - 9, "zettaflops")) { + tmp[len-9] = 0; + return surf_parse_get_double(tmp) * 1E21; + } + if (!strcmp(tmp + len - 9, "yottaflops")) { + tmp[len-9] = 0; + return surf_parse_get_double(tmp) * 1E24; + } + if (!strcmp(tmp + len - 5, "flops")) { + tmp[len-5] = 0; + return surf_parse_get_double(tmp); + } + if (!strcmp(tmp + len - 2, "kf")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E3; + } + if (!strcmp(tmp + len - 2, "mf")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E6; + } + if (!strcmp(tmp + len - 2, "gf")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E9; + } + if (!strcmp(tmp + len - 2, "tf")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E12; + } + if (!strcmp(tmp + len - 2, "pf")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E15; + } + if (!strcmp(tmp + len - 2, "ef")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E18; + } + if (!strcmp(tmp + len - 2, "zf")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E21; + } + if (!strcmp(tmp + len - 2, "yf")) { + tmp[len-2] = 0; + return surf_parse_get_double(tmp) * 1E24; + } + if (!strcmp(tmp + len - 1, "f")) { + tmp[len-1] = 0; + return surf_parse_get_double(tmp); + } + return surf_parse_get_double(tmp); +} /* * All the callback lists that can be overridden anywhere. @@ -340,20 +509,20 @@ void STag_surfxml_cluster(void){ cluster.prefix = A_surfxml_cluster_prefix; cluster.suffix = A_surfxml_cluster_suffix; cluster.radical = A_surfxml_cluster_radical; - cluster.power= surf_parse_get_double(A_surfxml_cluster_power); + cluster.power = surf_parse_get_power(A_surfxml_cluster_power); cluster.core_amount = surf_parse_get_int(A_surfxml_cluster_core); - cluster.bw = surf_parse_get_double(A_surfxml_cluster_bw); - cluster.lat = surf_parse_get_double(A_surfxml_cluster_lat); + cluster.bw = surf_parse_get_bandwidth(A_surfxml_cluster_bw); + cluster.lat = surf_parse_get_time(A_surfxml_cluster_lat); if(strcmp(A_surfxml_cluster_bb___bw,"")) - cluster.bb_bw = surf_parse_get_double(A_surfxml_cluster_bb___bw); + cluster.bb_bw = surf_parse_get_bandwidth(A_surfxml_cluster_bb___bw); if(strcmp(A_surfxml_cluster_bb___lat,"")) - cluster.bb_lat = surf_parse_get_double(A_surfxml_cluster_bb___lat); + cluster.bb_lat = surf_parse_get_time(A_surfxml_cluster_bb___lat); if(strcmp(A_surfxml_cluster_limiter___link,"")) cluster.limiter_link = surf_parse_get_double(A_surfxml_cluster_limiter___link); if(strcmp(A_surfxml_cluster_loopback___bw,"")) - cluster.loopback_bw = surf_parse_get_double(A_surfxml_cluster_loopback___bw); + cluster.loopback_bw = surf_parse_get_bandwidth(A_surfxml_cluster_loopback___bw); if(strcmp(A_surfxml_cluster_loopback___lat,"")) - cluster.loopback_lat = surf_parse_get_double(A_surfxml_cluster_loopback___lat); + cluster.loopback_lat = surf_parse_get_time(A_surfxml_cluster_loopback___lat); cluster.router_id = A_surfxml_cluster_router___id; switch (AX_surfxml_cluster_sharing___policy) { @@ -395,9 +564,9 @@ void STag_surfxml_cabinet(void){ cabinet.id = A_surfxml_cabinet_id; cabinet.prefix = A_surfxml_cabinet_prefix; cabinet.suffix = A_surfxml_cabinet_suffix; - cabinet.power = surf_parse_get_double(A_surfxml_cabinet_power); - cabinet.bw = surf_parse_get_double(A_surfxml_cabinet_bw); - cabinet.lat = surf_parse_get_double(A_surfxml_cabinet_lat); + cabinet.power = surf_parse_get_power(A_surfxml_cabinet_power); + cabinet.bw = surf_parse_get_bandwidth(A_surfxml_cabinet_bw); + cabinet.lat = surf_parse_get_time(A_surfxml_cabinet_lat); cabinet.radical = A_surfxml_cabinet_radical; sg_platf_new_cabinet(&cabinet); @@ -407,10 +576,10 @@ void STag_surfxml_peer(void){ s_sg_platf_peer_cbarg_t peer; memset(&peer,0,sizeof(peer)); peer.id = A_surfxml_peer_id; - peer.power = surf_parse_get_double(A_surfxml_peer_power); - peer.bw_in = surf_parse_get_double(A_surfxml_peer_bw___in); - peer.bw_out = surf_parse_get_double(A_surfxml_peer_bw___out); - peer.lat = surf_parse_get_double(A_surfxml_peer_lat); + peer.power = surf_parse_get_power(A_surfxml_peer_power); + peer.bw_in = surf_parse_get_bandwidth(A_surfxml_peer_bw___in); + peer.bw_out = surf_parse_get_bandwidth(A_surfxml_peer_bw___out); + peer.lat = surf_parse_get_time(A_surfxml_peer_lat); peer.coord = A_surfxml_peer_coordinates; peer.availability_trace = tmgr_trace_new_from_file(A_surfxml_peer_availability___file); peer.state_trace = tmgr_trace_new_from_file(A_surfxml_peer_state___file); @@ -430,9 +599,11 @@ void ETag_surfxml_link(void){ link.properties = current_property_set; link.id = A_surfxml_link_id; - link.bandwidth = surf_parse_get_double(A_surfxml_link_bandwidth); + link.bandwidth = surf_parse_get_bandwidth(A_surfxml_link_bandwidth); + //printf("Link bandwidth [%lg]\n", link.bandwidth); link.bandwidth_trace = tmgr_trace_new_from_file(A_surfxml_link_bandwidth___file); - link.latency = surf_parse_get_double(A_surfxml_link_latency); + link.latency = surf_parse_get_time(A_surfxml_link_latency); + //printf("Link latency [%lg]\n", link.latency); link.latency_trace = tmgr_trace_new_from_file(A_surfxml_link_latency___file); switch (A_surfxml_link_state) { @@ -496,8 +667,8 @@ void ETag_surfxml_backbone(void){ link.properties = NULL; link.id = A_surfxml_backbone_id; - link.bandwidth = surf_parse_get_double(A_surfxml_backbone_bandwidth); - link.latency = surf_parse_get_double(A_surfxml_backbone_latency); + link.bandwidth = surf_parse_get_bandwidth(A_surfxml_backbone_bandwidth); + link.latency = surf_parse_get_time(A_surfxml_backbone_latency); link.state = SURF_RESOURCE_ON; link.policy = SURF_LINK_SHARED; @@ -890,7 +1061,7 @@ double get_cpu_power(const char *power) power_scale = random_generate(random); } } else { - power_scale = surf_parse_get_double(power); + power_scale = surf_parse_get_power(power); } return power_scale; } diff --git a/src/xbt/graph.c b/src/xbt/graph.c index 2c6603b621..05e32c271d 100644 --- a/src/xbt/graph.c +++ b/src/xbt/graph.c @@ -724,7 +724,7 @@ void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename, fprintf(file, "label=\"%s\" ", name); if ((node_data_print) && ((name = node_data_print(node->data)))) fprintf(file, "data=\"%s\" ", name); - fprintf(file, ">\n"); + fprintf(file, "/>\n"); } xbt_dynar_foreach(g->edges, cursor, edge) { fprintf(file, " length); if ((edge_data_print) && ((name = edge_data_print(edge->data)))) fprintf(file, "data=\"%s\" ", name); - fprintf(file, ">\n"); + fprintf(file, "/>\n"); } fprintf(file, "\n"); fclose(file); diff --git a/teshsuite/msg/get_sender_p.xml b/teshsuite/msg/get_sender_p.xml index 90ab287708..aa5038e438 100644 --- a/teshsuite/msg/get_sender_p.xml +++ b/teshsuite/msg/get_sender_p.xml @@ -3,8 +3,8 @@ - - + + diff --git a/teshsuite/msg/pid_p.xml b/teshsuite/msg/pid_p.xml index f1d4756827..3420773830 100644 --- a/teshsuite/msg/pid_p.xml +++ b/teshsuite/msg/pid_p.xml @@ -3,8 +3,8 @@ - - + + diff --git a/teshsuite/msg/trace/platform.xml b/teshsuite/msg/trace/platform.xml index 66961d0895..5e8b1d586a 100644 --- a/teshsuite/msg/trace/platform.xml +++ b/teshsuite/msg/trace/platform.xml @@ -2,6 +2,6 @@ - + diff --git a/teshsuite/msg/trace/platform_trace.xml b/teshsuite/msg/trace/platform_trace.xml index f5b61e12d8..5913d93eb7 100644 --- a/teshsuite/msg/trace/platform_trace.xml +++ b/teshsuite/msg/trace/platform_trace.xml @@ -13,7 +13,7 @@ 60 0.5 - + diff --git a/teshsuite/simdag/availability/simulacrum_7_hosts.xml b/teshsuite/simdag/availability/simulacrum_7_hosts.xml index 835e3127e8..e223044572 100644 --- a/teshsuite/simdag/availability/simulacrum_7_hosts.xml +++ b/teshsuite/simdag/availability/simulacrum_7_hosts.xml @@ -2,35 +2,35 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/basic_platform.xml b/teshsuite/simdag/basic_platform.xml index e43a89e198..8d639fdaee 100644 --- a/teshsuite/simdag/basic_platform.xml +++ b/teshsuite/simdag/basic_platform.xml @@ -4,9 +4,9 @@ - - - + + + diff --git a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml index c4f0d55704..d879f07ae8 100644 --- a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml +++ b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml @@ -4,16 +4,16 @@ - - - - + + + + - - - - - + + + + + diff --git a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml index 6470a9d51a..c886e9654c 100644 --- a/teshsuite/simdag/network/p2p/platform_2p_1bb.xml +++ b/teshsuite/simdag/network/p2p/platform_2p_1bb.xml @@ -2,8 +2,8 @@ - - + + - + diff --git a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml index 6599c719fe..acd0ebbc31 100644 --- a/teshsuite/simdag/network/p2p/platform_2p_1fl.xml +++ b/teshsuite/simdag/network/p2p/platform_2p_1fl.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml index 20f99a9cc0..90e6a84916 100644 --- a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml +++ b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml index b499f5caf8..4e1dccde4c 100644 --- a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml +++ b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml @@ -2,12 +2,12 @@ - - + + - - - + + + diff --git a/teshsuite/simdag/network/platform_2p_1sl.xml b/teshsuite/simdag/network/platform_2p_1sl.xml index e91239b54f..92cdc2edda 100644 --- a/teshsuite/simdag/network/platform_2p_1sl.xml +++ b/teshsuite/simdag/network/platform_2p_1sl.xml @@ -4,12 +4,12 @@ - - + + - + diff --git a/teshsuite/simdag/partask/platform_2p_1sl.xml b/teshsuite/simdag/partask/platform_2p_1sl.xml index fc0bde9228..e6d67a4190 100644 --- a/teshsuite/simdag/partask/platform_2p_1sl.xml +++ b/teshsuite/simdag/partask/platform_2p_1sl.xml @@ -4,9 +4,9 @@ - - - + + + diff --git a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml index 185871ac02..5deb9ad909 100644 --- a/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml +++ b/teshsuite/simdag/partask/platform_2p_1sl_hetero.xml @@ -3,10 +3,10 @@ - - + + - diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/simdag/platforms/Dijkstra.xml index f66ad8baa5..2ccc31a0a8 100644 --- a/teshsuite/simdag/platforms/Dijkstra.xml +++ b/teshsuite/simdag/platforms/Dijkstra.xml @@ -4,17 +4,17 @@ - - + + - - + + - - - + + + diff --git a/teshsuite/simdag/platforms/Two_clusters_rulebased.xml b/teshsuite/simdag/platforms/Two_clusters_rulebased.xml index 7096f7592c..9c125efb14 100644 --- a/teshsuite/simdag/platforms/Two_clusters_rulebased.xml +++ b/teshsuite/simdag/platforms/Two_clusters_rulebased.xml @@ -4,14 +4,14 @@ + radical="0-1" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> + radical="2-3" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> - + + radical="0,2-4,6" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> diff --git a/teshsuite/simdag/platforms/clusterB.xml b/teshsuite/simdag/platforms/clusterB.xml index 5dcc474f13..df7822a1ee 100644 --- a/teshsuite/simdag/platforms/clusterB.xml +++ b/teshsuite/simdag/platforms/clusterB.xml @@ -1,5 +1,5 @@ + radical="0,2-4,6" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> diff --git a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml index a700f8217f..cba863bc30 100644 --- a/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml +++ b/teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml @@ -2,15 +2,15 @@ - - - - + + + + - - - - + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/simdag/platforms/four_hosts_floyd.xml index ec233d86db..01f16f061f 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd.xml @@ -2,15 +2,15 @@ - - - - + + + + - - - - + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml index d93a91cf9e..4c5d8c863d 100644 --- a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml +++ b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml @@ -2,18 +2,18 @@ - - - - - + + + + + - - - - - - + + + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml b/teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml index 381e5e4972..4c3ca7e4a2 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 e2c1eed1f2..a6fc761faa 100644 --- a/teshsuite/simdag/platforms/one_cluster.xml +++ b/teshsuite/simdag/platforms/one_cluster.xml @@ -3,7 +3,7 @@ + radical="0,2-4,6" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> diff --git a/teshsuite/simdag/platforms/one_cluster_file.xml b/teshsuite/simdag/platforms/one_cluster_file.xml index e53be106de..4be7cecbbc 100644 --- a/teshsuite/simdag/platforms/one_cluster_file.xml +++ b/teshsuite/simdag/platforms/one_cluster_file.xml @@ -3,8 +3,8 @@ diff --git a/teshsuite/simdag/platforms/one_cluster_foreach.xml b/teshsuite/simdag/platforms/one_cluster_foreach.xml index df1694223d..3c04467c99 100644 --- a/teshsuite/simdag/platforms/one_cluster_foreach.xml +++ b/teshsuite/simdag/platforms/one_cluster_foreach.xml @@ -6,11 +6,11 @@ radical="0,2-4,6"/> - - + + - diff --git a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml index 0462399a5c..b4e0ee246a 100644 --- a/teshsuite/simdag/platforms/one_cluster_fullduplex.xml +++ b/teshsuite/simdag/platforms/one_cluster_fullduplex.xml @@ -3,8 +3,8 @@ diff --git a/teshsuite/simdag/platforms/one_cluster_one_host.xml b/teshsuite/simdag/platforms/one_cluster_one_host.xml index 0998eca053..3e89d63b5a 100644 --- a/teshsuite/simdag/platforms/one_cluster_one_host.xml +++ b/teshsuite/simdag/platforms/one_cluster_one_host.xml @@ -3,12 +3,12 @@ + radical="0-4" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> - + - + diff --git a/teshsuite/simdag/platforms/one_cluster_one_host_random.xml b/teshsuite/simdag/platforms/one_cluster_one_host_random.xml index 7b9cd4e077..2983e2325f 100644 --- a/teshsuite/simdag/platforms/one_cluster_one_host_random.xml +++ b/teshsuite/simdag/platforms/one_cluster_one_host_random.xml @@ -13,7 +13,7 @@ - + diff --git a/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml b/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml index 8b52f2cc28..08f005c2f6 100644 --- a/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml +++ b/teshsuite/simdag/platforms/one_cluster_properties_foreach.xml @@ -5,10 +5,10 @@ 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 8a4f75c633..3171122da7 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 269186ba59..d305ec1595 100644 --- a/teshsuite/simdag/platforms/one_cluster_router_id.xml +++ b/teshsuite/simdag/platforms/one_cluster_router_id.xml @@ -3,7 +3,7 @@ + radical="0,2-4,6" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/> diff --git a/teshsuite/simdag/platforms/one_host.xml b/teshsuite/simdag/platforms/one_host.xml index 147feb292d..13aa42ca80 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 e88b01c022..38e0d0bc76 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 b04b6e97cb..e224a8a058 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 e24559794e..e49f851e20 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 e777671f0c..c34925a618 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 d21d0658d6..5e3f51623f 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 65fcacc987..b015c80d55 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 f3f26adf2b..06ebeaa0e8 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 742ec3d959..a4f82e17e5 100644 --- a/teshsuite/simdag/platforms/one_link_availability.xml +++ b/teshsuite/simdag/platforms/one_link_availability.xml @@ -2,8 +2,8 @@ - - + diff --git a/teshsuite/simdag/platforms/one_link_fatpipe.xml b/teshsuite/simdag/platforms/one_link_fatpipe.xml index 50b007187f..795b51b2ce 100644 --- a/teshsuite/simdag/platforms/one_link_fatpipe.xml +++ b/teshsuite/simdag/platforms/one_link_fatpipe.xml @@ -2,8 +2,8 @@ - - + diff --git a/teshsuite/simdag/platforms/one_link_shared.xml b/teshsuite/simdag/platforms/one_link_shared.xml index c9c5ccdb86..7df49aa918 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 4d3cb6951d..61d6efdece 100644 --- a/teshsuite/simdag/platforms/one_link_state_file.xml +++ b/teshsuite/simdag/platforms/one_link_state_file.xml @@ -2,8 +2,8 @@ - - + diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml index d2ba4b3cc1..4895cf2fac 100644 --- a/teshsuite/simdag/platforms/properties.xml +++ b/teshsuite/simdag/platforms/properties.xml @@ -11,6 +11,6 @@ - + diff --git a/teshsuite/simdag/platforms/random.xml b/teshsuite/simdag/platforms/random.xml index eb4bc877e5..eee7263d92 100644 --- a/teshsuite/simdag/platforms/random.xml +++ b/teshsuite/simdag/platforms/random.xml @@ -33,17 +33,17 @@ mode="linear" base="NBcore" linear_a="0.5" linear_b="1000" noise="white"/> - + power="CustomPower" bw_in_trace="mybw" bw_out="CustomBWval" - lat="5e-5" + lat="50us" /> diff --git a/teshsuite/simdag/platforms/route_override.xml b/teshsuite/simdag/platforms/route_override.xml index 268ae91aa5..fd3440b493 100644 --- a/teshsuite/simdag/platforms/route_override.xml +++ b/teshsuite/simdag/platforms/route_override.xml @@ -3,14 +3,14 @@ + radical="0-4" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> + radical="0-4" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> - + diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml index 3a797e952c..4be79024dc 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 f72e32a727..1de4ab6b5f 100644 --- a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml +++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml @@ -2,13 +2,13 @@ - - - + + + - - - + + + diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml index 026061166a..15262a240e 100644 --- a/teshsuite/simdag/platforms/two_clusters.xml +++ b/teshsuite/simdag/platforms/two_clusters.xml @@ -5,14 +5,14 @@ + radical="0-4" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> + radical="0-4" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> - + + radical="0-1" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> + radical="2-3" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> - + + radical="0-4" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/> + radical="0-4" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/> - + + radical="0-1" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> + radical="0-1" power="1gf" bw="125MBps" lat="50us" + bb_bw="2.25GBps" bb_lat="500us"/> - + - - + + - - + + diff --git a/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml b/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml index e76533449a..e74a6bc0e6 100644 --- a/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml +++ b/teshsuite/simdag/platforms/two_hosts_asymetric_BOGUS2.xml @@ -9,13 +9,13 @@ 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 c92e9baf1d..84559bc012 100644 --- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml +++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml @@ -2,12 +2,12 @@ - - + + - - - + + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml index fd22b5f143..aaf159991d 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml @@ -2,10 +2,10 @@ - - + + - + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml index a75ffe755d..af72d3b0e6 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml @@ -2,10 +2,10 @@ - - + + - diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml index 91ee52211c..10addf506f 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml @@ -2,12 +2,12 @@ - - + + - - - + + + diff --git a/testsuite/surf/platform.xml b/testsuite/surf/platform.xml index 1fb76b0998..ba29b4312c 100644 --- a/testsuite/surf/platform.xml +++ b/testsuite/surf/platform.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/tools/sg_xml_unit_converter.py b/tools/sg_xml_unit_converter.py new file mode 100644 index 0000000000..830e91fd62 --- /dev/null +++ b/tools/sg_xml_unit_converter.py @@ -0,0 +1,84 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# grep -ohrI 'bw=".*"' . | sort | uniq + +import sys, fnmatch, os +from decimal import Decimal +import re + +def to_str(dec): + return re.sub(r"(\.\d*?)0*$", r"\1", dec.to_eng_string()).rstrip(".") + +def format(xml, formats, attrib): + res = [] + m = re.search(r'%s="(.*?)"'%attrib, xml) + while m: + b, e = m.span(1) + res.append(xml[:b]) + val = xml[b:e] + xml = xml[e:] + try: + power = Decimal(val) + tmp = to_str(power) + for p, f in formats: + d = power / p + if d >= 1.0: + tmp = "%s%s"%(to_str(d), f) + break + res.append(tmp) + except: + print "Error with:", val + res.append(val) + m = re.search(r'%s="(.*?)"'%attrib, xml) + + res.append(xml) + return "".join(res) + +def formats(list): + return sorted(((Decimal(i), j) for i,j in list), key=lambda x: x[0], reverse=True) + +for root, dirnames, filenames in os.walk(sys.argv[1]): + for filename in fnmatch.filter(filenames, '*.xml'): + print root, dirnames, filename + path = os.path.join(root, filename) + xml = open(path).read() + + power_formats = formats([( "1E0", "f"), + ( "1E3", "kf"), + ( "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"), + ( "1E6", "MBps"), + ( "1E9", "GBps"), + ("1E12", "TBps")]) + xml = format(xml, bandwidth_formats, "bandwidth") + xml = format(xml, bandwidth_formats, "bw") + xml = format(xml, bandwidth_formats, "bb_bw") + xml = format(xml, bandwidth_formats, "bw_in") + xml = format(xml, bandwidth_formats, "bw_out") + + time_formats = formats([( "1E-12", "ps"), + ( "1E-9" , "ns"), + ( "1E-6" , "us"), + ( "1E-3" , "ms"), + ( "1E0" , "s"), + ( "60E0" , "m"), + ( "3600E0" , "h"), + ( "86400E0" , "d"), + ("604800E0" , "w")]) + xml = format(xml, time_formats, "latency") + xml = format(xml, time_formats, "lat") + xml = format(xml, time_formats, "bb_lat") + + #print xml + file = open(path, "w") + file.write(xml) + file.close() -- 2.20.1