From: Martin Quinson Date: Mon, 19 Jun 2017 14:10:40 +0000 (+0200) Subject: Revert "platform change impacts java too" X-Git-Tag: v3.16~35 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0d5011ff9c6105a9e15d451ec5f3b644d5c86659?hp=44594d451daa767330a63962c7ad367212b222ae Revert "platform change impacts java too" This reverts commit db53dd2fb0c95b25eebb7da2bccab7a4359c3441. --- diff --git a/examples/java/energy/consumption/energy_consumption.tesh b/examples/java/energy/consumption/energy_consumption.tesh index de113aba8e..211b2b18ee 100644 --- a/examples/java/energy/consumption/energy_consumption.tesh +++ b/examples/java/energy/consumption/energy_consumption.tesh @@ -4,7 +4,7 @@ $ java -classpath ${classpath:=.} energy/consumption/Main ${srcdir:=.}/../platforms/energy_platform.xml > [0.000000] [java/INFO] Using regular java threads. -> [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Energetic profile: 100.0:120.0:120.0, 93.0:110.0:110.0, 90.0:105.0:105.0 +> [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Energetic profile: 100.0:120.0:200.0, 93.0:110.0:170.0, 90.0:105.0:150.0 > [MyHost1:energyConsumer:(1) 0.000000] [java/INFO] Initial peak speed= 1.0E8 flop/s; Energy dissipated = 0.0 J > [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