1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-04-20 09:40:50 +01:00

Fix device sleep issue for jankbench workload

* Sleeping device when waiting for workload to end was causing workload
  to freeze. Changed device sleep to host sleep.

* Panda dataframe.ix() is deprecated so changed to .loc()
This commit is contained in:
Rob Freeman 2020-03-17 11:04:50 +00:00
parent 5049e3663b
commit c7de49026b

View File

@ -24,6 +24,7 @@ import threading
import sqlite3 import sqlite3
import subprocess import subprocess
import sys import sys
import time
from copy import copy from copy import copy
import pandas as pd import pandas as pd
@ -143,9 +144,8 @@ class Jankbench(ApkWorkload):
janks_pc, janks_pc,
], axis=1) ], axis=1)
results.columns = ['mean', 'std_dev', 'count_jank', 'jank_p'] results.columns = ['mean', 'std_dev', 'count_jank', 'jank_p']
for test_name, rep in results.index: for test_name, rep in results.index:
test_results = results.ix[test_name, rep] test_results = results.loc[test_name, rep]
for metric, value in test_results.items(): for metric, value in test_results.items():
context.add_metric(metric, value, units=None, lower_is_better=True, context.add_metric(metric, value, units=None, lower_is_better=True,
classifiers={'test_name': test_name, 'rep': rep}) classifiers={'test_name': test_name, 'rep': rep})
@ -218,7 +218,7 @@ class JankbenchRunMonitor(threading.Thread):
proc = subprocess.Popen(self.command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc = subprocess.Popen(self.command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
while not self.stop_event.is_set(): while not self.stop_event.is_set():
if self.run_ended.is_set(): if self.run_ended.is_set():
self.target.sleep(DELAY) time.sleep(DELAY)
else: else:
ready, _, _ = select.select([proc.stdout, proc.stderr], [], [], 2) ready, _, _ = select.select([proc.stdout, proc.stderr], [], [], 2)
if ready: if ready: