diff options
author | Yuqian Li <liyuqian@google.com> | 2017-10-17 16:26:32 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-17 21:05:09 +0000 |
commit | 84366d22d6535dd955d9aa14bb0f364381c3f45d (patch) | |
tree | 73eda60c5fbdaacd7207f7ef4cf8eccd02edeaba /tools/calmbench | |
parent | a0020f987e73630592a3e5fb3117830a5b2017a4 (diff) |
Add concise option to Calmbench bot
As \r doesn't work on bot output, the new output will be much more concise.
TBR: borenet@google.com
Bug: skia:
Change-Id: I190daeae230ea6e0c4bfebc53c6c5c1fd46c503a
Reviewed-on: https://skia-review.googlesource.com/60840
Reviewed-by: Yuqian Li <liyuqian@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'tools/calmbench')
-rw-r--r-- | tools/calmbench/ab.py | 21 | ||||
-rw-r--r-- | tools/calmbench/calmbench.py | 6 |
2 files changed, 21 insertions, 6 deletions
diff --git a/tools/calmbench/ab.py b/tools/calmbench/ab.py index 2ffb9e3ec3..e417414820 100644 --- a/tools/calmbench/ab.py +++ b/tools/calmbench/ab.py @@ -74,6 +74,10 @@ def parse_args(): parser.add_argument('noinit', type=str, help=("whether to skip running B" " ('true' or 'false')")) + parser.add_argument('--concise', dest='concise', action="store_true", + help="If set, no verbose thread info will be printed.") + parser.set_defaults(concise=False) + args = parser.parse_args() args.skip_b = args.skip_b == "true" args.noinit = args.noinit == "true" @@ -112,7 +116,8 @@ def append_times_from_file(args, name, filename): class ThreadRunner: """Simplest and stupidiest threaded executer.""" - def __init__(self): + def __init__(self, args): + self.concise = args.concise self.threads = [] def add(self, args, fn): @@ -138,12 +143,16 @@ class ThreadRunner: time.sleep(0.5) i += 1 - ts = Thread(target = spin); - ts.start() + if not self.concise: + ts = Thread(target = spin); + ts.start() + for t in self.threads: t.join() self.threads = [] - ts.join() + + if not self.concise: + ts.join() def split_arg(arg): @@ -183,7 +192,7 @@ def run(args, threadRunner, name, nano, arg, i): def init_run(args): - threadRunner = ThreadRunner() + threadRunner = ThreadRunner(args) for i in range(1, max(args.repeat, args.threads / 2) + 1): run(args, threadRunner, args.a, args.nano_a, args.arg_a, i) run(args, threadRunner, args.b, args.nano_b, args.arg_b, i) @@ -261,7 +270,7 @@ def test(): break print "Number of suspects at iteration %d: %d" % (it, len(suspects)) - threadRunner = ThreadRunner() + threadRunner = ThreadRunner(args) for j in range(1, max(1, args.threads / 2) + 1): run(args, threadRunner, args.a, args.nano_a, args.arg_a + suspects_arg(suspects), -j) diff --git a/tools/calmbench/calmbench.py b/tools/calmbench/calmbench.py index 4b484c905b..50208cc3fd 100644 --- a/tools/calmbench/calmbench.py +++ b/tools/calmbench/calmbench.py @@ -101,9 +101,12 @@ def parse_args(): help=skip_base_help) parser.add_argument('--noinit', dest='noinit', action="store_true", help=noinit_help) + parser.add_argument('--concise', dest='concise', action="store_true", + help="If set, no verbose thread info will be printed.") parser.set_defaults(no_compile=False); parser.set_defaults(skipbase=False); parser.set_defaults(noinit=False); + parser.set_defaults(concise=False); args = parser.parse_args() if not args.basearg: @@ -186,6 +189,9 @@ def main(): "true" if args.noinit else "false" ] + if args.concise: + command.append("--concise") + p = subprocess.Popen(command, cwd=args.skiadir) try: p.wait() |