From fd2b1966e5a515d842054817555d791e9f35d27f Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Fri, 24 Jan 2020 13:34:59 +0000 Subject: [PATCH] Better parsing --- scripts/jantoran_2.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/scripts/jantoran_2.py b/scripts/jantoran_2.py index 3ca6963..8a7decb 100755 --- a/scripts/jantoran_2.py +++ b/scripts/jantoran_2.py @@ -23,8 +23,18 @@ def compute_dropped(s): if state == 'BROKEN': s['current']['missing'].append((start, s['current']['npkt'], 1+s['current']['npkt']-start)) - - print(s['current']['missing']) + + t = s['current']['missing'] + t = filter(lambda p: (lambda start, stop, diff: start != 0)(*p), t) + t = filter(lambda p: (lambda start, stop, diff: diff > 25)(*p), t) + t = filter(lambda p: (lambda start, stop, diff: stop != s['current']['npkt'])(*p), t) + t = [x for x in t] + if len(t) > 0: + print(s['current']['identifier']) + print(t) + print('old max pkt', s['current']['max_pkt']) + s['current']['max_pkt'] = min(s['current']['max_pkt'], t[0][0] - 1) + print('new max pkt', s['current']['max_pkt']) return True def compute_failure(s): @@ -78,8 +88,8 @@ def extract_folder(p, s): return \ extract_info(p + '/info.txt', s) and \ extract_measlat(p + '/log/client-measlat-stdout.log', s) and \ - compute_failure(s) and \ - compute_dropped(s) + compute_dropped(s) and \ + compute_failure(s) def categorize(folder, s): s[folder] = s['current'] @@ -95,7 +105,7 @@ def extract(p, s): counter = 0 print("extracting...") for folder in os.listdir(p): - s['current'] = {} + s['current'] = { 'identifier': folder} extract_folder(p + '/' + folder, s) and \ categorize(folder, s) or \ print(f"An error occured with {folder}")