From: Martin Quinson Date: Mon, 19 Jun 2017 20:10:43 +0000 (+0200) Subject: revalidate the tesh files X-Git-Tag: v3.16~31 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/97ae160f255323b7009da89e997ed02ff6439361 revalidate the tesh files --- diff --git a/examples/java/cloud/migration/cloud_migration.tesh b/examples/java/cloud/migration/cloud_migration.tesh index 4c73eb1682..47ad381069 100644 --- a/examples/java/cloud/migration/cloud_migration.tesh +++ b/examples/java/cloud/migration/cloud_migration.tesh @@ -9,25 +9,25 @@ $ java -classpath ${classpath:=.} cloud/migration/Main ${srcdir:=.}/../platforms > [PM0:Test:(1) 0.000000] [java/INFO] - Launch migration from PM0 to PM1 > [PM0:Test:(1) 0.000000] [java/INFO] Start migration of VM vm0 to PM1 > [PM0:Test:(1) 0.000000] [java/INFO] currentLoad:90/ramSize:2048/dpIntensity:70/remaining:8.10E+11 -> [PM0:Test:(1) 35.084170] [java/INFO] End of migration of VM vm0 to node PM1 -> [PM0:Test:(1) 35.084170] [java/INFO] - End of Migration from PM0 to PM1 (duration:35.0841702956701) -> [PM0:Test:(1) 35.084170] [java/INFO] - Launch migration from PM1 to PM0 -> [PM0:Test:(1) 35.084170] [java/INFO] Start migration of VM vm0 to PM0 -> [PM0:Test:(1) 35.084170] [java/INFO] currentLoad:90/ramSize:2048/dpIntensity:70/remaining:6.22E+11 -> [PM0:Test:(1) 67.551019] [java/INFO] End of migration of VM vm0 to node PM0 -> [PM0:Test:(1) 67.551019] [java/INFO] - End of Migration from PM1 to PM0 (duration:32.46684874546391) -> [PM0:Test:(1) 67.551019] [java/INFO] -> [PM0:Test:(1) 67.551019] [java/INFO] -> [PM0:Test:(1) 67.551019] [java/INFO] Round trip of VM1 (load 80%) -> [PM0:Test:(1) 67.551019] [java/INFO] - Launch migration from PM0 to PM1 -> [PM0:Test:(1) 67.551019] [java/INFO] Start migration of VM vm0 to PM1 -> [PM0:Test:(1) 67.551019] [java/INFO] currentLoad:80/ramSize:2048/dpIntensity:70/remaining:4.65E+11 -> [PM0:Test:(1) 102.635189] [java/INFO] End of migration of VM vm0 to node PM1 -> [PM0:Test:(1) 102.635189] [java/INFO] - End of Migration from PM0 to PM1 (duration:35.08417029567006) -> [PM0:Test:(1) 102.635189] [java/INFO] - Launch migration from PM1 to PM0 -> [PM0:Test:(1) 102.635189] [java/INFO] Start migration of VM vm0 to PM0 -> [PM0:Test:(1) 102.635189] [java/INFO] currentLoad:80/ramSize:2048/dpIntensity:70/remaining:2.77E+11 -> [PM0:Test:(1) 135.102038] [java/INFO] End of migration of VM vm0 to node PM0 -> [PM0:Test:(1) 135.102038] [java/INFO] - End of Migration from PM1 to PM0 (duration:32.46684874546395) -> [PM0:Test:(1) 135.102038] [java/INFO] Forcefully destroy VMs -> [135.102038] [java/INFO] MSG_main finished; Cleaning up the simulation... +> [PM0:Test:(1) 45.731913] [java/INFO] End of migration of VM vm0 to node PM1 +> [PM0:Test:(1) 45.731913] [java/INFO] - End of Migration from PM0 to PM1 (duration:45.73191265731957) +> [PM0:Test:(1) 45.731913] [java/INFO] - Launch migration from PM1 to PM0 +> [PM0:Test:(1) 45.731913] [java/INFO] Start migration of VM vm0 to PM0 +> [PM0:Test:(1) 45.731913] [java/INFO] currentLoad:90/ramSize:2048/dpIntensity:70/remaining:5.01E+11 +> [PM0:Test:(1) 97.502571] [java/INFO] End of migration of VM vm0 to node PM0 +> [PM0:Test:(1) 97.502571] [java/INFO] - End of Migration from PM1 to PM0 (duration:51.770657959072125) +> [PM0:Test:(1) 97.502571] [java/INFO] +> [PM0:Test:(1) 97.502571] [java/INFO] +> [PM0:Test:(1) 97.502571] [java/INFO] Round trip of VM1 (load 80%) +> [PM0:Test:(1) 97.502571] [java/INFO] - Launch migration from PM0 to PM1 +> [PM0:Test:(1) 97.502571] [java/INFO] Start migration of VM vm0 to PM1 +> [PM0:Test:(1) 97.502571] [java/INFO] currentLoad:80/ramSize:2048/dpIntensity:70/remaining:1.24E+11 +> [PM0:Test:(1) 140.711178] [java/INFO] End of migration of VM vm0 to node PM1 +> [PM0:Test:(1) 140.711178] [java/INFO] - End of Migration from PM0 to PM1 (duration:43.20860711422699) +> [PM0:Test:(1) 140.711178] [java/INFO] - Launch migration from PM1 to PM0 +> [PM0:Test:(1) 140.711178] [java/INFO] Start migration of VM vm0 to PM0 +> [PM0:Test:(1) 140.711178] [java/INFO] currentLoad:80/ramSize:2048/dpIntensity:70/remaining:6.54E+11 +> [PM0:Test:(1) 183.918679] [java/INFO] End of migration of VM vm0 to node PM0 +> [PM0:Test:(1) 183.918679] [java/INFO] - End of Migration from PM1 to PM0 (duration:43.207501264227034) +> [PM0:Test:(1) 183.918679] [java/INFO] Forcefully destroy VMs +> [183.918679] [java/INFO] MSG_main finished; Cleaning up the simulation... diff --git a/examples/java/energy/pstate/energy_pstate.tesh b/examples/java/energy/pstate/energy_pstate.tesh index 7830de7b16..32e2e37900 100644 --- a/examples/java/energy/pstate/energy_pstate.tesh +++ b/examples/java/energy/pstate/energy_pstate.tesh @@ -18,8 +18,8 @@ $ java -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/../platforms/e > [MyHost2:dvfs_test:(3) 6.000000] [java/INFO] Task2 simulation time: 5.0 > [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: 1890.000000 Joules (used hosts: 1290.000000 Joules; unused/idle hosts: 600.000000) +> [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; Cleaning up 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: 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/java/energy/vm/energy_vm.tesh b/examples/java/energy/vm/energy_vm.tesh index 025e3f7b76..3afdf2d021 100644 --- a/examples/java/energy/vm/energy_vm.tesh +++ b/examples/java/energy/vm/energy_vm.tesh @@ -8,14 +8,14 @@ $ java -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../platforms/energ > [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Create two tasks on Host3: both inside a VM > [MyHost1:energy VM runner:(1) 0.000000] [java/INFO] Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds) > [MyHost1:energy VM runner:(1) 5.000000] [java/INFO] Wait another 5 seconds. The tasks stop at some point in between -> [MyHost2:p21:(4) 6.000000] [java/INFO] This worker is done. +> [MyHost3:p31:(6) 6.000000] [java/INFO] This worker is done. +> [MyHost3:p312:(7) 6.000000] [java/INFO] This worker is done. > [MyHost2:p22:(5) 6.000000] [java/INFO] This worker is done. -> [MyHost1:p12:(3) 6.000000] [java/INFO] This worker is done. +> [vmHost1:p12:(3) 6.000000] [java/INFO] This worker is done. +> [vmHost3:p21:(4) 6.000000] [java/INFO] This worker is done. > [vmHost1:p11:(2) 6.000000] [java/INFO] This worker is done. -> [vmHost3:p31:(6) 6.000000] [java/INFO] This worker is done. -> [vmHost3:p312:(7) 6.000000] [java/INFO] This worker is done. -> [10.000000] [surf_energy/INFO] Total energy consumption: 3360.000000 Joules (used hosts: 3360.000000 Joules; unused/idle hosts: 0.000000) +> [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; Cleaning up 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: 1120.000000 Joules -> [10.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 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/msg/energy-onoff/energy-onoff.tesh b/examples/msg/energy-onoff/energy-onoff.tesh index f0c366e8c6..f60249da18 100644 --- a/examples/msg/energy-onoff/energy-onoff.tesh +++ b/examples/msg/energy-onoff/energy-onoff.tesh @@ -4,7 +4,7 @@ p Testing the mechanism for computing host energy consumption ! output sort 19 $ ${bindir:=.}/energy-onoff/energy-onoff$EXEEXT ${srcdir:=.}/energy-onoff/platform_onoff.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" -> [ 0.000000] (1:onoff_test@MyHost2) Energetic profile: 95.0:120.0:200.0,93.0:110.0:170.0,90.0:100.0:150.0, 120:120:120,110:110:110 +> [ 0.000000] (1:onoff_test@MyHost2) Energetic profile: 95.0:200.0,93.0:170.0,90.0:150.0, 120:120,110:110 > [ 0.000000] (1:onoff_test@MyHost2) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J > [ 0.000000] (1:onoff_test@MyHost2) Sleep for 10 seconds > [ 10.000000] (1:onoff_test@MyHost2) Done sleeping. Current peak speed=1E+08; Energy dissipated=950.00 J diff --git a/examples/msg/energy-ptask/energy-ptask.tesh b/examples/msg/energy-ptask/energy-ptask.tesh index 260139045c..6414155e8d 100644 --- a/examples/msg/energy-ptask/energy-ptask.tesh +++ b/examples/msg/energy-ptask/energy-ptask.tesh @@ -8,8 +8,8 @@ $ ${bindir:=.}/energy-ptask/energy-ptask$EXEEXT ${srcdir:=.}/../platforms/energy > [311.000000] (1:test@MyHost1) Then, build a parallel task with no computation nor communication (synchro only) > [311.000000] (1:test@MyHost1) Finally, trick the ptask to do a 'remote execution', on host MyHost2 > [321.000000] (1:test@MyHost1) Goodbye now! -> [321.000000] (0:maestro@) Total energy consumption: 115160.000000 Joules (used hosts: 115160.000000 Joules; unused/idle hosts: 0.000000) +> [321.000000] (0:maestro@) Total energy consumption: 157960.888889 Joules (used hosts: 157960.888889 Joules; unused/idle hosts: 0.000000) > [321.000000] (0:maestro@) Simulation done. -> [321.000000] (0:maestro@) Energy consumption of host MyHost1: 38320.000000 Joules -> [321.000000] (0:maestro@) Energy consumption of host MyHost2: 38520.000000 Joules -> [321.000000] (0:maestro@) Energy consumption of host MyHost3: 38320.000000 Joules +> [321.000000] (0:maestro@) Energy consumption of host MyHost1: 30560.888889 Joules +> [321.000000] (0:maestro@) Energy consumption of host MyHost2: 64200.000000 Joules +> [321.000000] (0:maestro@) Energy consumption of host MyHost3: 63200.000000 Joules diff --git a/examples/msg/energy-vm/energy-vm.tesh b/examples/msg/energy-vm/energy-vm.tesh index c89dd5ddbd..965e8ac013 100644 --- a/examples/msg/energy-vm/energy-vm.tesh +++ b/examples/msg/energy-vm/energy-vm.tesh @@ -9,14 +9,14 @@ $ ${bindir:=.}/energy-vm/energy-vm$EXEEXT ${srcdir:=.}/../platforms/energy_platf > [ 0.000000] (1:dvfs@MyHost1) Create two tasks on Host3: both inside a VM > [ 0.000000] (1:dvfs@MyHost1) Wait 5 seconds. The tasks are still running (they run for 3 seconds, but 2 tasks are co-located, so they run for 6 seconds) > [ 5.000000] (1:dvfs@MyHost1) Wait another 5 seconds. The tasks stop at some point in between -> [ 6.000000] (4:p21@MyHost2) This worker is done. +> [ 6.000000] (6:p31@MyHost3) This worker is done. +> [ 6.000000] (7:p32@MyHost3) This worker is done. > [ 6.000000] (5:p22@MyHost2) This worker is done. -> [ 6.000000] (3:p12@MyHost1) This worker is done. +> [ 6.000000] (3:p12@vm_host1) This worker is done. +> [ 6.000000] (4:p21@vm_host3) This worker is done. > [ 6.000000] (2:p11@vm_host1) This worker is done. -> [ 6.000000] (6:p31@vm_host3) This worker is done. -> [ 6.000000] (7:p32@vm_host3) This worker is done. -> [ 10.000000] (0:maestro@) Total energy consumption: 3360.000000 Joules (used hosts: 3360.000000 Joules; unused/idle hosts: 0.000000) -> [ 10.000000] (0:maestro@) Total simulation time: 10.00; All hosts must have the exact same energy consumption. +> [ 10.000000] (0:maestro@) Total energy consumption: 4320.000000 Joules (used hosts: 4320.000000 Joules; unused/idle hosts: 0.000000) +> [ 10.000000] (0:maestro@) Total simulation time: 10.00; Host2 and Host3 must have the exact same energy consumption; Host1 is multi-core and will differ. > [ 10.000000] (0:maestro@) Energy consumption of host MyHost1: 1120.000000 Joules -> [ 10.000000] (0:maestro@) Energy consumption of host MyHost2: 1120.000000 Joules -> [ 10.000000] (0:maestro@) Energy consumption of host MyHost3: 1120.000000 Joules +> [ 10.000000] (0:maestro@) Energy consumption of host MyHost2: 1600.000000 Joules +> [ 10.000000] (0:maestro@) Energy consumption of host MyHost3: 1600.000000 Joules diff --git a/examples/smpi/energy/energy.tesh b/examples/smpi/energy/energy.tesh index d3503e3c19..d21b8326e7 100644 --- a/examples/smpi/energy/energy.tesh +++ b/examples/smpi/energy/energy.tesh @@ -5,16 +5,16 @@ $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platf > [0.000000] [rank 0] Current pstate: 0; Current power: 100000000 > [0.000000] [rank 1] Current pstate: 0; Current power: 100000000 > [10.000000] [rank 0] Energy consumed: 1200 Joules. -> [10.000000] [rank 1] Energy consumed: 1200 Joules. +> [10.000000] [rank 1] Energy consumed: 2000 Joules. > [10.000000] [rank 0] Current pstate: 1; Current power: 50000000 > [10.000000] [rank 1] Current pstate: 1; Current power: 50000000 > [30.000000] [rank 0] Energy consumed: 3400 Joules. -> [30.000000] [rank 1] Energy consumed: 3400 Joules. +> [30.000000] [rank 1] Energy consumed: 5400 Joules. > [30.000000] [rank 0] Current pstate: 2; Current power: 20000000 > [30.000000] [rank 1] Current pstate: 2; Current power: 20000000 > [80.000000] [rank 0] Energy consumed: 8650 Joules. -> [80.000000] [rank 1] Energy consumed: 8650 Joules. -> [80.000000] [surf_energy/INFO] Total energy consumption: 25300.000000 Joules (used hosts: 17300.000000 Joules; unused/idle hosts: 8000.000000) +> [80.000000] [rank 1] Energy consumed: 12900 Joules. +> [80.000000] [surf_energy/INFO] Total energy consumption: 29550.000000 Joules (used hosts: 21550.000000 Joules; unused/idle hosts: 8000.000000) > [80.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 8650.000000 Joules -> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 8650.000000 Joules +> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 12900.000000 Joules > [80.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 8000.000000 Joules diff --git a/examples/smpi/energy/f77/energy.tesh b/examples/smpi/energy/f77/energy.tesh index 3ea74d9370..a3391a6ebd 100644 --- a/examples/smpi/energy/f77/energy.tesh +++ b/examples/smpi/energy/f77/energy.tesh @@ -12,16 +12,16 @@ $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platf > [ 0.00000000] [rank 0] Current pstate: 0; Current power: 100000000.0000 > [ 0.00000000] [rank 1] Current pstate: 0; Current power: 100000000.0000 > [ 10.00000000] [rank 0] Energy consumed (Joules): 1200.0000 -> [ 10.00000000] [rank 1] Energy consumed (Joules): 1200.0000 +> [ 10.00000000] [rank 1] Energy consumed (Joules): 2000.0000 > [ 10.00000000] [rank 0] Current pstate: 1; Current power: 50000000.0000 > [ 10.00000000] [rank 1] Current pstate: 1; Current power: 50000000.0000 > [ 30.00000000] [rank 0] Energy consumed (Joules): 3400.0000 -> [ 30.00000000] [rank 1] Energy consumed (Joules): 3400.0000 +> [ 30.00000000] [rank 1] Energy consumed (Joules): 5400.0000 > [ 30.00000000] [rank 0] Current pstate: 2; Current power: 20000000.0000 > [ 30.00000000] [rank 1] Current pstate: 2; Current power: 20000000.0000 > [ 80.00000000] [rank 0] Energy consumed (Joules): 8650.0000 -> [ 80.00000000] [rank 1] Energy consumed (Joules): 8650.0000 -> [80.000000] [surf_energy/INFO] Total energy consumption: 25300.000000 Joules (used hosts: 17300.000000 Joules; unused/idle hosts: 8000.000000) +> [ 80.00000000] [rank 1] Energy consumed (Joules): 12900.0000 +> [80.000000] [surf_energy/INFO] Total energy consumption: 29550.000000 Joules (used hosts: 21550.000000 Joules; unused/idle hosts: 8000.000000) > [80.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 8650.000000 Joules -> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 8650.000000 Joules +> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 12900.000000 Joules > [80.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 8000.000000 Joules diff --git a/examples/smpi/energy/f90/energy.tesh b/examples/smpi/energy/f90/energy.tesh index aa6cd218ba..9c9f9478c5 100644 --- a/examples/smpi/energy/f90/energy.tesh +++ b/examples/smpi/energy/f90/energy.tesh @@ -1,5 +1,5 @@ p Test smpi bindings for dvfs functions (Fortran 90 example) -! output sort 1 + $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../platforms/energy_platform.xml --cfg=smpi/simulate-computation:no ${bindir:=.}/f90/sef90 --cfg=plugin:Energy --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning > [ 0.00000000] [rank 0] 3 pstates available > [ 0.00000000] [rank 1] 3 pstates available @@ -12,16 +12,16 @@ $ ../../../smpi_script/bin/smpirun -np 2 -hostfile ${srcdir:=.}/hostfile -platf > [ 0.00000000] [rank 0] Current pstate: 0; Current power: 100000000.0000 > [ 0.00000000] [rank 1] Current pstate: 0; Current power: 100000000.0000 > [ 10.00000000] [rank 0] Energy consumed (Joules): 1200.0000 -> [ 10.00000000] [rank 1] Energy consumed (Joules): 1200.0000 +> [ 10.00000000] [rank 1] Energy consumed (Joules): 2000.0000 > [ 10.00000000] [rank 0] Current pstate: 1; Current power: 50000000.0000 > [ 10.00000000] [rank 1] Current pstate: 1; Current power: 50000000.0000 > [ 30.00000000] [rank 0] Energy consumed (Joules): 3400.0000 -> [ 30.00000000] [rank 1] Energy consumed (Joules): 3400.0000 +> [ 30.00000000] [rank 1] Energy consumed (Joules): 5400.0000 > [ 30.00000000] [rank 0] Current pstate: 2; Current power: 20000000.0000 > [ 30.00000000] [rank 1] Current pstate: 2; Current power: 20000000.0000 > [ 80.00000000] [rank 0] Energy consumed (Joules): 8650.0000 -> [ 80.00000000] [rank 1] Energy consumed (Joules): 8650.0000 -> [80.000000] [surf_energy/INFO] Total energy consumption: 25300.000000 Joules (used hosts: 17300.000000 Joules; unused/idle hosts: 8000.000000) +> [ 80.00000000] [rank 1] Energy consumed (Joules): 12900.0000 +> [80.000000] [surf_energy/INFO] Total energy consumption: 29550.000000 Joules (used hosts: 21550.000000 Joules; unused/idle hosts: 8000.000000) > [80.000000] [surf_energy/INFO] Energy consumption of host MyHost1: 8650.000000 Joules -> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 8650.000000 Joules +> [80.000000] [surf_energy/INFO] Energy consumption of host MyHost2: 12900.000000 Joules > [80.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 8000.000000 Joules