From a3a7429c58c2a2ac9509b104dffa069790b2d03c Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Thu, 20 Jan 2022 15:45:47 +0100 Subject: [PATCH] fix java tesh files with new log category names --- .../java/energy/consumption/energy-consumption.tesh | 6 +++--- examples/deprecated/java/energy/pstate/energy-pstate.tesh | 8 ++++---- examples/deprecated/java/energy/vm/energy-vm.tesh | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/deprecated/java/energy/consumption/energy-consumption.tesh b/examples/deprecated/java/energy/consumption/energy-consumption.tesh index 66637f2538..e125d6eb11 100644 --- a/examples/deprecated/java/energy/consumption/energy-consumption.tesh +++ b/examples/deprecated/java/energy/consumption/energy-consumption.tesh @@ -11,7 +11,7 @@ $ ${javacmd:=java} -classpath ${classpath:=.} energy/consumption/Main ${srcdir:= > [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] 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 -> [20.000000] [surf_energy/INFO] Energy consumption of host MyHost3: 2000.000000 Joules +> [20.000000] [host_energy/INFO] Energy consumption of host MyHost1: 2200.000000 Joules +> [20.000000] [host_energy/INFO] Energy consumption of host MyHost2: 2000.000000 Joules +> [20.000000] [host_energy/INFO] Energy consumption of host MyHost3: 2000.000000 Joules diff --git a/examples/deprecated/java/energy/pstate/energy-pstate.tesh b/examples/deprecated/java/energy/pstate/energy-pstate.tesh index 4ee0a45956..b5ea27461e 100644 --- a/examples/deprecated/java/energy/pstate/energy-pstate.tesh +++ b/examples/deprecated/java/energy/pstate/energy-pstate.tesh @@ -18,8 +18,8 @@ $ ${javacmd:=java} -classpath ${classpath:=.} energy/pstate/Main ${srcdir:=.}/.. > [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: 2195.000000 Joules (used hosts: 1595.000000 Joules; unused/idle hosts: 600.000000) +> [6.000000] [host_energy/INFO] Total energy consumption: 2195.000000 Joules (used hosts: 1595.000000 Joules; unused/idle hosts: 600.000000) > [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 +> [6.000000] [host_energy/INFO] Energy consumption of host MyHost1: 645.000000 Joules +> [6.000000] [host_energy/INFO] Energy consumption of host MyHost2: 950.000000 Joules +> [6.000000] [host_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 ee3672d478..205d380e86 100644 --- a/examples/deprecated/java/energy/vm/energy-vm.tesh +++ b/examples/deprecated/java/energy/vm/energy-vm.tesh @@ -14,8 +14,8 @@ $ ${javacmd:=java} -classpath ${classpath:=.} energy/vm/Main ${srcdir:=.}/../../ > [vmHost1:p12:(3) 6.000000] [java/INFO] This worker is done. > [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] [host_energy/INFO] Total energy consumption: 4320.000000 Joules (used hosts: 4320.000000 Joules; unused/idle hosts: 0.000000) > [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 +> [10.000000] [host_energy/INFO] Energy consumption of host MyHost1: 1120.000000 Joules +> [10.000000] [host_energy/INFO] Energy consumption of host MyHost2: 1600.000000 Joules +> [10.000000] [host_energy/INFO] Energy consumption of host MyHost3: 1600.000000 Joules -- 2.20.1