aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-12-15 21:52:20 +0100
committerHans Nilsson <[email protected]>2015-12-21 13:59:04 +0100
commit2900f5787d81a5ad9f2f8ebcf0d51c7fe87eeb2c (patch)
tree405de6b233a30c1005ec69568149e01b3b3f5d5e
parentee18dff59a88407e66eb852e3226665cddc8080b (diff)
downloadotp-2900f5787d81a5ad9f2f8ebcf0d51c7fe87eeb2c.tar.gz
otp-2900f5787d81a5ad9f2f8ebcf0d51c7fe87eeb2c.tar.bz2
otp-2900f5787d81a5ad9f2f8ebcf0d51c7fe87eeb2c.zip
New structure of the report
-rw-r--r--lib/ssh/test/ssh_benchmark_SUITE.erl47
1 files changed, 27 insertions, 20 deletions
diff --git a/lib/ssh/test/ssh_benchmark_SUITE.erl b/lib/ssh/test/ssh_benchmark_SUITE.erl
index fe22aa9f20..0a11654116 100644
--- a/lib/ssh/test/ssh_benchmark_SUITE.erl
+++ b/lib/ssh/test/ssh_benchmark_SUITE.erl
@@ -125,18 +125,25 @@ openssh_client_shell(Config) ->
Algs = find_algs(List),
ct:pal("Algorithms = ~p~n~nTimes = ~p",[Algs,Times]),
lists:foreach(
- fun({Tag0,Value,Unit}) ->
- Tag = case Tag0 of
- {A,B} -> lists:concat([A," ",B]);
- _ when is_list(Tag0) -> lists:concat(Tag0);
- _ when is_atom(Tag0) -> Tag0
- end,
- DataName =
- ["Erl server ",Tag,sp(algo(Tag,Algs))," [",Unit,"]"],
- EventData = [{value, Value},
+ fun({Tag,Value,Unit}) ->
+ EventData =
+ case Tag of
+ {A,B} when A==encrypt ; A==decrypt ->
+ [{value, Value},
{suite, ?MODULE},
- {name, lists:concat(DataName)}
- ],
+ {name, mk_name(["Cipher ",A," ",B," [",Unit,"]"])}
+ ];
+ kex ->
+ [{value, Value},
+ {suite, ?MODULE},
+ {name, mk_name(["Erl server kex ",Algs#alg.kex," [",Unit,"]"])}
+ ];
+ _ when is_atom(Tag) ->
+ [{value, Value},
+ {suite, ?MODULE},
+ {name, mk_name(["Erl server ",Tag," [",Unit,"]"])}
+ ]
+ end,
ct:pal("ct_event:notify ~p",[EventData]),
ct_event:notify(#event{name = benchmark_data,
data = EventData})
@@ -150,13 +157,13 @@ openssh_client_shell(Config) ->
end.
-algo(kex, #alg{kex=Alg} ) -> Alg;
-algo(_, _) -> "".
-
-sp("") -> "";
-sp(A) -> lists:concat([" ",A]).
-
%%%================================================================
+mk_name(Name) -> [char(C) || C <- lists:concat(Name)].
+
+char($-) -> $_;
+char(C) -> C.
+
+%%%----------------------------------------------------------------
find_times(L) ->
Xs = [accept_to_hello, kex, kex_to_auth, auth, to_prompt],
[find_time(X,L) || X <- Xs] ++
@@ -239,8 +246,8 @@ find_algs(L) ->
%%%----------------
crypto_algs_times_sizes(EncDecs, L) ->
Raw = [{_Algorithm = case EncDec of
- encrypt -> [encrypt," ",S#ssh.encrypt];
- decrypt -> [decrypt," ",S#ssh.decrypt]
+ encrypt -> {encrypt,S#ssh.encrypt};
+ decrypt -> {decrypt,S#ssh.decrypt}
end,
size(Data),
now2micro_sec(now_diff(T1, T0))
@@ -252,7 +259,7 @@ crypto_algs_times_sizes(EncDecs, L) ->
t_return = T1} <- L,
ED == EncDec
],
- [{Alg, round(1024*Time/Size), "microsec/kbyte"} % Microseconds per 1k bytes.
+ [{Alg, round(1024*Time/Size), "microsec per kbyte"} % Microseconds per 1k bytes.
|| {Alg,Size,Time} <- lists:foldl(fun increment/2, [], Raw)].
increment({Alg,Sz,T}, [{Alg,SumSz,SumT}|Acc]) ->