donate-cpu-server.py: Time report: Format output, add showing factor (#1582)

Format the time output so the columns have the same width (as long as a text is not too long).
Add showing the factor of the time difference so very suspicious differences can be seen instantly.
Made the function body more PEP 8 conform by using lowercase variable names with underscores as delimiters.
Tested locally.
This commit is contained in:
Sebastian 2019-01-10 19:10:56 +01:00 committed by GitHub
parent e5c7543a7d
commit fd9ca16e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 13 deletions

View File

@ -390,26 +390,43 @@ def headMessageIdTodayReport(resultPath, messageId):
def timeReport(resultPath): def timeReport(resultPath):
text = 'Time report\n\n' text = 'Time report\n\n'
text += 'Package ' + OLD_VERSION + ' Head\n' column_widths = [25, 10, 10, 10]
text += 'Package '.ljust(column_widths[0]) + ' ' + \
OLD_VERSION.rjust(column_widths[1]) + ' ' + \
'Head'.rjust(column_widths[2]) + ' ' + \
'Factor'.rjust(column_widths[3]) + '\n'
totalTime184 = 0.0 total_time_base = 0.0
totalTimeHead = 0.0 total_time_head = 0.0
for filename in glob.glob(resultPath + '/*'): for filename in glob.glob(resultPath + '/*'):
for line in open(filename, 'rt'): for line in open(filename, 'rt'):
if not line.startswith('elapsed-time:'): if not line.startswith('elapsed-time:'):
continue continue
splitline = line.strip().split() split_line = line.strip().split()
t184 = float(splitline[2]) time_base = float(split_line[2])
thead = float(splitline[1]) time_head = float(split_line[1])
totalTime184 += t184 total_time_base += time_base
totalTimeHead += thead total_time_head += time_head
if t184 > 1 and t184*2 < thead: suspicious_time_difference = False
text += filename[len(resultPath)+1:] + ' ' + splitline[2] + ' ' + splitline[1] + '\n' if time_base > 1 and time_base*2 < time_head:
elif thead > 1 and thead*2 < t184: suspicious_time_difference = True
text += filename[len(resultPath)+1:] + ' ' + splitline[2] + ' ' + splitline[1] + '\n' elif time_head > 1 and time_head*2 < time_base:
suspicious_time_difference = True
if suspicious_time_difference:
if time_base > 0.0:
time_factor = time_head / time_base
else:
time_factor = 0.0
text += filename[len(resultPath)+1:].ljust(column_widths[0]) + ' ' + \
split_line[2].rjust(column_widths[1]) + ' ' + \
split_line[1].rjust(column_widths[2]) + ' ' + \
'{:.2f}'.format(time_factor).rjust(column_widths[3]) + '\n'
break break
text += '\nTotal time: ' + str(totalTime184) + ' ' + str(totalTimeHead) text += '\n'
text += 'Total time: '.ljust(column_widths[0]) + ' ' + \
str(total_time_base).rjust(column_widths[1]) + ' ' + \
str(total_time_head).rjust(column_widths[2])
return text return text