From 5c3987226cd9669d5fc0993d0541048475af9fcb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 17 Dec 2015 14:54:53 +0000 Subject: toaster: Update for buildstats changes This updates the toaster class to use the new data format from buildstats. This does mean it will no longer read IO data from older builds, however since that data is completely useless anyway, I don't consider that to be an issue. Signed-off-by: Richard Purdie --- meta/classes/toaster.bbclass | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'meta/classes/toaster.bbclass') diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index d63cff532e..7af495ed7c 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -199,8 +199,6 @@ python toaster_collect_task_stats() { def _read_stats(filename): cpu_usage = 0 disk_io = 0 - startio = '0' - endio = '0' started = '0' ended = '0' pn = '' @@ -215,11 +213,11 @@ python toaster_collect_task_stats() { if "CPU usage" in statinfo: cpu_usage = str(statinfo["CPU usage"]).strip('% \n\r') - if "EndTimeIO" in statinfo: - endio = str(statinfo["EndTimeIO"]).strip('% \n\r') + if "IO write_bytes" in statinfo: + disk_io = disk_io + str(statinfo["IO write_bytes"]).strip('% \n\r') - if "StartTimeIO" in statinfo: - startio = str(statinfo["StartTimeIO"]).strip('% \n\r') + if "IO read_bytes" in statinfo: + disk_io = disk_io + str(statinfo["IO read_bytes"]).strip('% \n\r') if "Started" in statinfo: started = str(statinfo["Started"]).strip('% \n\r') @@ -227,8 +225,6 @@ python toaster_collect_task_stats() { if "Ended" in statinfo: ended = str(statinfo["Ended"]).strip('% \n\r') - disk_io = int(endio) - int(startio) - elapsed_time = float(ended) - float(started) cpu_usage = float(cpu_usage) -- cgit 1.2.3-korg