Show More
@@ -103,25 +103,25 def idxwidth(nbidx): | |||
|
103 | 103 | idxwidth = 1 |
|
104 | 104 | return idxwidth |
|
105 | 105 | |
|
106 | def printresult(idx, data, maxidx): | |
|
106 | def printresult(idx, data, maxidx, verbose=False): | |
|
107 | 107 | """print a line of result to stdout""" |
|
108 | 108 | mask = '%%0%ii) %%s' % idxwidth(maxidx) |
|
109 |
out = ['%10.6f' % data['wall'] |
|
|
110 | '%10.6f' % data['comb'], | |
|
111 |
|
|
|
112 |
|
|
|
113 | '%6d' % data['count'], | |
|
114 | ] | |
|
109 | out = ['%10.6f' % data['wall']] | |
|
110 | if verbose: | |
|
111 | out.append('%10.6f' % data['comb']) | |
|
112 | out.append('%10.6f' % data['user']) | |
|
113 | out.append('%10.6f' % data['sys']) | |
|
114 | out.append('%6d' % data['count']) | |
|
115 | 115 | print mask % (idx, ' '.join(out)) |
|
116 | 116 | |
|
117 | def printheader(maxidx): | |
|
117 | def printheader(maxidx, verbose=False): | |
|
118 | 118 | header = [' ' * (idxwidth(maxidx) + 1), |
|
119 |
' %-8s' % ' |
|
|
120 | ' %-8s' % 'comb', | |
|
121 | ' %-8s' % 'user', | |
|
122 |
|
|
|
123 | '%6s' % 'count', | |
|
124 | ] | |
|
119 | ' %-8s' % 'time'] | |
|
120 | if verbose: | |
|
121 | header.append(' %-8s' % 'comb') | |
|
122 | header.append(' %-8s' % 'user') | |
|
123 | header.append(' %-8s' % 'sys') | |
|
124 | header.append('%6s' % 'count') | |
|
125 | 125 | print ' '.join(header) |
|
126 | 126 | |
|
127 | 127 | def getrevs(spec): |
@@ -141,6 +141,10 parser.add_option("-f", "--file", | |||
|
141 | 141 | parser.add_option("-R", "--repo", |
|
142 | 142 | help="run benchmark on REPO", metavar="REPO") |
|
143 | 143 | |
|
144 | parser.add_option("-v", "--verbose", | |
|
145 | action='store_true', | |
|
146 | help="display all timing data (not just best total time)") | |
|
147 | ||
|
144 | 148 | (options, args) = parser.parse_args() |
|
145 | 149 | |
|
146 | 150 | if not args: |
@@ -177,11 +181,11 for r in revs: | |||
|
177 | 181 | update(r) |
|
178 | 182 | res = [] |
|
179 | 183 | results.append(res) |
|
180 | printheader(len(revsets)) | |
|
184 | printheader(len(revsets), verbose=options.verbose) | |
|
181 | 185 | for idx, rset in enumerate(revsets): |
|
182 | 186 | data = perf(rset, target=options.repo) |
|
183 | 187 | res.append(data) |
|
184 | printresult(idx, data, len(revsets)) | |
|
188 | printresult(idx, data, len(revsets), verbose=options.verbose) | |
|
185 | 189 | sys.stdout.flush() |
|
186 | 190 | print "----------------------------" |
|
187 | 191 | |
@@ -204,7 +208,7 print | |||
|
204 | 208 | for ridx, rset in enumerate(revsets): |
|
205 | 209 | |
|
206 | 210 | print "revset #%i: %s" % (ridx, rset) |
|
207 | printheader(len(results)) | |
|
211 | printheader(len(results), verbose=options.verbose) | |
|
208 | 212 | for idx, data in enumerate(results): |
|
209 | printresult(idx, data[ridx], len(results)) | |
|
213 | printresult(idx, data[ridx], len(results), verbose=options.verbose) | |
|
210 | 214 |
General Comments 0
You need to be logged in to leave comments.
Login now