From: Martin Quinson Date: Tue, 18 Sep 2018 16:17:45 +0000 (+0200) Subject: Unify the host names in cluster description files X-Git-Tag: v3_21~81 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9bf83aee236cf9e699ba2d823f037ee6983cb4af Unify the host names in cluster description files This will allow to have only one hostfile for all of them. Particularly useful for the tuto. --- diff --git a/examples/java/app/bittorrent/app-bittorrent.tesh b/examples/java/app/bittorrent/app-bittorrent.tesh index 3eedd82a3b..d4dd1cac35 100644 --- a/examples/java/app/bittorrent/app-bittorrent.tesh +++ b/examples/java/app/bittorrent/app-bittorrent.tesh @@ -6,19 +6,19 @@ $ java -classpath ${classpath:=.} app/bittorrent/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/app/bittorrent/bittorrent.xml > [0.000000] [java/INFO] Using regular java threads. > [5000.046836] [java/INFO] MSG_main finished; Terminating the simulation... -> [node-0.acme.org:app.bittorrent.Tracker:(1) 0.000000] [java/INFO] Tracker launched. -> [node-0.acme.org:app.bittorrent.Tracker:(1) 3000.000000] [java/INFO] Tracker is leaving -> [node-1.acme.org:app.bittorrent.Peer:(2) 0.000000] [java/INFO] Hi, I'm joining the network with id 2 -> [node-1.acme.org:app.bittorrent.Peer:(2) 5000.007806] [java/INFO] Here is my current status: 1111111111 -> [node-2.acme.org:app.bittorrent.Peer:(3) 0.000000] [java/INFO] Hi, I'm joining the network with id 3 -> [node-2.acme.org:app.bittorrent.Peer:(3) 5000.023418] [java/INFO] Here is my current status: 1111111111 -> [node-3.acme.org:app.bittorrent.Peer:(4) 0.000000] [java/INFO] Hi, I'm joining the network with id 4 -> [node-3.acme.org:app.bittorrent.Peer:(4) 5000.023418] [java/INFO] Here is my current status: 1111111111 -> [node-4.acme.org:app.bittorrent.Peer:(5) 0.000000] [java/INFO] Hi, I'm joining the network with id 5 -> [node-4.acme.org:app.bittorrent.Peer:(5) 5000.007806] [java/INFO] Here is my current status: 1111111111 -> [node-5.acme.org:app.bittorrent.Peer:(6) 0.000000] [java/INFO] Hi, I'm joining the network with id 6 -> [node-5.acme.org:app.bittorrent.Peer:(6) 5000.023418] [java/INFO] Here is my current status: 1111111111 -> [node-6.acme.org:app.bittorrent.Peer:(7) 0.000000] [java/INFO] Hi, I'm joining the network with id 7 -> [node-6.acme.org:app.bittorrent.Peer:(7) 5000.046836] [java/INFO] Here is my current status: 1111111111 -> [node-7.acme.org:app.bittorrent.Peer:(8) 0.000000] [java/INFO] Hi, I'm joining the network with id 8 -> [node-7.acme.org:app.bittorrent.Peer:(8) 5000.031224] [java/INFO] Here is my current status: 1111111111 +> [node-0.simgrid.org:app.bittorrent.Tracker:(1) 0.000000] [java/INFO] Tracker launched. +> [node-0.simgrid.org:app.bittorrent.Tracker:(1) 3000.000000] [java/INFO] Tracker is leaving +> [node-1.simgrid.org:app.bittorrent.Peer:(2) 0.000000] [java/INFO] Hi, I'm joining the network with id 2 +> [node-1.simgrid.org:app.bittorrent.Peer:(2) 5000.007806] [java/INFO] Here is my current status: 1111111111 +> [node-2.simgrid.org:app.bittorrent.Peer:(3) 0.000000] [java/INFO] Hi, I'm joining the network with id 3 +> [node-2.simgrid.org:app.bittorrent.Peer:(3) 5000.023418] [java/INFO] Here is my current status: 1111111111 +> [node-3.simgrid.org:app.bittorrent.Peer:(4) 0.000000] [java/INFO] Hi, I'm joining the network with id 4 +> [node-3.simgrid.org:app.bittorrent.Peer:(4) 5000.023418] [java/INFO] Here is my current status: 1111111111 +> [node-4.simgrid.org:app.bittorrent.Peer:(5) 0.000000] [java/INFO] Hi, I'm joining the network with id 5 +> [node-4.simgrid.org:app.bittorrent.Peer:(5) 5000.007806] [java/INFO] Here is my current status: 1111111111 +> [node-5.simgrid.org:app.bittorrent.Peer:(6) 0.000000] [java/INFO] Hi, I'm joining the network with id 6 +> [node-5.simgrid.org:app.bittorrent.Peer:(6) 5000.023418] [java/INFO] Here is my current status: 1111111111 +> [node-6.simgrid.org:app.bittorrent.Peer:(7) 0.000000] [java/INFO] Hi, I'm joining the network with id 7 +> [node-6.simgrid.org:app.bittorrent.Peer:(7) 5000.046836] [java/INFO] Here is my current status: 1111111111 +> [node-7.simgrid.org:app.bittorrent.Peer:(8) 0.000000] [java/INFO] Hi, I'm joining the network with id 8 +> [node-7.simgrid.org:app.bittorrent.Peer:(8) 5000.031224] [java/INFO] Here is my current status: 1111111111 diff --git a/examples/java/app/bittorrent/bittorrent.xml b/examples/java/app/bittorrent/bittorrent.xml index df70dfb429..2a54a4caed 100644 --- a/examples/java/app/bittorrent/bittorrent.xml +++ b/examples/java/app/bittorrent/bittorrent.xml @@ -2,37 +2,37 @@ - + - + - + - + - + - + - + - + diff --git a/examples/java/dht/chord/chord.xml b/examples/java/dht/chord/chord.xml index 2434d41a85..bf73e43e54 100644 --- a/examples/java/dht/chord/chord.xml +++ b/examples/java/dht/chord/chord.xml @@ -1,59 +1,59 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/examples/java/dht/chord/dht-chord.tesh b/examples/java/dht/chord/dht-chord.tesh index 11b2e8468d..571d36fea8 100644 --- a/examples/java/dht/chord/dht-chord.tesh +++ b/examples/java/dht/chord/dht-chord.tesh @@ -5,12 +5,12 @@ $ java -classpath ${classpath:=.} dht/chord/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dht/chord/chord.xml > [0.000000] [java/INFO] Using regular java threads. > [1046.732943] [java/INFO] MSG_main finished; Terminating the simulation... -> [node-1.acme.org:dht.chord.Node:(2) 0.000000] [java/INFO] Joining the ring with id 366680 knowing node 42 -> [node-2.acme.org:dht.chord.Node:(3) 0.000000] [java/INFO] Joining the ring with id 533744 knowing node 366680 -> [node-3.acme.org:dht.chord.Node:(4) 0.000000] [java/INFO] Joining the ring with id 1319738 knowing node 42 -> [node-4.acme.org:dht.chord.Node:(5) 0.000000] [java/INFO] Joining the ring with id 16509405 knowing node 366680 -> [node-5.acme.org:dht.chord.Node:(6) 0.000000] [java/INFO] Joining the ring with id 10874876 knowing node 533744 -> [node-6.acme.org:dht.chord.Node:(7) 0.000000] [java/INFO] Joining the ring with id 16728096 knowing node 1319738 -> [node-7.acme.org:dht.chord.Node:(8) 0.000000] [java/INFO] Joining the ring with id 10004760 knowing node 16509405 -> [node-8.acme.org:dht.chord.Node:(9) 0.000000] [java/INFO] Joining the ring with id 6518808 knowing node 42 -> [node-9.acme.org:dht.chord.Node:(10) 0.000000] [java/INFO] Joining the ring with id 2015253 knowing node 1319738 +> [node-1.simgrid.org:dht.chord.Node:(2) 0.000000] [java/INFO] Joining the ring with id 366680 knowing node 42 +> [node-2.simgrid.org:dht.chord.Node:(3) 0.000000] [java/INFO] Joining the ring with id 533744 knowing node 366680 +> [node-3.simgrid.org:dht.chord.Node:(4) 0.000000] [java/INFO] Joining the ring with id 1319738 knowing node 42 +> [node-4.simgrid.org:dht.chord.Node:(5) 0.000000] [java/INFO] Joining the ring with id 16509405 knowing node 366680 +> [node-5.simgrid.org:dht.chord.Node:(6) 0.000000] [java/INFO] Joining the ring with id 10874876 knowing node 533744 +> [node-6.simgrid.org:dht.chord.Node:(7) 0.000000] [java/INFO] Joining the ring with id 16728096 knowing node 1319738 +> [node-7.simgrid.org:dht.chord.Node:(8) 0.000000] [java/INFO] Joining the ring with id 10004760 knowing node 16509405 +> [node-8.simgrid.org:dht.chord.Node:(9) 0.000000] [java/INFO] Joining the ring with id 6518808 knowing node 42 +> [node-9.simgrid.org:dht.chord.Node:(10) 0.000000] [java/INFO] Joining the ring with id 2015253 knowing node 1319738 diff --git a/examples/java/dht/kademlia/dht-kademlia.tesh b/examples/java/dht/kademlia/dht-kademlia.tesh index f5ff1e4714..df3a2bb13a 100644 --- a/examples/java/dht/kademlia/dht-kademlia.tesh +++ b/examples/java/dht/kademlia/dht-kademlia.tesh @@ -5,11 +5,11 @@ $ java -classpath ${classpath:=.} dht/kademlia/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dht/kademlia/kademlia.xml > [0.000000] [java/INFO] Using regular java threads. > [900.000000] [java/INFO] MSG_main finished; Terminating the simulation... -> [node-0.acme.org:dht.kademlia.Node:(1) 0.000000] [java/INFO] Hi, I'm going to create the network with the id 0! -> [node-0.acme.org:dht.kademlia.Node:(1) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded. -> [node-1.acme.org:dht.kademlia.Node:(2) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 1! -> [node-1.acme.org:dht.kademlia.Node:(2) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded. -> [node-2.acme.org:dht.kademlia.Node:(3) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 2! -> [node-2.acme.org:dht.kademlia.Node:(3) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded. -> [node-3.acme.org:dht.kademlia.Node:(4) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 4! -> [node-3.acme.org:dht.kademlia.Node:(4) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded. +> [node-0.simgrid.org:dht.kademlia.Node:(1) 0.000000] [java/INFO] Hi, I'm going to create the network with the id 0! +> [node-0.simgrid.org:dht.kademlia.Node:(1) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded. +> [node-1.simgrid.org:dht.kademlia.Node:(2) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 1! +> [node-1.simgrid.org:dht.kademlia.Node:(2) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded. +> [node-2.simgrid.org:dht.kademlia.Node:(3) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 2! +> [node-2.simgrid.org:dht.kademlia.Node:(3) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded. +> [node-3.simgrid.org:dht.kademlia.Node:(4) 0.000000] [java/INFO] Hi, I'm going to join the network with the id 4! +> [node-3.simgrid.org:dht.kademlia.Node:(4) 900.000000] [java/INFO] 8/8 FIND_NODE have succedded. diff --git a/examples/java/dht/kademlia/kademlia.xml b/examples/java/dht/kademlia/kademlia.xml index 748558ffd6..faadb8e0d7 100644 --- a/examples/java/dht/kademlia/kademlia.xml +++ b/examples/java/dht/kademlia/kademlia.xml @@ -2,24 +2,24 @@ - + - + - + - + diff --git a/examples/java/process/startkilltime/process-startkilltime.tesh b/examples/java/process/startkilltime/process-startkilltime.tesh index 889c1fd7c3..65c460ac31 100644 --- a/examples/java/process/startkilltime/process-startkilltime.tesh +++ b/examples/java/process/startkilltime/process-startkilltime.tesh @@ -1,12 +1,12 @@ #!/usr/bin/env tesh $ java -classpath ${classpath:=.} process/startkilltime/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/process/startkilltime/startkilltime.xml > [0.000000] [java/INFO] Using regular java threads. -> [node-0.acme.org:process.startkilltime.Sleeper:(1) 0.000000] [java/INFO] Hello! I go to sleep. -> [node-1.acme.org:process.startkilltime.Sleeper:(2) 1.000000] [java/INFO] Hello! I go to sleep. -> [node-2.acme.org:process.startkilltime.Sleeper:(3) 2.000000] [java/INFO] Hello! I go to sleep. -> [node-3.acme.org:process.startkilltime.Sleeper:(4) 3.000000] [java/INFO] Hello! I go to sleep. -> [node-4.acme.org:process.startkilltime.Sleeper:(5) 4.000000] [java/INFO] Hello! I go to sleep. -> [node-5.acme.org:process.startkilltime.Sleeper:(6) 5.000000] [java/INFO] Hello! I go to sleep. -> [node-2.acme.org:process.startkilltime.Sleeper:(3) 6.000000] [java/INFO] Done sleeping -> [node-3.acme.org:process.startkilltime.Sleeper:(4) 7.000000] [java/INFO] Done sleeping +> [node-0.simgrid.org:process.startkilltime.Sleeper:(1) 0.000000] [java/INFO] Hello! I go to sleep. +> [node-1.simgrid.org:process.startkilltime.Sleeper:(2) 1.000000] [java/INFO] Hello! I go to sleep. +> [node-2.simgrid.org:process.startkilltime.Sleeper:(3) 2.000000] [java/INFO] Hello! I go to sleep. +> [node-3.simgrid.org:process.startkilltime.Sleeper:(4) 3.000000] [java/INFO] Hello! I go to sleep. +> [node-4.simgrid.org:process.startkilltime.Sleeper:(5) 4.000000] [java/INFO] Hello! I go to sleep. +> [node-5.simgrid.org:process.startkilltime.Sleeper:(6) 5.000000] [java/INFO] Hello! I go to sleep. +> [node-2.simgrid.org:process.startkilltime.Sleeper:(3) 6.000000] [java/INFO] Done sleeping +> [node-3.simgrid.org:process.startkilltime.Sleeper:(4) 7.000000] [java/INFO] Done sleeping > [10.000000] [java/INFO] MSG_main finished; Terminating the simulation... diff --git a/examples/java/process/startkilltime/startkilltime.xml b/examples/java/process/startkilltime/startkilltime.xml index dc3c969bf2..20e50d4d0a 100644 --- a/examples/java/process/startkilltime/startkilltime.xml +++ b/examples/java/process/startkilltime/startkilltime.xml @@ -1,22 +1,22 @@ - + - + - + - + - + - + diff --git a/examples/msg/cloud-masterworker/cloud-masterworker.tesh b/examples/msg/cloud-masterworker/cloud-masterworker.tesh index 08a3842448..24813d1ee2 100644 --- a/examples/msg/cloud-masterworker/cloud-masterworker.tesh +++ b/examples/msg/cloud-masterworker/cloud-masterworker.tesh @@ -3,54 +3,54 @@ p Testing the Cloud API with a simple master/workers $ $SG_TEST_EXENV ${bindir:=.}/cloud-masterworker$EXEEXT --log=no_loc ${platfdir}/cluster_backbone.xml -> [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] # Launch 2 VMs -> [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] create VM00 on PM(node-1.acme.org) -> [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] put a process (WRK00) on VM00 +> [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] # Launch 2 VMs +> [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] create VM00 on PM(node-1.simgrid.org) +> [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] put a process (WRK00) on VM00 > [VM00:WRK00:(2) 0.000000] [msg_test/INFO] WRK00 is listening on mailbox(MBOX:WRK00) -> [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] create VM01 on PM(node-10.acme.org) -> [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] put a process (WRK01) on VM01 +> [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] create VM01 on PM(node-10.simgrid.org) +> [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] put a process (WRK01) on VM01 > [VM01:WRK01:(3) 0.000000] [msg_test/INFO] WRK01 is listening on mailbox(MBOX:WRK01) -> [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] # Send a task to 2 worker process -> [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] Send task(Task00) to mailbox(MBOX:WRK00) +> [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] # Send a task to 2 worker process +> [node-0.simgrid.org:master:(1) 0.000000] [msg_test/INFO] Send task(Task00) to mailbox(MBOX:WRK00) > [VM00:WRK00:(2) 0.090280] [msg_test/INFO] WRK00 received task(Task00) from mailbox(MBOX:WRK00) -> [node-0.acme.org:master:(1) 0.090280] [msg_test/INFO] Send task(Task01) to mailbox(MBOX:WRK01) +> [node-0.simgrid.org:master:(1) 0.090280] [msg_test/INFO] Send task(Task01) to mailbox(MBOX:WRK01) > [VM00:WRK00:(2) 0.100280] [msg_test/INFO] WRK00 executed task(Task00) > [VM01:WRK01:(3) 0.180560] [msg_test/INFO] WRK01 received task(Task01) from mailbox(MBOX:WRK01) -> [node-0.acme.org:master:(1) 0.180560] [msg_test/INFO] # Suspend all VMs -> [node-0.acme.org:master:(1) 0.180560] [msg_test/INFO] suspend VM00 -> [node-0.acme.org:master:(1) 0.180560] [msg_test/INFO] suspend VM01 -> [node-0.acme.org:master:(1) 0.180560] [msg_test/INFO] # Wait a while -> [node-0.acme.org:master:(1) 2.180560] [msg_test/INFO] # Resume all VMs -> [node-0.acme.org:master:(1) 2.180560] [msg_test/INFO] # Sleep long enough for everyone to be done with previous batch of work +> [node-0.simgrid.org:master:(1) 0.180560] [msg_test/INFO] # Suspend all VMs +> [node-0.simgrid.org:master:(1) 0.180560] [msg_test/INFO] suspend VM00 +> [node-0.simgrid.org:master:(1) 0.180560] [msg_test/INFO] suspend VM01 +> [node-0.simgrid.org:master:(1) 0.180560] [msg_test/INFO] # Wait a while +> [node-0.simgrid.org:master:(1) 2.180560] [msg_test/INFO] # Resume all VMs +> [node-0.simgrid.org:master:(1) 2.180560] [msg_test/INFO] # Sleep long enough for everyone to be done with previous batch of work > [VM01:WRK01:(3) 2.190560] [msg_test/INFO] WRK01 executed task(Task01) -> [node-0.acme.org:master:(1) 10.000000] [msg_test/INFO] # Add one more process on each VM -> [node-0.acme.org:master:(1) 10.000000] [msg_test/INFO] put a process (WRK02) on VM00 +> [node-0.simgrid.org:master:(1) 10.000000] [msg_test/INFO] # Add one more process on each VM +> [node-0.simgrid.org:master:(1) 10.000000] [msg_test/INFO] put a process (WRK02) on VM00 > [VM00:WRK02:(4) 10.000000] [msg_test/INFO] WRK02 is listening on mailbox(MBOX:WRK02) -> [node-0.acme.org:master:(1) 10.000000] [msg_test/INFO] put a process (WRK03) on VM01 +> [node-0.simgrid.org:master:(1) 10.000000] [msg_test/INFO] put a process (WRK03) on VM01 > [VM01:WRK03:(5) 10.000000] [msg_test/INFO] WRK03 is listening on mailbox(MBOX:WRK03) -> [node-0.acme.org:master:(1) 10.000000] [msg_test/INFO] # Send a task to 4 worker process -> [node-0.acme.org:master:(1) 10.000000] [msg_test/INFO] Send task(Task00) to mailbox(MBOX:WRK00) +> [node-0.simgrid.org:master:(1) 10.000000] [msg_test/INFO] # Send a task to 4 worker process +> [node-0.simgrid.org:master:(1) 10.000000] [msg_test/INFO] Send task(Task00) to mailbox(MBOX:WRK00) > [VM00:WRK00:(2) 10.090280] [msg_test/INFO] WRK00 received task(Task00) from mailbox(MBOX:WRK00) -> [node-0.acme.org:master:(1) 10.090280] [msg_test/INFO] Send task(Task01) to mailbox(MBOX:WRK01) +> [node-0.simgrid.org:master:(1) 10.090280] [msg_test/INFO] Send task(Task01) to mailbox(MBOX:WRK01) > [VM00:WRK00:(2) 10.100280] [msg_test/INFO] WRK00 executed task(Task00) > [VM01:WRK01:(3) 10.180560] [msg_test/INFO] WRK01 received task(Task01) from mailbox(MBOX:WRK01) -> [node-0.acme.org:master:(1) 10.180560] [msg_test/INFO] Send task(Task02) to mailbox(MBOX:WRK02) +> [node-0.simgrid.org:master:(1) 10.180560] [msg_test/INFO] Send task(Task02) to mailbox(MBOX:WRK02) > [VM01:WRK01:(3) 10.190560] [msg_test/INFO] WRK01 executed task(Task01) > [VM00:WRK02:(4) 10.270841] [msg_test/INFO] WRK02 received task(Task02) from mailbox(MBOX:WRK02) -> [node-0.acme.org:master:(1) 10.270841] [msg_test/INFO] Send task(Task03) to mailbox(MBOX:WRK03) +> [node-0.simgrid.org:master:(1) 10.270841] [msg_test/INFO] Send task(Task03) to mailbox(MBOX:WRK03) > [VM00:WRK02:(4) 10.280841] [msg_test/INFO] WRK02 executed task(Task02) > [VM01:WRK03:(5) 10.361121] [msg_test/INFO] WRK03 received task(Task03) from mailbox(MBOX:WRK03) -> [node-0.acme.org:master:(1) 10.361121] [msg_test/INFO] # Migrate all VMs to PM(node-1.acme.org) +> [node-0.simgrid.org:master:(1) 10.361121] [msg_test/INFO] # Migrate all VMs to PM(node-1.simgrid.org) > [VM01:WRK03:(5) 10.371121] [msg_test/INFO] WRK03 executed task(Task03) -> [node-0.acme.org:master:(1) 28.561942] [msg_test/INFO] # Migrate all VMs to PM(node-10.acme.org) -> [node-0.acme.org:master:(1) 46.319984] [msg_test/INFO] # Shutdown the half of worker processes gracefully. The remaining half will be forcibly killed. +> [node-0.simgrid.org:master:(1) 28.561942] [msg_test/INFO] # Migrate all VMs to PM(node-10.simgrid.org) +> [node-0.simgrid.org:master:(1) 46.319984] [msg_test/INFO] # Shutdown the half of worker processes gracefully. The remaining half will be forcibly killed. > [VM00:WRK00:(2) 46.327790] [msg_test/INFO] WRK00 received task(finalize) from mailbox(MBOX:WRK00) > [VM01:WRK01:(3) 46.335596] [msg_test/INFO] WRK01 received task(finalize) from mailbox(MBOX:WRK01) -> [node-0.acme.org:master:(1) 46.335596] [msg_test/INFO] # Wait a while before effective shutdown. -> [node-0.acme.org:master:(1) 48.335596] [msg_test/INFO] # Shutdown and destroy all the VMs. The remaining worker processes will be forcibly killed. -> [node-0.acme.org:master:(1) 48.335596] [msg_test/INFO] shutdown VM00 -> [node-0.acme.org:master:(1) 48.335596] [msg_test/INFO] destroy VM00 -> [node-0.acme.org:master:(1) 48.335596] [msg_test/INFO] shutdown VM01 -> [node-0.acme.org:master:(1) 48.335596] [msg_test/INFO] destroy VM01 -> [node-0.acme.org:master:(1) 48.335596] [msg_test/INFO] # Goodbye now! +> [node-0.simgrid.org:master:(1) 46.335596] [msg_test/INFO] # Wait a while before effective shutdown. +> [node-0.simgrid.org:master:(1) 48.335596] [msg_test/INFO] # Shutdown and destroy all the VMs. The remaining worker processes will be forcibly killed. +> [node-0.simgrid.org:master:(1) 48.335596] [msg_test/INFO] shutdown VM00 +> [node-0.simgrid.org:master:(1) 48.335596] [msg_test/INFO] destroy VM00 +> [node-0.simgrid.org:master:(1) 48.335596] [msg_test/INFO] shutdown VM01 +> [node-0.simgrid.org:master:(1) 48.335596] [msg_test/INFO] destroy VM01 +> [node-0.simgrid.org:master:(1) 48.335596] [msg_test/INFO] # Goodbye now! > [48.335596] [msg_test/INFO] Bye (simulation time 48.3356) diff --git a/examples/msg/dht-kademlia/dht-kademlia.tesh b/examples/msg/dht-kademlia/dht-kademlia.tesh index 940e8dc92d..577c2995c9 100644 --- a/examples/msg/dht-kademlia/dht-kademlia.tesh +++ b/examples/msg/dht-kademlia/dht-kademlia.tesh @@ -4,30 +4,30 @@ p Testing the Kademlia implementation with MSG ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" -> [ 0.000000] ( 1:node@node-0.acme.org) Hi, I'm going to create the network with id 0 -> [ 0.000000] ( 2:node@node-1.acme.org) Hi, I'm going to join the network with id 1 -> [ 0.000000] ( 3:node@node-2.acme.org) Hi, I'm going to join the network with id 3 -> [ 0.000000] ( 4:node@node-3.acme.org) Hi, I'm going to join the network with id 7 -> [ 0.000000] ( 5:node@node-4.acme.org) Hi, I'm going to join the network with id 15 -> [ 0.000000] ( 6:node@node-5.acme.org) Hi, I'm going to join the network with id 31 -> [ 0.000000] ( 7:node@node-6.acme.org) Hi, I'm going to join the network with id 63 -> [ 0.000000] ( 8:node@node-7.acme.org) Hi, I'm going to join the network with id 127 -> [ 0.000000] ( 9:node@node-8.acme.org) Hi, I'm going to join the network with id 255 -> [ 0.000000] (10:node@node-9.acme.org) Hi, I'm going to join the network with id 511 -> [ 0.000000] (11:node@node-10.acme.org) Hi, I'm going to join the network with id 1023 -> [ 0.000000] (12:node@node-11.acme.org) Hi, I'm going to join the network with id 2047 -> [ 0.000000] (13:node@node-12.acme.org) Hi, I'm going to join the network with id 4095 -> [780.000000] ( 7:node@node-6.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] ( 9:node@node-8.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] ( 3:node@node-2.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] ( 2:node@node-1.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] (11:node@node-10.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] ( 1:node@node-0.acme.org) 7/7 FIND_NODE have succeeded -> [780.000000] ( 5:node@node-4.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] (13:node@node-12.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] ( 8:node@node-7.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] ( 6:node@node-5.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] (10:node@node-9.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] (12:node@node-11.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] ( 4:node@node-3.acme.org) 5/5 FIND_NODE have succeeded +> [ 0.000000] ( 1:node@node-0.simgrid.org) Hi, I'm going to create the network with id 0 +> [ 0.000000] ( 2:node@node-1.simgrid.org) Hi, I'm going to join the network with id 1 +> [ 0.000000] ( 3:node@node-2.simgrid.org) Hi, I'm going to join the network with id 3 +> [ 0.000000] ( 4:node@node-3.simgrid.org) Hi, I'm going to join the network with id 7 +> [ 0.000000] ( 5:node@node-4.simgrid.org) Hi, I'm going to join the network with id 15 +> [ 0.000000] ( 6:node@node-5.simgrid.org) Hi, I'm going to join the network with id 31 +> [ 0.000000] ( 7:node@node-6.simgrid.org) Hi, I'm going to join the network with id 63 +> [ 0.000000] ( 8:node@node-7.simgrid.org) Hi, I'm going to join the network with id 127 +> [ 0.000000] ( 9:node@node-8.simgrid.org) Hi, I'm going to join the network with id 255 +> [ 0.000000] (10:node@node-9.simgrid.org) Hi, I'm going to join the network with id 511 +> [ 0.000000] (11:node@node-10.simgrid.org) Hi, I'm going to join the network with id 1023 +> [ 0.000000] (12:node@node-11.simgrid.org) Hi, I'm going to join the network with id 2047 +> [ 0.000000] (13:node@node-12.simgrid.org) Hi, I'm going to join the network with id 4095 +> [780.000000] ( 7:node@node-6.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] ( 9:node@node-8.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] ( 3:node@node-2.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] ( 2:node@node-1.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] (11:node@node-10.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] ( 1:node@node-0.simgrid.org) 7/7 FIND_NODE have succeeded +> [780.000000] ( 5:node@node-4.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] (13:node@node-12.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] ( 8:node@node-7.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] ( 6:node@node-5.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] (10:node@node-9.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] (12:node@node-11.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] ( 4:node@node-3.simgrid.org) 5/5 FIND_NODE have succeeded > [780.000000] ( 0:maestro@) Simulated time: 780 diff --git a/examples/msg/dht-kademlia/dht-kademlia_d.xml b/examples/msg/dht-kademlia/dht-kademlia_d.xml index e199776298..05a08792d3 100644 --- a/examples/msg/dht-kademlia/dht-kademlia_d.xml +++ b/examples/msg/dht-kademlia/dht-kademlia_d.xml @@ -2,69 +2,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/examples/msg/dht-kademlia/generate.py b/examples/msg/dht-kademlia/generate.py index 3e75bacdf9..d4a9c287c9 100755 --- a/examples/msg/dht-kademlia/generate.py +++ b/examples/msg/dht-kademlia/generate.py @@ -23,7 +23,7 @@ all_ids = [0] sys.stdout.write("\n" "\n" - "\n \n" + "\n \n" " \n \n \n" % end_date) for i in range(1, nb_nodes): @@ -33,7 +33,7 @@ for i in range(1, nb_nodes): ok = not my_id in all_ids known_id = all_ids[random.randint(0, len(all_ids) - 1)] start_date = i * 10 - line = " \n "\ + line = " \n "\ "\n \n \n \n" % ( i, my_id, known_id, end_date) sys.stdout.write(line) diff --git a/examples/msg/dht-pastry/dht-pastry.tesh b/examples/msg/dht-pastry/dht-pastry.tesh index 4f0cd41a59..fc66316b90 100644 --- a/examples/msg/dht-pastry/dht-pastry.tesh +++ b/examples/msg/dht-pastry/dht-pastry.tesh @@ -3,174 +3,174 @@ p Testing the Pastry implementation with MSG $ $SG_TEST_EXENV ${bindir:=.}/dht-pastry$EXEEXT -nb_bits=6 ${platfdir}/cluster_backbone.xml ${srcdir}/dht-pastry_d.xml --log=msg_pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 25.007806] (1:node@node-0.acme.org) Task update from 366680 !!! -> [ 25.007806] (1:node@node-0.acme.org) Node: -> [ 25.007806] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [ 25.007806] (1:node@node-0.acme.org) Namespace: -> [ 25.007806] (1:node@node-0.acme.org) ffffffff -> [ 25.007806] (1:node@node-0.acme.org) ffffffff -> [ 25.007806] (1:node@node-0.acme.org) ffffffff -> [ 25.007806] (1:node@node-0.acme.org) ffffffff -> [ 25.007806] (1:node@node-0.acme.org) ffffffff -> [ 25.007806] (1:node@node-0.acme.org) ffffffff -> [ 40.015612] (1:node@node-0.acme.org) Task update from 533744 !!! -> [ 40.015612] (1:node@node-0.acme.org) Node: -> [ 40.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [ 40.015612] (1:node@node-0.acme.org) Namespace: -> [ 40.015612] (1:node@node-0.acme.org) ffffffff -> [ 40.015612] (1:node@node-0.acme.org) ffffffff -> [ 40.015612] (1:node@node-0.acme.org) ffffffff -> [ 40.015612] (1:node@node-0.acme.org) ffffffff -> [ 40.015612] (1:node@node-0.acme.org) ffffffff -> [ 40.015612] (1:node@node-0.acme.org) ffffffff -> [ 40.023418] (2:node@node-1.acme.org) Task update from 533744 !!! -> [ 40.023418] (2:node@node-1.acme.org) Node: -> [ 40.023418] (2:node@node-1.acme.org) Id: 366680 '00059858' -> [ 40.023418] (2:node@node-1.acme.org) Namespace: -> [ 40.023418] (2:node@node-1.acme.org) ffffffff -> [ 40.023418] (2:node@node-1.acme.org) ffffffff -> [ 40.023418] (2:node@node-1.acme.org) 0000002a -> [ 40.023418] (2:node@node-1.acme.org) ffffffff -> [ 40.023418] (2:node@node-1.acme.org) ffffffff -> [ 40.023418] (2:node@node-1.acme.org) ffffffff -> [ 45.015612] (1:node@node-0.acme.org) Task update from 1319738 !!! -> [ 45.015612] (1:node@node-0.acme.org) Node: -> [ 45.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [ 45.015612] (1:node@node-0.acme.org) Namespace: -> [ 45.015612] (1:node@node-0.acme.org) ffffffff -> [ 45.015612] (1:node@node-0.acme.org) ffffffff -> [ 45.015612] (1:node@node-0.acme.org) ffffffff -> [ 45.015612] (1:node@node-0.acme.org) ffffffff -> [ 45.015612] (1:node@node-0.acme.org) ffffffff -> [ 45.015612] (1:node@node-0.acme.org) ffffffff -> [ 55.015612] (1:node@node-0.acme.org) Task update from 16509405 !!! -> [ 55.015612] (1:node@node-0.acme.org) Node: -> [ 55.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [ 55.015612] (1:node@node-0.acme.org) Namespace: -> [ 55.015612] (1:node@node-0.acme.org) ffffffff -> [ 55.015612] (1:node@node-0.acme.org) ffffffff -> [ 55.015612] (1:node@node-0.acme.org) ffffffff -> [ 55.015612] (1:node@node-0.acme.org) ffffffff -> [ 55.015612] (1:node@node-0.acme.org) ffffffff -> [ 55.015612] (1:node@node-0.acme.org) ffffffff -> [ 55.031224] (2:node@node-1.acme.org) Task update from 16509405 !!! -> [ 55.031224] (2:node@node-1.acme.org) Node: -> [ 55.031224] (2:node@node-1.acme.org) Id: 366680 '00059858' -> [ 55.031224] (2:node@node-1.acme.org) Namespace: -> [ 55.031224] (2:node@node-1.acme.org) ffffffff -> [ 55.031224] (2:node@node-1.acme.org) ffffffff -> [ 55.031224] (2:node@node-1.acme.org) 0000002a -> [ 55.031224] (2:node@node-1.acme.org) ffffffff -> [ 55.031224] (2:node@node-1.acme.org) ffffffff -> [ 55.031224] (2:node@node-1.acme.org) ffffffff -> [ 60.015612] (1:node@node-0.acme.org) Task update from 10874876 !!! -> [ 60.015612] (1:node@node-0.acme.org) Node: -> [ 60.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [ 60.015612] (1:node@node-0.acme.org) Namespace: -> [ 60.015612] (1:node@node-0.acme.org) ffffffff -> [ 60.015612] (1:node@node-0.acme.org) ffffffff -> [ 60.015612] (1:node@node-0.acme.org) ffffffff -> [ 60.015612] (1:node@node-0.acme.org) ffffffff -> [ 60.015612] (1:node@node-0.acme.org) ffffffff -> [ 60.015612] (1:node@node-0.acme.org) ffffffff -> [ 60.031224] (2:node@node-1.acme.org) Task update from 10874876 !!! -> [ 60.031224] (2:node@node-1.acme.org) Node: -> [ 60.031224] (2:node@node-1.acme.org) Id: 366680 '00059858' -> [ 60.031224] (2:node@node-1.acme.org) Namespace: -> [ 60.031224] (2:node@node-1.acme.org) ffffffff -> [ 60.031224] (2:node@node-1.acme.org) ffffffff -> [ 60.031224] (2:node@node-1.acme.org) 0000002a -> [ 60.031224] (2:node@node-1.acme.org) ffffffff -> [ 60.031224] (2:node@node-1.acme.org) ffffffff -> [ 60.031224] (2:node@node-1.acme.org) ffffffff -> [ 60.039030] (3:node@node-2.acme.org) Task update from 10874876 !!! -> [ 60.039030] (3:node@node-2.acme.org) Node: -> [ 60.039030] (3:node@node-2.acme.org) Id: 533744 '000824f0' -> [ 60.039030] (3:node@node-2.acme.org) Namespace: -> [ 60.039030] (3:node@node-2.acme.org) ffffffff -> [ 60.039030] (3:node@node-2.acme.org) 0000002a -> [ 60.039030] (3:node@node-2.acme.org) 00059858 -> [ 60.039030] (3:node@node-2.acme.org) ffffffff -> [ 60.039030] (3:node@node-2.acme.org) ffffffff -> [ 60.039030] (3:node@node-2.acme.org) ffffffff -> [ 65.031224] (4:node@node-3.acme.org) Task update from 16728096 !!! -> [ 65.031224] (4:node@node-3.acme.org) Node: -> [ 65.031224] (4:node@node-3.acme.org) Id: 1319738 '0014233a' -> [ 65.031224] (4:node@node-3.acme.org) Namespace: -> [ 65.031224] (4:node@node-3.acme.org) ffffffff -> [ 65.031224] (4:node@node-3.acme.org) ffffffff -> [ 65.031224] (4:node@node-3.acme.org) 0000002a -> [ 65.031224] (4:node@node-3.acme.org) ffffffff -> [ 65.031224] (4:node@node-3.acme.org) ffffffff -> [ 65.031224] (4:node@node-3.acme.org) ffffffff -> [ 70.015612] (1:node@node-0.acme.org) Task update from 16728096 !!! -> [ 70.015612] (1:node@node-0.acme.org) Node: -> [ 70.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [ 70.015612] (1:node@node-0.acme.org) Namespace: -> [ 70.015612] (1:node@node-0.acme.org) ffffffff -> [ 70.015612] (1:node@node-0.acme.org) ffffffff -> [ 70.015612] (1:node@node-0.acme.org) ffffffff -> [ 70.015612] (1:node@node-0.acme.org) ffffffff -> [ 70.015612] (1:node@node-0.acme.org) ffffffff -> [ 70.015612] (1:node@node-0.acme.org) ffffffff -> [ 75.031224] (2:node@node-1.acme.org) Task update from 10004760 !!! -> [ 75.031224] (2:node@node-1.acme.org) Node: -> [ 75.031224] (2:node@node-1.acme.org) Id: 366680 '00059858' -> [ 75.031224] (2:node@node-1.acme.org) Namespace: -> [ 75.031224] (2:node@node-1.acme.org) ffffffff -> [ 75.031224] (2:node@node-1.acme.org) ffffffff -> [ 75.031224] (2:node@node-1.acme.org) 0000002a -> [ 75.031224] (2:node@node-1.acme.org) ffffffff -> [ 75.031224] (2:node@node-1.acme.org) ffffffff -> [ 75.031224] (2:node@node-1.acme.org) ffffffff -> [ 75.054642] (5:node@node-4.acme.org) Task update from 10004760 !!! -> [ 75.054642] (5:node@node-4.acme.org) Node: -> [ 75.054642] (5:node@node-4.acme.org) Id: 16509405 '00fbe9dd' -> [ 75.054642] (5:node@node-4.acme.org) Namespace: -> [ 75.054642] (5:node@node-4.acme.org) ffffffff -> [ 75.054642] (5:node@node-4.acme.org) 0000002a -> [ 75.054642] (5:node@node-4.acme.org) 00059858 -> [ 75.054642] (5:node@node-4.acme.org) ffffffff -> [ 75.054642] (5:node@node-4.acme.org) ffffffff -> [ 75.054642] (5:node@node-4.acme.org) ffffffff -> [ 80.015612] (1:node@node-0.acme.org) Task update from 10004760 !!! -> [ 80.015612] (1:node@node-0.acme.org) Node: -> [ 80.015612] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [ 80.015612] (1:node@node-0.acme.org) Namespace: -> [ 80.015612] (1:node@node-0.acme.org) ffffffff -> [ 80.015612] (1:node@node-0.acme.org) ffffffff -> [ 80.015612] (1:node@node-0.acme.org) ffffffff -> [ 80.015612] (1:node@node-0.acme.org) ffffffff -> [ 80.015612] (1:node@node-0.acme.org) ffffffff -> [ 80.015612] (1:node@node-0.acme.org) ffffffff -> [ 95.023418] (1:node@node-0.acme.org) Task update from 6518808 !!! -> [ 95.023418] (1:node@node-0.acme.org) Node: -> [ 95.023418] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [ 95.023418] (1:node@node-0.acme.org) Namespace: -> [ 95.023418] (1:node@node-0.acme.org) ffffffff -> [ 95.023418] (1:node@node-0.acme.org) ffffffff -> [ 95.023418] (1:node@node-0.acme.org) ffffffff -> [ 95.023418] (1:node@node-0.acme.org) ffffffff -> [ 95.023418] (1:node@node-0.acme.org) ffffffff -> [ 95.023418] (1:node@node-0.acme.org) ffffffff -> [100.023418] (1:node@node-0.acme.org) Task update from 2015253 !!! -> [100.023418] (1:node@node-0.acme.org) Node: -> [100.023418] (1:node@node-0.acme.org) Id: 42 '0000002a' -> [100.023418] (1:node@node-0.acme.org) Namespace: -> [100.023418] (1:node@node-0.acme.org) ffffffff -> [100.023418] (1:node@node-0.acme.org) ffffffff -> [100.023418] (1:node@node-0.acme.org) ffffffff -> [100.023418] (1:node@node-0.acme.org) ffffffff -> [100.023418] (1:node@node-0.acme.org) ffffffff -> [100.023418] (1:node@node-0.acme.org) ffffffff -> [100.039030] (4:node@node-3.acme.org) Task update from 2015253 !!! -> [100.039030] (4:node@node-3.acme.org) Node: -> [100.039030] (4:node@node-3.acme.org) Id: 1319738 '0014233a' -> [100.039030] (4:node@node-3.acme.org) Namespace: -> [100.039030] (4:node@node-3.acme.org) ffffffff -> [100.039030] (4:node@node-3.acme.org) ffffffff -> [100.039030] (4:node@node-3.acme.org) 0000002a -> [100.039030] (4:node@node-3.acme.org) ffffffff -> [100.039030] (4:node@node-3.acme.org) ffffffff -> [100.039030] (4:node@node-3.acme.org) ffffffff +> [ 25.007806] (1:node@node-0.simgrid.org) Task update from 366680 !!! +> [ 25.007806] (1:node@node-0.simgrid.org) Node: +> [ 25.007806] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [ 25.007806] (1:node@node-0.simgrid.org) Namespace: +> [ 25.007806] (1:node@node-0.simgrid.org) ffffffff +> [ 25.007806] (1:node@node-0.simgrid.org) ffffffff +> [ 25.007806] (1:node@node-0.simgrid.org) ffffffff +> [ 25.007806] (1:node@node-0.simgrid.org) ffffffff +> [ 25.007806] (1:node@node-0.simgrid.org) ffffffff +> [ 25.007806] (1:node@node-0.simgrid.org) ffffffff +> [ 40.015612] (1:node@node-0.simgrid.org) Task update from 533744 !!! +> [ 40.015612] (1:node@node-0.simgrid.org) Node: +> [ 40.015612] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [ 40.015612] (1:node@node-0.simgrid.org) Namespace: +> [ 40.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 40.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 40.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 40.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 40.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 40.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 40.023418] (2:node@node-1.simgrid.org) Task update from 533744 !!! +> [ 40.023418] (2:node@node-1.simgrid.org) Node: +> [ 40.023418] (2:node@node-1.simgrid.org) Id: 366680 '00059858' +> [ 40.023418] (2:node@node-1.simgrid.org) Namespace: +> [ 40.023418] (2:node@node-1.simgrid.org) ffffffff +> [ 40.023418] (2:node@node-1.simgrid.org) ffffffff +> [ 40.023418] (2:node@node-1.simgrid.org) 0000002a +> [ 40.023418] (2:node@node-1.simgrid.org) ffffffff +> [ 40.023418] (2:node@node-1.simgrid.org) ffffffff +> [ 40.023418] (2:node@node-1.simgrid.org) ffffffff +> [ 45.015612] (1:node@node-0.simgrid.org) Task update from 1319738 !!! +> [ 45.015612] (1:node@node-0.simgrid.org) Node: +> [ 45.015612] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [ 45.015612] (1:node@node-0.simgrid.org) Namespace: +> [ 45.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 45.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 45.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 45.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 45.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 45.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 55.015612] (1:node@node-0.simgrid.org) Task update from 16509405 !!! +> [ 55.015612] (1:node@node-0.simgrid.org) Node: +> [ 55.015612] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [ 55.015612] (1:node@node-0.simgrid.org) Namespace: +> [ 55.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 55.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 55.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 55.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 55.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 55.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 55.031224] (2:node@node-1.simgrid.org) Task update from 16509405 !!! +> [ 55.031224] (2:node@node-1.simgrid.org) Node: +> [ 55.031224] (2:node@node-1.simgrid.org) Id: 366680 '00059858' +> [ 55.031224] (2:node@node-1.simgrid.org) Namespace: +> [ 55.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 55.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 55.031224] (2:node@node-1.simgrid.org) 0000002a +> [ 55.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 55.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 55.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 60.015612] (1:node@node-0.simgrid.org) Task update from 10874876 !!! +> [ 60.015612] (1:node@node-0.simgrid.org) Node: +> [ 60.015612] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [ 60.015612] (1:node@node-0.simgrid.org) Namespace: +> [ 60.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 60.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 60.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 60.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 60.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 60.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 60.031224] (2:node@node-1.simgrid.org) Task update from 10874876 !!! +> [ 60.031224] (2:node@node-1.simgrid.org) Node: +> [ 60.031224] (2:node@node-1.simgrid.org) Id: 366680 '00059858' +> [ 60.031224] (2:node@node-1.simgrid.org) Namespace: +> [ 60.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 60.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 60.031224] (2:node@node-1.simgrid.org) 0000002a +> [ 60.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 60.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 60.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 60.039030] (3:node@node-2.simgrid.org) Task update from 10874876 !!! +> [ 60.039030] (3:node@node-2.simgrid.org) Node: +> [ 60.039030] (3:node@node-2.simgrid.org) Id: 533744 '000824f0' +> [ 60.039030] (3:node@node-2.simgrid.org) Namespace: +> [ 60.039030] (3:node@node-2.simgrid.org) ffffffff +> [ 60.039030] (3:node@node-2.simgrid.org) 0000002a +> [ 60.039030] (3:node@node-2.simgrid.org) 00059858 +> [ 60.039030] (3:node@node-2.simgrid.org) ffffffff +> [ 60.039030] (3:node@node-2.simgrid.org) ffffffff +> [ 60.039030] (3:node@node-2.simgrid.org) ffffffff +> [ 65.031224] (4:node@node-3.simgrid.org) Task update from 16728096 !!! +> [ 65.031224] (4:node@node-3.simgrid.org) Node: +> [ 65.031224] (4:node@node-3.simgrid.org) Id: 1319738 '0014233a' +> [ 65.031224] (4:node@node-3.simgrid.org) Namespace: +> [ 65.031224] (4:node@node-3.simgrid.org) ffffffff +> [ 65.031224] (4:node@node-3.simgrid.org) ffffffff +> [ 65.031224] (4:node@node-3.simgrid.org) 0000002a +> [ 65.031224] (4:node@node-3.simgrid.org) ffffffff +> [ 65.031224] (4:node@node-3.simgrid.org) ffffffff +> [ 65.031224] (4:node@node-3.simgrid.org) ffffffff +> [ 70.015612] (1:node@node-0.simgrid.org) Task update from 16728096 !!! +> [ 70.015612] (1:node@node-0.simgrid.org) Node: +> [ 70.015612] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [ 70.015612] (1:node@node-0.simgrid.org) Namespace: +> [ 70.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 70.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 70.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 70.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 70.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 70.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 75.031224] (2:node@node-1.simgrid.org) Task update from 10004760 !!! +> [ 75.031224] (2:node@node-1.simgrid.org) Node: +> [ 75.031224] (2:node@node-1.simgrid.org) Id: 366680 '00059858' +> [ 75.031224] (2:node@node-1.simgrid.org) Namespace: +> [ 75.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 75.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 75.031224] (2:node@node-1.simgrid.org) 0000002a +> [ 75.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 75.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 75.031224] (2:node@node-1.simgrid.org) ffffffff +> [ 75.054642] (5:node@node-4.simgrid.org) Task update from 10004760 !!! +> [ 75.054642] (5:node@node-4.simgrid.org) Node: +> [ 75.054642] (5:node@node-4.simgrid.org) Id: 16509405 '00fbe9dd' +> [ 75.054642] (5:node@node-4.simgrid.org) Namespace: +> [ 75.054642] (5:node@node-4.simgrid.org) ffffffff +> [ 75.054642] (5:node@node-4.simgrid.org) 0000002a +> [ 75.054642] (5:node@node-4.simgrid.org) 00059858 +> [ 75.054642] (5:node@node-4.simgrid.org) ffffffff +> [ 75.054642] (5:node@node-4.simgrid.org) ffffffff +> [ 75.054642] (5:node@node-4.simgrid.org) ffffffff +> [ 80.015612] (1:node@node-0.simgrid.org) Task update from 10004760 !!! +> [ 80.015612] (1:node@node-0.simgrid.org) Node: +> [ 80.015612] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [ 80.015612] (1:node@node-0.simgrid.org) Namespace: +> [ 80.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 80.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 80.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 80.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 80.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 80.015612] (1:node@node-0.simgrid.org) ffffffff +> [ 95.023418] (1:node@node-0.simgrid.org) Task update from 6518808 !!! +> [ 95.023418] (1:node@node-0.simgrid.org) Node: +> [ 95.023418] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [ 95.023418] (1:node@node-0.simgrid.org) Namespace: +> [ 95.023418] (1:node@node-0.simgrid.org) ffffffff +> [ 95.023418] (1:node@node-0.simgrid.org) ffffffff +> [ 95.023418] (1:node@node-0.simgrid.org) ffffffff +> [ 95.023418] (1:node@node-0.simgrid.org) ffffffff +> [ 95.023418] (1:node@node-0.simgrid.org) ffffffff +> [ 95.023418] (1:node@node-0.simgrid.org) ffffffff +> [100.023418] (1:node@node-0.simgrid.org) Task update from 2015253 !!! +> [100.023418] (1:node@node-0.simgrid.org) Node: +> [100.023418] (1:node@node-0.simgrid.org) Id: 42 '0000002a' +> [100.023418] (1:node@node-0.simgrid.org) Namespace: +> [100.023418] (1:node@node-0.simgrid.org) ffffffff +> [100.023418] (1:node@node-0.simgrid.org) ffffffff +> [100.023418] (1:node@node-0.simgrid.org) ffffffff +> [100.023418] (1:node@node-0.simgrid.org) ffffffff +> [100.023418] (1:node@node-0.simgrid.org) ffffffff +> [100.023418] (1:node@node-0.simgrid.org) ffffffff +> [100.039030] (4:node@node-3.simgrid.org) Task update from 2015253 !!! +> [100.039030] (4:node@node-3.simgrid.org) Node: +> [100.039030] (4:node@node-3.simgrid.org) Id: 1319738 '0014233a' +> [100.039030] (4:node@node-3.simgrid.org) Namespace: +> [100.039030] (4:node@node-3.simgrid.org) ffffffff +> [100.039030] (4:node@node-3.simgrid.org) ffffffff +> [100.039030] (4:node@node-3.simgrid.org) 0000002a +> [100.039030] (4:node@node-3.simgrid.org) ffffffff +> [100.039030] (4:node@node-3.simgrid.org) ffffffff +> [100.039030] (4:node@node-3.simgrid.org) ffffffff > [1000.054642] (0:maestro@) Simulated time: 1000.05 diff --git a/examples/msg/dht-pastry/dht-pastry_d.xml b/examples/msg/dht-pastry/dht-pastry_d.xml index b698648349..aca5b2533f 100644 --- a/examples/msg/dht-pastry/dht-pastry_d.xml +++ b/examples/msg/dht-pastry/dht-pastry_d.xml @@ -1,59 +1,59 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/examples/msg/dht-pastry/generate.py b/examples/msg/dht-pastry/generate.py index b106691f2b..05cd33cb15 100755 --- a/examples/msg/dht-pastry/generate.py +++ b/examples/msg/dht-pastry/generate.py @@ -29,7 +29,7 @@ all_ids = [42] sys.stdout.write("\n" "\n" "\n" - " \n" % end_date) + " \n" % end_date) for i in range(1, nb_nodes): @@ -40,7 +40,7 @@ for i in range(1, nb_nodes): known_id = all_ids[random.randint(0, len(all_ids) - 1)] start_date = i * 10 - line = " \n" % ( + line = " \n" % ( i, my_id, known_id, start_date, end_date) sys.stdout.write(line) all_ids.append(my_id) diff --git a/examples/msg/network-ns3/network-ns3.tesh b/examples/msg/network-ns3/network-ns3.tesh index a97d671c91..94ce835f91 100644 --- a/examples/msg/network-ns3/network-ns3.tesh +++ b/examples/msg/network-ns3/network-ns3.tesh @@ -28,7 +28,7 @@ p One cluster $ ${bindir:=.}/network-ns3/network-ns3 ${platfdir}/cluster_backbone.xml ${srcdir}/network-ns3/one_cluster_d.xml --cfg=network/model:NS3 "--log=root.fmt:[%h:%P(%i)]%e[%c/%p]%e%m%n" > [:maestro(0)] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3' -> [node-6.acme.org:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-2.acme.org to node-6.acme.org +> [node-6.simgrid.org:worker(2)] [msg_test/INFO] FLOW[1] : Receive 100 bytes from node-2.acme.org to node-6.acme.org p Dogbone diff --git a/examples/msg/network-ns3/one_cluster_d.xml b/examples/msg/network-ns3/one_cluster_d.xml index 4c0f7bc333..1de597da6d 100644 --- a/examples/msg/network-ns3/one_cluster_d.xml +++ b/examples/msg/network-ns3/one_cluster_d.xml @@ -1,12 +1,12 @@ - + - + - + diff --git a/examples/platforms/cluster_backbone.xml b/examples/platforms/cluster_backbone.xml index 632aa4476d..b2b96e3ed3 100644 --- a/examples/platforms/cluster_backbone.xml +++ b/examples/platforms/cluster_backbone.xml @@ -9,13 +9,13 @@ l0| l1| l2| l97| l96 | | l99 | | | ........ | | | | | - node-0.acme.org node-99.acme.org + node-0.simgrid.org node-99.simgrid.org The route from node-0 to node-2 is: l0.UP ; backbone ; l2.DOWN The route from node-0 to the outer world begins with: l0.UP ; backbone --> - diff --git a/examples/platforms/cluster_crossbar.xml b/examples/platforms/cluster_crossbar.xml index 6a4a71f659..9000faf4a7 100644 --- a/examples/platforms/cluster_crossbar.xml +++ b/examples/platforms/cluster_crossbar.xml @@ -10,14 +10,14 @@ l0 / l1| \l2 / | \ / | \ - host-0 host-1 host-2 ... + node-0 node-1 node-2 ... All hosts can communicate at full speed with no interference on the crossbar. Only the links of each hosts are limiting. --> diff --git a/examples/platforms/cluster_dragonfly.xml b/examples/platforms/cluster_dragonfly.xml index ec1a36021c..bb9d29f1e0 100644 --- a/examples/platforms/cluster_dragonfly.xml +++ b/examples/platforms/cluster_dragonfly.xml @@ -3,7 +3,7 @@ diff --git a/examples/platforms/cluster_fat_tree.xml b/examples/platforms/cluster_fat_tree.xml index a761be103d..d1bb503ab5 100644 --- a/examples/platforms/cluster_fat_tree.xml +++ b/examples/platforms/cluster_fat_tree.xml @@ -9,7 +9,7 @@ diff --git a/examples/platforms/cluster_prototype.lua b/examples/platforms/cluster_prototype.lua index 8c77192120..d9b1505cec 100644 --- a/examples/platforms/cluster_prototype.lua +++ b/examples/platforms/cluster_prototype.lua @@ -52,7 +52,7 @@ end simgrid.engine.open(); - cluster_factory = my_cluster{prefix="node-", suffix=".acme.org", radical=seq(0,262144), host_factory = function(hostno) + cluster_factory = my_cluster{prefix="node-", suffix=".simgrid.org", radical=seq(0,262144), host_factory = function(hostno) if hostno % 2 == 0 then return "blabla" end if hostno % 2 == 1 then return "blublub" end end, @@ -62,6 +62,6 @@ lat="50us", sharing_sharing_policy="SPLITDUPLEX" }() - --my_cluster{prefix="node2-", suffix=".acme.org", radical=seq(0,44) } + --my_cluster{prefix="node2-", suffix=".simgrid.org", radical=seq(0,44) } simgrid.engine.close(); diff --git a/examples/platforms/cluster_torus.xml b/examples/platforms/cluster_torus.xml index b8871a7780..84055df1cb 100644 --- a/examples/platforms/cluster_torus.xml +++ b/examples/platforms/cluster_torus.xml @@ -3,7 +3,7 @@ diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml index e134824872..8196cd9433 100644 --- a/examples/platforms/prop.xml +++ b/examples/platforms/prop.xml @@ -17,7 +17,7 @@ - diff --git a/examples/platforms/routing_none.xml b/examples/platforms/routing_none.xml index 5cd432cccf..0fd2502e96 100644 --- a/examples/platforms/routing_none.xml +++ b/examples/platforms/routing_none.xml @@ -3,15 +3,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh index 4a58e068dd..2a70e45941 100644 --- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh +++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh @@ -1,14 +1,14 @@ #!/usr/bin/env tesh $ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-lifetime ${platfdir}/cluster_backbone.xml s4u-actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep. -> [ 0.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep. -> [ 2.000000] (3:sleeper@node-0.acme.org) Hello! I go to sleep. -> [ 3.000000] (2:sleeper@node-1.acme.org) Exiting now (done sleeping or got killed). -> [ 4.000000] (4:sleeper@node-2.acme.org) Hello! I go to sleep. -> [ 7.000000] (4:sleeper@node-2.acme.org) Exiting now (done sleeping or got killed). -> [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping. -> [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). -> [ 12.000000] (3:sleeper@node-0.acme.org) Done sleeping. -> [ 12.000000] (3:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). +> [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. +> [ 0.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. +> [ 2.000000] (3:sleeper@node-0.simgrid.org) Hello! I go to sleep. +> [ 3.000000] (2:sleeper@node-1.simgrid.org) Exiting now (done sleeping or got killed). +> [ 4.000000] (4:sleeper@node-2.simgrid.org) Hello! I go to sleep. +> [ 7.000000] (4:sleeper@node-2.simgrid.org) Exiting now (done sleeping or got killed). +> [ 10.000000] (1:sleeper@node-0.simgrid.org) Done sleeping. +> [ 10.000000] (1:sleeper@node-0.simgrid.org) Exiting now (done sleeping or got killed). +> [ 12.000000] (3:sleeper@node-0.simgrid.org) Done sleeping. +> [ 12.000000] (3:sleeper@node-0.simgrid.org) Exiting now (done sleeping or got killed). diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml b/examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml index c69e987886..41ec532e6f 100644 --- a/examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml +++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime_d.xml @@ -4,8 +4,8 @@ - - - - + + + + diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh index 78c526950b..a72f286368 100644 --- a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh +++ b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh @@ -5,19 +5,19 @@ p Testing the Bittorrent implementation with S4U ! timeout 10 ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/s4u-bittorrent ${platfdir}/cluster_backbone.xml s4u-app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:tracker@node-0.acme.org) Tracker launched. -> [ 0.000000] (2:peer@node-1.acme.org) Hi, I'm joining the network with id 2 -> [ 0.000000] (3:peer@node-2.acme.org) Hi, I'm joining the network with id 3 -> [ 0.000000] (4:peer@node-3.acme.org) Hi, I'm joining the network with id 4 -> [ 0.000000] (5:peer@node-4.acme.org) Hi, I'm joining the network with id 5 -> [ 0.000000] (6:peer@node-5.acme.org) Hi, I'm joining the network with id 6 -> [ 0.000000] (7:peer@node-6.acme.org) Hi, I'm joining the network with id 7 -> [ 0.000000] (8:peer@node-7.acme.org) Hi, I'm joining the network with id 8 -> [ 3000.000000] (1:tracker@node-0.acme.org) Tracker is leaving -> [ 5000.007806] (2:peer@node-1.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (3:peer@node-2.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (4:peer@node-3.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (5:peer@node-4.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (6:peer@node-5.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (7:peer@node-6.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (8:peer@node-7.acme.org) Here is my current status: 1111111111 +> [ 0.000000] (1:tracker@node-0.simgrid.org) Tracker launched. +> [ 0.000000] (2:peer@node-1.simgrid.org) Hi, I'm joining the network with id 2 +> [ 0.000000] (3:peer@node-2.simgrid.org) Hi, I'm joining the network with id 3 +> [ 0.000000] (4:peer@node-3.simgrid.org) Hi, I'm joining the network with id 4 +> [ 0.000000] (5:peer@node-4.simgrid.org) Hi, I'm joining the network with id 5 +> [ 0.000000] (6:peer@node-5.simgrid.org) Hi, I'm joining the network with id 6 +> [ 0.000000] (7:peer@node-6.simgrid.org) Hi, I'm joining the network with id 7 +> [ 0.000000] (8:peer@node-7.simgrid.org) Hi, I'm joining the network with id 8 +> [ 3000.000000] (1:tracker@node-0.simgrid.org) Tracker is leaving +> [ 5000.007806] (2:peer@node-1.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (3:peer@node-2.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (4:peer@node-3.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (5:peer@node-4.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (6:peer@node-5.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (7:peer@node-6.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (8:peer@node-7.simgrid.org) Here is my current status: 1111111111 diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml b/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml index 5460ab1a9d..5248ff8e04 100644 --- a/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml +++ b/examples/s4u/app-bittorrent/s4u-app-bittorrent_d.xml @@ -2,37 +2,37 @@ - + - + - + - + - + - + - + - + diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.cpp b/examples/s4u/app-chainsend/s4u-app-chainsend.cpp index 79785f5122..aff5692070 100644 --- a/examples/s4u/app-chainsend/s4u-app-chainsend.cpp +++ b/examples/s4u/app-chainsend/s4u-app-chainsend.cpp @@ -144,7 +144,7 @@ public: Broadcaster(int hostcount, unsigned int piece_count) : piece_count(piece_count) { for (int i = 1; i <= hostcount; i++) { - std::string name = std::string("node-") + std::to_string(i) + ".acme.org"; + std::string name = std::string("node-") + std::to_string(i) + ".simgrid.org"; XBT_DEBUG("%s", name.c_str()); mailboxes.push_back(simgrid::s4u::Mailbox::by_name(name)); } @@ -189,16 +189,16 @@ int main(int argc, char* argv[]) e.load_platform(argv[1]); - simgrid::s4u::Actor::create("broadcaster", simgrid::s4u::Host::by_name("node-0.acme.org"), broadcaster, 8, 256); + simgrid::s4u::Actor::create("broadcaster", simgrid::s4u::Host::by_name("node-0.simgrid.org"), broadcaster, 8, 256); - simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-1.acme.org"), peer); - simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-2.acme.org"), peer); - simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-3.acme.org"), peer); - simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-4.acme.org"), peer); - simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-5.acme.org"), peer); - simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-6.acme.org"), peer); - simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-7.acme.org"), peer); - simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-8.acme.org"), peer); + simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-1.simgrid.org"), peer); + simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-2.simgrid.org"), peer); + simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-3.simgrid.org"), peer); + simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-4.simgrid.org"), peer); + simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-5.simgrid.org"), peer); + simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-6.simgrid.org"), peer); + simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-7.simgrid.org"), peer); + simgrid::s4u::Actor::create("peer", simgrid::s4u::Host::by_name("node-8.simgrid.org"), peer); e.run(); XBT_INFO("Total simulation time: %e", simgrid::s4u::Engine::get_clock()); diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh index fc96fcb010..db1425576f 100644 --- a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh +++ b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh @@ -5,12 +5,12 @@ p Testing the chainsend S4U implementation ! timeout 60 ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-chainsend ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" -> [ 2.214423] (2:peer@node-1.acme.org) ### 2.214423 16777216 bytes (Avg 7.225360 MB/s); copy finished (simulated). -> [ 2.222796] (3:peer@node-2.acme.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). -> [ 2.231170] (4:peer@node-3.acme.org) ### 2.231170 16777216 bytes (Avg 7.171127 MB/s); copy finished (simulated). -> [ 2.239543] (5:peer@node-4.acme.org) ### 2.239543 16777216 bytes (Avg 7.144314 MB/s); copy finished (simulated). -> [ 2.247917] (6:peer@node-5.acme.org) ### 2.247917 16777216 bytes (Avg 7.117701 MB/s); copy finished (simulated). -> [ 2.256290] (7:peer@node-6.acme.org) ### 2.256290 16777216 bytes (Avg 7.091286 MB/s); copy finished (simulated). +> [ 2.214423] (2:peer@node-1.simgrid.org) ### 2.214423 16777216 bytes (Avg 7.225360 MB/s); copy finished (simulated). +> [ 2.222796] (3:peer@node-2.simgrid.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). +> [ 2.231170] (4:peer@node-3.simgrid.org) ### 2.231170 16777216 bytes (Avg 7.171127 MB/s); copy finished (simulated). +> [ 2.239543] (5:peer@node-4.simgrid.org) ### 2.239543 16777216 bytes (Avg 7.144314 MB/s); copy finished (simulated). +> [ 2.247917] (6:peer@node-5.simgrid.org) ### 2.247917 16777216 bytes (Avg 7.117701 MB/s); copy finished (simulated). +> [ 2.256290] (7:peer@node-6.simgrid.org) ### 2.256290 16777216 bytes (Avg 7.091286 MB/s); copy finished (simulated). > [ 2.264637] (0:maestro@) Total simulation time: 2.264637e+00 -> [ 2.264637] (8:peer@node-7.acme.org) ### 2.264637 16777216 bytes (Avg 7.065151 MB/s); copy finished (simulated). -> [ 2.264637] (9:peer@node-8.acme.org) ### 2.264637 16777216 bytes (Avg 7.065151 MB/s); copy finished (simulated). +> [ 2.264637] (8:peer@node-7.simgrid.org) ### 2.264637 16777216 bytes (Avg 7.065151 MB/s); copy finished (simulated). +> [ 2.264637] (9:peer@node-8.simgrid.org) ### 2.264637 16777216 bytes (Avg 7.065151 MB/s); copy finished (simulated). diff --git a/examples/s4u/dht-chord/s4u-dht-chord.tesh b/examples/s4u/dht-chord/s4u-dht-chord.tesh index 3505574dbe..5f7aaa8822 100644 --- a/examples/s4u/dht-chord/s4u-dht-chord.tesh +++ b/examples/s4u/dht-chord/s4u-dht-chord.tesh @@ -4,234 +4,234 @@ p Testing the Chord implementation with S4U ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-chord$EXEEXT -nb_bits=3 ${platfdir}/cluster_backbone.xml s4u-dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%P@%h)%e%m%n" -> [ 0.00000] (node@node-0.acme.org) My finger table: -> [ 0.00000] (node@node-0.acme.org) Start | Succ -> [ 0.00000] (node@node-0.acme.org) 3 | 42 -> [ 0.00000] (node@node-0.acme.org) 4 | 42 -> [ 0.00000] (node@node-0.acme.org) 6 | 42 -> [ 0.00000] (node@node-0.acme.org) Predecessor: -1 -> [ 10.00000] (node@node-1.acme.org) Joining the ring with id 366680, knowing node 42 -> [ 15.00751] (node@node-1.acme.org) My new finger #0 is 42 -> [ 15.00751] (node@node-1.acme.org) My finger table: -> [ 15.00751] (node@node-1.acme.org) Start | Succ -> [ 15.00751] (node@node-1.acme.org) 1 | 42 -> [ 15.00751] (node@node-1.acme.org) 2 | 366680 -> [ 15.00751] (node@node-1.acme.org) 4 | 366680 -> [ 15.00751] (node@node-1.acme.org) Predecessor: -1 -> [ 20.00000] (node@node-2.acme.org) Joining the ring with id 533744, knowing node 366680 -> [ 30.00000] (node@node-3.acme.org) Joining the ring with id 1319738, knowing node 42 -> [ 30.00721] (node@node-2.acme.org) My new finger #0 is 42 -> [ 30.00721] (node@node-2.acme.org) My finger table: -> [ 30.00721] (node@node-2.acme.org) Start | Succ -> [ 30.00721] (node@node-2.acme.org) 1 | 42 -> [ 30.00721] (node@node-2.acme.org) 2 | 533744 -> [ 30.00721] (node@node-2.acme.org) 4 | 533744 -> [ 30.00721] (node@node-2.acme.org) Predecessor: -1 -> [ 35.00711] (node@node-3.acme.org) My new finger #0 is 42 -> [ 35.00711] (node@node-3.acme.org) My finger table: -> [ 35.00711] (node@node-3.acme.org) Start | Succ -> [ 35.00711] (node@node-3.acme.org) 3 | 42 -> [ 35.00711] (node@node-3.acme.org) 4 | 1319738 -> [ 35.00711] (node@node-3.acme.org) 6 | 1319738 -> [ 35.00711] (node@node-3.acme.org) Predecessor: -1 -> [ 40.00000] (node@node-4.acme.org) Joining the ring with id 16509405, knowing node 366680 -> [ 49.99900] (node@node-0.acme.org) My new predecessor is 366680 -> [ 49.99900] (node@node-0.acme.org) My finger table: -> [ 49.99900] (node@node-0.acme.org) Start | Succ -> [ 49.99900] (node@node-0.acme.org) 3 | 42 -> [ 49.99900] (node@node-0.acme.org) 4 | 42 -> [ 49.99900] (node@node-0.acme.org) 6 | 42 -> [ 49.99900] (node@node-0.acme.org) Predecessor: 366680 -> [ 49.99900] (node@node-0.acme.org) My new finger #0 is 366680 -> [ 55.00671] (node@node-4.acme.org) My new finger #0 is 366680 -> [ 55.00671] (node@node-4.acme.org) My finger table: -> [ 55.00671] (node@node-4.acme.org) Start | Succ -> [ 55.00671] (node@node-4.acme.org) 6 | 366680 -> [ 55.00671] (node@node-4.acme.org) 7 | 16509405 -> [ 55.00671] (node@node-4.acme.org) 1 | 16509405 -> [ 55.00671] (node@node-4.acme.org) Predecessor: -1 -> [ 60.00000] (node@node-6.acme.org) Joining the ring with id 16728096, knowing node 1319738 -> [ 65.00651] (node@node-3.acme.org) My new finger #0 is 366680 -> [ 65.01431] (node@node-6.acme.org) My new finger #0 is 366680 -> [ 65.01431] (node@node-6.acme.org) My finger table: -> [ 65.01431] (node@node-6.acme.org) Start | Succ -> [ 65.01431] (node@node-6.acme.org) 1 | 366680 -> [ 65.01431] (node@node-6.acme.org) 2 | 16728096 -> [ 65.01431] (node@node-6.acme.org) 4 | 16728096 -> [ 65.01431] (node@node-6.acme.org) Predecessor: -1 -> [ 70.00641] (node@node-1.acme.org) My new predecessor is 16509405 -> [ 70.00641] (node@node-1.acme.org) My finger table: -> [ 70.00641] (node@node-1.acme.org) Start | Succ -> [ 70.00641] (node@node-1.acme.org) 1 | 42 -> [ 70.00641] (node@node-1.acme.org) 2 | 366680 -> [ 70.00641] (node@node-1.acme.org) 4 | 366680 -> [ 70.00641] (node@node-1.acme.org) Predecessor: 16509405 -> [ 80.01401] (node@node-0.acme.org) My new finger #0 is 16509405 -> [ 85.01391] (node@node-6.acme.org) My new finger #0 is 16509405 -> [ 100.02922] (node@node-3.acme.org) My new finger #0 is 16509405 -> [ 110.02902] (node@node-4.acme.org) My new predecessor is 42 -> [ 110.02902] (node@node-4.acme.org) My finger table: -> [ 110.02902] (node@node-4.acme.org) Start | Succ -> [ 110.02902] (node@node-4.acme.org) 6 | 366680 -> [ 110.02902] (node@node-4.acme.org) 7 | 16509405 -> [ 110.02902] (node@node-4.acme.org) 1 | 16509405 -> [ 110.02902] (node@node-4.acme.org) Predecessor: 42 -> [ 115.03673] (node@node-6.acme.org) My new finger #0 is 42 -> [ 200.05164] (node@node-3.acme.org) Well Guys! I Think it's time for me to leave ;) -> [ 210.04364] (node@node-1.acme.org) Well Guys! I Think it's time for me to leave ;) -> [ 210.05925] (node@node-4.acme.org) My new predecessor is -1 -> [ 220.05905] (node@node-4.acme.org) My new predecessor is 42 -> [ 220.05905] (node@node-4.acme.org) My finger table: -> [ 220.05905] (node@node-4.acme.org) Start | Succ -> [ 220.05905] (node@node-4.acme.org) 6 | 366680 -> [ 220.05905] (node@node-4.acme.org) 7 | 16509405 -> [ 220.05905] (node@node-4.acme.org) 1 | 16509405 -> [ 220.05905] (node@node-4.acme.org) Predecessor: 42 -> [ 220.07466] (node@node-0.acme.org) My new predecessor is 16509405 -> [ 225.05895] (node@node-4.acme.org) My new finger #0 is 42 -> [ 230.07446] (node@node-0.acme.org) My new predecessor is 533744 -> [ 230.07446] (node@node-0.acme.org) My finger table: -> [ 230.07446] (node@node-0.acme.org) Start | Succ -> [ 230.07446] (node@node-0.acme.org) 3 | 16509405 -> [ 230.07446] (node@node-0.acme.org) 4 | 42 -> [ 230.07446] (node@node-0.acme.org) 6 | 42 -> [ 230.07446] (node@node-0.acme.org) Predecessor: 533744 -> [ 235.08217] (node@node-4.acme.org) My new finger #0 is 533744 -> [ 240.08987] (node@node-0.acme.org) My new finger #1 is 16509405 -> [ 240.08987] (node@node-0.acme.org) My finger table: -> [ 240.08987] (node@node-0.acme.org) Start | Succ -> [ 240.08987] (node@node-0.acme.org) 3 | 16509405 -> [ 240.08987] (node@node-0.acme.org) 4 | 16509405 -> [ 240.08987] (node@node-0.acme.org) 6 | 42 -> [ 240.08987] (node@node-0.acme.org) Predecessor: 533744 -> [ 250.00000] (node@node-5.acme.org) Joining the ring with id 10874876, knowing node 533744 -> [ 255.11299] (node@node-5.acme.org) My new finger #0 is 16509405 -> [ 255.11299] (node@node-5.acme.org) My finger table: -> [ 255.11299] (node@node-5.acme.org) Start | Succ -> [ 255.11299] (node@node-5.acme.org) 5 | 16509405 -> [ 255.11299] (node@node-5.acme.org) 6 | 10874876 -> [ 255.11299] (node@node-5.acme.org) 0 | 10874876 -> [ 255.11299] (node@node-5.acme.org) Predecessor: -1 -> [ 265.09718] (node@node-2.acme.org) My new predecessor is 16509405 -> [ 265.09718] (node@node-2.acme.org) My finger table: -> [ 265.09718] (node@node-2.acme.org) Start | Succ -> [ 265.09718] (node@node-2.acme.org) 1 | 42 -> [ 265.09718] (node@node-2.acme.org) 2 | 533744 -> [ 265.09718] (node@node-2.acme.org) 4 | 533744 -> [ 265.09718] (node@node-2.acme.org) Predecessor: 16509405 -> [ 275.11259] (node@node-5.acme.org) My new finger #0 is 42 -> [ 280.10468] (node@node-4.acme.org) My new predecessor is 10874876 -> [ 280.10468] (node@node-4.acme.org) My finger table: -> [ 280.10468] (node@node-4.acme.org) Start | Succ -> [ 280.10468] (node@node-4.acme.org) 6 | 533744 -> [ 280.10468] (node@node-4.acme.org) 7 | 16509405 -> [ 280.10468] (node@node-4.acme.org) 1 | 16509405 -> [ 280.10468] (node@node-4.acme.org) Predecessor: 10874876 -> [ 285.13581] (node@node-4.acme.org) My new predecessor is 42 -> [ 285.13581] (node@node-4.acme.org) My finger table: -> [ 285.13581] (node@node-4.acme.org) Start | Succ -> [ 285.13581] (node@node-4.acme.org) 6 | 533744 -> [ 285.13581] (node@node-4.acme.org) 7 | 16509405 -> [ 285.13581] (node@node-4.acme.org) 1 | 16509405 -> [ 285.13581] (node@node-4.acme.org) Predecessor: 42 -> [ 300.13551] (node@node-4.acme.org) My new finger #1 is 533744 -> [ 300.13551] (node@node-4.acme.org) My finger table: -> [ 300.13551] (node@node-4.acme.org) Start | Succ -> [ 300.13551] (node@node-4.acme.org) 6 | 533744 -> [ 300.13551] (node@node-4.acme.org) 7 | 533744 -> [ 300.13551] (node@node-4.acme.org) 1 | 16509405 -> [ 300.13551] (node@node-4.acme.org) Predecessor: 42 -> [ 300.14332] (node@node-2.acme.org) My new finger #1 is 42 -> [ 300.14332] (node@node-2.acme.org) My finger table: -> [ 300.14332] (node@node-2.acme.org) Start | Succ -> [ 300.14332] (node@node-2.acme.org) 1 | 42 -> [ 300.14332] (node@node-2.acme.org) 2 | 42 -> [ 300.14332] (node@node-2.acme.org) 4 | 533744 -> [ 300.14332] (node@node-2.acme.org) Predecessor: 16509405 -> [ 305.14322] (node@node-5.acme.org) My new finger #0 is 533744 -> [ 305.15102] (node@node-0.acme.org) My new finger #0 is 10874876 -> [ 310.15873] (node@node-6.acme.org) My new finger #1 is 42 -> [ 310.15873] (node@node-6.acme.org) My finger table: -> [ 310.15873] (node@node-6.acme.org) Start | Succ -> [ 310.15873] (node@node-6.acme.org) 1 | 42 -> [ 310.15873] (node@node-6.acme.org) 2 | 42 -> [ 310.15873] (node@node-6.acme.org) 4 | 16728096 -> [ 310.15873] (node@node-6.acme.org) Predecessor: -1 -> [ 330.16613] (node@node-5.acme.org) My new finger #0 is 16509405 -> [ 335.16603] (node@node-5.acme.org) My new predecessor is 42 -> [ 335.16603] (node@node-5.acme.org) My finger table: -> [ 335.16603] (node@node-5.acme.org) Start | Succ -> [ 335.16603] (node@node-5.acme.org) 5 | 16509405 -> [ 335.16603] (node@node-5.acme.org) 6 | 10874876 -> [ 335.16603] (node@node-5.acme.org) 0 | 10874876 -> [ 335.16603] (node@node-5.acme.org) Predecessor: 42 -> [ 340.16593] (node@node-4.acme.org) Well Guys! I Think it's time for me to leave ;) -> [ 350.15793] (node@node-2.acme.org) My new predecessor is 42 -> [ 350.16573] (node@node-0.acme.org) My new finger #0 is 533744 -> [ 360.18115] (node@node-0.acme.org) My new finger #2 is 533744 -> [ 360.18115] (node@node-0.acme.org) My finger table: -> [ 360.18115] (node@node-0.acme.org) Start | Succ -> [ 360.18115] (node@node-0.acme.org) 3 | 533744 -> [ 360.18115] (node@node-0.acme.org) 4 | 16509405 -> [ 360.18115] (node@node-0.acme.org) 6 | 533744 -> [ 360.18115] (node@node-0.acme.org) Predecessor: 533744 -> [ 420.23459] (node@node-2.acme.org) Well Guys! I Think it's time for me to leave ;) -> [ 425.22668] (node@node-0.acme.org) My new predecessor is 42 -> [ 475.22668] (node@node-0.acme.org) My new finger #0 is 42 -> [ 480.22658] (node@node-0.acme.org) My new predecessor is 16728096 -> [ 480.22658] (node@node-0.acme.org) My finger table: -> [ 480.22658] (node@node-0.acme.org) Start | Succ -> [ 480.22658] (node@node-0.acme.org) 3 | 42 -> [ 480.22658] (node@node-0.acme.org) 4 | 16509405 -> [ 480.22658] (node@node-0.acme.org) 6 | 533744 -> [ 480.22658] (node@node-0.acme.org) Predecessor: 16728096 -> [ 485.23429] (node@node-6.acme.org) My new finger #2 is 42 -> [ 485.23429] (node@node-6.acme.org) My finger table: -> [ 485.23429] (node@node-6.acme.org) Start | Succ -> [ 485.23429] (node@node-6.acme.org) 1 | 42 -> [ 485.23429] (node@node-6.acme.org) 2 | 42 -> [ 485.23429] (node@node-6.acme.org) 4 | 42 -> [ 485.23429] (node@node-6.acme.org) Predecessor: -1 -> [ 495.24189] (node@node-0.acme.org) My new finger #0 is 16728096 -> [ 575.25691] (node@node-6.acme.org) My new predecessor is 42 -> [ 575.25691] (node@node-6.acme.org) My finger table: -> [ 575.25691] (node@node-6.acme.org) Start | Succ -> [ 575.25691] (node@node-6.acme.org) 1 | 42 -> [ 575.25691] (node@node-6.acme.org) 2 | 42 -> [ 575.25691] (node@node-6.acme.org) 4 | 42 -> [ 575.25691] (node@node-6.acme.org) Predecessor: 42 -> [ 600.26421] (node@node-0.acme.org) My new finger #1 is 16728096 -> [ 600.26421] (node@node-0.acme.org) My finger table: -> [ 600.26421] (node@node-0.acme.org) Start | Succ -> [ 600.26421] (node@node-0.acme.org) 3 | 16728096 -> [ 600.26421] (node@node-0.acme.org) 4 | 16728096 -> [ 600.26421] (node@node-0.acme.org) 6 | 533744 -> [ 600.26421] (node@node-0.acme.org) Predecessor: 16728096 -> [ 720.35548] (node@node-0.acme.org) My new finger #2 is 16728096 -> [ 720.35548] (node@node-0.acme.org) My finger table: -> [ 720.35548] (node@node-0.acme.org) Start | Succ -> [ 720.35548] (node@node-0.acme.org) 3 | 16728096 -> [ 720.35548] (node@node-0.acme.org) 4 | 16728096 -> [ 720.35548] (node@node-0.acme.org) 6 | 16728096 -> [ 720.35548] (node@node-0.acme.org) Predecessor: 16728096 -> [ 855.45426] (node@node-6.acme.org) My new finger #2 is 16728096 -> [ 855.45426] (node@node-6.acme.org) My finger table: -> [ 855.45426] (node@node-6.acme.org) Start | Succ -> [ 855.45426] (node@node-6.acme.org) 1 | 42 -> [ 855.45426] (node@node-6.acme.org) 2 | 42 -> [ 855.45426] (node@node-6.acme.org) 4 | 16728096 -> [ 855.45426] (node@node-6.acme.org) Predecessor: 42 -> [ 860.45416] (node@node-6.acme.org) Well Guys! I Think it's time for me to leave ;) -> [ 865.44626] (node@node-0.acme.org) My new predecessor is 42 -> [ 890.42334] (node@node-5.acme.org) Well Guys! I Think it's time for me to leave ;) -> [ 915.44626] (node@node-0.acme.org) My new finger #0 is 42 -> [ 940.44576] (node@node-0.acme.org) My new finger #0 is 16509405 -> [ 990.44576] (node@node-0.acme.org) My new finger #1 is 16509405 -> [ 990.44576] (node@node-0.acme.org) My finger table: -> [ 990.44576] (node@node-0.acme.org) Start | Succ -> [ 990.44576] (node@node-0.acme.org) 3 | 16509405 -> [ 990.44576] (node@node-0.acme.org) 4 | 16509405 -> [ 990.44576] (node@node-0.acme.org) 6 | 16728096 -> [ 990.44576] (node@node-0.acme.org) Predecessor: 42 -> [1040.44576] (node@node-0.acme.org) Well Guys! I Think it's time for me to leave ;) +> [ 0.00000] (node@node-0.simgrid.org) My finger table: +> [ 0.00000] (node@node-0.simgrid.org) Start | Succ +> [ 0.00000] (node@node-0.simgrid.org) 3 | 42 +> [ 0.00000] (node@node-0.simgrid.org) 4 | 42 +> [ 0.00000] (node@node-0.simgrid.org) 6 | 42 +> [ 0.00000] (node@node-0.simgrid.org) Predecessor: -1 +> [ 10.00000] (node@node-1.simgrid.org) Joining the ring with id 366680, knowing node 42 +> [ 15.00751] (node@node-1.simgrid.org) My new finger #0 is 42 +> [ 15.00751] (node@node-1.simgrid.org) My finger table: +> [ 15.00751] (node@node-1.simgrid.org) Start | Succ +> [ 15.00751] (node@node-1.simgrid.org) 1 | 42 +> [ 15.00751] (node@node-1.simgrid.org) 2 | 366680 +> [ 15.00751] (node@node-1.simgrid.org) 4 | 366680 +> [ 15.00751] (node@node-1.simgrid.org) Predecessor: -1 +> [ 20.00000] (node@node-2.simgrid.org) Joining the ring with id 533744, knowing node 366680 +> [ 30.00000] (node@node-3.simgrid.org) Joining the ring with id 1319738, knowing node 42 +> [ 30.00721] (node@node-2.simgrid.org) My new finger #0 is 42 +> [ 30.00721] (node@node-2.simgrid.org) My finger table: +> [ 30.00721] (node@node-2.simgrid.org) Start | Succ +> [ 30.00721] (node@node-2.simgrid.org) 1 | 42 +> [ 30.00721] (node@node-2.simgrid.org) 2 | 533744 +> [ 30.00721] (node@node-2.simgrid.org) 4 | 533744 +> [ 30.00721] (node@node-2.simgrid.org) Predecessor: -1 +> [ 35.00711] (node@node-3.simgrid.org) My new finger #0 is 42 +> [ 35.00711] (node@node-3.simgrid.org) My finger table: +> [ 35.00711] (node@node-3.simgrid.org) Start | Succ +> [ 35.00711] (node@node-3.simgrid.org) 3 | 42 +> [ 35.00711] (node@node-3.simgrid.org) 4 | 1319738 +> [ 35.00711] (node@node-3.simgrid.org) 6 | 1319738 +> [ 35.00711] (node@node-3.simgrid.org) Predecessor: -1 +> [ 40.00000] (node@node-4.simgrid.org) Joining the ring with id 16509405, knowing node 366680 +> [ 49.99900] (node@node-0.simgrid.org) My new predecessor is 366680 +> [ 49.99900] (node@node-0.simgrid.org) My finger table: +> [ 49.99900] (node@node-0.simgrid.org) Start | Succ +> [ 49.99900] (node@node-0.simgrid.org) 3 | 42 +> [ 49.99900] (node@node-0.simgrid.org) 4 | 42 +> [ 49.99900] (node@node-0.simgrid.org) 6 | 42 +> [ 49.99900] (node@node-0.simgrid.org) Predecessor: 366680 +> [ 49.99900] (node@node-0.simgrid.org) My new finger #0 is 366680 +> [ 55.00671] (node@node-4.simgrid.org) My new finger #0 is 366680 +> [ 55.00671] (node@node-4.simgrid.org) My finger table: +> [ 55.00671] (node@node-4.simgrid.org) Start | Succ +> [ 55.00671] (node@node-4.simgrid.org) 6 | 366680 +> [ 55.00671] (node@node-4.simgrid.org) 7 | 16509405 +> [ 55.00671] (node@node-4.simgrid.org) 1 | 16509405 +> [ 55.00671] (node@node-4.simgrid.org) Predecessor: -1 +> [ 60.00000] (node@node-6.simgrid.org) Joining the ring with id 16728096, knowing node 1319738 +> [ 65.00651] (node@node-3.simgrid.org) My new finger #0 is 366680 +> [ 65.01431] (node@node-6.simgrid.org) My new finger #0 is 366680 +> [ 65.01431] (node@node-6.simgrid.org) My finger table: +> [ 65.01431] (node@node-6.simgrid.org) Start | Succ +> [ 65.01431] (node@node-6.simgrid.org) 1 | 366680 +> [ 65.01431] (node@node-6.simgrid.org) 2 | 16728096 +> [ 65.01431] (node@node-6.simgrid.org) 4 | 16728096 +> [ 65.01431] (node@node-6.simgrid.org) Predecessor: -1 +> [ 70.00641] (node@node-1.simgrid.org) My new predecessor is 16509405 +> [ 70.00641] (node@node-1.simgrid.org) My finger table: +> [ 70.00641] (node@node-1.simgrid.org) Start | Succ +> [ 70.00641] (node@node-1.simgrid.org) 1 | 42 +> [ 70.00641] (node@node-1.simgrid.org) 2 | 366680 +> [ 70.00641] (node@node-1.simgrid.org) 4 | 366680 +> [ 70.00641] (node@node-1.simgrid.org) Predecessor: 16509405 +> [ 80.01401] (node@node-0.simgrid.org) My new finger #0 is 16509405 +> [ 85.01391] (node@node-6.simgrid.org) My new finger #0 is 16509405 +> [ 100.02922] (node@node-3.simgrid.org) My new finger #0 is 16509405 +> [ 110.02902] (node@node-4.simgrid.org) My new predecessor is 42 +> [ 110.02902] (node@node-4.simgrid.org) My finger table: +> [ 110.02902] (node@node-4.simgrid.org) Start | Succ +> [ 110.02902] (node@node-4.simgrid.org) 6 | 366680 +> [ 110.02902] (node@node-4.simgrid.org) 7 | 16509405 +> [ 110.02902] (node@node-4.simgrid.org) 1 | 16509405 +> [ 110.02902] (node@node-4.simgrid.org) Predecessor: 42 +> [ 115.03673] (node@node-6.simgrid.org) My new finger #0 is 42 +> [ 200.05164] (node@node-3.simgrid.org) Well Guys! I Think it's time for me to leave ;) +> [ 210.04364] (node@node-1.simgrid.org) Well Guys! I Think it's time for me to leave ;) +> [ 210.05925] (node@node-4.simgrid.org) My new predecessor is -1 +> [ 220.05905] (node@node-4.simgrid.org) My new predecessor is 42 +> [ 220.05905] (node@node-4.simgrid.org) My finger table: +> [ 220.05905] (node@node-4.simgrid.org) Start | Succ +> [ 220.05905] (node@node-4.simgrid.org) 6 | 366680 +> [ 220.05905] (node@node-4.simgrid.org) 7 | 16509405 +> [ 220.05905] (node@node-4.simgrid.org) 1 | 16509405 +> [ 220.05905] (node@node-4.simgrid.org) Predecessor: 42 +> [ 220.07466] (node@node-0.simgrid.org) My new predecessor is 16509405 +> [ 225.05895] (node@node-4.simgrid.org) My new finger #0 is 42 +> [ 230.07446] (node@node-0.simgrid.org) My new predecessor is 533744 +> [ 230.07446] (node@node-0.simgrid.org) My finger table: +> [ 230.07446] (node@node-0.simgrid.org) Start | Succ +> [ 230.07446] (node@node-0.simgrid.org) 3 | 16509405 +> [ 230.07446] (node@node-0.simgrid.org) 4 | 42 +> [ 230.07446] (node@node-0.simgrid.org) 6 | 42 +> [ 230.07446] (node@node-0.simgrid.org) Predecessor: 533744 +> [ 235.08217] (node@node-4.simgrid.org) My new finger #0 is 533744 +> [ 240.08987] (node@node-0.simgrid.org) My new finger #1 is 16509405 +> [ 240.08987] (node@node-0.simgrid.org) My finger table: +> [ 240.08987] (node@node-0.simgrid.org) Start | Succ +> [ 240.08987] (node@node-0.simgrid.org) 3 | 16509405 +> [ 240.08987] (node@node-0.simgrid.org) 4 | 16509405 +> [ 240.08987] (node@node-0.simgrid.org) 6 | 42 +> [ 240.08987] (node@node-0.simgrid.org) Predecessor: 533744 +> [ 250.00000] (node@node-5.simgrid.org) Joining the ring with id 10874876, knowing node 533744 +> [ 255.11299] (node@node-5.simgrid.org) My new finger #0 is 16509405 +> [ 255.11299] (node@node-5.simgrid.org) My finger table: +> [ 255.11299] (node@node-5.simgrid.org) Start | Succ +> [ 255.11299] (node@node-5.simgrid.org) 5 | 16509405 +> [ 255.11299] (node@node-5.simgrid.org) 6 | 10874876 +> [ 255.11299] (node@node-5.simgrid.org) 0 | 10874876 +> [ 255.11299] (node@node-5.simgrid.org) Predecessor: -1 +> [ 265.09718] (node@node-2.simgrid.org) My new predecessor is 16509405 +> [ 265.09718] (node@node-2.simgrid.org) My finger table: +> [ 265.09718] (node@node-2.simgrid.org) Start | Succ +> [ 265.09718] (node@node-2.simgrid.org) 1 | 42 +> [ 265.09718] (node@node-2.simgrid.org) 2 | 533744 +> [ 265.09718] (node@node-2.simgrid.org) 4 | 533744 +> [ 265.09718] (node@node-2.simgrid.org) Predecessor: 16509405 +> [ 275.11259] (node@node-5.simgrid.org) My new finger #0 is 42 +> [ 280.10468] (node@node-4.simgrid.org) My new predecessor is 10874876 +> [ 280.10468] (node@node-4.simgrid.org) My finger table: +> [ 280.10468] (node@node-4.simgrid.org) Start | Succ +> [ 280.10468] (node@node-4.simgrid.org) 6 | 533744 +> [ 280.10468] (node@node-4.simgrid.org) 7 | 16509405 +> [ 280.10468] (node@node-4.simgrid.org) 1 | 16509405 +> [ 280.10468] (node@node-4.simgrid.org) Predecessor: 10874876 +> [ 285.13581] (node@node-4.simgrid.org) My new predecessor is 42 +> [ 285.13581] (node@node-4.simgrid.org) My finger table: +> [ 285.13581] (node@node-4.simgrid.org) Start | Succ +> [ 285.13581] (node@node-4.simgrid.org) 6 | 533744 +> [ 285.13581] (node@node-4.simgrid.org) 7 | 16509405 +> [ 285.13581] (node@node-4.simgrid.org) 1 | 16509405 +> [ 285.13581] (node@node-4.simgrid.org) Predecessor: 42 +> [ 300.13551] (node@node-4.simgrid.org) My new finger #1 is 533744 +> [ 300.13551] (node@node-4.simgrid.org) My finger table: +> [ 300.13551] (node@node-4.simgrid.org) Start | Succ +> [ 300.13551] (node@node-4.simgrid.org) 6 | 533744 +> [ 300.13551] (node@node-4.simgrid.org) 7 | 533744 +> [ 300.13551] (node@node-4.simgrid.org) 1 | 16509405 +> [ 300.13551] (node@node-4.simgrid.org) Predecessor: 42 +> [ 300.14332] (node@node-2.simgrid.org) My new finger #1 is 42 +> [ 300.14332] (node@node-2.simgrid.org) My finger table: +> [ 300.14332] (node@node-2.simgrid.org) Start | Succ +> [ 300.14332] (node@node-2.simgrid.org) 1 | 42 +> [ 300.14332] (node@node-2.simgrid.org) 2 | 42 +> [ 300.14332] (node@node-2.simgrid.org) 4 | 533744 +> [ 300.14332] (node@node-2.simgrid.org) Predecessor: 16509405 +> [ 305.14322] (node@node-5.simgrid.org) My new finger #0 is 533744 +> [ 305.15102] (node@node-0.simgrid.org) My new finger #0 is 10874876 +> [ 310.15873] (node@node-6.simgrid.org) My new finger #1 is 42 +> [ 310.15873] (node@node-6.simgrid.org) My finger table: +> [ 310.15873] (node@node-6.simgrid.org) Start | Succ +> [ 310.15873] (node@node-6.simgrid.org) 1 | 42 +> [ 310.15873] (node@node-6.simgrid.org) 2 | 42 +> [ 310.15873] (node@node-6.simgrid.org) 4 | 16728096 +> [ 310.15873] (node@node-6.simgrid.org) Predecessor: -1 +> [ 330.16613] (node@node-5.simgrid.org) My new finger #0 is 16509405 +> [ 335.16603] (node@node-5.simgrid.org) My new predecessor is 42 +> [ 335.16603] (node@node-5.simgrid.org) My finger table: +> [ 335.16603] (node@node-5.simgrid.org) Start | Succ +> [ 335.16603] (node@node-5.simgrid.org) 5 | 16509405 +> [ 335.16603] (node@node-5.simgrid.org) 6 | 10874876 +> [ 335.16603] (node@node-5.simgrid.org) 0 | 10874876 +> [ 335.16603] (node@node-5.simgrid.org) Predecessor: 42 +> [ 340.16593] (node@node-4.simgrid.org) Well Guys! I Think it's time for me to leave ;) +> [ 350.15793] (node@node-2.simgrid.org) My new predecessor is 42 +> [ 350.16573] (node@node-0.simgrid.org) My new finger #0 is 533744 +> [ 360.18115] (node@node-0.simgrid.org) My new finger #2 is 533744 +> [ 360.18115] (node@node-0.simgrid.org) My finger table: +> [ 360.18115] (node@node-0.simgrid.org) Start | Succ +> [ 360.18115] (node@node-0.simgrid.org) 3 | 533744 +> [ 360.18115] (node@node-0.simgrid.org) 4 | 16509405 +> [ 360.18115] (node@node-0.simgrid.org) 6 | 533744 +> [ 360.18115] (node@node-0.simgrid.org) Predecessor: 533744 +> [ 420.23459] (node@node-2.simgrid.org) Well Guys! I Think it's time for me to leave ;) +> [ 425.22668] (node@node-0.simgrid.org) My new predecessor is 42 +> [ 475.22668] (node@node-0.simgrid.org) My new finger #0 is 42 +> [ 480.22658] (node@node-0.simgrid.org) My new predecessor is 16728096 +> [ 480.22658] (node@node-0.simgrid.org) My finger table: +> [ 480.22658] (node@node-0.simgrid.org) Start | Succ +> [ 480.22658] (node@node-0.simgrid.org) 3 | 42 +> [ 480.22658] (node@node-0.simgrid.org) 4 | 16509405 +> [ 480.22658] (node@node-0.simgrid.org) 6 | 533744 +> [ 480.22658] (node@node-0.simgrid.org) Predecessor: 16728096 +> [ 485.23429] (node@node-6.simgrid.org) My new finger #2 is 42 +> [ 485.23429] (node@node-6.simgrid.org) My finger table: +> [ 485.23429] (node@node-6.simgrid.org) Start | Succ +> [ 485.23429] (node@node-6.simgrid.org) 1 | 42 +> [ 485.23429] (node@node-6.simgrid.org) 2 | 42 +> [ 485.23429] (node@node-6.simgrid.org) 4 | 42 +> [ 485.23429] (node@node-6.simgrid.org) Predecessor: -1 +> [ 495.24189] (node@node-0.simgrid.org) My new finger #0 is 16728096 +> [ 575.25691] (node@node-6.simgrid.org) My new predecessor is 42 +> [ 575.25691] (node@node-6.simgrid.org) My finger table: +> [ 575.25691] (node@node-6.simgrid.org) Start | Succ +> [ 575.25691] (node@node-6.simgrid.org) 1 | 42 +> [ 575.25691] (node@node-6.simgrid.org) 2 | 42 +> [ 575.25691] (node@node-6.simgrid.org) 4 | 42 +> [ 575.25691] (node@node-6.simgrid.org) Predecessor: 42 +> [ 600.26421] (node@node-0.simgrid.org) My new finger #1 is 16728096 +> [ 600.26421] (node@node-0.simgrid.org) My finger table: +> [ 600.26421] (node@node-0.simgrid.org) Start | Succ +> [ 600.26421] (node@node-0.simgrid.org) 3 | 16728096 +> [ 600.26421] (node@node-0.simgrid.org) 4 | 16728096 +> [ 600.26421] (node@node-0.simgrid.org) 6 | 533744 +> [ 600.26421] (node@node-0.simgrid.org) Predecessor: 16728096 +> [ 720.35548] (node@node-0.simgrid.org) My new finger #2 is 16728096 +> [ 720.35548] (node@node-0.simgrid.org) My finger table: +> [ 720.35548] (node@node-0.simgrid.org) Start | Succ +> [ 720.35548] (node@node-0.simgrid.org) 3 | 16728096 +> [ 720.35548] (node@node-0.simgrid.org) 4 | 16728096 +> [ 720.35548] (node@node-0.simgrid.org) 6 | 16728096 +> [ 720.35548] (node@node-0.simgrid.org) Predecessor: 16728096 +> [ 855.45426] (node@node-6.simgrid.org) My new finger #2 is 16728096 +> [ 855.45426] (node@node-6.simgrid.org) My finger table: +> [ 855.45426] (node@node-6.simgrid.org) Start | Succ +> [ 855.45426] (node@node-6.simgrid.org) 1 | 42 +> [ 855.45426] (node@node-6.simgrid.org) 2 | 42 +> [ 855.45426] (node@node-6.simgrid.org) 4 | 16728096 +> [ 855.45426] (node@node-6.simgrid.org) Predecessor: 42 +> [ 860.45416] (node@node-6.simgrid.org) Well Guys! I Think it's time for me to leave ;) +> [ 865.44626] (node@node-0.simgrid.org) My new predecessor is 42 +> [ 890.42334] (node@node-5.simgrid.org) Well Guys! I Think it's time for me to leave ;) +> [ 915.44626] (node@node-0.simgrid.org) My new finger #0 is 42 +> [ 940.44576] (node@node-0.simgrid.org) My new finger #0 is 16509405 +> [ 990.44576] (node@node-0.simgrid.org) My new finger #1 is 16509405 +> [ 990.44576] (node@node-0.simgrid.org) My finger table: +> [ 990.44576] (node@node-0.simgrid.org) Start | Succ +> [ 990.44576] (node@node-0.simgrid.org) 3 | 16509405 +> [ 990.44576] (node@node-0.simgrid.org) 4 | 16509405 +> [ 990.44576] (node@node-0.simgrid.org) 6 | 16728096 +> [ 990.44576] (node@node-0.simgrid.org) Predecessor: 42 +> [1040.44576] (node@node-0.simgrid.org) Well Guys! I Think it's time for me to leave ;) > [1090.44576] (maestro@) Simulated time: 1090.45 diff --git a/examples/s4u/dht-chord/s4u-dht-chord_d.xml b/examples/s4u/dht-chord/s4u-dht-chord_d.xml index d2af449509..fa0982255a 100644 --- a/examples/s4u/dht-chord/s4u-dht-chord_d.xml +++ b/examples/s4u/dht-chord/s4u-dht-chord_d.xml @@ -1,41 +1,41 @@ - + - + - + - + - + - + - + diff --git a/examples/s4u/dht-kademlia/generate.py b/examples/s4u/dht-kademlia/generate.py index 3e75bacdf9..d4a9c287c9 100755 --- a/examples/s4u/dht-kademlia/generate.py +++ b/examples/s4u/dht-kademlia/generate.py @@ -23,7 +23,7 @@ all_ids = [0] sys.stdout.write("\n" "\n" - "\n \n" + "\n \n" " \n \n \n" % end_date) for i in range(1, nb_nodes): @@ -33,7 +33,7 @@ for i in range(1, nb_nodes): ok = not my_id in all_ids known_id = all_ids[random.randint(0, len(all_ids) - 1)] start_date = i * 10 - line = " \n "\ + line = " \n "\ "\n \n \n \n" % ( i, my_id, known_id, end_date) sys.stdout.write(line) diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh index 94de33bf7c..4370d1588e 100644 --- a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh +++ b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh @@ -4,30 +4,30 @@ p Testing the Kademlia implementation with S4U ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/s4u-dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" -> [ 0.000000] ( 1:node@node-0.acme.org) Hi, I'm going to create the network with id 0 -> [ 0.000000] ( 2:node@node-1.acme.org) Hi, I'm going to join the network with id 1 -> [ 0.000000] ( 3:node@node-2.acme.org) Hi, I'm going to join the network with id 3 -> [ 0.000000] ( 4:node@node-3.acme.org) Hi, I'm going to join the network with id 7 -> [ 0.000000] ( 5:node@node-4.acme.org) Hi, I'm going to join the network with id 15 -> [ 0.000000] ( 6:node@node-5.acme.org) Hi, I'm going to join the network with id 31 -> [ 0.000000] ( 7:node@node-6.acme.org) Hi, I'm going to join the network with id 63 -> [ 0.000000] ( 8:node@node-7.acme.org) Hi, I'm going to join the network with id 127 -> [ 0.000000] ( 9:node@node-8.acme.org) Hi, I'm going to join the network with id 255 -> [ 0.000000] (10:node@node-9.acme.org) Hi, I'm going to join the network with id 511 -> [ 0.000000] (11:node@node-10.acme.org) Hi, I'm going to join the network with id 1023 -> [ 0.000000] (12:node@node-11.acme.org) Hi, I'm going to join the network with id 2047 -> [ 0.000000] (13:node@node-12.acme.org) Hi, I'm going to join the network with id 4095 -> [780.000000] ( 7:node@node-6.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] ( 9:node@node-8.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] ( 3:node@node-2.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] ( 2:node@node-1.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] (11:node@node-10.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] ( 1:node@node-0.acme.org) 7/7 FIND_NODE have succeeded -> [780.000000] ( 5:node@node-4.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] (13:node@node-12.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] ( 8:node@node-7.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] ( 6:node@node-5.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] (10:node@node-9.acme.org) 5/5 FIND_NODE have succeeded -> [780.000000] (12:node@node-11.acme.org) 6/6 FIND_NODE have succeeded -> [780.000000] ( 4:node@node-3.acme.org) 5/5 FIND_NODE have succeeded +> [ 0.000000] ( 1:node@node-0.simgrid.org) Hi, I'm going to create the network with id 0 +> [ 0.000000] ( 2:node@node-1.simgrid.org) Hi, I'm going to join the network with id 1 +> [ 0.000000] ( 3:node@node-2.simgrid.org) Hi, I'm going to join the network with id 3 +> [ 0.000000] ( 4:node@node-3.simgrid.org) Hi, I'm going to join the network with id 7 +> [ 0.000000] ( 5:node@node-4.simgrid.org) Hi, I'm going to join the network with id 15 +> [ 0.000000] ( 6:node@node-5.simgrid.org) Hi, I'm going to join the network with id 31 +> [ 0.000000] ( 7:node@node-6.simgrid.org) Hi, I'm going to join the network with id 63 +> [ 0.000000] ( 8:node@node-7.simgrid.org) Hi, I'm going to join the network with id 127 +> [ 0.000000] ( 9:node@node-8.simgrid.org) Hi, I'm going to join the network with id 255 +> [ 0.000000] (10:node@node-9.simgrid.org) Hi, I'm going to join the network with id 511 +> [ 0.000000] (11:node@node-10.simgrid.org) Hi, I'm going to join the network with id 1023 +> [ 0.000000] (12:node@node-11.simgrid.org) Hi, I'm going to join the network with id 2047 +> [ 0.000000] (13:node@node-12.simgrid.org) Hi, I'm going to join the network with id 4095 +> [780.000000] ( 7:node@node-6.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] ( 9:node@node-8.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] ( 3:node@node-2.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] ( 2:node@node-1.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] (11:node@node-10.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] ( 1:node@node-0.simgrid.org) 7/7 FIND_NODE have succeeded +> [780.000000] ( 5:node@node-4.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] (13:node@node-12.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] ( 8:node@node-7.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] ( 6:node@node-5.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] (10:node@node-9.simgrid.org) 5/5 FIND_NODE have succeeded +> [780.000000] (12:node@node-11.simgrid.org) 6/6 FIND_NODE have succeeded +> [780.000000] ( 4:node@node-3.simgrid.org) 5/5 FIND_NODE have succeeded > [780.000000] ( 0:maestro@) Simulated time: 780 diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml b/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml index e199776298..05a08792d3 100644 --- a/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml +++ b/examples/s4u/dht-kademlia/s4u-dht-kademlia_d.xml @@ -2,69 +2,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/examples/s4u/platform-properties/s4u-platform-properties.cpp b/examples/s4u/platform-properties/s4u-platform-properties.cpp index b0298ce0f8..836c6dca34 100644 --- a/examples/s4u/platform-properties/s4u-platform-properties.cpp +++ b/examples/s4u/platform-properties/s4u-platform-properties.cpp @@ -68,7 +68,7 @@ static void david(std::vector /*args*/) { /* Dump what we have on a remote host */ simgrid::s4u::this_actor::sleep_for(2); // Wait for alice and carole to be done with its experiment - test_host("node-0.acme.org"); + test_host("node-0.simgrid.org"); } static void bob(std::vector /*args*/) diff --git a/examples/s4u/platform-properties/s4u-platform-properties.tesh b/examples/s4u/platform-properties/s4u-platform-properties.tesh index 351105acf0..b3f7e54b91 100644 --- a/examples/s4u/platform-properties/s4u-platform-properties.tesh +++ b/examples/s4u/platform-properties/s4u-platform-properties.tesh @@ -7,11 +7,11 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-properties$EXEEXT ${platfdir}/prop.xm > [ 0.000000] (0:maestro@) There are 7 hosts in the environment > [ 0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s > [ 0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-0.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-1.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-2.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-3.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-4.acme.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-0.simgrid.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-1.simgrid.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-2.simgrid.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-3.simgrid.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-4.simgrid.org' runs at 1000000000 flops/s > [ 0.000000] (2:bob@host1) == Print the properties of the zone > [ 0.000000] (2:bob@host1) Zone property: filename -> prop.xml > [ 0.000000] (2:bob@host1) Zone property: date -> 31-08-12 @@ -35,7 +35,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-properties$EXEEXT ${platfdir}/prop.xm > [ 1.000000] (3:carole@host2) Property: Hdd old value: 180 > [ 1.000000] (3:carole@host2) == Trying to modify a host property > [ 1.000000] (3:carole@host2) Property: Hdd old value: 250 -> [ 2.000000] (4:david@host2) == Print the properties of the host 'node-0.acme.org' +> [ 2.000000] (4:david@host2) == Print the properties of the host 'node-0.simgrid.org' > [ 2.000000] (4:david@host2) Host property: 'Hdd' -> '180' > [ 2.000000] (4:david@host2) Host property: 'bla' -> 'acme cluster' > [ 2.000000] (4:david@host2) Host property: 'mem' -> '42' diff --git a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh index 99cc45c0db..7cdeeab957 100644 --- a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh +++ b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh @@ -29,126 +29,126 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-routing-get-clusters$EXEEXT ${platfdir}/cluste $ $SG_TEST_EXENV ${bindir:=.}/s4u-routing-get-clusters$EXEEXT ${platfdir}/cluster_dragonfly.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n" > [ 0.000000] (maestro@) bob_cluster -> [ 0.000000] (maestro@) node-0.acme.org -> [ 0.000000] (maestro@) node-1.acme.org -> [ 0.000000] (maestro@) node-2.acme.org -> [ 0.000000] (maestro@) node-3.acme.org -> [ 0.000000] (maestro@) node-4.acme.org -> [ 0.000000] (maestro@) node-5.acme.org -> [ 0.000000] (maestro@) node-6.acme.org -> [ 0.000000] (maestro@) node-7.acme.org -> [ 0.000000] (maestro@) node-8.acme.org -> [ 0.000000] (maestro@) node-9.acme.org -> [ 0.000000] (maestro@) node-10.acme.org -> [ 0.000000] (maestro@) node-11.acme.org -> [ 0.000000] (maestro@) node-12.acme.org -> [ 0.000000] (maestro@) node-13.acme.org -> [ 0.000000] (maestro@) node-14.acme.org -> [ 0.000000] (maestro@) node-15.acme.org -> [ 0.000000] (maestro@) node-16.acme.org -> [ 0.000000] (maestro@) node-17.acme.org -> [ 0.000000] (maestro@) node-18.acme.org -> [ 0.000000] (maestro@) node-19.acme.org -> [ 0.000000] (maestro@) node-20.acme.org -> [ 0.000000] (maestro@) node-21.acme.org -> [ 0.000000] (maestro@) node-22.acme.org -> [ 0.000000] (maestro@) node-23.acme.org -> [ 0.000000] (maestro@) node-24.acme.org -> [ 0.000000] (maestro@) node-25.acme.org -> [ 0.000000] (maestro@) node-26.acme.org -> [ 0.000000] (maestro@) node-27.acme.org -> [ 0.000000] (maestro@) node-28.acme.org -> [ 0.000000] (maestro@) node-29.acme.org -> [ 0.000000] (maestro@) node-30.acme.org -> [ 0.000000] (maestro@) node-31.acme.org -> [ 0.000000] (maestro@) node-32.acme.org -> [ 0.000000] (maestro@) node-33.acme.org -> [ 0.000000] (maestro@) node-34.acme.org -> [ 0.000000] (maestro@) node-35.acme.org -> [ 0.000000] (maestro@) node-36.acme.org -> [ 0.000000] (maestro@) node-37.acme.org -> [ 0.000000] (maestro@) node-38.acme.org -> [ 0.000000] (maestro@) node-39.acme.org -> [ 0.000000] (maestro@) node-40.acme.org -> [ 0.000000] (maestro@) node-41.acme.org -> [ 0.000000] (maestro@) node-42.acme.org -> [ 0.000000] (maestro@) node-43.acme.org -> [ 0.000000] (maestro@) node-44.acme.org -> [ 0.000000] (maestro@) node-45.acme.org -> [ 0.000000] (maestro@) node-46.acme.org -> [ 0.000000] (maestro@) node-47.acme.org -> [ 0.000000] (maestro@) node-48.acme.org -> [ 0.000000] (maestro@) node-49.acme.org -> [ 0.000000] (maestro@) node-50.acme.org -> [ 0.000000] (maestro@) node-51.acme.org -> [ 0.000000] (maestro@) node-52.acme.org -> [ 0.000000] (maestro@) node-53.acme.org -> [ 0.000000] (maestro@) node-54.acme.org -> [ 0.000000] (maestro@) node-55.acme.org -> [ 0.000000] (maestro@) node-56.acme.org -> [ 0.000000] (maestro@) node-57.acme.org -> [ 0.000000] (maestro@) node-58.acme.org -> [ 0.000000] (maestro@) node-59.acme.org -> [ 0.000000] (maestro@) node-60.acme.org -> [ 0.000000] (maestro@) node-61.acme.org -> [ 0.000000] (maestro@) node-62.acme.org -> [ 0.000000] (maestro@) node-63.acme.org -> [ 0.000000] (maestro@) node-64.acme.org -> [ 0.000000] (maestro@) node-65.acme.org -> [ 0.000000] (maestro@) node-66.acme.org -> [ 0.000000] (maestro@) node-67.acme.org -> [ 0.000000] (maestro@) node-68.acme.org -> [ 0.000000] (maestro@) node-69.acme.org -> [ 0.000000] (maestro@) node-70.acme.org -> [ 0.000000] (maestro@) node-71.acme.org -> [ 0.000000] (maestro@) node-72.acme.org -> [ 0.000000] (maestro@) node-73.acme.org -> [ 0.000000] (maestro@) node-74.acme.org -> [ 0.000000] (maestro@) node-75.acme.org -> [ 0.000000] (maestro@) node-76.acme.org -> [ 0.000000] (maestro@) node-77.acme.org -> [ 0.000000] (maestro@) node-78.acme.org -> [ 0.000000] (maestro@) node-79.acme.org -> [ 0.000000] (maestro@) node-80.acme.org -> [ 0.000000] (maestro@) node-81.acme.org -> [ 0.000000] (maestro@) node-82.acme.org -> [ 0.000000] (maestro@) node-83.acme.org -> [ 0.000000] (maestro@) node-84.acme.org -> [ 0.000000] (maestro@) node-85.acme.org -> [ 0.000000] (maestro@) node-86.acme.org -> [ 0.000000] (maestro@) node-87.acme.org -> [ 0.000000] (maestro@) node-88.acme.org -> [ 0.000000] (maestro@) node-89.acme.org -> [ 0.000000] (maestro@) node-90.acme.org -> [ 0.000000] (maestro@) node-91.acme.org -> [ 0.000000] (maestro@) node-92.acme.org -> [ 0.000000] (maestro@) node-93.acme.org -> [ 0.000000] (maestro@) node-94.acme.org -> [ 0.000000] (maestro@) node-95.acme.org -> [ 0.000000] (maestro@) node-96.acme.org -> [ 0.000000] (maestro@) node-97.acme.org -> [ 0.000000] (maestro@) node-98.acme.org -> [ 0.000000] (maestro@) node-99.acme.org -> [ 0.000000] (maestro@) node-100.acme.org -> [ 0.000000] (maestro@) node-101.acme.org -> [ 0.000000] (maestro@) node-102.acme.org -> [ 0.000000] (maestro@) node-103.acme.org -> [ 0.000000] (maestro@) node-104.acme.org -> [ 0.000000] (maestro@) node-105.acme.org -> [ 0.000000] (maestro@) node-106.acme.org -> [ 0.000000] (maestro@) node-107.acme.org -> [ 0.000000] (maestro@) node-108.acme.org -> [ 0.000000] (maestro@) node-109.acme.org -> [ 0.000000] (maestro@) node-110.acme.org -> [ 0.000000] (maestro@) node-111.acme.org -> [ 0.000000] (maestro@) node-112.acme.org -> [ 0.000000] (maestro@) node-113.acme.org -> [ 0.000000] (maestro@) node-114.acme.org -> [ 0.000000] (maestro@) node-115.acme.org -> [ 0.000000] (maestro@) node-116.acme.org -> [ 0.000000] (maestro@) node-117.acme.org -> [ 0.000000] (maestro@) node-118.acme.org -> [ 0.000000] (maestro@) node-119.acme.org +> [ 0.000000] (maestro@) node-0.simgrid.org +> [ 0.000000] (maestro@) node-1.simgrid.org +> [ 0.000000] (maestro@) node-2.simgrid.org +> [ 0.000000] (maestro@) node-3.simgrid.org +> [ 0.000000] (maestro@) node-4.simgrid.org +> [ 0.000000] (maestro@) node-5.simgrid.org +> [ 0.000000] (maestro@) node-6.simgrid.org +> [ 0.000000] (maestro@) node-7.simgrid.org +> [ 0.000000] (maestro@) node-8.simgrid.org +> [ 0.000000] (maestro@) node-9.simgrid.org +> [ 0.000000] (maestro@) node-10.simgrid.org +> [ 0.000000] (maestro@) node-11.simgrid.org +> [ 0.000000] (maestro@) node-12.simgrid.org +> [ 0.000000] (maestro@) node-13.simgrid.org +> [ 0.000000] (maestro@) node-14.simgrid.org +> [ 0.000000] (maestro@) node-15.simgrid.org +> [ 0.000000] (maestro@) node-16.simgrid.org +> [ 0.000000] (maestro@) node-17.simgrid.org +> [ 0.000000] (maestro@) node-18.simgrid.org +> [ 0.000000] (maestro@) node-19.simgrid.org +> [ 0.000000] (maestro@) node-20.simgrid.org +> [ 0.000000] (maestro@) node-21.simgrid.org +> [ 0.000000] (maestro@) node-22.simgrid.org +> [ 0.000000] (maestro@) node-23.simgrid.org +> [ 0.000000] (maestro@) node-24.simgrid.org +> [ 0.000000] (maestro@) node-25.simgrid.org +> [ 0.000000] (maestro@) node-26.simgrid.org +> [ 0.000000] (maestro@) node-27.simgrid.org +> [ 0.000000] (maestro@) node-28.simgrid.org +> [ 0.000000] (maestro@) node-29.simgrid.org +> [ 0.000000] (maestro@) node-30.simgrid.org +> [ 0.000000] (maestro@) node-31.simgrid.org +> [ 0.000000] (maestro@) node-32.simgrid.org +> [ 0.000000] (maestro@) node-33.simgrid.org +> [ 0.000000] (maestro@) node-34.simgrid.org +> [ 0.000000] (maestro@) node-35.simgrid.org +> [ 0.000000] (maestro@) node-36.simgrid.org +> [ 0.000000] (maestro@) node-37.simgrid.org +> [ 0.000000] (maestro@) node-38.simgrid.org +> [ 0.000000] (maestro@) node-39.simgrid.org +> [ 0.000000] (maestro@) node-40.simgrid.org +> [ 0.000000] (maestro@) node-41.simgrid.org +> [ 0.000000] (maestro@) node-42.simgrid.org +> [ 0.000000] (maestro@) node-43.simgrid.org +> [ 0.000000] (maestro@) node-44.simgrid.org +> [ 0.000000] (maestro@) node-45.simgrid.org +> [ 0.000000] (maestro@) node-46.simgrid.org +> [ 0.000000] (maestro@) node-47.simgrid.org +> [ 0.000000] (maestro@) node-48.simgrid.org +> [ 0.000000] (maestro@) node-49.simgrid.org +> [ 0.000000] (maestro@) node-50.simgrid.org +> [ 0.000000] (maestro@) node-51.simgrid.org +> [ 0.000000] (maestro@) node-52.simgrid.org +> [ 0.000000] (maestro@) node-53.simgrid.org +> [ 0.000000] (maestro@) node-54.simgrid.org +> [ 0.000000] (maestro@) node-55.simgrid.org +> [ 0.000000] (maestro@) node-56.simgrid.org +> [ 0.000000] (maestro@) node-57.simgrid.org +> [ 0.000000] (maestro@) node-58.simgrid.org +> [ 0.000000] (maestro@) node-59.simgrid.org +> [ 0.000000] (maestro@) node-60.simgrid.org +> [ 0.000000] (maestro@) node-61.simgrid.org +> [ 0.000000] (maestro@) node-62.simgrid.org +> [ 0.000000] (maestro@) node-63.simgrid.org +> [ 0.000000] (maestro@) node-64.simgrid.org +> [ 0.000000] (maestro@) node-65.simgrid.org +> [ 0.000000] (maestro@) node-66.simgrid.org +> [ 0.000000] (maestro@) node-67.simgrid.org +> [ 0.000000] (maestro@) node-68.simgrid.org +> [ 0.000000] (maestro@) node-69.simgrid.org +> [ 0.000000] (maestro@) node-70.simgrid.org +> [ 0.000000] (maestro@) node-71.simgrid.org +> [ 0.000000] (maestro@) node-72.simgrid.org +> [ 0.000000] (maestro@) node-73.simgrid.org +> [ 0.000000] (maestro@) node-74.simgrid.org +> [ 0.000000] (maestro@) node-75.simgrid.org +> [ 0.000000] (maestro@) node-76.simgrid.org +> [ 0.000000] (maestro@) node-77.simgrid.org +> [ 0.000000] (maestro@) node-78.simgrid.org +> [ 0.000000] (maestro@) node-79.simgrid.org +> [ 0.000000] (maestro@) node-80.simgrid.org +> [ 0.000000] (maestro@) node-81.simgrid.org +> [ 0.000000] (maestro@) node-82.simgrid.org +> [ 0.000000] (maestro@) node-83.simgrid.org +> [ 0.000000] (maestro@) node-84.simgrid.org +> [ 0.000000] (maestro@) node-85.simgrid.org +> [ 0.000000] (maestro@) node-86.simgrid.org +> [ 0.000000] (maestro@) node-87.simgrid.org +> [ 0.000000] (maestro@) node-88.simgrid.org +> [ 0.000000] (maestro@) node-89.simgrid.org +> [ 0.000000] (maestro@) node-90.simgrid.org +> [ 0.000000] (maestro@) node-91.simgrid.org +> [ 0.000000] (maestro@) node-92.simgrid.org +> [ 0.000000] (maestro@) node-93.simgrid.org +> [ 0.000000] (maestro@) node-94.simgrid.org +> [ 0.000000] (maestro@) node-95.simgrid.org +> [ 0.000000] (maestro@) node-96.simgrid.org +> [ 0.000000] (maestro@) node-97.simgrid.org +> [ 0.000000] (maestro@) node-98.simgrid.org +> [ 0.000000] (maestro@) node-99.simgrid.org +> [ 0.000000] (maestro@) node-100.simgrid.org +> [ 0.000000] (maestro@) node-101.simgrid.org +> [ 0.000000] (maestro@) node-102.simgrid.org +> [ 0.000000] (maestro@) node-103.simgrid.org +> [ 0.000000] (maestro@) node-104.simgrid.org +> [ 0.000000] (maestro@) node-105.simgrid.org +> [ 0.000000] (maestro@) node-106.simgrid.org +> [ 0.000000] (maestro@) node-107.simgrid.org +> [ 0.000000] (maestro@) node-108.simgrid.org +> [ 0.000000] (maestro@) node-109.simgrid.org +> [ 0.000000] (maestro@) node-110.simgrid.org +> [ 0.000000] (maestro@) node-111.simgrid.org +> [ 0.000000] (maestro@) node-112.simgrid.org +> [ 0.000000] (maestro@) node-113.simgrid.org +> [ 0.000000] (maestro@) node-114.simgrid.org +> [ 0.000000] (maestro@) node-115.simgrid.org +> [ 0.000000] (maestro@) node-116.simgrid.org +> [ 0.000000] (maestro@) node-117.simgrid.org +> [ 0.000000] (maestro@) node-118.simgrid.org +> [ 0.000000] (maestro@) node-119.simgrid.org > [ 0.000000] (maestro@) bob_cluster' dragonfly topology: > [ 0.000000] (maestro@) 0: (0, 0, 0, 0) > [ 0.000000] (maestro@) 1: (0, 0, 0, 1) diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.tesh b/examples/simdag/dag-dotload/sd_dag-dotload.tesh index 317aa20efc..82b831126e 100644 --- a/examples/simdag/dag-dotload/sd_dag-dotload.tesh +++ b/examples/simdag/dag-dotload/sd_dag-dotload.tesh @@ -193,26 +193,26 @@ $ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:= > [110.004162] [test/INFO] Producing the trace of the run into dag.trace $ cat ${srcdir:=.}/dag-dotload/dag.trace -> [0.000000->0.000000] node-0.acme.org compute 0.000000 flops # root -> [0.000000->10.000000] node-1.acme.org compute 10000000129.452715 flops # 0 -> [10.000680->20.000680] node-10.acme.org compute 10000000131.133657 flops # 1 -> [20.001360->30.001360] node-11.acme.org compute 10000000121.124870 flops # 2 -> [30.002040->40.002041] node-12.acme.org compute 10000000230.608025 flops # 3 -> [40.002041->50.002041] node-13.acme.org compute 10000000004.994019 flops # 4 -> [50.002721->60.002721] node-14.acme.org compute 10000000046.016401 flops # 5 -> [60.002721->70.002721] node-15.acme.org compute 10000000091.598791 flops # 6 -> [70.003401->80.003401] node-16.acme.org compute 10000000040.679438 flops # 7 -> [80.004161->90.004161] node-17.acme.org compute 10000000250.490017 flops # 8 -> [90.004161->100.004161] node-18.acme.org compute 10000000079.267649 flops # 9 -> [10.000000 -> 10.000680] node-1.acme.org -> node-10.acme.org transfer of 10001 bytes # 0->1 -> [20.000680 -> 20.001360] node-10.acme.org -> node-11.acme.org transfer of 10004 bytes # 1->2 -> [30.001360 -> 30.002040] node-11.acme.org -> node-12.acme.org transfer of 10002 bytes # 2->3 -> [50.002041 -> 50.002721] node-13.acme.org -> node-14.acme.org transfer of 10029 bytes # 4->5 -> [70.002721 -> 70.003401] node-15.acme.org -> node-16.acme.org transfer of 10005 bytes # 6->7 -> [80.003401 -> 80.004161] node-16.acme.org -> node-17.acme.org transfer of 10000 bytes # 7->8 -> [80.003401 -> 80.084193] node-16.acme.org -> node-0.acme.org transfer of 10014000 bytes # 7->end -> [0.000000 -> 0.080712] node-0.acme.org -> node-14.acme.org transfer of 10014000 bytes # root->5 -> [100.004161->110.004162] node-0.acme.org compute 10000000129.452715 flops # end +> [0.000000->0.000000] node-0.simgrid.org compute 0.000000 flops # root +> [0.000000->10.000000] node-1.simgrid.org compute 10000000129.452715 flops # 0 +> [10.000680->20.000680] node-10.simgrid.org compute 10000000131.133657 flops # 1 +> [20.001360->30.001360] node-11.simgrid.org compute 10000000121.124870 flops # 2 +> [30.002040->40.002041] node-12.simgrid.org compute 10000000230.608025 flops # 3 +> [40.002041->50.002041] node-13.simgrid.org compute 10000000004.994019 flops # 4 +> [50.002721->60.002721] node-14.simgrid.org compute 10000000046.016401 flops # 5 +> [60.002721->70.002721] node-15.simgrid.org compute 10000000091.598791 flops # 6 +> [70.003401->80.003401] node-16.simgrid.org compute 10000000040.679438 flops # 7 +> [80.004161->90.004161] node-17.simgrid.org compute 10000000250.490017 flops # 8 +> [90.004161->100.004161] node-18.simgrid.org compute 10000000079.267649 flops # 9 +> [10.000000 -> 10.000680] node-1.simgrid.org -> node-10.simgrid.org transfer of 10001 bytes # 0->1 +> [20.000680 -> 20.001360] node-10.simgrid.org -> node-11.simgrid.org transfer of 10004 bytes # 1->2 +> [30.001360 -> 30.002040] node-11.simgrid.org -> node-12.simgrid.org transfer of 10002 bytes # 2->3 +> [50.002041 -> 50.002721] node-13.simgrid.org -> node-14.simgrid.org transfer of 10029 bytes # 4->5 +> [70.002721 -> 70.003401] node-15.simgrid.org -> node-16.simgrid.org transfer of 10005 bytes # 6->7 +> [80.003401 -> 80.004161] node-16.simgrid.org -> node-17.simgrid.org transfer of 10000 bytes # 7->8 +> [80.003401 -> 80.084193] node-16.simgrid.org -> node-0.simgrid.org transfer of 10014000 bytes # 7->end +> [0.000000 -> 0.080712] node-0.simgrid.org -> node-14.simgrid.org transfer of 10014000 bytes # root->5 +> [100.004161->110.004162] node-0.simgrid.org compute 10000000129.452715 flops # end $ rm -f ${srcdir:=.}/dag-dotload/dag.trace ${srcdir:=.}/dot.dot diff --git a/examples/simdag/daxload/sd_daxload.tesh b/examples/simdag/daxload/sd_daxload.tesh index c2823c2321..79ad304b27 100644 --- a/examples/simdag/daxload/sd_daxload.tesh +++ b/examples/simdag/daxload/sd_daxload.tesh @@ -105,21 +105,21 @@ $ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../pl > [84.067138] [test/INFO] Producing the trace of the run into smalldax.trace $ cat ${srcdir:=.}/daxload/smalldax.trace -> [0.000000] node-0.acme.org compute 0.000000 # root -> [0.016600] node-1.acme.org compute 42000000000.000000 # 1@task1 -> [0.016600] node-10.acme.org compute 42000000000.000000 # 2@task2 -> [42.033200] node-11.acme.org compute 42000000000.000000 # 3@task1 -> [0.000000] node-0.acme.org send node-1.acme.org 1000000.000000 # root_i1_1@task1 -> [0.016600] node-1.acme.org recv node-0.acme.org 1000000.000000 # root_i1_1@task1 -> [0.000000] node-0.acme.org send node-10.acme.org 1000000.000000 # root_i2_2@task2 -> [0.016600] node-10.acme.org recv node-0.acme.org 1000000.000000 # root_i2_2@task2 -> [42.016600] node-1.acme.org send node-11.acme.org 1000000.000000 # 1@task1_o1_3@task1 -> [42.033200] node-11.acme.org recv node-1.acme.org 1000000.000000 # 1@task1_o1_3@task1 -> [42.016600] node-10.acme.org send node-11.acme.org 1000000.000000 # 2@task2_o2_3@task1 -> [42.033200] node-11.acme.org recv node-10.acme.org 1000000.000000 # 2@task2_o2_3@task1 -> [84.033200] node-11.acme.org send node-0.acme.org 4167312.000000 # 3@task1_o3_end -> [84.067138] node-0.acme.org recv node-11.acme.org 4167312.000000 # 3@task1_o3_end -> [84.067138] node-0.acme.org compute 0.000000 # end +> [0.000000] node-0.simgrid.org compute 0.000000 # root +> [0.016600] node-1.simgrid.org compute 42000000000.000000 # 1@task1 +> [0.016600] node-10.simgrid.org compute 42000000000.000000 # 2@task2 +> [42.033200] node-11.simgrid.org compute 42000000000.000000 # 3@task1 +> [0.000000] node-0.simgrid.org send node-1.simgrid.org 1000000.000000 # root_i1_1@task1 +> [0.016600] node-1.simgrid.org recv node-0.simgrid.org 1000000.000000 # root_i1_1@task1 +> [0.000000] node-0.simgrid.org send node-10.simgrid.org 1000000.000000 # root_i2_2@task2 +> [0.016600] node-10.simgrid.org recv node-0.simgrid.org 1000000.000000 # root_i2_2@task2 +> [42.016600] node-1.simgrid.org send node-11.simgrid.org 1000000.000000 # 1@task1_o1_3@task1 +> [42.033200] node-11.simgrid.org recv node-1.simgrid.org 1000000.000000 # 1@task1_o1_3@task1 +> [42.016600] node-10.simgrid.org send node-11.simgrid.org 1000000.000000 # 2@task2_o2_3@task1 +> [42.033200] node-11.simgrid.org recv node-10.simgrid.org 1000000.000000 # 2@task2_o2_3@task1 +> [84.033200] node-11.simgrid.org send node-0.simgrid.org 4167312.000000 # 3@task1_o3_end +> [84.067138] node-0.simgrid.org recv node-11.simgrid.org 4167312.000000 # 3@task1_o3_end +> [84.067138] node-0.simgrid.org compute 0.000000 # end ! output ignore $ cmake -E remove -f ${srcdir:=.}/dax.dot ${srcdir:=.}/daxload/smalldax.trace diff --git a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh index bc50781fcc..0f0c302435 100644 --- a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh +++ b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh @@ -219,26 +219,26 @@ $ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc > [100.003561] [test/INFO] Producing the trace of the run into dag_with_good_schedule.trace $ cat ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.trace -> [0.000000->0.000000] node-0.acme.org compute 0.000000 flops # root -> [0.000000->10.000000] node-1.acme.org compute 10000000129.452715 flops # 0 -> [0.000000->10.000000] node-0.acme.org compute 10000000131.133657 flops # 1 -> [10.000760->20.000760] node-1.acme.org compute 10000000121.124870 flops # 2 -> [20.001440->30.001441] node-1.acme.org compute 10000000230.608025 flops # 3 -> [30.001441->40.001441] node-0.acme.org compute 10000000004.994019 flops # 4 -> [40.002121->50.002121] node-0.acme.org compute 10000000046.016401 flops # 5 -> [50.002121->60.002121] node-0.acme.org compute 10000000091.598791 flops # 6 -> [60.002801->70.002801] node-0.acme.org compute 10000000040.679438 flops # 7 -> [70.003561->80.003561] node-1.acme.org compute 10000000250.490017 flops # 8 -> [80.003561->90.003561] node-1.acme.org compute 10000000079.267649 flops # 9 -> [0.000000 -> 0.080712] node-0.acme.org -> node-0.acme.org transfer of 10014000 bytes # root->5 -> [10.000000 -> 10.000760] node-1.acme.org -> node-1.acme.org transfer of 10001 bytes # 0->2 -> [10.000000 -> 10.000760] node-0.acme.org -> node-1.acme.org transfer of 10004 bytes # 1->2 -> [20.000760 -> 20.001440] node-1.acme.org -> node-1.acme.org transfer of 10002 bytes # 2->3 -> [40.001441 -> 40.002121] node-0.acme.org -> node-0.acme.org transfer of 10029 bytes # 4->5 -> [60.002121 -> 60.002801] node-0.acme.org -> node-0.acme.org transfer of 10005 bytes # 6->7 -> [70.002801 -> 70.003561] node-0.acme.org -> node-1.acme.org transfer of 10000 bytes # 7->8 -> [70.002801 -> 70.083593] node-0.acme.org -> node-0.acme.org transfer of 10014000 bytes # 7->end -> [90.003561->100.003561] node-0.acme.org compute 10000000129.452715 flops # end +> [0.000000->0.000000] node-0.simgrid.org compute 0.000000 flops # root +> [0.000000->10.000000] node-1.simgrid.org compute 10000000129.452715 flops # 0 +> [0.000000->10.000000] node-0.simgrid.org compute 10000000131.133657 flops # 1 +> [10.000760->20.000760] node-1.simgrid.org compute 10000000121.124870 flops # 2 +> [20.001440->30.001441] node-1.simgrid.org compute 10000000230.608025 flops # 3 +> [30.001441->40.001441] node-0.simgrid.org compute 10000000004.994019 flops # 4 +> [40.002121->50.002121] node-0.simgrid.org compute 10000000046.016401 flops # 5 +> [50.002121->60.002121] node-0.simgrid.org compute 10000000091.598791 flops # 6 +> [60.002801->70.002801] node-0.simgrid.org compute 10000000040.679438 flops # 7 +> [70.003561->80.003561] node-1.simgrid.org compute 10000000250.490017 flops # 8 +> [80.003561->90.003561] node-1.simgrid.org compute 10000000079.267649 flops # 9 +> [0.000000 -> 0.080712] node-0.simgrid.org -> node-0.simgrid.org transfer of 10014000 bytes # root->5 +> [10.000000 -> 10.000760] node-1.simgrid.org -> node-1.simgrid.org transfer of 10001 bytes # 0->2 +> [10.000000 -> 10.000760] node-0.simgrid.org -> node-1.simgrid.org transfer of 10004 bytes # 1->2 +> [20.000760 -> 20.001440] node-1.simgrid.org -> node-1.simgrid.org transfer of 10002 bytes # 2->3 +> [40.001441 -> 40.002121] node-0.simgrid.org -> node-0.simgrid.org transfer of 10029 bytes # 4->5 +> [60.002121 -> 60.002801] node-0.simgrid.org -> node-0.simgrid.org transfer of 10005 bytes # 6->7 +> [70.002801 -> 70.003561] node-0.simgrid.org -> node-1.simgrid.org transfer of 10000 bytes # 7->8 +> [70.002801 -> 70.083593] node-0.simgrid.org -> node-0.simgrid.org transfer of 10014000 bytes # 7->end +> [90.003561->100.003561] node-0.simgrid.org compute 10000000129.452715 flops # end $ rm -f ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.trace diff --git a/examples/smpi/mc/hostfile_bugged1 b/examples/smpi/mc/hostfile_bugged1 index 4ae7dab5d6..edbbeb8312 100644 --- a/examples/smpi/mc/hostfile_bugged1 +++ b/examples/smpi/mc/hostfile_bugged1 @@ -1,3 +1,3 @@ -node-1.acme.org -node-2.acme.org -node-3.acme.org +node-1.simgrid.org +node-2.simgrid.org +node-3.simgrid.org diff --git a/examples/smpi/mc/hostfile_bugged1_liveness b/examples/smpi/mc/hostfile_bugged1_liveness index 4ae7dab5d6..edbbeb8312 100644 --- a/examples/smpi/mc/hostfile_bugged1_liveness +++ b/examples/smpi/mc/hostfile_bugged1_liveness @@ -1,3 +1,3 @@ -node-1.acme.org -node-2.acme.org -node-3.acme.org +node-1.simgrid.org +node-2.simgrid.org +node-3.simgrid.org diff --git a/examples/smpi/mc/hostfile_bugged2 b/examples/smpi/mc/hostfile_bugged2 index c5d2c79a34..dcdb382c01 100644 --- a/examples/smpi/mc/hostfile_bugged2 +++ b/examples/smpi/mc/hostfile_bugged2 @@ -1,36 +1,36 @@ -node-1.acme.org -node-2.acme.org -node-3.acme.org -node-4.acme.org -node-5.acme.org -node-6.acme.org -node-7.acme.org -node-8.acme.org -node-9.acme.org -node-10.acme.org -node-11.acme.org -node-12.acme.org -node-13.acme.org -node-14.acme.org -node-15.acme.org -node-16.acme.org -node-17.acme.org -node-18.acme.org -node-19.acme.org -node-20.acme.org -node-21.acme.org -node-22.acme.org -node-23.acme.org -node-24.acme.org -node-25.acme.org -node-26.acme.org -node-27.acme.org -node-28.acme.org -node-29.acme.org -node-30.acme.org -node-31.acme.org -node-32.acme.org -node-33.acme.org -node-34.acme.org -node-35.acme.org -node-36.acme.org +node-1.simgrid.org +node-2.simgrid.org +node-3.simgrid.org +node-4.simgrid.org +node-5.simgrid.org +node-6.simgrid.org +node-7.simgrid.org +node-8.simgrid.org +node-9.simgrid.org +node-10.simgrid.org +node-11.simgrid.org +node-12.simgrid.org +node-13.simgrid.org +node-14.simgrid.org +node-15.simgrid.org +node-16.simgrid.org +node-17.simgrid.org +node-18.simgrid.org +node-19.simgrid.org +node-20.simgrid.org +node-21.simgrid.org +node-22.simgrid.org +node-23.simgrid.org +node-24.simgrid.org +node-25.simgrid.org +node-26.simgrid.org +node-27.simgrid.org +node-28.simgrid.org +node-29.simgrid.org +node-30.simgrid.org +node-31.simgrid.org +node-32.simgrid.org +node-33.simgrid.org +node-34.simgrid.org +node-35.simgrid.org +node-36.simgrid.org diff --git a/examples/smpi/mc/hostfile_mutual_exclusion b/examples/smpi/mc/hostfile_mutual_exclusion index 4ae7dab5d6..edbbeb8312 100644 --- a/examples/smpi/mc/hostfile_mutual_exclusion +++ b/examples/smpi/mc/hostfile_mutual_exclusion @@ -1,3 +1,3 @@ -node-1.acme.org -node-2.acme.org -node-3.acme.org +node-1.simgrid.org +node-2.simgrid.org +node-3.simgrid.org diff --git a/examples/smpi/mc/hostfile_non_termination b/examples/smpi/mc/hostfile_non_termination index ae28a97e07..c1627f2e47 100644 --- a/examples/smpi/mc/hostfile_non_termination +++ b/examples/smpi/mc/hostfile_non_termination @@ -1,2 +1,2 @@ -node-1.acme.org -node-2.acme.org \ No newline at end of file +node-1.simgrid.org +node-2.simgrid.org \ No newline at end of file diff --git a/examples/smpi/mc/hostfile_only_send_deterministic b/examples/smpi/mc/hostfile_only_send_deterministic index 4ae7dab5d6..edbbeb8312 100644 --- a/examples/smpi/mc/hostfile_only_send_deterministic +++ b/examples/smpi/mc/hostfile_only_send_deterministic @@ -1,3 +1,3 @@ -node-1.acme.org -node-2.acme.org -node-3.acme.org +node-1.simgrid.org +node-2.simgrid.org +node-3.simgrid.org diff --git a/examples/smpi/mc/non_deterministic.tesh b/examples/smpi/mc/non_deterministic.tesh index b41d0d35b5..b702255a26 100644 --- a/examples/smpi/mc/non_deterministic.tesh +++ b/examples/smpi/mc/non_deterministic.tesh @@ -9,28 +9,28 @@ $ ../../../smpi_script/bin/smpirun -wrapper ${bindir:=.}/../../../bin/simgrid-mc > [0.000000] [mc_comm_determinism/INFO] **************************************************** > [0.000000] [mc_comm_determinism/INFO] ** Initial communications pattern (per process): ** > [0.000000] [mc_comm_determinism/INFO] Communications from the process 1: -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.acme.org <- (2) node-2.acme.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.acme.org -> (2) node-2.acme.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.acme.org <- (3) node-3.acme.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.acme.org -> (3) node-3.acme.org] iSend +> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org <- (2) node-2.simgrid.org] iRecv +> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org -> (2) node-2.simgrid.org] iSend +> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org <- (3) node-3.simgrid.org] iRecv +> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org -> (3) node-3.simgrid.org] iSend > [0.000000] [mc_comm_determinism/INFO] Communications from the process 2: -> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.acme.org -> (1) node-1.acme.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.acme.org <- (1) node-1.acme.org] iRecv +> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.simgrid.org -> (1) node-1.simgrid.org] iSend +> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.simgrid.org <- (1) node-1.simgrid.org] iRecv > [0.000000] [mc_comm_determinism/INFO] Communications from the process 3: -> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.acme.org -> (1) node-1.acme.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.acme.org <- (1) node-1.acme.org] iRecv +> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.simgrid.org -> (1) node-1.simgrid.org] iSend +> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.simgrid.org <- (1) node-1.simgrid.org] iRecv > [0.000000] [mc_comm_determinism/INFO] ** Communications pattern counter-example (per process): ** > [0.000000] [mc_comm_determinism/INFO] Communications from the process 1: -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.acme.org <- (3) node-3.acme.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.acme.org -> (3) node-3.acme.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.acme.org <- (2) node-2.acme.org] iRecv -> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.acme.org -> (2) node-2.acme.org] iSend +> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org <- (3) node-3.simgrid.org] iRecv +> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org -> (3) node-3.simgrid.org] iSend +> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org <- (2) node-2.simgrid.org] iRecv +> [0.000000] [mc_comm_determinism/INFO] [(1) node-1.simgrid.org -> (2) node-2.simgrid.org] iSend > [0.000000] [mc_comm_determinism/INFO] Communications from the process 2: -> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.acme.org -> (1) node-1.acme.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.acme.org <- (1) node-1.acme.org] iRecv +> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.simgrid.org -> (1) node-1.simgrid.org] iSend +> [0.000000] [mc_comm_determinism/INFO] [(2) node-2.simgrid.org <- (1) node-1.simgrid.org] iRecv > [0.000000] [mc_comm_determinism/INFO] Communications from the process 3: -> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.acme.org -> (1) node-1.acme.org] iSend -> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.acme.org <- (1) node-1.acme.org] iRecv +> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.simgrid.org -> (1) node-1.simgrid.org] iSend +> [0.000000] [mc_comm_determinism/INFO] [(3) node-3.simgrid.org <- (1) node-1.simgrid.org] iRecv > [0.000000] [mc_global/INFO] Expanded states = 16037 > [0.000000] [mc_global/INFO] Visited states = 80801 > [0.000000] [mc_global/INFO] Executed transitions = 76048 diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index 479475007d..67f34c2e22 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.cpp @@ -62,20 +62,18 @@ void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* /* This function acts as a main in the parsing area. */ void parse_platform_file(std::string file) { -#if SIMGRID_HAVE_LUA const char* cfile = file.c_str(); int len = strlen(cfile); int is_lua = len > 3 && file[len - 3] == 'l' && file[len - 2] == 'u' && file[len - 1] == 'a'; -#endif sg_platf_init(); -#if SIMGRID_HAVE_LUA /* Check if file extension is "lua". If so, we will use * the lua bindings to parse the platform file (since it is * written in lua). If not, we will use the (old?) XML parser */ if (is_lua) { +#if SIMGRID_HAVE_LUA lua_State* L = luaL_newstate(); luaL_openlibs(L); @@ -88,8 +86,10 @@ void parse_platform_file(std::string file) } lua_close(L); return; - } +#else + XBT_WARN("This looks like a lua platform file, but your SimGrid was not compiled with lua. Loading it as XML."); #endif + } // Use XML parser diff --git a/teshsuite/msg/app-bittorrent/app-bittorrent.tesh b/teshsuite/msg/app-bittorrent/app-bittorrent.tesh index 9d603fb672..91c2c6ab4c 100644 --- a/teshsuite/msg/app-bittorrent/app-bittorrent.tesh +++ b/teshsuite/msg/app-bittorrent/app-bittorrent.tesh @@ -5,19 +5,19 @@ p Testing the Bittorrent implementation with MSG ! timeout 10 ! output sort 19 $ ${bindir:=.}/bittorrent ${platfdir}/cluster_backbone.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:tracker@node-0.acme.org) Tracker launched. -> [ 0.000000] (2:peer@node-1.acme.org) Hi, I'm joining the network with id 2 -> [ 0.000000] (3:peer@node-2.acme.org) Hi, I'm joining the network with id 3 -> [ 0.000000] (4:peer@node-3.acme.org) Hi, I'm joining the network with id 4 -> [ 0.000000] (5:peer@node-4.acme.org) Hi, I'm joining the network with id 5 -> [ 0.000000] (6:peer@node-5.acme.org) Hi, I'm joining the network with id 6 -> [ 0.000000] (7:peer@node-6.acme.org) Hi, I'm joining the network with id 7 -> [ 0.000000] (8:peer@node-7.acme.org) Hi, I'm joining the network with id 8 -> [ 3000.000000] (1:tracker@node-0.acme.org) Tracker is leaving -> [ 5000.007806] (2:peer@node-1.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (3:peer@node-2.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (4:peer@node-3.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (5:peer@node-4.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (6:peer@node-5.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (7:peer@node-6.acme.org) Here is my current status: 1111111111 -> [ 5000.007806] (8:peer@node-7.acme.org) Here is my current status: 1111111111 +> [ 0.000000] (1:tracker@node-0.simgrid.org) Tracker launched. +> [ 0.000000] (2:peer@node-1.simgrid.org) Hi, I'm joining the network with id 2 +> [ 0.000000] (3:peer@node-2.simgrid.org) Hi, I'm joining the network with id 3 +> [ 0.000000] (4:peer@node-3.simgrid.org) Hi, I'm joining the network with id 4 +> [ 0.000000] (5:peer@node-4.simgrid.org) Hi, I'm joining the network with id 5 +> [ 0.000000] (6:peer@node-5.simgrid.org) Hi, I'm joining the network with id 6 +> [ 0.000000] (7:peer@node-6.simgrid.org) Hi, I'm joining the network with id 7 +> [ 0.000000] (8:peer@node-7.simgrid.org) Hi, I'm joining the network with id 8 +> [ 3000.000000] (1:tracker@node-0.simgrid.org) Tracker is leaving +> [ 5000.007806] (2:peer@node-1.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (3:peer@node-2.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (4:peer@node-3.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (5:peer@node-4.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (6:peer@node-5.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (7:peer@node-6.simgrid.org) Here is my current status: 1111111111 +> [ 5000.007806] (8:peer@node-7.simgrid.org) Here is my current status: 1111111111 diff --git a/teshsuite/msg/app-bittorrent/app-bittorrent_d.xml b/teshsuite/msg/app-bittorrent/app-bittorrent_d.xml index 5460ab1a9d..5248ff8e04 100644 --- a/teshsuite/msg/app-bittorrent/app-bittorrent_d.xml +++ b/teshsuite/msg/app-bittorrent/app-bittorrent_d.xml @@ -2,37 +2,37 @@ - + - + - + - + - + - + - + - + diff --git a/teshsuite/msg/app-bittorrent/generate.py b/teshsuite/msg/app-bittorrent/generate.py index 4c504d8fe4..16b2dc3ba2 100755 --- a/teshsuite/msg/app-bittorrent/generate.py +++ b/teshsuite/msg/app-bittorrent/generate.py @@ -30,7 +30,7 @@ all_ids = [42] sys.stdout.write("\n" "\n" "\n" - " \n" + " \n" " \n \n" % end_date) for i in range(1, nb_nodes): @@ -40,7 +40,7 @@ for i in range(1, nb_nodes): my_id = random.randint(0, max_id) ok = not my_id in all_ids start_date = i * 10 - line = " \n" % i + line = " \n" % i line += " \n \n" % ( my_id, end_date) if random.randint(0, 100) < seed_percentage: diff --git a/teshsuite/msg/app-chainsend/app-chainsend.tesh b/teshsuite/msg/app-chainsend/app-chainsend.tesh index f021c71ec3..f26c3663b9 100644 --- a/teshsuite/msg/app-chainsend/app-chainsend.tesh +++ b/teshsuite/msg/app-chainsend/app-chainsend.tesh @@ -5,12 +5,12 @@ p Testing the chainsend MSG implementation ! timeout 60 ! output sort 19 $ $SG_TEST_EXENV ${bindir:=.}/chainsend ${platfdir}/cluster_backbone.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" -> [ 2.214423] (2:peer@node-1.acme.org) ### 2.214423 16777216 bytes (Avg 7.225359 MB/s); copy finished (simulated). -> [ 2.222796] (3:peer@node-2.acme.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). -> [ 2.231170] (4:peer@node-3.acme.org) ### 2.231170 16777216 bytes (Avg 7.171126 MB/s); copy finished (simulated). -> [ 2.239543] (5:peer@node-4.acme.org) ### 2.239543 16777216 bytes (Avg 7.144314 MB/s); copy finished (simulated). -> [ 2.247917] (6:peer@node-5.acme.org) ### 2.247917 16777216 bytes (Avg 7.117701 MB/s); copy finished (simulated). -> [ 2.256290] (7:peer@node-6.acme.org) ### 2.256290 16777216 bytes (Avg 7.091286 MB/s); copy finished (simulated). +> [ 2.214423] (2:peer@node-1.simgrid.org) ### 2.214423 16777216 bytes (Avg 7.225359 MB/s); copy finished (simulated). +> [ 2.222796] (3:peer@node-2.simgrid.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated). +> [ 2.231170] (4:peer@node-3.simgrid.org) ### 2.231170 16777216 bytes (Avg 7.171126 MB/s); copy finished (simulated). +> [ 2.239543] (5:peer@node-4.simgrid.org) ### 2.239543 16777216 bytes (Avg 7.144314 MB/s); copy finished (simulated). +> [ 2.247917] (6:peer@node-5.simgrid.org) ### 2.247917 16777216 bytes (Avg 7.117701 MB/s); copy finished (simulated). +> [ 2.256290] (7:peer@node-6.simgrid.org) ### 2.256290 16777216 bytes (Avg 7.091286 MB/s); copy finished (simulated). > [ 2.264637] (0:maestro@) Total simulation time: 2.264637e+00 -> [ 2.264637] (8:peer@node-7.acme.org) ### 2.264637 16777216 bytes (Avg 7.065151 MB/s); copy finished (simulated). -> [ 2.264637] (9:peer@node-8.acme.org) ### 2.264637 16777216 bytes (Avg 7.065151 MB/s); copy finished (simulated). +> [ 2.264637] (8:peer@node-7.simgrid.org) ### 2.264637 16777216 bytes (Avg 7.065151 MB/s); copy finished (simulated). +> [ 2.264637] (9:peer@node-8.simgrid.org) ### 2.264637 16777216 bytes (Avg 7.065151 MB/s); copy finished (simulated). diff --git a/teshsuite/msg/app-chainsend/app-chainsend_d.xml b/teshsuite/msg/app-chainsend/app-chainsend_d.xml index 73ab26bbd2..1fa674af6c 100644 --- a/teshsuite/msg/app-chainsend/app-chainsend_d.xml +++ b/teshsuite/msg/app-chainsend/app-chainsend_d.xml @@ -3,34 +3,34 @@ - + - + - + - + - + - + - + - + - + diff --git a/teshsuite/msg/platform-properties/platform-properties.c b/teshsuite/msg/platform-properties/platform-properties.c index 5facf622f4..58ed491ed7 100644 --- a/teshsuite/msg/platform-properties/platform-properties.c +++ b/teshsuite/msg/platform-properties/platform-properties.c @@ -63,7 +63,7 @@ static int carole(int argc, char* argv[]) static int david(int argc, char* argv[]) { /* Dump what we have on a remote host */ MSG_process_sleep(2); // Wait for alice and carole to be done with its experiment - test_host("node-0.acme.org"); + test_host("node-0.simgrid.org"); return 0; } diff --git a/teshsuite/msg/platform-properties/platform-properties.tesh b/teshsuite/msg/platform-properties/platform-properties.tesh index 09bb106c3b..6864d3345a 100644 --- a/teshsuite/msg/platform-properties/platform-properties.tesh +++ b/teshsuite/msg/platform-properties/platform-properties.tesh @@ -7,11 +7,11 @@ $ $SG_TEST_EXENV ${bindir:=.}/platform-properties$EXEEXT ${platfdir}/prop.xml ${ > [ 0.000000] (0:maestro@) There are 7 hosts in the environment > [ 0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s > [ 0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-0.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-1.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-2.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-3.acme.org' runs at 1000000000 flops/s -> [ 0.000000] (0:maestro@) Host 'node-4.acme.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-0.simgrid.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-1.simgrid.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-2.simgrid.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-3.simgrid.org' runs at 1000000000 flops/s +> [ 0.000000] (0:maestro@) Host 'node-4.simgrid.org' runs at 1000000000 flops/s > [ 0.000000] (2:bob@host1) == Print the properties of the AS > [ 0.000000] (2:bob@host1) Process property: filename -> prop.xml > [ 0.000000] (2:bob@host1) Process property: date -> 31-08-12 @@ -35,7 +35,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/platform-properties$EXEEXT ${platfdir}/prop.xml ${ > [ 1.000000] (3:carole@host2) Property: Hdd old value: 180 > [ 1.000000] (3:carole@host2) == Trying to modify a host property > [ 1.000000] (3:carole@host2) Property: Hdd old value: 250 -> [ 2.000000] (4:david@host2) == Print the properties of the host 'node-0.acme.org' +> [ 2.000000] (4:david@host2) == Print the properties of the host 'node-0.simgrid.org' > [ 2.000000] (4:david@host2) Host property: 'mem' -> '42' > [ 2.000000] (4:david@host2) Host property: 'bla' -> 'acme cluster' > [ 2.000000] (4:david@host2) Host property: 'Hdd' -> '180' diff --git a/teshsuite/msg/process-lifetime/baseline_d.xml b/teshsuite/msg/process-lifetime/baseline_d.xml index e24ccedf13..1a05c2ac4e 100644 --- a/teshsuite/msg/process-lifetime/baseline_d.xml +++ b/teshsuite/msg/process-lifetime/baseline_d.xml @@ -2,7 +2,7 @@ - + diff --git a/teshsuite/msg/process-lifetime/kill_d.xml b/teshsuite/msg/process-lifetime/kill_d.xml index 6d7d312410..872aa2f56a 100644 --- a/teshsuite/msg/process-lifetime/kill_d.xml +++ b/teshsuite/msg/process-lifetime/kill_d.xml @@ -1,13 +1,13 @@ - + - + - + diff --git a/teshsuite/msg/process-lifetime/process-lifetime.tesh b/teshsuite/msg/process-lifetime/process-lifetime.tesh index f22f6521ec..4d3c96b899 100644 --- a/teshsuite/msg/process-lifetime/process-lifetime.tesh +++ b/teshsuite/msg/process-lifetime/process-lifetime.tesh @@ -3,63 +3,63 @@ p Test0 Process without time $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/baseline_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep. -> [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping. -> [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). +> [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. +> [ 10.000000] (1:sleeper@node-0.simgrid.org) Done sleeping. +> [ 10.000000] (1:sleeper@node-0.simgrid.org) Exiting now (done sleeping or got killed). > [ 10.000000] (0:maestro@) Simulation time 10 p Test1 Process with start time $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/start_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep. -> [ 1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep. -> [ 2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep. -> [ 3.000000] (4:sleeper@node-3.acme.org) Hello! I go to sleep. -> [ 4.000000] (5:sleeper@node-4.acme.org) Hello! I go to sleep. -> [ 5.000000] (6:sleeper@node-5.acme.org) Hello! I go to sleep. -> [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping. -> [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). -> [ 11.000000] (2:sleeper@node-1.acme.org) Done sleeping. -> [ 11.000000] (2:sleeper@node-1.acme.org) Exiting now (done sleeping or got killed). -> [ 12.000000] (3:sleeper@node-2.acme.org) Done sleeping. -> [ 12.000000] (3:sleeper@node-2.acme.org) Exiting now (done sleeping or got killed). -> [ 13.000000] (4:sleeper@node-3.acme.org) Done sleeping. -> [ 13.000000] (4:sleeper@node-3.acme.org) Exiting now (done sleeping or got killed). -> [ 14.000000] (5:sleeper@node-4.acme.org) Done sleeping. -> [ 14.000000] (5:sleeper@node-4.acme.org) Exiting now (done sleeping or got killed). -> [ 15.000000] (6:sleeper@node-5.acme.org) Done sleeping. -> [ 15.000000] (6:sleeper@node-5.acme.org) Exiting now (done sleeping or got killed). +> [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. +> [ 1.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. +> [ 2.000000] (3:sleeper@node-2.simgrid.org) Hello! I go to sleep. +> [ 3.000000] (4:sleeper@node-3.simgrid.org) Hello! I go to sleep. +> [ 4.000000] (5:sleeper@node-4.simgrid.org) Hello! I go to sleep. +> [ 5.000000] (6:sleeper@node-5.simgrid.org) Hello! I go to sleep. +> [ 10.000000] (1:sleeper@node-0.simgrid.org) Done sleeping. +> [ 10.000000] (1:sleeper@node-0.simgrid.org) Exiting now (done sleeping or got killed). +> [ 11.000000] (2:sleeper@node-1.simgrid.org) Done sleeping. +> [ 11.000000] (2:sleeper@node-1.simgrid.org) Exiting now (done sleeping or got killed). +> [ 12.000000] (3:sleeper@node-2.simgrid.org) Done sleeping. +> [ 12.000000] (3:sleeper@node-2.simgrid.org) Exiting now (done sleeping or got killed). +> [ 13.000000] (4:sleeper@node-3.simgrid.org) Done sleeping. +> [ 13.000000] (4:sleeper@node-3.simgrid.org) Exiting now (done sleeping or got killed). +> [ 14.000000] (5:sleeper@node-4.simgrid.org) Done sleeping. +> [ 14.000000] (5:sleeper@node-4.simgrid.org) Exiting now (done sleeping or got killed). +> [ 15.000000] (6:sleeper@node-5.simgrid.org) Done sleeping. +> [ 15.000000] (6:sleeper@node-5.simgrid.org) Exiting now (done sleeping or got killed). > [ 15.000000] (0:maestro@) Simulation time 15 p Test1 Process with kill time ! output sort $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:sleeper@node-1.acme.org) Hello! I go to sleep. -> [ 0.000000] (2:sleeper@node-2.acme.org) Hello! I go to sleep. -> [ 0.000000] (3:sleeper@node-3.acme.org) Hello! I go to sleep. -> [ 6.000000] (1:sleeper@node-1.acme.org) Exiting now (done sleeping or got killed). -> [ 6.000000] (2:sleeper@node-2.acme.org) Exiting now (done sleeping or got killed). -> [ 6.000000] (3:sleeper@node-3.acme.org) Done sleeping. -> [ 6.000000] (3:sleeper@node-3.acme.org) Exiting now (done sleeping or got killed). +> [ 0.000000] (1:sleeper@node-1.simgrid.org) Hello! I go to sleep. +> [ 0.000000] (2:sleeper@node-2.simgrid.org) Hello! I go to sleep. +> [ 0.000000] (3:sleeper@node-3.simgrid.org) Hello! I go to sleep. +> [ 6.000000] (1:sleeper@node-1.simgrid.org) Exiting now (done sleeping or got killed). +> [ 6.000000] (2:sleeper@node-2.simgrid.org) Exiting now (done sleeping or got killed). +> [ 6.000000] (3:sleeper@node-3.simgrid.org) Done sleeping. +> [ 6.000000] (3:sleeper@node-3.simgrid.org) Exiting now (done sleeping or got killed). > [ 6.000000] (0:maestro@) Simulation time 6 p Test2 Process with start and kill times ! output sort $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/start_kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep. -> [ 1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep. -> [ 2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep. -> [ 3.000000] (4:sleeper@node-3.acme.org) Hello! I go to sleep. -> [ 4.000000] (5:sleeper@node-4.acme.org) Hello! I go to sleep. -> [ 5.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed). -> [ 5.000000] (6:sleeper@node-5.acme.org) Hello! I go to sleep. -> [ 6.000000] (2:sleeper@node-1.acme.org) Exiting now (done sleeping or got killed). -> [ 6.000000] (3:sleeper@node-2.acme.org) Done sleeping. -> [ 6.000000] (3:sleeper@node-2.acme.org) Exiting now (done sleeping or got killed). -> [ 7.000000] (4:sleeper@node-3.acme.org) Done sleeping. -> [ 7.000000] (4:sleeper@node-3.acme.org) Exiting now (done sleeping or got killed). -> [ 9.000000] (5:sleeper@node-4.acme.org) Exiting now (done sleeping or got killed). -> [ 10.000000] (6:sleeper@node-5.acme.org) Exiting now (done sleeping or got killed). +> [ 0.000000] (1:sleeper@node-0.simgrid.org) Hello! I go to sleep. +> [ 1.000000] (2:sleeper@node-1.simgrid.org) Hello! I go to sleep. +> [ 2.000000] (3:sleeper@node-2.simgrid.org) Hello! I go to sleep. +> [ 3.000000] (4:sleeper@node-3.simgrid.org) Hello! I go to sleep. +> [ 4.000000] (5:sleeper@node-4.simgrid.org) Hello! I go to sleep. +> [ 5.000000] (1:sleeper@node-0.simgrid.org) Exiting now (done sleeping or got killed). +> [ 5.000000] (6:sleeper@node-5.simgrid.org) Hello! I go to sleep. +> [ 6.000000] (2:sleeper@node-1.simgrid.org) Exiting now (done sleeping or got killed). +> [ 6.000000] (3:sleeper@node-2.simgrid.org) Done sleeping. +> [ 6.000000] (3:sleeper@node-2.simgrid.org) Exiting now (done sleeping or got killed). +> [ 7.000000] (4:sleeper@node-3.simgrid.org) Done sleeping. +> [ 7.000000] (4:sleeper@node-3.simgrid.org) Exiting now (done sleeping or got killed). +> [ 9.000000] (5:sleeper@node-4.simgrid.org) Exiting now (done sleeping or got killed). +> [ 10.000000] (6:sleeper@node-5.simgrid.org) Exiting now (done sleeping or got killed). > [ 10.000000] (0:maestro@) Simulation time 10 diff --git a/teshsuite/msg/process-lifetime/start_d.xml b/teshsuite/msg/process-lifetime/start_d.xml index 3d6934b178..35b5dcd048 100644 --- a/teshsuite/msg/process-lifetime/start_d.xml +++ b/teshsuite/msg/process-lifetime/start_d.xml @@ -1,22 +1,22 @@ - + - + - + - + - + - + diff --git a/teshsuite/msg/process-lifetime/start_kill_d.xml b/teshsuite/msg/process-lifetime/start_kill_d.xml index 7292ca2fbb..37c82f2068 100644 --- a/teshsuite/msg/process-lifetime/start_kill_d.xml +++ b/teshsuite/msg/process-lifetime/start_kill_d.xml @@ -1,22 +1,22 @@ - + - + - + - + - + - + diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh index 8d0565ab00..db201f60c8 100644 --- a/teshsuite/simdag/flatifier/flatifier.tesh +++ b/teshsuite/simdag/flatifier/flatifier.tesh @@ -690,19 +690,19 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/cluster_torus.xm > > > -> -> -> -> -> -> -> -> -> -> -> -> -> +> +> +> +> +> +> +> +> +> +> +> +> +> > > > @@ -788,511 +788,511 @@ $ ${bindir:=.}/flatifier$EXEEXT ${srcdir:=.}/examples/platforms/cluster_torus.xm > > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > -> +> > > > diff --git a/teshsuite/smpi/coll-alltoall/clusters.tesh b/teshsuite/smpi/coll-alltoall/clusters.tesh index 798892e524..33faf0c66c 100644 --- a/teshsuite/smpi/coll-alltoall/clusters.tesh +++ b/teshsuite/smpi/coll-alltoall/clusters.tesh @@ -3,18 +3,18 @@ p Test classic - backbone $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ${bindir}/../hostfile_cluster -platform ${platfdir:=.}/cluster_backbone.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error -> [rank 0] -> node-0.acme.org -> [rank 1] -> node-1.acme.org -> [rank 2] -> node-2.acme.org -> [rank 3] -> node-3.acme.org -> [rank 4] -> node-4.acme.org -> [rank 5] -> node-5.acme.org -> [rank 6] -> node-6.acme.org -> [rank 7] -> node-7.acme.org -> [rank 8] -> node-8.acme.org -> [rank 9] -> node-9.acme.org -> [rank 10] -> node-10.acme.org -> [rank 11] -> node-11.acme.org +> [rank 0] -> node-0.simgrid.org +> [rank 1] -> node-1.simgrid.org +> [rank 2] -> node-2.simgrid.org +> [rank 3] -> node-3.simgrid.org +> [rank 4] -> node-4.simgrid.org +> [rank 5] -> node-5.simgrid.org +> [rank 6] -> node-6.simgrid.org +> [rank 7] -> node-7.simgrid.org +> [rank 8] -> node-8.simgrid.org +> [rank 9] -> node-9.simgrid.org +> [rank 10] -> node-10.simgrid.org +> [rank 11] -> node-11.simgrid.org > [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 ] > [1] sndbuf=[12 13 14 15 16 17 18 19 20 21 22 23 ] > [2] sndbuf=[24 25 26 27 28 29 30 31 32 33 34 35 ] @@ -83,18 +83,18 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -platform ../../../examples ! output sort p Test torus $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_cluster -platform ../../../examples/platforms/cluster_torus.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error -> [rank 0] -> node-0.acme.org -> [rank 1] -> node-1.acme.org -> [rank 2] -> node-2.acme.org -> [rank 3] -> node-3.acme.org -> [rank 4] -> node-4.acme.org -> [rank 5] -> node-5.acme.org -> [rank 6] -> node-6.acme.org -> [rank 7] -> node-7.acme.org -> [rank 8] -> node-8.acme.org -> [rank 9] -> node-9.acme.org -> [rank 10] -> node-10.acme.org -> [rank 11] -> node-11.acme.org +> [rank 0] -> node-0.simgrid.org +> [rank 1] -> node-1.simgrid.org +> [rank 2] -> node-2.simgrid.org +> [rank 3] -> node-3.simgrid.org +> [rank 4] -> node-4.simgrid.org +> [rank 5] -> node-5.simgrid.org +> [rank 6] -> node-6.simgrid.org +> [rank 7] -> node-7.simgrid.org +> [rank 8] -> node-8.simgrid.org +> [rank 9] -> node-9.simgrid.org +> [rank 10] -> node-10.simgrid.org +> [rank 11] -> node-11.simgrid.org > [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 ] > [1] sndbuf=[12 13 14 15 16 17 18 19 20 21 22 23 ] > [2] sndbuf=[24 25 26 27 28 29 30 31 32 33 34 35 ] @@ -123,18 +123,18 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_clust ! output sort p Test fat tree $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_cluster -platform ../../../examples/platforms/cluster_fat_tree.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error -> [rank 0] -> node-0.acme.org -> [rank 1] -> node-1.acme.org -> [rank 2] -> node-2.acme.org -> [rank 3] -> node-3.acme.org -> [rank 4] -> node-4.acme.org -> [rank 5] -> node-5.acme.org -> [rank 6] -> node-6.acme.org -> [rank 7] -> node-7.acme.org -> [rank 8] -> node-8.acme.org -> [rank 9] -> node-9.acme.org -> [rank 10] -> node-10.acme.org -> [rank 11] -> node-11.acme.org +> [rank 0] -> node-0.simgrid.org +> [rank 1] -> node-1.simgrid.org +> [rank 2] -> node-2.simgrid.org +> [rank 3] -> node-3.simgrid.org +> [rank 4] -> node-4.simgrid.org +> [rank 5] -> node-5.simgrid.org +> [rank 6] -> node-6.simgrid.org +> [rank 7] -> node-7.simgrid.org +> [rank 8] -> node-8.simgrid.org +> [rank 9] -> node-9.simgrid.org +> [rank 10] -> node-10.simgrid.org +> [rank 11] -> node-11.simgrid.org > [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 ] > [1] sndbuf=[12 13 14 15 16 17 18 19 20 21 22 23 ] > [2] sndbuf=[24 25 26 27 28 29 30 31 32 33 34 35 ] @@ -163,18 +163,18 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_clust ! output sort p Test fat tree IB $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_cluster -platform ../../../examples/platforms/cluster_fat_tree.xml -np 12 --cfg=network/model:IB --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error -> [rank 0] -> node-0.acme.org -> [rank 1] -> node-1.acme.org -> [rank 2] -> node-2.acme.org -> [rank 3] -> node-3.acme.org -> [rank 4] -> node-4.acme.org -> [rank 5] -> node-5.acme.org -> [rank 6] -> node-6.acme.org -> [rank 7] -> node-7.acme.org -> [rank 8] -> node-8.acme.org -> [rank 9] -> node-9.acme.org -> [rank 10] -> node-10.acme.org -> [rank 11] -> node-11.acme.org +> [rank 0] -> node-0.simgrid.org +> [rank 1] -> node-1.simgrid.org +> [rank 2] -> node-2.simgrid.org +> [rank 3] -> node-3.simgrid.org +> [rank 4] -> node-4.simgrid.org +> [rank 5] -> node-5.simgrid.org +> [rank 6] -> node-6.simgrid.org +> [rank 7] -> node-7.simgrid.org +> [rank 8] -> node-8.simgrid.org +> [rank 9] -> node-9.simgrid.org +> [rank 10] -> node-10.simgrid.org +> [rank 11] -> node-11.simgrid.org > [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 ] > [1] sndbuf=[12 13 14 15 16 17 18 19 20 21 22 23 ] > [2] sndbuf=[24 25 26 27 28 29 30 31 32 33 34 35 ] @@ -203,18 +203,18 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_clust ! output sort p Test Dragonfly $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_cluster -platform ../../../examples/platforms/cluster_dragonfly.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error -> [rank 0] -> node-0.acme.org -> [rank 1] -> node-1.acme.org -> [rank 2] -> node-2.acme.org -> [rank 3] -> node-3.acme.org -> [rank 4] -> node-4.acme.org -> [rank 5] -> node-5.acme.org -> [rank 6] -> node-6.acme.org -> [rank 7] -> node-7.acme.org -> [rank 8] -> node-8.acme.org -> [rank 9] -> node-9.acme.org -> [rank 10] -> node-10.acme.org -> [rank 11] -> node-11.acme.org +> [rank 0] -> node-0.simgrid.org +> [rank 1] -> node-1.simgrid.org +> [rank 2] -> node-2.simgrid.org +> [rank 3] -> node-3.simgrid.org +> [rank 4] -> node-4.simgrid.org +> [rank 5] -> node-5.simgrid.org +> [rank 6] -> node-6.simgrid.org +> [rank 7] -> node-7.simgrid.org +> [rank 8] -> node-8.simgrid.org +> [rank 9] -> node-9.simgrid.org +> [rank 10] -> node-10.simgrid.org +> [rank 11] -> node-11.simgrid.org > [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 ] > [1] sndbuf=[12 13 14 15 16 17 18 19 20 21 22 23 ] > [2] sndbuf=[24 25 26 27 28 29 30 31 32 33 34 35 ] diff --git a/teshsuite/smpi/hostfile_cluster b/teshsuite/smpi/hostfile_cluster index 31db2a70c5..dcda7e235c 100644 --- a/teshsuite/smpi/hostfile_cluster +++ b/teshsuite/smpi/hostfile_cluster @@ -1,12 +1,12 @@ -node-0.acme.org -node-1.acme.org -node-2.acme.org -node-3.acme.org -node-4.acme.org -node-5.acme.org -node-6.acme.org -node-7.acme.org -node-8.acme.org -node-9.acme.org -node-10.acme.org -node-11.acme.org +node-0.simgrid.org +node-1.simgrid.org +node-2.simgrid.org +node-3.simgrid.org +node-4.simgrid.org +node-5.simgrid.org +node-6.simgrid.org +node-7.simgrid.org +node-8.simgrid.org +node-9.simgrid.org +node-10.simgrid.org +node-11.simgrid.org