sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-18 12:06:08 +00:00
Code Issues Releases Wiki Activity

utils/revent: recording parser fixes

Browse Source 
- change magic string literal to a b'' string so that the comparison
  works in python 3
- expand timestamp tuples (struct.unpack always returns a tuple) before
  attempting to cast to float.
This commit is contained in:
Sergei Trofimov 2018-10-08 17:36:24 +01:00 committed by Marc Bonnici
parent 93ffe0434c
commit 98727bce30
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wa/utils/revent.py
View File

@ -201,7 +201,7 @@ class ReventRecording(object):
def _parse_header_and_devices(self, fh):
magic, version = read_struct(fh, header_one_struct)
if magic != 'REVENT':
if magic != b'REVENT':
msg = '{} does not appear to be an revent recording'
raise ValueError(msg.format(self.filepath))
self.version = version
@ -216,11 +216,11 @@ class ReventRecording(object):
raise ValueError('Unexpected recording mode: {}'.format(self.mode))
self.num_events, = read_struct(fh, u64_struct)
if self.version > 2:
ts_sec = read_struct(fh, u64_struct)
ts_usec = read_struct(fh, u64_struct)
ts_sec = read_struct(fh, u64_struct)[0]
ts_usec = read_struct(fh, u64_struct)[0]
self.start_time = datetime.fromtimestamp(ts_sec + float(ts_usec) / 1000000)
ts_sec = read_struct(fh, u64_struct)
ts_usec = read_struct(fh, u64_struct)
ts_sec = read_struct(fh, u64_struct)[0]
ts_usec = read_struct(fh, u64_struct)[0]
self.end_time = datetime.fromtimestamp(ts_sec + float(ts_usec) / 1000000)
elif 2 > self.version >= 0: