lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-30 22:23:13 +03:00
Code Activity

test-zstd-speed.py: improved exception handling

Browse Source
This commit is contained in:
inikep
2016-06-22 18:12:57 +02:00
parent 47020670b6
commit 116128ce41
1 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
tests/test-zstd-speed.py
View File

@ -123,7 +123,7 @@ def benchmark_and_compare(branch, commit, resultsFileName, lastCLevel, testFileP
log("WARNING: bench loadavg=%.2f is higher than %s, sleeping for %s seconds" % (os.getloadavg()[0], maxLoadAvg, sleepTime)) log("WARNING: bench loadavg=%.2f is higher than %s, sleeping for %s seconds" % (os.getloadavg()[0], maxLoadAvg, sleepTime))
time.sleep(sleepTime) time.sleep(sleepTime)
start_load = str(os.getloadavg()) start_load = str(os.getloadavg())
result = execute('programs/zstd -qi5b1e' + str(lastCLevel) + ' ' + testFilePath, print_output=True) result = execute('programs/zstd -qi5b1e%s %s' % (lastCLevel, testFilePath), print_output=True)
end_load = str(os.getloadavg()) end_load = str(os.getloadavg())
linesExpected = lastCLevel + 2; linesExpected = lastCLevel + 2;
if len(result) != linesExpected: if len(result) != linesExpected:
@ -148,44 +148,35 @@ def benchmark_and_compare(branch, commit, resultsFileName, lastCLevel, testFileP
return text return text
def check_commit(branch, commit, args, testFilePaths, have_mutt, have_mail): def update_config_file(branch, commit):
try: last_commit = None
last_commit = None commitFileName = working_path + "/commit_" + branch.replace("/", "_") + ".txt"
commitFileName = working_path + "/commit_" + branch.replace("/", "_") if os.path.isfile(commitFileName):
if os.path.isfile(commitFileName): last_commit = file(commitFileName, 'r').read()
last_commit = file(commitFileName, 'r').read() file(commitFileName, 'w').write(commit)
file(commitFileName, 'w').write(commit) return last_commit
if commit == last_commit:
log("skipping branch %s: head %s already processed" % (branch, commit))
return
log("build branch %s: head %s is different from prev %s" % (branch, commit, last_commit)) def test_commit(branch, commit, last_commit, args, testFilePaths, have_mutt, have_mail):
compile(branch, commit, last_commit, args.dry_run) compile(branch, commit, last_commit, args.dry_run)
logFileName = working_path + "/log_" + branch.replace("/", "_") + ".txt"
text_to_send = []
results_files = ""
for filePath in testFilePaths:
fileName = filePath.rpartition('/')[2]
resultsFileName = working_path + "/results_" + branch.replace("/", "_") + "_" + fileName.replace(".", "_") + ".txt"
last_commit, cspeed, dspeed = get_last_results(resultsFileName)
logFileName = working_path + "/log_" + branch.replace("/", "_") if not args.dry_run:
text_to_send = [] text = benchmark_and_compare(branch, commit, resultsFileName, args.lastCLevel, filePath, fileName, cspeed, dspeed, args.lowerLimit, args.maxLoadAvg, args.message)
results_files = "" if text:
for filePath in testFilePaths: log("WARNING: redoing tests for branch %s: commit %s" % (branch, commit))
fileName = filePath.rpartition('/')[2]
resultsFileName = working_path + "/results_" + branch.replace("/", "_") + "_" + fileName.replace(".", "_") + ".txt"
last_commit, cspeed, dspeed = get_last_results(resultsFileName)
if not args.dry_run:
text = benchmark_and_compare(branch, commit, resultsFileName, args.lastCLevel, filePath, fileName, cspeed, dspeed, args.lowerLimit, args.maxLoadAvg, args.message) text = benchmark_and_compare(branch, commit, resultsFileName, args.lastCLevel, filePath, fileName, cspeed, dspeed, args.lowerLimit, args.maxLoadAvg, args.message)
if text: if text:
log("WARNING: redoing tests for branch %s: commit %s" % (branch, commit)) text_to_send.append(text)
text = benchmark_and_compare(branch, commit, resultsFileName, args.lastCLevel, filePath, fileName, cspeed, dspeed, args.lowerLimit, args.maxLoadAvg, args.message) results_files += resultsFileName + " "
if text: if text_to_send:
text_to_send.append(text) send_email_with_attachments(branch, commit, last_commit, args.emails, text_to_send, results_files, logFileName, args.lowerLimit, have_mutt, have_mail)
results_files += resultsFileName + " "
if text_to_send:
send_email_with_attachments(branch, commit, last_commit, args.emails, text_to_send, results_files, logFileName, args.lowerLimit, have_mutt, have_mail)
except Exception as e:
stack = traceback.format_exc()
email_topic = '%s:%s ERROR in %s:%s' % (email_header, pid, branch, commit)
send_email(args.emails, email_topic, stack, have_mutt, have_mail)
print(stack)
if __name__ == '__main__': if __name__ == '__main__':
@ -258,13 +249,22 @@ if __name__ == '__main__':
if (loadavg <= args.maxLoadAvg): if (loadavg <= args.maxLoadAvg):
branches = git_get_branches() branches = git_get_branches()
for branch in branches: for branch in branches:
commits = execute('git show -s --format=%h ' + branch)[0] commit = execute('git show -s --format=%h ' + branch)[0]
for commit in [commits]: last_commit = update_config_file(branch, commit)
check_commit(branch, commit, args, testFilePaths, have_mutt, have_mail) if commit == last_commit:
log("skipping branch %s: head %s already processed" % (branch, commit))
else:
log("build branch %s: head %s is different from prev %s" % (branch, commit, last_commit))
test_commit(branch, commit, last_commit, args, testFilePaths, have_mutt, have_mail)
else: else:
log("WARNING: main loadavg=%.2f is higher than %s" % (loadavg, args.maxLoadAvg)) log("WARNING: main loadavg=%.2f is higher than %s" % (loadavg, args.maxLoadAvg))
log("sleep for %s seconds" % args.sleepTime) log("sleep for %s seconds" % args.sleepTime)
time.sleep(args.sleepTime) time.sleep(args.sleepTime)
except Exception as e:
stack = traceback.format_exc()
email_topic = '%s:%s ERROR in %s:%s' % (email_header, pid, branch, commit)
send_email(args.emails, email_topic, stack, have_mutt, have_mail)
print(stack)
except KeyboardInterrupt: except KeyboardInterrupt:
os.unlink(pidfile) os.unlink(pidfile)
send_email(args.emails, email_header + ':%s test-zstd-speed.py has been stopped' % pid, args.message, have_mutt, have_mail) send_email(args.emails, email_header + ':%s test-zstd-speed.py has been stopped' % pid, args.message, have_mutt, have_mail)