From 3c6ff7bd67641e93cc3d710565dcc6251b623583 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 2 Apr 2020 13:02:26 +0200 Subject: [PATCH] revalidate Java tesh files --- examples/deprecated/java/app/bittorrent/app-bittorrent.tesh | 2 +- .../java/app/centralizedmutex/app-centralizedmutex.tesh | 2 +- .../deprecated/java/app/masterworker/app-masterworker.tesh | 2 +- examples/deprecated/java/app/pingpong/app-pingpong.tesh | 2 +- examples/deprecated/java/app/tokenring/app-tokenring.tesh | 6 +++--- examples/deprecated/java/async/dsend/async-dsend.tesh | 2 +- examples/deprecated/java/async/waitall/async-waitall.tesh | 2 +- examples/deprecated/java/async/yield/async-yield.tesh | 2 +- .../java/cloud/masterworker/cloud-masterworker.tesh | 2 +- .../deprecated/java/cloud/migration/cloud-migration.tesh | 2 +- examples/deprecated/java/dht/chord/dht-chord.tesh | 2 +- examples/deprecated/java/dht/kademlia/dht-kademlia.tesh | 2 +- .../java/energy/consumption/energy-consumption.tesh | 2 +- examples/deprecated/java/energy/pstate/energy-pstate.tesh | 2 +- examples/deprecated/java/energy/vm/energy-vm.tesh | 2 +- examples/deprecated/java/hostload/hostload.tesh | 2 +- examples/deprecated/java/io/file/io-file.tesh | 2 +- examples/deprecated/java/io/storage/io-storage.tesh | 2 +- examples/deprecated/java/process/kill/process-kill.tesh | 2 +- .../java/process/migration/process-migration.tesh | 2 +- .../java/process/startkilltime/process-startkilltime.tesh | 2 +- .../deprecated/java/process/suspend/process-suspend.tesh | 2 +- examples/deprecated/java/task/priority/task-priority.tesh | 2 +- examples/deprecated/java/trace/pingpong/trace-pingpong.tesh | 2 +- teshsuite/java/semaphoregc/semaphoregc.tesh | 2 +- teshsuite/java/sleephostoff/sleephostoff.tesh | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh b/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh index c2208d04a6..ce00fa8e1c 100644 --- a/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh +++ b/examples/deprecated/java/app/bittorrent/app-bittorrent.tesh @@ -5,7 +5,7 @@ $ ${javacmd:=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.039030] [java/INFO] MSG_main finished; Terminating the simulation... +> [5000.039030] [java/INFO] Terminating the simulation... > [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 diff --git a/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh b/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh index d6ebe805f7..74d30a1568 100644 --- a/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh +++ b/examples/deprecated/java/app/centralizedmutex/app-centralizedmutex.tesh @@ -11,4 +11,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/centralizedmutex/Main ${srcdir > [Fafard:app.centralizedmutex.Node:(3) 0.063737] [java/INFO] Wait for a grant from the coordinator > [Tremblay:app.centralizedmutex.Coordinator:(1) 0.063737] [java/INFO] Got a request from app.centralizedmutex.Node. Queue empty: grant it > [Tremblay:app.centralizedmutex.Coordinator:(1) 0.134167] [java/INFO] we should shutdown the simulation now -> [0.134167] [java/INFO] MSG_main finished; Terminating the simulation... +> [0.134167] [java/INFO] Terminating the simulation... diff --git a/examples/deprecated/java/app/masterworker/app-masterworker.tesh b/examples/deprecated/java/app/masterworker/app-masterworker.tesh index 5245fa6e94..f8cca45836 100644 --- a/examples/deprecated/java/app/masterworker/app-masterworker.tesh +++ b/examples/deprecated/java/app/masterworker/app-masterworker.tesh @@ -17,4 +17,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/masterworker/Main ${srcdir:=.} > [ 5.628842] (7:app.masterworker.Worker@Jupiter) Received Finalize. I'm done. See you! > [ 5.628842] (8:app.masterworker.Worker@Jacquelin) Received Finalize. I'm done. See you! > [ 5.628842] (1:app.masterworker.Master@Jacquelin) Goodbye now! -> [ 5.628842] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 5.628842] (0:maestro@) Terminating the simulation... diff --git a/examples/deprecated/java/app/pingpong/app-pingpong.tesh b/examples/deprecated/java/app/pingpong/app-pingpong.tesh index 51420473e6..e68b679fa2 100644 --- a/examples/deprecated/java/app/pingpong/app-pingpong.tesh +++ b/examples/deprecated/java/app/pingpong/app-pingpong.tesh @@ -20,4 +20,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/pingpong/Main ${srcdir:=.}/../ > [Boivin:Receiver:(2) 3.146646] [java/INFO] --- bw 9.533962169004266E7 ---- > [Boivin:Receiver:(2) 3.146646] [java/INFO] Done. > [Jacquelin:Sender:(1) 3.146646] [java/INFO] Done. -> [3.146646] [java/INFO] MSG_main finished; Terminating the simulation... +> [3.146646] [java/INFO] Terminating the simulation... diff --git a/examples/deprecated/java/app/tokenring/app-tokenring.tesh b/examples/deprecated/java/app/tokenring/app-tokenring.tesh index f065739a29..f7b5076eec 100644 --- a/examples/deprecated/java/app/tokenring/app-tokenring.tesh +++ b/examples/deprecated/java/app/tokenring/app-tokenring.tesh @@ -15,7 +15,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/.. > [ 0.101019] (6:5@host6) Host '5' received 'Token' > [ 0.101019] (6:5@host6) Host '5' send 'Token' to Host '0' > [ 0.131796] (1:0@host1) Host '0' received 'Token' -> [ 0.131796] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 0.131796] (0:maestro@) Terminating the simulation... > [ 0.131796] (0:maestro@) Simulation time 0.13179602061855672 $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/two_peers.xml '--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n' @@ -25,7 +25,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/.. > [ 0.624423] (2:1@100036570) Host '1' received 'Token' > [ 0.624423] (2:1@100036570) Host '1' send 'Token' to Host '0' > [ 1.248846] (1:0@100030591) Host '0' received 'Token' -> [ 1.248846] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 1.248846] (0:maestro@) Terminating the simulation... > [ 1.248846] (0:maestro@) Simulation time 1.2488464578972847 $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n' @@ -151,5 +151,5 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/.. > [ 1.791501] (60:59@host-9.cluster2) Host '59' received 'Token' > [ 1.791501] (60:59@host-9.cluster2) Host '59' send 'Token' to Host '0' > [ 1.821865] (1:0@host-1.cluster1) Host '0' received 'Token' -> [ 1.821865] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 1.821865] (0:maestro@) Terminating the simulation... > [ 1.821865] (0:maestro@) Simulation time 1.8218653608247406 diff --git a/examples/deprecated/java/async/dsend/async-dsend.tesh b/examples/deprecated/java/async/dsend/async-dsend.tesh index 399a2aeec4..99e2112954 100644 --- a/examples/deprecated/java/async/dsend/async-dsend.tesh +++ b/examples/deprecated/java/async/dsend/async-dsend.tesh @@ -24,4 +24,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} async/dsend/Main ${srcdir:=.}/../. > [ 2.964768] (3:Receiver@Fafard) Received a task. I'm done. See you! > [ 4.162002] (5:Receiver@Jacquelin) Received a task. I'm done. See you! > [ 20.000000] (1:Sender@Boivin) Done sleeping. Goodbye now! -> [ 20.000000] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 20.000000] (0:maestro@) Terminating the simulation... diff --git a/examples/deprecated/java/async/waitall/async-waitall.tesh b/examples/deprecated/java/async/waitall/async-waitall.tesh index c2b6c4a481..35eedc02c7 100644 --- a/examples/deprecated/java/async/waitall/async-waitall.tesh +++ b/examples/deprecated/java/async/waitall/async-waitall.tesh @@ -23,4 +23,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} async/waitall/Main ${srcdir:=.}/.. > [ 2.964768] (3:Receiver@Fafard) I got my task, good bye. > [ 4.162002] (5:Receiver@Jacquelin) I got my task, good bye. > [ 4.162002] (1:Sender@Boivin) Goodbye now! -> [ 4.162002] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 4.162002] (0:maestro@) Terminating the simulation... diff --git a/examples/deprecated/java/async/yield/async-yield.tesh b/examples/deprecated/java/async/yield/async-yield.tesh index 16db9ac600..e83e606d88 100644 --- a/examples/deprecated/java/async/yield/async-yield.tesh +++ b/examples/deprecated/java/async/yield/async-yield.tesh @@ -5,4 +5,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} async/yield/Main ${srcdir:=.}/../. > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:Yielder@Boivin) Yielded 10. Good bye now! > [ 0.000000] (2:Yielder@Bourassa) Yielded 15. Good bye now! -> [ 0.000000] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 0.000000] (0:maestro@) Terminating the simulation... diff --git a/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh b/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh index ec1de09209..66e1e042d3 100644 --- a/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh +++ b/examples/deprecated/java/cloud/masterworker/cloud-masterworker.tesh @@ -202,4 +202,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} cloud/masterworker/Main ${srcdir:= > [49971.662691] (1:Master@Boivin) Send some work to everyone > [49973.849223] (1:Master@Boivin) Suspend all VMs, wait a while, resume them, migrate them and shut them down. > [50971.662691] (1:Master@Boivin) XXXXXXXXXXXXXXX Step 50 done. -> [50971.662691] (0:maestro@) MSG_main finished; Terminating the simulation... +> [50971.662691] (0:maestro@) Terminating the simulation... diff --git a/examples/deprecated/java/cloud/migration/cloud-migration.tesh b/examples/deprecated/java/cloud/migration/cloud-migration.tesh index c0b1ae434f..58bd2164af 100644 --- a/examples/deprecated/java/cloud/migration/cloud-migration.tesh +++ b/examples/deprecated/java/cloud/migration/cloud-migration.tesh @@ -30,4 +30,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} cloud/migration/Main ${srcdir:=.}/ > [PM0:Test:(1) 183.918289] [java/INFO] End of migration of VM vm0 to node PM0 > [PM0:Test:(1) 183.918289] [java/INFO] - End of Migration from PM1 to PM0 (duration:43.20730611422704) > [PM0:Test:(1) 183.918289] [java/INFO] Forcefully destroy VMs -> [183.918289] [java/INFO] MSG_main finished; Terminating the simulation... +> [183.918289] [java/INFO] Terminating the simulation... diff --git a/examples/deprecated/java/dht/chord/dht-chord.tesh b/examples/deprecated/java/dht/chord/dht-chord.tesh index 42723c9346..e85a815648 100644 --- a/examples/deprecated/java/dht/chord/dht-chord.tesh +++ b/examples/deprecated/java/dht/chord/dht-chord.tesh @@ -4,7 +4,7 @@ $ ${javacmd:=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.803210] [java/INFO] MSG_main finished; Terminating the simulation... +> [1046.803210] [java/INFO] Terminating the simulation... > [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 diff --git a/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh b/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh index d7b5caf49e..4791a132bc 100644 --- a/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh +++ b/examples/deprecated/java/dht/kademlia/dht-kademlia.tesh @@ -4,7 +4,7 @@ $ ${javacmd:=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... +> [900.000000] [java/INFO] Terminating the simulation... > [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! diff --git a/examples/deprecated/java/energy/consumption/energy-consumption.tesh b/examples/deprecated/java/energy/consumption/energy-consumption.tesh index eccc8fdf9f..66637f2538 100644 --- a/examples/deprecated/java/energy/consumption/energy-consumption.tesh +++ b/examples/deprecated/java/energy/consumption/energy-consumption.tesh @@ -9,7 +9,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} energy/consumption/Main ${srcdir:= > [MyHost1:energyConsumer:(1) 10.000000] [java/INFO] Currently consumed energy after sleeping 10 sec: 1000.0 > [MyHost1:energyConsumer:(1) 20.000000] [java/INFO] Currently consumed energy after executing 1E9 flops: 2200.0 > [20.000000] [surf_energy/INFO] Total energy consumption: 6200.000000 Joules (used hosts: 2200.000000 Joules; unused/idle hosts: 4000.000000) -> [20.000000] [java/INFO] MSG_main finished; Terminating the simulation... +> [20.000000] [java/INFO] Terminating the simulation... > [20.000000] [java/INFO] Total simulation time: 20.0 > [20.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 2200.000000 Joules > [20.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 2000.000000 Joules diff --git a/examples/deprecated/java/energy/pstate/energy-pstate.tesh b/examples/deprecated/java/energy/pstate/energy-pstate.tesh index 38db7a6b92..4ee0a45956 100644 --- a/examples/deprecated/java/energy/pstate/energy-pstate.tesh +++ b/examples/deprecated/java/energy/pstate/energy-pstate.tesh @@ -19,7 +19,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/.. > [MyHost2:dvfs_test:(3) 6.000000] [java/INFO] Count of Processor states=3 > [MyHost2:dvfs_test:(3) 6.000000] [java/INFO] Current power peak=2.0E7 > [6.000000] [surf_energy/INFO] Total energy consumption: 2195.000000 Joules (used hosts: 1595.000000 Joules; unused/idle hosts: 600.000000) -> [6.000000] [java/INFO] MSG_main finished; Terminating the simulation... +> [6.000000] [java/INFO] Terminating the simulation... > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 645.000000 Joules > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 950.000000 Joules > [6.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 600.000000 Joules diff --git a/examples/deprecated/java/energy/vm/energy-vm.tesh b/examples/deprecated/java/energy/vm/energy-vm.tesh index 45ab11ccd9..ee3672d478 100644 --- a/examples/deprecated/java/energy/vm/energy-vm.tesh +++ b/examples/deprecated/java/energy/vm/energy-vm.tesh @@ -15,7 +15,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../../ > [vmHost1:p11:(2) 6.000000] [java/INFO] This worker is done. > [vmHost3:p21:(4) 6.000000] [java/INFO] This worker is done. > [10.000000] [surf_energy/INFO] Total energy consumption: 4320.000000 Joules (used hosts: 4320.000000 Joules; unused/idle hosts: 0.000000) -> [10.000000] [java/INFO] MSG_main finished; Terminating the simulation... +> [10.000000] [java/INFO] Terminating the simulation... > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 1120.000000 Joules > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 1600.000000 Joules > [10.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 1600.000000 Joules diff --git a/examples/deprecated/java/hostload/hostload.tesh b/examples/deprecated/java/hostload/hostload.tesh index 12bf489f41..35d98dc731 100644 --- a/examples/deprecated/java/hostload/hostload.tesh +++ b/examples/deprecated/java/hostload/hostload.tesh @@ -17,4 +17,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} hostload/Main ${srcdir:=.}/../../p > [Boivin::(1) 14.077680] [java/INFO] Speed=9.8095E7 flop/s > [Boivin::(1) 14.077680] [java/INFO] Computed Flops 4.0E8 > [Boivin::(1) 14.077680] [java/INFO] AvgLoad 0.2896556718201238 -> [14.077680] [java/INFO] MSG_main finished; Terminating the simulation... \ No newline at end of file +> [14.077680] [java/INFO] Terminating the simulation... \ No newline at end of file diff --git a/examples/deprecated/java/io/file/io-file.tesh b/examples/deprecated/java/io/file/io-file.tesh index 2ee1178869..f1d5950e09 100644 --- a/examples/deprecated/java/io/file/io-file.tesh +++ b/examples/deprecated/java/io/file/io-file.tesh @@ -23,4 +23,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} io/file/Main ${srcdir:=.}/../../pl > [carl:2:(3) 0.003433] [java/INFO] Seek back to the beginning of /home/doc/simgrid/examples/platforms/g5k_cabinets.xml > [bob:1:(2) 0.004414] [java/INFO] Having read 104028 on /home/doc/simgrid/examples/platforms/nancy.xml > [carl:2:(3) 0.004533] [java/INFO] Having read 110000 on /home/doc/simgrid/examples/platforms/g5k_cabinets.xml -> [0.004533] [java/INFO] MSG_main finished; Terminating the simulation... +> [0.004533] [java/INFO] Terminating the simulation... diff --git a/examples/deprecated/java/io/storage/io-storage.tesh b/examples/deprecated/java/io/storage/io-storage.tesh index 9f7fc358ca..73193eb35f 100644 --- a/examples/deprecated/java/io/storage/io-storage.tesh +++ b/examples/deprecated/java/io/storage/io-storage.tesh @@ -22,4 +22,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} io/storage/Main ${srcdir:=.}/../.. > [denise:0:(1) 0.000000] [java/INFO] Disk: Disk2 > [denise:0:(1) 0.000000] [java/INFO] Disk: Disk3 > [denise:0:(1) 0.000000] [java/INFO] Disk: Disk4 -> [0.000000] [java/INFO] MSG_main finished; Terminating the simulation... +> [0.000000] [java/INFO] Terminating the simulation... diff --git a/examples/deprecated/java/process/kill/process-kill.tesh b/examples/deprecated/java/process/kill/process-kill.tesh index 45d42492aa..3dfabcc0c7 100644 --- a/examples/deprecated/java/process/kill/process-kill.tesh +++ b/examples/deprecated/java/process/kill/process-kill.tesh @@ -9,4 +9,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} process/kill/Main ${srcdir:=.}/../ > [Boivin:victim:(2) 10.000000] [java/INFO] OK, OK. Let's work > [Jacquelin:killer:(1) 11.000000] [java/INFO] Kill Process > [Jacquelin:killer:(1) 11.000000] [java/INFO] Ok, goodbye now. -> [11.000000] [java/INFO] MSG_main finished; Terminating the simulation... +> [11.000000] [java/INFO] Terminating the simulation... diff --git a/examples/deprecated/java/process/migration/process-migration.tesh b/examples/deprecated/java/process/migration/process-migration.tesh index 5b18d6f5b1..242b21621e 100644 --- a/examples/deprecated/java/process/migration/process-migration.tesh +++ b/examples/deprecated/java/process/migration/process-migration.tesh @@ -8,7 +8,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} process/migration/Main ${srcdir:=. > [ 0.000000] (2:emigrant@Boivin) Yeah, found something to do > [ 1.000000] (1:policeman@Boivin) Wait a bit before migrating the emigrant. > [ 3.000000] (2:emigrant@Boivin) Moving back to home after work -> [ 7.000000] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 7.000000] (0:maestro@) Terminating the simulation... > [ 7.000000] (2:emigrant@Jacquelin) I've been moved on this new host:Jacquelin > [ 7.000000] (2:emigrant@Jacquelin) Uh, nothing to do here. Stopping now > [ 7.000000] (1:policeman@Boivin) I moved the emigrant diff --git a/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh b/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh index a2422d4305..d2fd7df6c4 100644 --- a/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh +++ b/examples/deprecated/java/process/startkilltime/process-startkilltime.tesh @@ -9,4 +9,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} process/startkilltime/Main ${srcdi > [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... +> [10.000000] [java/INFO] Terminating the simulation... diff --git a/examples/deprecated/java/process/suspend/process-suspend.tesh b/examples/deprecated/java/process/suspend/process-suspend.tesh index 64cc4a1ffb..8ed5050ad3 100644 --- a/examples/deprecated/java/process/suspend/process-suspend.tesh +++ b/examples/deprecated/java/process/suspend/process-suspend.tesh @@ -6,7 +6,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} process/suspend/Main ${srcdir:=.}/ > [ 0.000000] (1:DreamMaster@Jacquelin) Let's create a lazy guy. > [ 0.000000] (1:DreamMaster@Jacquelin) Let's wait a little bit... > [ 0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep. -> [ 10.000000] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 10.000000] (0:maestro@) Terminating the simulation... > [ 10.000000] (1:DreamMaster@Jacquelin) Let's wake the lazy guy up! >:) BOOOOOUUUHHH!!!! > [ 10.000000] (1:DreamMaster@Jacquelin) OK, goodbye now. > [ 10.000000] (2:Lazy@Jacquelin) Uuuh ? Did somebody call me ? diff --git a/examples/deprecated/java/task/priority/task-priority.tesh b/examples/deprecated/java/task/priority/task-priority.tesh index 84710f0491..1ba6ad7a36 100644 --- a/examples/deprecated/java/task/priority/task-priority.tesh +++ b/examples/deprecated/java/task/priority/task-priority.tesh @@ -7,5 +7,5 @@ $ ${javacmd:=java} -classpath ${classpath:=.} task/priority/Main ${srcdir:=.}/.. > [ 0.000000] (1:task.priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 1.0 > [ 0.000000] (2:task.priority.Test@Fafard) Hello! Running a task of size 7.6296E7 with priority 2.0 > [ 1.500000] (2:task.priority.Test@Fafard) Goodbye now! -> [ 2.000000] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 2.000000] (0:maestro@) Terminating the simulation... > [ 2.000000] (1:task.priority.Test@Fafard) Goodbye now! diff --git a/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh b/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh index 61e8b7abe5..62c1e0f4c7 100644 --- a/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh +++ b/examples/deprecated/java/trace/pingpong/trace-pingpong.tesh @@ -7,7 +7,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} trace/pingpong/Main ${srcdir:=.}/. > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'simulation.trace' > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes' -> [3.817809] [java/INFO] MSG_main finished; Terminating the simulation... +> [3.817809] [java/INFO] Terminating the simulation... > [Boivin:Receiver:(2) 0.000000] [java/INFO] hello! > [Boivin:Receiver:(2) 0.000000] [java/INFO] try to get a task > [Boivin:Receiver:(2) 1.048882] [java/INFO] Got at time 1.0488818628325232 diff --git a/teshsuite/java/semaphoregc/semaphoregc.tesh b/teshsuite/java/semaphoregc/semaphoregc.tesh index 010bd0b053..4abd4f5d1e 100644 --- a/teshsuite/java/semaphoregc/semaphoregc.tesh +++ b/teshsuite/java/semaphoregc/semaphoregc.tesh @@ -4,4 +4,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} semaphoregc.SemaphoreGC ${srcdir:= > [ 0.0000] (0:maestro@) Using regular java threads. > [ 0.0000] (1:SemCreator@Fafard) Creating 50 new Semaphores, yielding and triggering a GC after each > [ 500.0000] (1:SemCreator@Fafard) It worked, we survived. The test is passed. -> [ 500.0000] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 500.0000] (0:maestro@) Terminating the simulation... diff --git a/teshsuite/java/sleephostoff/sleephostoff.tesh b/teshsuite/java/sleephostoff/sleephostoff.tesh index b67522a3d7..9a2ea81802 100644 --- a/teshsuite/java/sleephostoff/sleephostoff.tesh +++ b/teshsuite/java/sleephostoff/sleephostoff.tesh @@ -9,4 +9,4 @@ $ ${javacmd:=java} -classpath ${classpath:=.} sleephostoff.SleepHostOff ${srcdir > [ 0.020000] (1:TestRunner@Fafard) Tremblay has been stopped > [ 0.020000] (2:Sleeper@Tremblay) catch HostFailureException: Host Failure > [ 0.320000] (1:TestRunner@Fafard) Test sleep seems ok, cool! (number of Process : 1, it should be 1 (i.e. the Test one)) -> [ 0.320000] (0:maestro@) MSG_main finished; Terminating the simulation... +> [ 0.320000] (0:maestro@) Terminating the simulation... -- 2.20.1