From 3979a58065edeeb5cbc66eaf8fc326c95e598c34 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Fri, 24 May 2019 15:54:00 +0200 Subject: Update --- src/g5k/energyFromLogs.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/g5k/energyFromLogs.sh') diff --git a/src/g5k/energyFromLogs.sh b/src/g5k/energyFromLogs.sh index 0336f03..6a5e9eb 100755 --- a/src/g5k/energyFromLogs.sh +++ b/src/g5k/energyFromLogs.sh @@ -20,7 +20,9 @@ do nbSensors=$(getValue $cmd nbSensors) simKey=$(getValue $cmd simKey) delayStart=$(getValue $cmd delayStart) - ./recordEnergy.sh nova $nodeName $from $to "${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}.csv" - ./recordEnergy.sh nova $nodeName $delayStart $from "${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}_IDLE.csv" + python ./wattmeters.py $nodeName $from $to + mv power.csv "${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}.csv" + python ./wattmeters.py $nodeName $delayStart $from + mv power.csv "${simKey}_${vmSize}VMSIZE_${nbSensors}NBSENSORS_${from}${to}_IDLE.csv" done -- cgit v1.2.3