From 7b9972a1b7c3d3357a3089161831ca87e055fa61 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 13 Oct 2018 21:51:57 +0200 Subject: [PATCH] move the DTD file from gforge to our own homepage --- docs/source/tuto_s4u/deployment1.xml | 2 +- docs/source/tuto_s4u/deployment2.xml | 2 +- docs/source/tuto_s4u/deployment3.xml | 2 +- docs/source/tuto_s4u/deployment4.xml | 2 +- docs/source/tuto_smpi/3hosts.xml | 2 +- examples/java/app/bittorrent/bittorrent.xml | 2 +- .../app/centralizedmutex/centralizedmutex.xml | 2 +- .../java/app/masterworker/masterworker.xml | 2 +- examples/java/dht/chord/chord.xml | 2 +- examples/java/dht/kademlia/kademlia.xml | 2 +- .../process/startkilltime/startkilltime.xml | 2 +- examples/java/task/priority/priority.xml | 2 +- .../app-masterworker-multicore_d.xml | 2 +- .../app-masterworker-vivaldi_d.xml | 2 +- .../app-masterworker/app-masterworker_d.xml | 2 +- examples/msg/dht-kademlia/dht-kademlia_d.xml | 2 +- examples/msg/dht-kademlia/generate.py | 2 +- examples/msg/dht-pastry/dht-pastry_d.xml | 2 +- examples/msg/mc/deploy_bugged1.xml | 2 +- examples/msg/mc/deploy_bugged1_liveness.xml | 2 +- .../mc/deploy_bugged1_liveness_visited.xml | 2 +- examples/msg/mc/deploy_bugged2.xml | 2 +- examples/msg/mc/deploy_bugged2_liveness.xml | 2 +- examples/msg/mc/deploy_bugged3.xml | 2 +- examples/msg/mc/deploy_centralized_mutex.xml | 2 +- examples/msg/mc/deploy_electric_fence.xml | 2 +- examples/msg/mc/platform.xml | 2 +- examples/msg/network-ns3/3hosts_2links_d.xml | 2 +- examples/msg/network-ns3/3links-timer_d.xml | 2 +- examples/msg/network-ns3/3links_d.xml | 2 +- examples/msg/network-ns3/crosstraffic_d.xml | 2 +- examples/msg/network-ns3/dogbone_d.xml | 2 +- examples/msg/network-ns3/one_cluster_d.xml | 2 +- examples/msg/network-ns3/onelink_d.xml | 2 +- examples/platforms/bypassASroute.xml | 2 +- examples/platforms/bypassRoute.xml | 2 +- examples/platforms/cloud.xml | 2 +- examples/platforms/cluster_and_one_host.xml | 2 +- examples/platforms/cluster_backbone.xml | 2 +- examples/platforms/cluster_crossbar.xml | 2 +- examples/platforms/cluster_dragonfly.xml | 2 +- examples/platforms/cluster_fat_tree.xml | 2 +- examples/platforms/cluster_multi.xml | 2 +- examples/platforms/cluster_torus.xml | 2 +- examples/platforms/config.xml | 2 +- examples/platforms/config_tracing.xml | 2 +- examples/platforms/crosstraffic.xml | 2 +- examples/platforms/data_center.xml | 2 +- examples/platforms/dogbone.xml | 2 +- examples/platforms/energy_cluster.xml | 2 +- examples/platforms/energy_platform.xml | 2 +- examples/platforms/faulty_host.xml | 2 +- examples/platforms/g5k.xml | 2 +- examples/platforms/griffon.xml | 2 +- examples/platforms/meta_cluster.xml | 2 +- examples/platforms/multicore_machine.xml | 2 +- examples/platforms/onelink.xml | 2 +- examples/platforms/prop.xml | 2 +- examples/platforms/routing_cluster.xml | 2 +- examples/platforms/routing_none.xml | 2 +- examples/platforms/simulacrum_7_hosts.xml | 2 +- examples/platforms/small_platform.xml | 2 +- .../platforms/small_platform_constant.xml | 2 +- examples/platforms/small_platform_fatpipe.xml | 2 +- .../small_platform_one_link_routes.xml | 2 +- .../small_platform_with_failures.xml | 2 +- .../platforms/small_platform_with_routers.xml | 2 +- examples/platforms/storage/remote_io.xml | 2 +- examples/platforms/storage/storage.xml | 2 +- .../syscoord/generate_peer_platform.pl | 2 +- examples/platforms/three_multicore_hosts.xml | 2 +- examples/platforms/two_hosts.xml | 2 +- .../platforms/two_hosts_platform_shared.xml | 2 +- .../two_hosts_platform_with_availability.xml | 2 +- ...ts_platform_with_availability_included.xml | 2 +- examples/platforms/two_peers.xml | 2 +- examples/platforms/vivaldi.xml | 2 +- .../s4u/actor-create/s4u-actor-create_d.xml | 2 +- .../actor-lifetime/s4u-actor-lifetime_d.xml | 2 +- .../s4u/actor-yield/s4u-actor-yield_d.xml | 2 +- .../app-bittorrent/s4u-app-bittorrent_d.xml | 2 +- .../s4u-app-masterworkers_d.xml | 2 +- .../s4u/async-ready/s4u-async-ready_d.xml | 2 +- examples/s4u/async-wait/s4u-async-wait_d.xml | 2 +- .../s4u/async-waitall/s4u-async-waitall_d.xml | 2 +- .../s4u/async-waitany/s4u-async-waitany_d.xml | 2 +- .../async-waituntil/s4u-async-waituntil_d.xml | 2 +- examples/s4u/dht-chord/s4u-dht-chord_d.xml | 2 +- examples/s4u/dht-kademlia/generate.py | 2 +- .../s4u/dht-kademlia/s4u-dht-kademlia_d.xml | 2 +- examples/s4u/energy-boot/platform_boot.xml | 2 +- .../io-file-remote/s4u-io-file-remote_d.xml | 2 +- .../s4u-masterworker-failures_d.xml | 2 +- .../s4u-platform-properties_d.xml | 2 +- .../replay-comm/s4u-replay-comm-split_d.xml | 2 +- .../s4u/replay-comm/s4u-replay-comm_d.xml | 2 +- .../replay-storage/s4u-replay-storage_d.xml | 2 +- .../generate_multiple_deployment.sh | 2 +- .../deployment_masterslave_mailbox_smpi.xml | 2 +- include/simgrid/s4u/Actor.hpp | 4 ++-- src/smpi/smpirun.in | 4 ++-- src/surf/xml/simgrid.dtd | 3 +-- src/surf/xml/simgrid_dtd.c | 3 +-- src/surf/xml/surfxml_sax_cb.cpp | 2 +- .../mc/mutex-handling/mutex-handling_d.xml | 2 +- .../msg/app-bittorrent/app-bittorrent_d.xml | 2 +- teshsuite/msg/app-bittorrent/generate.py | 2 +- .../msg/app-chainsend/app-chainsend_d.xml | 2 +- teshsuite/msg/app-pingpong/app-pingpong_d.xml | 2 +- teshsuite/msg/async-wait/async-wait2_d.xml | 2 +- teshsuite/msg/async-wait/async-wait3_d.xml | 2 +- teshsuite/msg/async-wait/async-wait4_d.xml | 2 +- teshsuite/msg/async-wait/async-wait_d.xml | 2 +- .../msg/async-waitall/async-waitall_d.xml | 2 +- .../msg/async-waitany/async-waitany_d.xml | 2 +- .../msg/io-file-remote/io-file-remote_d.xml | 2 +- .../platform-properties_d.xml | 2 +- teshsuite/msg/process-lifetime/baseline_d.xml | 2 +- teshsuite/msg/process-lifetime/kill_d.xml | 2 +- teshsuite/msg/process-lifetime/start_d.xml | 2 +- .../msg/process-lifetime/start_kill_d.xml | 2 +- .../msg/process-yield/process-yield_d.xml | 2 +- .../msg/task-priority/task-priority_d.xml | 2 +- .../trace_integration/test-hbp1-c0s0-c0s1.xml | 2 +- .../trace_integration/test-hbp1-c0s0-c1s0.xml | 2 +- .../trace_integration/test-hbp1-c0s1-c0s2.xml | 2 +- .../trace_integration/test-hbp1-c0s1-c2s2.xml | 2 +- .../trace_integration/test-hbp1-c0s2-c1s0.xml | 2 +- .../trace_integration/test-hbp1-c0s2-c1s1.xml | 2 +- .../trace_integration/test-hbp1-c1s1-c1s2.xml | 2 +- .../trace_integration/test-hbp1-c1s1-c3s2.xml | 2 +- .../test-hbp1.0-hbp1.0-hbp1.0.xml | 2 +- .../test-hbp1.0-hbp3.0-hbp4.0.xml | 2 +- .../trace_integration/test-hbp1.5-hbp1.5.xml | 2 +- .../trace_integration/test-hbp2.5-hbp1.5.xml | 2 +- .../activity-lifecycle/testing_platform.xml | 2 +- teshsuite/simdag/flatifier/flatifier.cpp | 2 +- teshsuite/simdag/flatifier/flatifier.tesh | 20 +++++++++---------- teshsuite/simdag/platforms/Dijkstra.xml | 2 +- .../platforms/bogus_disk_attachment.xml | 2 +- .../platforms/bogus_missing_dst_gateway.xml | 2 +- .../platforms/bogus_missing_src_gateway.xml | 2 +- .../platforms/bogus_two_hosts_asymetric.xml | 2 +- .../simdag/platforms/four_hosts_floyd.xml | 2 +- .../simdag/platforms/host_attributes.xml | 2 +- .../simdag/platforms/link_attributes.xml | 2 +- teshsuite/simdag/platforms/one_cluster.xml | 2 +- .../platforms/one_cluster_multicore.xml | 2 +- .../platforms/one_cluster_router_id.xml | 2 +- .../platforms/one_cluster_splitduplex.xml | 2 +- .../simdag/platforms/platform_2p_1bb.xml | 2 +- .../simdag/platforms/platform_2p_1fl.xml | 2 +- .../simdag/platforms/platform_2p_1sl.xml | 2 +- .../platforms/platform_2p_1sl_hetero.xml | 2 +- .../simdag/platforms/platform_2p_1switch.xml | 2 +- .../simdag/platforms/platform_4p_1switch.xml | 2 +- teshsuite/simdag/platforms/properties.xml | 2 +- .../simdag/platforms/test_of_is_router.xml | 2 +- .../three_hosts_non_symmetric_route.xml | 2 +- teshsuite/simdag/platforms/two_clusters.xml | 2 +- .../platforms/two_clusters_one_name.xml | 2 +- .../platforms/two_clusters_router_id.xml | 2 +- .../simdag/platforms/two_hosts_multi_hop.xml | 2 +- .../simdag/platforms/two_hosts_one_link.xml | 2 +- .../two_hosts_one_link_splitduplex.xml | 2 +- tools/cmake/MaintainerMode.cmake | 4 ++-- tools/simgrid_update_xml.pl | 4 ++-- 167 files changed, 180 insertions(+), 182 deletions(-) diff --git a/docs/source/tuto_s4u/deployment1.xml b/docs/source/tuto_s4u/deployment1.xml index 5fc2809114..883565e901 100644 --- a/docs/source/tuto_s4u/deployment1.xml +++ b/docs/source/tuto_s4u/deployment1.xml @@ -1,5 +1,5 @@ - + diff --git a/docs/source/tuto_s4u/deployment2.xml b/docs/source/tuto_s4u/deployment2.xml index e9163f217f..6c11658367 100644 --- a/docs/source/tuto_s4u/deployment2.xml +++ b/docs/source/tuto_s4u/deployment2.xml @@ -1,5 +1,5 @@ - + diff --git a/docs/source/tuto_s4u/deployment3.xml b/docs/source/tuto_s4u/deployment3.xml index 6cddb86c47..55d541e043 100644 --- a/docs/source/tuto_s4u/deployment3.xml +++ b/docs/source/tuto_s4u/deployment3.xml @@ -1,5 +1,5 @@ - + diff --git a/docs/source/tuto_s4u/deployment4.xml b/docs/source/tuto_s4u/deployment4.xml index e5dcfe11d5..7e0223286f 100644 --- a/docs/source/tuto_s4u/deployment4.xml +++ b/docs/source/tuto_s4u/deployment4.xml @@ -1,5 +1,5 @@ - + diff --git a/docs/source/tuto_smpi/3hosts.xml b/docs/source/tuto_smpi/3hosts.xml index dc058953bb..26e4c8f788 100644 --- a/docs/source/tuto_smpi/3hosts.xml +++ b/docs/source/tuto_smpi/3hosts.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/java/app/bittorrent/bittorrent.xml b/examples/java/app/bittorrent/bittorrent.xml index 2a54a4caed..b22ff10492 100644 --- a/examples/java/app/bittorrent/bittorrent.xml +++ b/examples/java/app/bittorrent/bittorrent.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/java/app/centralizedmutex/centralizedmutex.xml b/examples/java/app/centralizedmutex/centralizedmutex.xml index da816b5059..cffdc2eb05 100644 --- a/examples/java/app/centralizedmutex/centralizedmutex.xml +++ b/examples/java/app/centralizedmutex/centralizedmutex.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/java/app/masterworker/masterworker.xml b/examples/java/app/masterworker/masterworker.xml index 0a96f6cd87..a059ff108a 100644 --- a/examples/java/app/masterworker/masterworker.xml +++ b/examples/java/app/masterworker/masterworker.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/java/dht/chord/chord.xml b/examples/java/dht/chord/chord.xml index bf73e43e54..bd76a59259 100644 --- a/examples/java/dht/chord/chord.xml +++ b/examples/java/dht/chord/chord.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/java/dht/kademlia/kademlia.xml b/examples/java/dht/kademlia/kademlia.xml index faadb8e0d7..537afcb49a 100644 --- a/examples/java/dht/kademlia/kademlia.xml +++ b/examples/java/dht/kademlia/kademlia.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/java/process/startkilltime/startkilltime.xml b/examples/java/process/startkilltime/startkilltime.xml index 20e50d4d0a..4c0e589e06 100644 --- a/examples/java/process/startkilltime/startkilltime.xml +++ b/examples/java/process/startkilltime/startkilltime.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/java/task/priority/priority.xml b/examples/java/task/priority/priority.xml index 26b16414b7..3349a60298 100644 --- a/examples/java/task/priority/priority.xml +++ b/examples/java/task/priority/priority.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/app-masterworker/app-masterworker-multicore_d.xml b/examples/msg/app-masterworker/app-masterworker-multicore_d.xml index cf8c0eb226..beaafef5a5 100644 --- a/examples/msg/app-masterworker/app-masterworker-multicore_d.xml +++ b/examples/msg/app-masterworker/app-masterworker-multicore_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml b/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml index cd7a4f444a..8d01b0f9af 100644 --- a/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml +++ b/examples/msg/app-masterworker/app-masterworker-vivaldi_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/app-masterworker/app-masterworker_d.xml b/examples/msg/app-masterworker/app-masterworker_d.xml index feadead6cd..947e9a3b32 100644 --- a/examples/msg/app-masterworker/app-masterworker_d.xml +++ b/examples/msg/app-masterworker/app-masterworker_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/dht-kademlia/dht-kademlia_d.xml b/examples/msg/dht-kademlia/dht-kademlia_d.xml index 05a08792d3..8dc2965996 100644 --- a/examples/msg/dht-kademlia/dht-kademlia_d.xml +++ b/examples/msg/dht-kademlia/dht-kademlia_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/dht-kademlia/generate.py b/examples/msg/dht-kademlia/generate.py index d4a9c287c9..eb1abb2db4 100755 --- a/examples/msg/dht-kademlia/generate.py +++ b/examples/msg/dht-kademlia/generate.py @@ -22,7 +22,7 @@ max_id = 2 ** nb_bits - 1 all_ids = [0] sys.stdout.write("\n" - "\n" + "\n" "\n \n" " \n \n \n" % end_date) diff --git a/examples/msg/dht-pastry/dht-pastry_d.xml b/examples/msg/dht-pastry/dht-pastry_d.xml index aca5b2533f..df8c102982 100644 --- a/examples/msg/dht-pastry/dht-pastry_d.xml +++ b/examples/msg/dht-pastry/dht-pastry_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/deploy_bugged1.xml b/examples/msg/mc/deploy_bugged1.xml index 1f4b2a7c4b..1cbc7ab83a 100644 --- a/examples/msg/mc/deploy_bugged1.xml +++ b/examples/msg/mc/deploy_bugged1.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/deploy_bugged1_liveness.xml b/examples/msg/mc/deploy_bugged1_liveness.xml index 3d6b31c5e4..e47601c512 100644 --- a/examples/msg/mc/deploy_bugged1_liveness.xml +++ b/examples/msg/mc/deploy_bugged1_liveness.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/deploy_bugged1_liveness_visited.xml b/examples/msg/mc/deploy_bugged1_liveness_visited.xml index af31561c40..b8e29cdde3 100644 --- a/examples/msg/mc/deploy_bugged1_liveness_visited.xml +++ b/examples/msg/mc/deploy_bugged1_liveness_visited.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/deploy_bugged2.xml b/examples/msg/mc/deploy_bugged2.xml index c95f94bcf7..08653275c2 100644 --- a/examples/msg/mc/deploy_bugged2.xml +++ b/examples/msg/mc/deploy_bugged2.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/deploy_bugged2_liveness.xml b/examples/msg/mc/deploy_bugged2_liveness.xml index e1b845cd39..4b4771b905 100644 --- a/examples/msg/mc/deploy_bugged2_liveness.xml +++ b/examples/msg/mc/deploy_bugged2_liveness.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/deploy_bugged3.xml b/examples/msg/mc/deploy_bugged3.xml index c95f94bcf7..08653275c2 100644 --- a/examples/msg/mc/deploy_bugged3.xml +++ b/examples/msg/mc/deploy_bugged3.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/deploy_centralized_mutex.xml b/examples/msg/mc/deploy_centralized_mutex.xml index 89ba1a2de3..51dfff5443 100644 --- a/examples/msg/mc/deploy_centralized_mutex.xml +++ b/examples/msg/mc/deploy_centralized_mutex.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/deploy_electric_fence.xml b/examples/msg/mc/deploy_electric_fence.xml index 1926770de7..75f6396303 100644 --- a/examples/msg/mc/deploy_electric_fence.xml +++ b/examples/msg/mc/deploy_electric_fence.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/mc/platform.xml b/examples/msg/mc/platform.xml index 29d062c526..246d72b54f 100644 --- a/examples/msg/mc/platform.xml +++ b/examples/msg/mc/platform.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/network-ns3/3hosts_2links_d.xml b/examples/msg/network-ns3/3hosts_2links_d.xml index 1d7171d069..ddd625587f 100644 --- a/examples/msg/network-ns3/3hosts_2links_d.xml +++ b/examples/msg/network-ns3/3hosts_2links_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/network-ns3/3links-timer_d.xml b/examples/msg/network-ns3/3links-timer_d.xml index f58f3bd21b..03ae9ab877 100644 --- a/examples/msg/network-ns3/3links-timer_d.xml +++ b/examples/msg/network-ns3/3links-timer_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/network-ns3/3links_d.xml b/examples/msg/network-ns3/3links_d.xml index 2bb2b03c7d..97568c148b 100644 --- a/examples/msg/network-ns3/3links_d.xml +++ b/examples/msg/network-ns3/3links_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/network-ns3/crosstraffic_d.xml b/examples/msg/network-ns3/crosstraffic_d.xml index cc69bd78db..a24618f20f 100644 --- a/examples/msg/network-ns3/crosstraffic_d.xml +++ b/examples/msg/network-ns3/crosstraffic_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/network-ns3/dogbone_d.xml b/examples/msg/network-ns3/dogbone_d.xml index 150a99ac03..5134597eca 100644 --- a/examples/msg/network-ns3/dogbone_d.xml +++ b/examples/msg/network-ns3/dogbone_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/network-ns3/one_cluster_d.xml b/examples/msg/network-ns3/one_cluster_d.xml index 1de597da6d..f1106e1b0d 100644 --- a/examples/msg/network-ns3/one_cluster_d.xml +++ b/examples/msg/network-ns3/one_cluster_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/msg/network-ns3/onelink_d.xml b/examples/msg/network-ns3/onelink_d.xml index 2a2d4b299d..59404cbe31 100644 --- a/examples/msg/network-ns3/onelink_d.xml +++ b/examples/msg/network-ns3/onelink_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml index ea93cd3740..90091076f0 100644 --- a/examples/platforms/bypassASroute.xml +++ b/examples/platforms/bypassASroute.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/bypassRoute.xml b/examples/platforms/bypassRoute.xml index 072fe3a956..5cb7f57021 100644 --- a/examples/platforms/bypassRoute.xml +++ b/examples/platforms/bypassRoute.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml index 82672eaf46..44c41dd8ff 100644 --- a/examples/platforms/cloud.xml +++ b/examples/platforms/cloud.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/cluster_and_one_host.xml b/examples/platforms/cluster_and_one_host.xml index 165f6d4a79..ee0d267af1 100644 --- a/examples/platforms/cluster_and_one_host.xml +++ b/examples/platforms/cluster_and_one_host.xml @@ -1,5 +1,5 @@ - + - + diff --git a/examples/platforms/faulty_host.xml b/examples/platforms/faulty_host.xml index 60dc58aca0..1aedb3a29a 100644 --- a/examples/platforms/faulty_host.xml +++ b/examples/platforms/faulty_host.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml index 234b305cfe..564d3952eb 100644 --- a/examples/platforms/g5k.xml +++ b/examples/platforms/g5k.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml index 8196cd9433..6a0ac5cf18 100644 --- a/examples/platforms/prop.xml +++ b/examples/platforms/prop.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/routing_cluster.xml b/examples/platforms/routing_cluster.xml index 1f2c7a1f90..fae4223cc8 100644 --- a/examples/platforms/routing_cluster.xml +++ b/examples/platforms/routing_cluster.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml index 3887685f76..c2357c32ac 100644 --- a/examples/platforms/simulacrum_7_hosts.xml +++ b/examples/platforms/simulacrum_7_hosts.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/small_platform_with_failures.xml b/examples/platforms/small_platform_with_failures.xml index a19986ca70..7e58d5002f 100644 --- a/examples/platforms/small_platform_with_failures.xml +++ b/examples/platforms/small_platform_with_failures.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/small_platform_with_routers.xml b/examples/platforms/small_platform_with_routers.xml index 688d71c01b..920489de7b 100644 --- a/examples/platforms/small_platform_with_routers.xml +++ b/examples/platforms/small_platform_with_routers.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/storage/remote_io.xml b/examples/platforms/storage/remote_io.xml index 16a0dfde4a..c19c354941 100644 --- a/examples/platforms/storage/remote_io.xml +++ b/examples/platforms/storage/remote_io.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml index 1402e680f9..8d99f5c2cb 100644 --- a/examples/platforms/storage/storage.xml +++ b/examples/platforms/storage/storage.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/syscoord/generate_peer_platform.pl b/examples/platforms/syscoord/generate_peer_platform.pl index c571aac9d9..a94a7ce6f0 100755 --- a/examples/platforms/syscoord/generate_peer_platform.pl +++ b/examples/platforms/syscoord/generate_peer_platform.pl @@ -10,7 +10,7 @@ use strict; use warnings; print "\n"; -print "\n"; +print "\n"; print "\n\n"; print "\n\n"; diff --git a/examples/platforms/three_multicore_hosts.xml b/examples/platforms/three_multicore_hosts.xml index 0b237dafbf..75181fc32a 100644 --- a/examples/platforms/three_multicore_hosts.xml +++ b/examples/platforms/three_multicore_hosts.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/two_hosts.xml b/examples/platforms/two_hosts.xml index 472dee1514..2e40130469 100644 --- a/examples/platforms/two_hosts.xml +++ b/examples/platforms/two_hosts.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/two_hosts_platform_shared.xml b/examples/platforms/two_hosts_platform_shared.xml index 362f8a8b3e..c6f5b17602 100644 --- a/examples/platforms/two_hosts_platform_shared.xml +++ b/examples/platforms/two_hosts_platform_shared.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/two_hosts_platform_with_availability.xml b/examples/platforms/two_hosts_platform_with_availability.xml index 217b7a327f..a8f4023111 100644 --- a/examples/platforms/two_hosts_platform_with_availability.xml +++ b/examples/platforms/two_hosts_platform_with_availability.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/two_hosts_platform_with_availability_included.xml b/examples/platforms/two_hosts_platform_with_availability_included.xml index b6fc4190f2..4828cfcb5f 100644 --- a/examples/platforms/two_hosts_platform_with_availability_included.xml +++ b/examples/platforms/two_hosts_platform_with_availability_included.xml @@ -1,5 +1,5 @@ - + 0.0 1.0 diff --git a/examples/platforms/two_peers.xml b/examples/platforms/two_peers.xml index 723632668a..a8296cc3c3 100644 --- a/examples/platforms/two_peers.xml +++ b/examples/platforms/two_peers.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml index 2bb79ed12f..2c98066c2c 100644 --- a/examples/platforms/vivaldi.xml +++ b/examples/platforms/vivaldi.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/actor-create/s4u-actor-create_d.xml b/examples/s4u/actor-create/s4u-actor-create_d.xml index 43f3b33016..753a9c40f4 100644 --- a/examples/s4u/actor-create/s4u-actor-create_d.xml +++ b/examples/s4u/actor-create/s4u-actor-create_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/actor-yield/s4u-actor-yield_d.xml b/examples/s4u/actor-yield/s4u-actor-yield_d.xml index b1ab776f57..968055f0fd 100644 --- a/examples/s4u/actor-yield/s4u-actor-yield_d.xml +++ b/examples/s4u/actor-yield/s4u-actor-yield_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml b/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml index 5248ff8e04..08ae46d427 100644 --- a/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml +++ b/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml b/examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml index 292e3bb6f6..7f098a6fa3 100644 --- a/examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml +++ b/examples/s4u/app-masterworkers/s4u-app-masterworkers_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/async-ready/s4u-async-ready_d.xml b/examples/s4u/async-ready/s4u-async-ready_d.xml index e7e48c2d93..d19aa205fc 100644 --- a/examples/s4u/async-ready/s4u-async-ready_d.xml +++ b/examples/s4u/async-ready/s4u-async-ready_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/async-wait/s4u-async-wait_d.xml b/examples/s4u/async-wait/s4u-async-wait_d.xml index 88df6ecc12..def2e5cb50 100644 --- a/examples/s4u/async-wait/s4u-async-wait_d.xml +++ b/examples/s4u/async-wait/s4u-async-wait_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/async-waitall/s4u-async-waitall_d.xml b/examples/s4u/async-waitall/s4u-async-waitall_d.xml index 122a03088b..8e51efffe5 100644 --- a/examples/s4u/async-waitall/s4u-async-waitall_d.xml +++ b/examples/s4u/async-waitall/s4u-async-waitall_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/async-waitany/s4u-async-waitany_d.xml b/examples/s4u/async-waitany/s4u-async-waitany_d.xml index 4296dbb65b..4b4161d339 100644 --- a/examples/s4u/async-waitany/s4u-async-waitany_d.xml +++ b/examples/s4u/async-waitany/s4u-async-waitany_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/async-waituntil/s4u-async-waituntil_d.xml b/examples/s4u/async-waituntil/s4u-async-waituntil_d.xml index 88df6ecc12..def2e5cb50 100644 --- a/examples/s4u/async-waituntil/s4u-async-waituntil_d.xml +++ b/examples/s4u/async-waituntil/s4u-async-waituntil_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/dht-chord/s4u-dht-chord_d.xml b/examples/s4u/dht-chord/s4u-dht-chord_d.xml index fa0982255a..4daaf6fd0a 100644 --- a/examples/s4u/dht-chord/s4u-dht-chord_d.xml +++ b/examples/s4u/dht-chord/s4u-dht-chord_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/dht-kademlia/generate.py b/examples/s4u/dht-kademlia/generate.py index d4a9c287c9..eb1abb2db4 100755 --- a/examples/s4u/dht-kademlia/generate.py +++ b/examples/s4u/dht-kademlia/generate.py @@ -22,7 +22,7 @@ max_id = 2 ** nb_bits - 1 all_ids = [0] sys.stdout.write("\n" - "\n" + "\n" "\n \n" " \n \n \n" % end_date) diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml b/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml index 05a08792d3..8dc2965996 100644 --- a/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml +++ b/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/energy-boot/platform_boot.xml b/examples/s4u/energy-boot/platform_boot.xml index 9025efdedd..dfa05d28cd 100644 --- a/examples/s4u/energy-boot/platform_boot.xml +++ b/examples/s4u/energy-boot/platform_boot.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/io-file-remote/s4u-io-file-remote_d.xml b/examples/s4u/io-file-remote/s4u-io-file-remote_d.xml index 838ab3d3ea..3b3f1ab705 100644 --- a/examples/s4u/io-file-remote/s4u-io-file-remote_d.xml +++ b/examples/s4u/io-file-remote/s4u-io-file-remote_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/platform-failures/s4u-masterworker-failures_d.xml b/examples/s4u/platform-failures/s4u-masterworker-failures_d.xml index feadead6cd..947e9a3b32 100644 --- a/examples/s4u/platform-failures/s4u-masterworker-failures_d.xml +++ b/examples/s4u/platform-failures/s4u-masterworker-failures_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/platform-properties/s4u-platform-properties_d.xml b/examples/s4u/platform-properties/s4u-platform-properties_d.xml index f4c76b92a1..3f4bc5a3eb 100644 --- a/examples/s4u/platform-properties/s4u-platform-properties_d.xml +++ b/examples/s4u/platform-properties/s4u-platform-properties_d.xml @@ -1,5 +1,5 @@ - + diff --git a/examples/s4u/replay-comm/s4u-replay-comm-split_d.xml b/examples/s4u/replay-comm/s4u-replay-comm-split_d.xml index acc67cc0bc..313d8008f2 100644 --- a/examples/s4u/replay-comm/s4u-replay-comm-split_d.xml +++ b/examples/s4u/replay-comm/s4u-replay-comm-split_d.xml @@ -1,5 +1,5 @@ - + diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index 5bc3aab755..cbe234dcd2 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -98,8 +98,8 @@ namespace s4u { * * @code{.xml} * - * - * + * + * * * * diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in index ca795e226a..858bc05cdd 100755 --- a/src/smpi/smpirun.in +++ b/src/smpi/smpirun.in @@ -323,7 +323,7 @@ if [ -z "${PLATFORM}" ]; then cat > ${PLATFORMTMP} < - + PLATFORMHEAD @@ -365,7 +365,7 @@ APPLICATIONTMP="$(mktemp smpitmp-appXXXXXX)" cat > ${APPLICATIONTMP} < - + APPLICATIONHEAD diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd index 5f1e9c6986..d499d3d5e1 100644 --- a/src/surf/xml/simgrid.dtd +++ b/src/surf/xml/simgrid.dtd @@ -32,8 +32,7 @@ To upgrade your files, use the tool simgrid_update_xml - In , cannot set the availability nor state traces. This was too complex and unused. - - The DOCTYPE points to the right URL (this file): - http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd + - The DOCTYPE points to the right URL (this file). - Kill . Was not doing anything. diff --git a/src/surf/xml/simgrid_dtd.c b/src/surf/xml/simgrid_dtd.c index 80c2cd9d4a..75d15032d1 100644 --- a/src/surf/xml/simgrid_dtd.c +++ b/src/surf/xml/simgrid_dtd.c @@ -9287,8 +9287,7 @@ FAIL("Premature EOF: `' expected."); * It was redundent with state and availability traces, and with peak values. * - In , cannot set the availability nor state traces. * This was too complex and unused. - * - The DOCTYPE points to the right URL (this file): - * http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd + * - The DOCTYPE points to the right URL. * - Kill . Was not doing anything. * - A warning is emitted for unit-less values (they are still accepted). * The value 0 can remain unit-less, as its unit does not matter. diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index 715d57de7d..1b920ef2a5 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -371,7 +371,7 @@ void STag_surfxml_platform() { "Changes introduced in SimGrid 3.13:\n" " - 'power' attribute of hosts (and others) got renamed to 'speed'.\n" " - In , attribute kind=\"POWER\" is now kind=\"SPEED\".\n" - " - DOCTYPE now point to the rignt URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd\n" + " - DOCTYPE now point to the rignt URL.\n" " - speed, bandwidth and latency attributes now MUST have an explicit unit (f, Bps, s by default)" "\n\n" "Use simgrid_update_xml to update your file automatically. " diff --git a/teshsuite/mc/mutex-handling/mutex-handling_d.xml b/teshsuite/mc/mutex-handling/mutex-handling_d.xml index d6eb805e60..aad5411cf2 100644 --- a/teshsuite/mc/mutex-handling/mutex-handling_d.xml +++ b/teshsuite/mc/mutex-handling/mutex-handling_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/app-bittorrent/app-bittorrent_d.xml b/teshsuite/msg/app-bittorrent/app-bittorrent_d.xml index 5248ff8e04..08ae46d427 100644 --- a/teshsuite/msg/app-bittorrent/app-bittorrent_d.xml +++ b/teshsuite/msg/app-bittorrent/app-bittorrent_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/app-bittorrent/generate.py b/teshsuite/msg/app-bittorrent/generate.py index 16b2dc3ba2..ddd057f76c 100755 --- a/teshsuite/msg/app-bittorrent/generate.py +++ b/teshsuite/msg/app-bittorrent/generate.py @@ -28,7 +28,7 @@ max_id = 2 ** nb_bits - 1 all_ids = [42] sys.stdout.write("\n" - "\n" + "\n" "\n" " \n" " \n \n" % end_date) diff --git a/teshsuite/msg/app-chainsend/app-chainsend_d.xml b/teshsuite/msg/app-chainsend/app-chainsend_d.xml index 1fa674af6c..99ccb9fb95 100644 --- a/teshsuite/msg/app-chainsend/app-chainsend_d.xml +++ b/teshsuite/msg/app-chainsend/app-chainsend_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/app-pingpong/app-pingpong_d.xml b/teshsuite/msg/app-pingpong/app-pingpong_d.xml index c0fdc23b7d..6ba946681a 100644 --- a/teshsuite/msg/app-pingpong/app-pingpong_d.xml +++ b/teshsuite/msg/app-pingpong/app-pingpong_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/async-wait/async-wait2_d.xml b/teshsuite/msg/async-wait/async-wait2_d.xml index 1e49112af9..ed5bd4aac4 100644 --- a/teshsuite/msg/async-wait/async-wait2_d.xml +++ b/teshsuite/msg/async-wait/async-wait2_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/async-wait/async-wait3_d.xml b/teshsuite/msg/async-wait/async-wait3_d.xml index f1ef12d94e..d34251f1ca 100644 --- a/teshsuite/msg/async-wait/async-wait3_d.xml +++ b/teshsuite/msg/async-wait/async-wait3_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/async-wait/async-wait4_d.xml b/teshsuite/msg/async-wait/async-wait4_d.xml index 84ca7e6a15..98a66e92aa 100644 --- a/teshsuite/msg/async-wait/async-wait4_d.xml +++ b/teshsuite/msg/async-wait/async-wait4_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/async-wait/async-wait_d.xml b/teshsuite/msg/async-wait/async-wait_d.xml index e385572019..7c910c7991 100644 --- a/teshsuite/msg/async-wait/async-wait_d.xml +++ b/teshsuite/msg/async-wait/async-wait_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/async-waitall/async-waitall_d.xml b/teshsuite/msg/async-waitall/async-waitall_d.xml index 6f122c2988..21828dfeef 100644 --- a/teshsuite/msg/async-waitall/async-waitall_d.xml +++ b/teshsuite/msg/async-waitall/async-waitall_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/async-waitany/async-waitany_d.xml b/teshsuite/msg/async-waitany/async-waitany_d.xml index 2e680c4c3f..0bf5bdd122 100644 --- a/teshsuite/msg/async-waitany/async-waitany_d.xml +++ b/teshsuite/msg/async-waitany/async-waitany_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/io-file-remote/io-file-remote_d.xml b/teshsuite/msg/io-file-remote/io-file-remote_d.xml index 838ab3d3ea..3b3f1ab705 100644 --- a/teshsuite/msg/io-file-remote/io-file-remote_d.xml +++ b/teshsuite/msg/io-file-remote/io-file-remote_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/platform-properties/platform-properties_d.xml b/teshsuite/msg/platform-properties/platform-properties_d.xml index f4c76b92a1..3f4bc5a3eb 100644 --- a/teshsuite/msg/platform-properties/platform-properties_d.xml +++ b/teshsuite/msg/platform-properties/platform-properties_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/process-lifetime/baseline_d.xml b/teshsuite/msg/process-lifetime/baseline_d.xml index 1a05c2ac4e..c43dc771e5 100644 --- a/teshsuite/msg/process-lifetime/baseline_d.xml +++ b/teshsuite/msg/process-lifetime/baseline_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/process-lifetime/kill_d.xml b/teshsuite/msg/process-lifetime/kill_d.xml index 872aa2f56a..1d386bc9b6 100644 --- a/teshsuite/msg/process-lifetime/kill_d.xml +++ b/teshsuite/msg/process-lifetime/kill_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/process-lifetime/start_d.xml b/teshsuite/msg/process-lifetime/start_d.xml index 35b5dcd048..e26d0c89ea 100644 --- a/teshsuite/msg/process-lifetime/start_d.xml +++ b/teshsuite/msg/process-lifetime/start_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/process-lifetime/start_kill_d.xml b/teshsuite/msg/process-lifetime/start_kill_d.xml index 37c82f2068..86c326698f 100644 --- a/teshsuite/msg/process-lifetime/start_kill_d.xml +++ b/teshsuite/msg/process-lifetime/start_kill_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/process-yield/process-yield_d.xml b/teshsuite/msg/process-yield/process-yield_d.xml index b1ab776f57..968055f0fd 100644 --- a/teshsuite/msg/process-yield/process-yield_d.xml +++ b/teshsuite/msg/process-yield/process-yield_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/task-priority/task-priority_d.xml b/teshsuite/msg/task-priority/task-priority_d.xml index 5d15f2b87f..c82c90668c 100644 --- a/teshsuite/msg/task-priority/task-priority_d.xml +++ b/teshsuite/msg/task-priority/task-priority_d.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml index b761bdbf59..8b3a94153d 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c0s1.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml index aa093e31c0..a79170c67e 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s0-c1s0.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml index a919a7395f..4e8b150acc 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c0s2.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml index 28c048a768..45cab67775 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s1-c2s2.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml index a6ee0c0d73..0743317c50 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s0.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml index 2bf91a18aa..6e8b51232d 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c0s2-c1s1.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml index cd8c9c05ee..60070b7711 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c1s2.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml index 4fd1842b55..3d86d9014c 100644 --- a/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml +++ b/teshsuite/msg/trace_integration/test-hbp1-c1s1-c3s2.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml index 4d2d81a494..36f6d80929 100644 --- a/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1.0-hbp1.0-hbp1.0.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml index 7b14f7877f..f5fb2c7297 100644 --- a/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml +++ b/teshsuite/msg/trace_integration/test-hbp1.0-hbp3.0-hbp4.0.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml index b31e3cab72..d7071446c6 100644 --- a/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml +++ b/teshsuite/msg/trace_integration/test-hbp1.5-hbp1.5.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml index e8466466cf..610f5e0bb3 100644 --- a/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml +++ b/teshsuite/msg/trace_integration/test-hbp2.5-hbp1.5.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/s4u/activity-lifecycle/testing_platform.xml b/teshsuite/s4u/activity-lifecycle/testing_platform.xml index 434ff754d6..aa1a667fd6 100644 --- a/teshsuite/s4u/activity-lifecycle/testing_platform.xml +++ b/teshsuite/s4u/activity-lifecycle/testing_platform.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/flatifier/flatifier.cpp b/teshsuite/simdag/flatifier/flatifier.cpp index 31f1dc8f69..dbb1e71c0a 100644 --- a/teshsuite/simdag/flatifier/flatifier.cpp +++ b/teshsuite/simdag/flatifier/flatifier.cpp @@ -186,7 +186,7 @@ static void dump_platform() int version = 4; std::printf("\n"); - std::printf("\n"); + std::printf("\n"); std::printf("\n", version); std::printf("\n"); diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh index db201f60c8..5bfeacdcf4 100644 --- a/teshsuite/simdag/flatifier/flatifier.tesh +++ b/teshsuite/simdag/flatifier/flatifier.tesh @@ -2,7 +2,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -137,7 +137,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%1 $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -271,7 +271,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster_multicore.xml "--log=ro $ ${bindir:=.}/flatifier$EXEEXT ../platforms/host_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -305,7 +305,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/host_attributes.xml "--log=root.fmt $ ${bindir:=.}/flatifier$EXEEXT ../platforms/link_attributes.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -323,7 +323,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/link_attributes.xml "--log=root.fmt $ ${bindir:=.}/flatifier$EXEEXT ../platforms/three_hosts_non_symmetric_route.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -366,7 +366,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/three_hosts_non_symmetric_route.xml $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -501,7 +501,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_clusters.xml "--log=root.fmt:[% $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_multi_hop.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -528,7 +528,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_multi_hop.xml "--log=root $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -553,7 +553,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ../platforms/two_hosts_one_link.xml "--log=root. $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > @@ -687,7 +687,7 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/bypassASroute.xm $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/cluster_torus.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" > [ 0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks. > -> +> > > > diff --git a/teshsuite/simdag/platforms/Dijkstra.xml b/teshsuite/simdag/platforms/Dijkstra.xml index cf18d7b06d..61c8ba19d1 100644 --- a/teshsuite/simdag/platforms/Dijkstra.xml +++ b/teshsuite/simdag/platforms/Dijkstra.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml index b344e45c76..411dedfe6b 100644 --- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml +++ b/teshsuite/simdag/platforms/bogus_disk_attachment.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml index c754f89d49..b78d3e7b5e 100644 --- a/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml +++ b/teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml index 8de74a8782..08e11f120f 100644 --- a/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml +++ b/teshsuite/simdag/platforms/bogus_missing_src_gateway.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml index 34eb3f27b6..3759aa9aeb 100644 --- a/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml +++ b/teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/link_attributes.xml b/teshsuite/simdag/platforms/link_attributes.xml index 9e037aec7e..1be41fd93b 100644 --- a/teshsuite/simdag/platforms/link_attributes.xml +++ b/teshsuite/simdag/platforms/link_attributes.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/one_cluster.xml b/teshsuite/simdag/platforms/one_cluster.xml index fc8e1cdc42..cb3d6f261a 100644 --- a/teshsuite/simdag/platforms/one_cluster.xml +++ b/teshsuite/simdag/platforms/one_cluster.xml @@ -1,5 +1,5 @@ - + - + diff --git a/teshsuite/simdag/platforms/one_cluster_router_id.xml b/teshsuite/simdag/platforms/one_cluster_router_id.xml index fa52d2bd3e..cda3cfaf50 100644 --- a/teshsuite/simdag/platforms/one_cluster_router_id.xml +++ b/teshsuite/simdag/platforms/one_cluster_router_id.xml @@ -1,5 +1,5 @@ - + - + - + diff --git a/teshsuite/simdag/platforms/platform_2p_1fl.xml b/teshsuite/simdag/platforms/platform_2p_1fl.xml index 9f76670b84..22aa6e3d11 100644 --- a/teshsuite/simdag/platforms/platform_2p_1fl.xml +++ b/teshsuite/simdag/platforms/platform_2p_1fl.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_2p_1sl.xml b/teshsuite/simdag/platforms/platform_2p_1sl.xml index bc4740ac2e..3b5c55a87b 100644 --- a/teshsuite/simdag/platforms/platform_2p_1sl.xml +++ b/teshsuite/simdag/platforms/platform_2p_1sl.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml index db1e5b8da6..6771667b51 100644 --- a/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml +++ b/teshsuite/simdag/platforms/platform_2p_1sl_hetero.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_2p_1switch.xml b/teshsuite/simdag/platforms/platform_2p_1switch.xml index 2082b8ae9f..00cdf1ff54 100644 --- a/teshsuite/simdag/platforms/platform_2p_1switch.xml +++ b/teshsuite/simdag/platforms/platform_2p_1switch.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/platform_4p_1switch.xml b/teshsuite/simdag/platforms/platform_4p_1switch.xml index bc4167930b..b49e42fb55 100644 --- a/teshsuite/simdag/platforms/platform_4p_1switch.xml +++ b/teshsuite/simdag/platforms/platform_4p_1switch.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/properties.xml b/teshsuite/simdag/platforms/properties.xml index d1d276034b..d52a0edfc2 100644 --- a/teshsuite/simdag/platforms/properties.xml +++ b/teshsuite/simdag/platforms/properties.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/test_of_is_router.xml b/teshsuite/simdag/platforms/test_of_is_router.xml index c20f45e6bd..05875a22c5 100644 --- a/teshsuite/simdag/platforms/test_of_is_router.xml +++ b/teshsuite/simdag/platforms/test_of_is_router.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml index e34b492997..895af14b81 100644 --- a/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml +++ b/teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml index 294cab3488..6ad324c3fc 100644 --- a/teshsuite/simdag/platforms/two_clusters.xml +++ b/teshsuite/simdag/platforms/two_clusters.xml @@ -1,5 +1,5 @@ - + - + - + - + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link.xml b/teshsuite/simdag/platforms/two_hosts_one_link.xml index afef580b6e..793998f458 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link.xml @@ -1,5 +1,5 @@ - + diff --git a/teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml b/teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml index 7fcc7a4237..7e766ff6ab 100644 --- a/teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml +++ b/teshsuite/simdag/platforms/two_hosts_one_link_splitduplex.xml @@ -1,5 +1,5 @@ - + diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake index a277ad00ff..9d746164c4 100644 --- a/tools/cmake/MaintainerMode.cmake +++ b/tools/cmake/MaintainerMode.cmake @@ -177,7 +177,7 @@ if(enable_maintainer_mode AND NOT WIN32) #${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/surf/xml - COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd -S src/surf/xml/simgrid_dtd.l -L src/surf/xml/simgrid.dtd + COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P surfxml --sysid=https://simgrid.org/simgrid.dtd -S src/surf/xml/simgrid_dtd.l -L src/surf/xml/simgrid.dtd COMMAND ${SED_EXE} -i ${string14} src/surf/xml/simgrid_dtd.l COMMAND ${SED_EXE} -i "'s/FAIL(\"Bad declaration %s.\",yytext)/FAIL(\"Bad declaration %s.\\\\nIf your are using a XML v3 file (check the version attribute in ), please update it with tools\\/simgrid_update_xml.pl\",yytext)/'" src/surf/xml/simgrid_dtd.l COMMAND ${CMAKE_COMMAND} -E echo " Generated src/surf/xml/simgrid_dtd.l" @@ -190,7 +190,7 @@ if(enable_maintainer_mode AND NOT WIN32) #${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid.h - COMMAND ${FLEXML_EXE} --root-tags platform -P surfxml --sysid=http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd -H src/surf/xml/simgrid_dtd.h -L src/surf/xml/simgrid.dtd + COMMAND ${FLEXML_EXE} --root-tags platform -P surfxml --sysid=https://simgrid.org/simgrid.dtd -H src/surf/xml/simgrid_dtd.h -L src/surf/xml/simgrid.dtd COMMAND ${SED_EXE} -i ${string1} src/surf/xml/simgrid_dtd.h COMMAND ${SED_EXE} -i ${string2} src/surf/xml/simgrid_dtd.h COMMAND ${SED_EXE} -i ${string14} src/surf/xml/simgrid_dtd.h diff --git a/tools/simgrid_update_xml.pl b/tools/simgrid_update_xml.pl index 6cd86c2c6e..3980939a64 100755 --- a/tools/simgrid_update_xml.pl +++ b/tools/simgrid_update_xml.pl @@ -103,7 +103,7 @@ In , attribute kind="POWER" is now kind="SPEED". =item -The DOCTYPE points to the right URL: http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd +The DOCTYPE points to the right URL. =item @@ -173,7 +173,7 @@ my $filename = $ARGV[0] or die "Usage: simgrid_update_xml.pl file_to_convert.xml open INPUT, "$filename" or die "Cannot open input file $filename: $!\n"; my $output_string = "\n". - "\n". + "\n". "\n"; my($AS_opened)=0; -- 2.20.1