Commit 906462a3 authored by Kirill Smelkov's avatar Kirill Smelkov

X neotest: Move cluster / node out fro benchmark name to label in environment

This should make inter-host or inter-cluster comparisions of benchmark more straightforward.
parent 321dfcc7
...@@ -46,9 +46,9 @@ class SeriesSet(OrderedDict): ...@@ -46,9 +46,9 @@ class SeriesSet(OrderedDict):
self.unit = unit self.unit = unit
_n_re = re.compile(r'.*(-\d+)$') _n_re = re.compile(ur'.*(·\d+)$')
# seriesof extracts "-<n>" series from benchmark B. # seriesof extracts "·<n>" series from benchmark B.
# #
# all values must have the same unit. # all values must have the same unit.
# #
...@@ -59,9 +59,9 @@ def seriesof(B): ...@@ -59,9 +59,9 @@ def seriesof(B):
for name in Bn: for name in Bn:
m = _n_re.match(name) m = _n_re.match(name)
if m is None: if m is None:
continue # no -<n> continue # no ·<n>
name_ = name[:m.start(1)] # without -<n> name_ = name[:m.start(1)] # without ·<n>
n = m.group(1) n = m.group(1)
n = n[1:] n = n[1:]
n = int(n) n = int(n)
...@@ -83,7 +83,7 @@ def seriesof(B): ...@@ -83,7 +83,7 @@ def seriesof(B):
return S return S
# plotseries makes plot of benchmark series how they change by "-<n>" # plotseries makes plot of benchmark series how they change by "·<n>"
# #
# S should be {} name -> BenchSeries. # S should be {} name -> BenchSeries.
# #
...@@ -91,7 +91,7 @@ def seriesof(B): ...@@ -91,7 +91,7 @@ def seriesof(B):
def plotseries(labkey, S): def plotseries(labkey, S):
plt.title("XXX ZODB server handling read requests") plt.title("XXX ZODB server handling read requests")
# order plots (and thus their order in legend automatically) by value at "-1" # order plots (and thus their order in legend automatically) by value at "·1"
namev = S.keys() namev = S.keys()
namev.sort(key = lambda _: S[_].series[0][1].avg, reverse=True) namev.sort(key = lambda _: S[_].series[0][1].avg, reverse=True)
...@@ -141,8 +141,8 @@ def main(): ...@@ -141,8 +141,8 @@ def main():
if S is None: if S is None:
continue # nothing found continue # nothing found
# XXX hack just fs1 works very fast and makes seeing other variants hard # working directly with fs1 is very fast and makes seeing other variants hard.
del S['deco/fs1/zwrk.go'] del S['fs1-zwrk.go']
# only show !log for neo/py as this are faster # only show !log for neo/py as this are faster
for k in S.keys(): for k in S.keys():
......
This diff is collapsed.
...@@ -414,7 +414,7 @@ func zwrk(ctx context.Context, url string, nwrk int, h hasher, bench, check stri ...@@ -414,7 +414,7 @@ func zwrk(ctx context.Context, url string, nwrk int, h hasher, bench, check stri
latavg := float64(nwrk) * tavg latavg := float64(nwrk) * tavg
rps := float64(r.N) / r.T.Seconds() rps := float64(r.N) / r.T.Seconds()
topic := fmt.Sprintf(bench, "zwrk.go") topic := fmt.Sprintf(bench, "zwrk.go")
fmt.Printf("Benchmark%s-%d %d\t%.1f req/s %.3f latency-µs/object\n", fmt.Printf("Benchmark%s·%d %d\t%.1f req/s %.3f latency-µs/object\n",
topic, nwrk, r.N, rps, latavg) topic, nwrk, r.N, rps, latavg)
return nil return nil
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment