From 92398986996514fd5f5499b3f9a8122c8154c2cb Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Tue, 23 Mar 2021 13:11:02 +0800 Subject: [PATCH] =?UTF-8?q?rf:=20=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DsTest/utArrayDs.erl | 2 +- .../DsTest/utArrayDs1.erl | 4 +- .../DsTest/utAtomicsDs.erl | 2 +- src/{testCase => measure}/DsTest/utDictDs.erl | 2 +- .../DsTest/utEtsOrdDs.erl | 2 +- .../DsTest/utEtsSetDs.erl | 2 +- .../DsTest/utGb_setsDs.erl | 2 +- .../DsTest/utGb_treesDs.erl | 2 +- .../DsTest/utHashBblDs.erl | 4 +- .../DsTest/utHashBblDs1.erl | 4 +- .../DsTest/utKhashDs.erl | 2 +- .../DsTest/utListsDs.erl | 4 +- src/{testCase => measure}/DsTest/utMapsDs.erl | 2 +- .../DsTest/utNifArrayDs.erl | 2 +- .../DsTest/utNifHashbDs.erl | 2 +- .../DsTest/utOrddictDs.erl | 4 +- .../DsTest/utOrdsetsDs.erl | 4 +- .../DsTest/utPTermDs.erl | 4 +- src/{testCase => measure}/DsTest/utPdDs.erl | 2 +- src/{testCase => measure}/DsTest/utSetsDs.erl | 2 +- src/{testCase => measure}/DsTest/utTestDs.erl | 51 ++++++++++++------- .../DsTest/utTupleDs.erl | 4 +- .../DsTestSimple/utSArrayDs.erl | 2 +- .../DsTestSimple/utSDictDs.erl | 2 +- .../DsTestSimple/utSEtsOrdDs.erl | 2 +- .../DsTestSimple/utSEtsSetDs.erl | 2 +- .../DsTestSimple/utSGb_setsDs.erl | 2 +- .../DsTestSimple/utSGb_treesDs.erl | 2 +- .../DsTestSimple/utSListsDs.erl | 4 +- .../DsTestSimple/utSMapsDs.erl | 2 +- .../DsTestSimple/utSOrddictDs.erl | 4 +- .../DsTestSimple/utSOrdsetsDs.erl | 4 +- .../DsTestSimple/utSPdDs.erl | 2 +- .../DsTestSimple/utSSetsDs.erl | 2 +- .../DsTestSimple/utSTestDs.erl | 41 ++++++++++----- .../DsTestSimple/utSTupleDs.erl | 4 +- .../ListPdTs/utListPdTs.erl | 0 .../ListPdTs/utListTs.erl | 0 src/{testCase => measure}/ListPdTs/utPdTs.erl | 0 39 files changed, 108 insertions(+), 76 deletions(-) rename src/{testCase => measure}/DsTest/utArrayDs.erl (95%) rename src/{testCase => measure}/DsTest/utArrayDs1.erl (88%) rename src/{testCase => measure}/DsTest/utAtomicsDs.erl (94%) rename src/{testCase => measure}/DsTest/utDictDs.erl (94%) rename src/{testCase => measure}/DsTest/utEtsOrdDs.erl (95%) rename src/{testCase => measure}/DsTest/utEtsSetDs.erl (95%) rename src/{testCase => measure}/DsTest/utGb_setsDs.erl (94%) rename src/{testCase => measure}/DsTest/utGb_treesDs.erl (94%) rename src/{testCase => measure}/DsTest/utHashBblDs.erl (90%) rename src/{testCase => measure}/DsTest/utHashBblDs1.erl (90%) rename src/{testCase => measure}/DsTest/utKhashDs.erl (96%) rename src/{testCase => measure}/DsTest/utListsDs.erl (89%) rename src/{testCase => measure}/DsTest/utMapsDs.erl (94%) rename src/{testCase => measure}/DsTest/utNifArrayDs.erl (96%) rename src/{testCase => measure}/DsTest/utNifHashbDs.erl (95%) rename src/{testCase => measure}/DsTest/utOrddictDs.erl (90%) rename src/{testCase => measure}/DsTest/utOrdsetsDs.erl (89%) rename src/{testCase => measure}/DsTest/utPTermDs.erl (89%) rename src/{testCase => measure}/DsTest/utPdDs.erl (96%) rename src/{testCase => measure}/DsTest/utSetsDs.erl (94%) rename src/{testCase => measure}/DsTest/utTestDs.erl (78%) rename src/{testCase => measure}/DsTest/utTupleDs.erl (89%) rename src/{testCase => measure}/DsTestSimple/utSArrayDs.erl (94%) rename src/{testCase => measure}/DsTestSimple/utSDictDs.erl (93%) rename src/{testCase => measure}/DsTestSimple/utSEtsOrdDs.erl (95%) rename src/{testCase => measure}/DsTestSimple/utSEtsSetDs.erl (95%) rename src/{testCase => measure}/DsTestSimple/utSGb_setsDs.erl (93%) rename src/{testCase => measure}/DsTestSimple/utSGb_treesDs.erl (93%) rename src/{testCase => measure}/DsTestSimple/utSListsDs.erl (88%) rename src/{testCase => measure}/DsTestSimple/utSMapsDs.erl (94%) rename src/{testCase => measure}/DsTestSimple/utSOrddictDs.erl (89%) rename src/{testCase => measure}/DsTestSimple/utSOrdsetsDs.erl (88%) rename src/{testCase => measure}/DsTestSimple/utSPdDs.erl (95%) rename src/{testCase => measure}/DsTestSimple/utSSetsDs.erl (93%) rename src/{testCase => measure}/DsTestSimple/utSTestDs.erl (82%) rename src/{testCase => measure}/DsTestSimple/utSTupleDs.erl (88%) rename src/{testCase => measure}/ListPdTs/utListPdTs.erl (100%) rename src/{testCase => measure}/ListPdTs/utListTs.erl (100%) rename src/{testCase => measure}/ListPdTs/utPdTs.erl (100%) diff --git a/src/testCase/DsTest/utArrayDs.erl b/src/measure/DsTest/utArrayDs.erl similarity index 95% rename from src/testCase/DsTest/utArrayDs.erl rename to src/measure/DsTest/utArrayDs.erl index 8b2640b..9c9dd89 100644 --- a/src/testCase/DsTest/utArrayDs.erl +++ b/src/measure/DsTest/utArrayDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num - 1, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, utTermSize:byteSize(NewDsI)}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utArrayDs1.erl b/src/measure/DsTest/utArrayDs1.erl similarity index 88% rename from src/testCase/DsTest/utArrayDs1.erl rename to src/measure/DsTest/utArrayDs1.erl index 914242d..1d67aa9 100644 --- a/src/testCase/DsTest/utArrayDs1.erl +++ b/src/measure/DsTest/utArrayDs1.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 8192 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utAtomicsDs.erl b/src/measure/DsTest/utAtomicsDs.erl similarity index 94% rename from src/testCase/DsTest/utAtomicsDs.erl rename to src/measure/DsTest/utAtomicsDs.erl index a31b452..2db63be 100644 --- a/src/testCase/DsTest/utAtomicsDs.erl +++ b/src/measure/DsTest/utAtomicsDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utDictDs.erl b/src/measure/DsTest/utDictDs.erl similarity index 94% rename from src/testCase/DsTest/utDictDs.erl rename to src/measure/DsTest/utDictDs.erl index a7d7e60..d037730 100644 --- a/src/testCase/DsTest/utDictDs.erl +++ b/src/measure/DsTest/utDictDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utEtsOrdDs.erl b/src/measure/DsTest/utEtsOrdDs.erl similarity index 95% rename from src/testCase/DsTest/utEtsOrdDs.erl rename to src/measure/DsTest/utEtsOrdDs.erl index 56b4caa..7c16a3f 100644 --- a/src/testCase/DsTest/utEtsOrdDs.erl +++ b/src/measure/DsTest/utEtsOrdDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utEtsSetDs.erl b/src/measure/DsTest/utEtsSetDs.erl similarity index 95% rename from src/testCase/DsTest/utEtsSetDs.erl rename to src/measure/DsTest/utEtsSetDs.erl index b7b9f99..6551e81 100644 --- a/src/testCase/DsTest/utEtsSetDs.erl +++ b/src/measure/DsTest/utEtsSetDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utGb_setsDs.erl b/src/measure/DsTest/utGb_setsDs.erl similarity index 94% rename from src/testCase/DsTest/utGb_setsDs.erl rename to src/measure/DsTest/utGb_setsDs.erl index f54710a..fe6ce8b 100644 --- a/src/testCase/DsTest/utGb_setsDs.erl +++ b/src/measure/DsTest/utGb_setsDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utGb_treesDs.erl b/src/measure/DsTest/utGb_treesDs.erl similarity index 94% rename from src/testCase/DsTest/utGb_treesDs.erl rename to src/measure/DsTest/utGb_treesDs.erl index 417b43d..89734cb 100644 --- a/src/testCase/DsTest/utGb_treesDs.erl +++ b/src/measure/DsTest/utGb_treesDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utHashBblDs.erl b/src/measure/DsTest/utHashBblDs.erl similarity index 90% rename from src/testCase/DsTest/utHashBblDs.erl rename to src/measure/DsTest/utHashBblDs.erl index 7f92933..55ffd33 100644 --- a/src/testCase/DsTest/utHashBblDs.erl +++ b/src/measure/DsTest/utHashBblDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 65536 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, no_size}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utHashBblDs1.erl b/src/measure/DsTest/utHashBblDs1.erl similarity index 90% rename from src/testCase/DsTest/utHashBblDs1.erl rename to src/measure/DsTest/utHashBblDs1.erl index cdf08bc..20732aa 100644 --- a/src/testCase/DsTest/utHashBblDs1.erl +++ b/src/measure/DsTest/utHashBblDs1.erl @@ -16,11 +16,11 @@ start(Num, Pid) when Num =< 65536 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, no_size}), %io:format("~w",[NewDsF]), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utKhashDs.erl b/src/measure/DsTest/utKhashDs.erl similarity index 96% rename from src/testCase/DsTest/utKhashDs.erl rename to src/measure/DsTest/utKhashDs.erl index ac63b9e..d0408c5 100644 --- a/src/testCase/DsTest/utKhashDs.erl +++ b/src/measure/DsTest/utKhashDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utListsDs.erl b/src/measure/DsTest/utListsDs.erl similarity index 89% rename from src/testCase/DsTest/utListsDs.erl rename to src/measure/DsTest/utListsDs.erl index c43e1ad..d7694af 100644 --- a/src/testCase/DsTest/utListsDs.erl +++ b/src/measure/DsTest/utListsDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 32768 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utMapsDs.erl b/src/measure/DsTest/utMapsDs.erl similarity index 94% rename from src/testCase/DsTest/utMapsDs.erl rename to src/measure/DsTest/utMapsDs.erl index 750103f..63d906a 100644 --- a/src/testCase/DsTest/utMapsDs.erl +++ b/src/measure/DsTest/utMapsDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utNifArrayDs.erl b/src/measure/DsTest/utNifArrayDs.erl similarity index 96% rename from src/testCase/DsTest/utNifArrayDs.erl rename to src/measure/DsTest/utNifArrayDs.erl index 47aabc4..0fff48c 100644 --- a/src/testCase/DsTest/utNifArrayDs.erl +++ b/src/measure/DsTest/utNifArrayDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num - 1, Ds), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utNifHashbDs.erl b/src/measure/DsTest/utNifHashbDs.erl similarity index 95% rename from src/testCase/DsTest/utNifHashbDs.erl rename to src/measure/DsTest/utNifHashbDs.erl index 569f309..cc398fd 100644 --- a/src/testCase/DsTest/utNifHashbDs.erl +++ b/src/measure/DsTest/utNifHashbDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, Ds), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utOrddictDs.erl b/src/measure/DsTest/utOrddictDs.erl similarity index 90% rename from src/testCase/DsTest/utOrddictDs.erl rename to src/measure/DsTest/utOrddictDs.erl index 479d288..5b5a145 100644 --- a/src/testCase/DsTest/utOrddictDs.erl +++ b/src/measure/DsTest/utOrddictDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 32768 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utOrdsetsDs.erl b/src/measure/DsTest/utOrdsetsDs.erl similarity index 89% rename from src/testCase/DsTest/utOrdsetsDs.erl rename to src/measure/DsTest/utOrdsetsDs.erl index 138adf2..a66b930 100644 --- a/src/testCase/DsTest/utOrdsetsDs.erl +++ b/src/measure/DsTest/utOrdsetsDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 65536 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utPTermDs.erl b/src/measure/DsTest/utPTermDs.erl similarity index 89% rename from src/testCase/DsTest/utPTermDs.erl rename to src/measure/DsTest/utPTermDs.erl index 88d546c..8458ca0 100644 --- a/src/testCase/DsTest/utPTermDs.erl +++ b/src/measure/DsTest/utPTermDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 131072 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, not_support, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, not_support, not_support, no_size}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utPdDs.erl b/src/measure/DsTest/utPdDs.erl similarity index 96% rename from src/testCase/DsTest/utPdDs.erl rename to src/measure/DsTest/utPdDs.erl index 3736ce8..40dd548 100644 --- a/src/testCase/DsTest/utPdDs.erl +++ b/src/measure/DsTest/utPdDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTest/utSetsDs.erl b/src/measure/DsTest/utSetsDs.erl similarity index 94% rename from src/testCase/DsTest/utSetsDs.erl rename to src/measure/DsTest/utSetsDs.erl index 480c80d..0fcd8f4 100644 --- a/src/testCase/DsTest/utSetsDs.erl +++ b/src/measure/DsTest/utSetsDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTest/utTestDs.erl b/src/measure/DsTest/utTestDs.erl similarity index 78% rename from src/testCase/DsTest/utTestDs.erl rename to src/measure/DsTest/utTestDs.erl index 13bd80b..63fe956 100644 --- a/src/testCase/DsTest/utTestDs.erl +++ b/src/measure/DsTest/utTestDs.erl @@ -6,6 +6,7 @@ , update = [] , for = [] , delete = [] + , size = [] }). %-define(V_NUM, [8, 16, 32, 64, 128, 256, 516, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 524288, 1048576]). @@ -48,16 +49,16 @@ runCnt(Cnt, Num, Ds) -> runExe(Num, Ds) -> Pid = erlang:spawn_link(Ds, start, [Num, self()]), receive - {over, Pid, InsertTU, ReadTU, UpdateTU, ForTU, DeleteTU} -> + {over, Pid, InsertTU, ReadTU, UpdateTU, ForTU, DeleteTU, TermSize} -> Insert = cvrTUnit(InsertTU), Read = cvrTUnit(ReadTU), Update = cvrTUnit(UpdateTU), For = cvrTUnit(ForTU), Delete = cvrTUnit(DeleteTU), - storeStatistics(Ds, Num, Insert, Read, Update, For, Delete), + storeStatistics(Ds, Num, Insert, Read, Update, For, Delete, TermSize), {_, DsName} = lists:split(2, atom_to_list(Ds)), - printLog("~-10.s ~8.s ~12.s ~12.s ~10.s ~12.s ~10.s ~14.s ~10.s ~12.s ~12.s ~12.s ~n", - [DsName, integer_to_list(Num), timeToStr(Insert), calcPer(Insert, Num), timeToStr(Read), calcPer(Read, Num), timeToStr(Update), calcPer(Update, Num), timeToStr(For), calcPer(For, Num), timeToStr(Delete), calcPer(Delete, Num)]); + printLog("~-10.s ~8.s ~12.s ~12.s ~10.s ~12.s ~10.s ~14.s ~10.s ~12.s ~12.s ~12.s ~12.s ~n", + [DsName, integer_to_list(Num), timeToStr(Insert), calcPer(Insert, Num), timeToStr(Read), calcPer(Read, Num), timeToStr(Update), calcPer(Update, Num), timeToStr(For), calcPer(For, Num), timeToStr(Delete), calcPer(Delete, Num), sizeToStr(TermSize)]); {'EXIT', Pid, normal} -> ok; _ShutDown -> @@ -72,10 +73,10 @@ runAvg([], _VNumList) -> ok. runCal([Num | T], Ds) -> - #tempCnt{insert = InsertList, read = ReadList, update = UpdateList, for = ForList, delete = DeleteList} = getStatistics(Ds, Num), + #tempCnt{insert = InsertList, read = ReadList, update = UpdateList, for = ForList, delete = DeleteList, size = SizeList} = getStatistics(Ds, Num), {_, DsName} = lists:split(2, atom_to_list(Ds)), - printLog("~-10.s ~8.s ~12.s ~12.s ~14.s ~12.s ~12.s~n", - [DsName, integer_to_list(Num), calcAvg(InsertList, Num), calcAvg(ReadList, Num), calcAvg(UpdateList, Num), calcAvg(ForList, Num), calcAvg(DeleteList, Num)]), + printLog("~-10.s ~8.s ~12.s ~12.s ~14.s ~12.s ~12.s ~12.s~n", + [DsName, integer_to_list(Num), calcAvgT(InsertList, Num), calcAvgT(ReadList, Num), calcAvgT(UpdateList, Num), calcAvgT(ForList, Num), calcAvgT(DeleteList, Num), calcAvgS(SizeList, Num)]), runCal(T, Ds); runCal([], _Ds) -> ok. @@ -105,6 +106,11 @@ timeToStr(Time) when Time > ?US -> timeToStr(Time) -> integer_to_list(Time) ++ "ns". +sizeToStr(no_size) -> + <<"noSize">>; +sizeToStr(TermSize) -> + integer_to_list(TermSize). + calcPer(not_support, _Num) -> <<"notSupport">>; calcPer(skip, _Num) -> @@ -112,39 +118,50 @@ calcPer(skip, _Num) -> calcPer(Time, Num) -> float_to_list(Time / Num, [{decimals, 2}]) ++ "ns". -calcAvg([not_support | _], Num) -> +calcAvgS([no_size | _], Num) -> + <<"noSize">>; +calcAvgS(CntList, Num) -> + %% 去掉最大值与最小值 然后求平均值 + AvgCnt = ?Cnt - 2, + SortList = lists:sort(CntList), + AvgList = lists:sublist(SortList, 2, AvgCnt), + float_to_list(lists:sum(AvgList) / AvgCnt / Num, [{decimals, 2}]). + +calcAvgT([not_support | _], Num) -> <<"notSupport">>; -calcAvg([skip | _], Num) -> +calcAvgT([skip | _], Num) -> <<"skip">>; -calcAvg(CntList, Num) -> +calcAvgT([no_size | _], Num) -> + <<"noSize">>; +calcAvgT(CntList, Num) -> %% 去掉最大值与最小值 然后求平均值 AvgCnt = ?Cnt - 2, SortList = lists:sort(CntList), AvgList = lists:sublist(SortList, 2, AvgCnt), float_to_list(lists:sum(AvgList) / AvgCnt / Num, [{decimals, 2}]) ++ "ns". -storeStatistics(Ds, Num, Insert, Read, Update, For, Delete) -> - #tempCnt{insert = InsertList, read = ReadList, update = UpdateList, for = ForList, delete = DeleteList} = +storeStatistics(Ds, Num, Insert, Read, Update, For, Delete, TermSize) -> + #tempCnt{insert = InsertList, read = ReadList, update = UpdateList, for = ForList, delete = DeleteList, size = SizeList} = case erlang:get({Ds, Num}) of undefined -> #tempCnt{}; TempCnt -> TempCnt end, - NewTempCnt = #tempCnt{insert = [Insert | InsertList], read = [Read | ReadList], update = [Update | UpdateList], for = [For | ForList], delete = [Delete | DeleteList]}, + NewTempCnt = #tempCnt{insert = [Insert | InsertList], read = [Read | ReadList], update = [Update | UpdateList], for = [For | ForList], delete = [Delete | DeleteList], size = [TermSize | SizeList]}, erlang:put({Ds, Num}, NewTempCnt). getStatistics(Ds, Num) -> erlang:get({Ds, Num}). printTitle() -> - printLog("~n~-10.s ~8.s ~12.s ~12.s ~10.s ~12.s ~10.s ~14.s ~10.s ~12.s ~12.s ~12.s ~n", - ["DsName", "V_Num", "insert", "insert/per", "read", "read/per", "update", "update/per", "for", "for/per", "delete", "delete/per"]), + printLog("~n~-10.s ~8.s ~12.s ~12.s ~10.s ~12.s ~10.s ~14.s ~10.s ~12.s ~12.s ~12.s ~12.s ~n", + ["DsName", "V_Num", "insert", "insert/per", "read", "read/per", "update", "update/per", "for", "for/per", "delete", "delete/per", "termSize"]), printLog("~s ~n", [[$= || _ <- lists:seq(1, 145)]]). printAvg() -> - printLog("~n~-10.s ~8.s ~12.s ~12.s ~14.s ~12.s ~12.s~n", - ["DsName", "V_Num", "insert/per", "read/per", "update/per", "for/per", "delete/per"]), + printLog("~n~-10.s ~8.s ~12.s ~12.s ~14.s ~12.s ~12.s ~12.s~n", + ["DsName", "V_Num", "insert/per", "read/per", "update/per", "for/per", "delete/per", termSize]), printLog("~s ~n", [[$= || _ <- lists:seq(1, 85)]]). printLog(Format, Args) -> diff --git a/src/testCase/DsTest/utTupleDs.erl b/src/measure/DsTest/utTupleDs.erl similarity index 89% rename from src/testCase/DsTest/utTupleDs.erl rename to src/measure/DsTest/utTupleDs.erl index 1f7c03d..f93d703 100644 --- a/src/testCase/DsTest/utTupleDs.erl +++ b/src/measure/DsTest/utTupleDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 65536 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTestSimple/utSArrayDs.erl b/src/measure/DsTestSimple/utSArrayDs.erl similarity index 94% rename from src/testCase/DsTestSimple/utSArrayDs.erl rename to src/measure/DsTestSimple/utSArrayDs.erl index e26edb6..26d79fd 100644 --- a/src/testCase/DsTestSimple/utSArrayDs.erl +++ b/src/measure/DsTestSimple/utSArrayDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num - 1, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, utTermSize:byteSize(NewDsI)}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTestSimple/utSDictDs.erl b/src/measure/DsTestSimple/utSDictDs.erl similarity index 93% rename from src/testCase/DsTestSimple/utSDictDs.erl rename to src/measure/DsTestSimple/utSDictDs.erl index 30c56c8..fc8145a 100644 --- a/src/testCase/DsTestSimple/utSDictDs.erl +++ b/src/measure/DsTestSimple/utSDictDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSEtsOrdDs.erl b/src/measure/DsTestSimple/utSEtsOrdDs.erl similarity index 95% rename from src/testCase/DsTestSimple/utSEtsOrdDs.erl rename to src/measure/DsTestSimple/utSEtsOrdDs.erl index a5abcb6..0a34a4b 100644 --- a/src/testCase/DsTestSimple/utSEtsOrdDs.erl +++ b/src/measure/DsTestSimple/utSEtsOrdDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSEtsSetDs.erl b/src/measure/DsTestSimple/utSEtsSetDs.erl similarity index 95% rename from src/testCase/DsTestSimple/utSEtsSetDs.erl rename to src/measure/DsTestSimple/utSEtsSetDs.erl index c5a6802..cce0f00 100644 --- a/src/testCase/DsTestSimple/utSEtsSetDs.erl +++ b/src/measure/DsTestSimple/utSEtsSetDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSGb_setsDs.erl b/src/measure/DsTestSimple/utSGb_setsDs.erl similarity index 93% rename from src/testCase/DsTestSimple/utSGb_setsDs.erl rename to src/measure/DsTestSimple/utSGb_setsDs.erl index 07a5423..8ce142e 100644 --- a/src/testCase/DsTestSimple/utSGb_setsDs.erl +++ b/src/measure/DsTestSimple/utSGb_setsDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSGb_treesDs.erl b/src/measure/DsTestSimple/utSGb_treesDs.erl similarity index 93% rename from src/testCase/DsTestSimple/utSGb_treesDs.erl rename to src/measure/DsTestSimple/utSGb_treesDs.erl index 587a43e..12b0bc1 100644 --- a/src/testCase/DsTestSimple/utSGb_treesDs.erl +++ b/src/measure/DsTestSimple/utSGb_treesDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSListsDs.erl b/src/measure/DsTestSimple/utSListsDs.erl similarity index 88% rename from src/testCase/DsTestSimple/utSListsDs.erl rename to src/measure/DsTestSimple/utSListsDs.erl index 262e197..24240eb 100644 --- a/src/testCase/DsTestSimple/utSListsDs.erl +++ b/src/measure/DsTestSimple/utSListsDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 32768 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSMapsDs.erl b/src/measure/DsTestSimple/utSMapsDs.erl similarity index 94% rename from src/testCase/DsTestSimple/utSMapsDs.erl rename to src/measure/DsTestSimple/utSMapsDs.erl index d7b80a7..6b3c74d 100644 --- a/src/testCase/DsTestSimple/utSMapsDs.erl +++ b/src/measure/DsTestSimple/utSMapsDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSOrddictDs.erl b/src/measure/DsTestSimple/utSOrddictDs.erl similarity index 89% rename from src/testCase/DsTestSimple/utSOrddictDs.erl rename to src/measure/DsTestSimple/utSOrddictDs.erl index 6b0adec..f320266 100644 --- a/src/testCase/DsTestSimple/utSOrddictDs.erl +++ b/src/measure/DsTestSimple/utSOrddictDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 32768 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSOrdsetsDs.erl b/src/measure/DsTestSimple/utSOrdsetsDs.erl similarity index 88% rename from src/testCase/DsTestSimple/utSOrdsetsDs.erl rename to src/measure/DsTestSimple/utSOrdsetsDs.erl index 3e20e9e..4e424ea 100644 --- a/src/testCase/DsTestSimple/utSOrdsetsDs.erl +++ b/src/measure/DsTestSimple/utSOrdsetsDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 65536 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSPdDs.erl b/src/measure/DsTestSimple/utSPdDs.erl similarity index 95% rename from src/testCase/DsTestSimple/utSPdDs.erl rename to src/measure/DsTestSimple/utSPdDs.erl index 18e435a..0016a42 100644 --- a/src/testCase/DsTestSimple/utSPdDs.erl +++ b/src/measure/DsTestSimple/utSPdDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, Time6 - Time5, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/DsTestSimple/utSSetsDs.erl b/src/measure/DsTestSimple/utSSetsDs.erl similarity index 93% rename from src/testCase/DsTestSimple/utSSetsDs.erl rename to src/measure/DsTestSimple/utSSetsDs.erl index 85d15ae..aab28bb 100644 --- a/src/testCase/DsTestSimple/utSSetsDs.erl +++ b/src/measure/DsTestSimple/utSSetsDs.erl @@ -16,7 +16,7 @@ start(Num, Pid) -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, not_support, Time5 - Time4, Time6 - Time5, utTermSize:byteSize(NewDsI)}), exit(normal). init(_Num) -> diff --git a/src/testCase/DsTestSimple/utSTestDs.erl b/src/measure/DsTestSimple/utSTestDs.erl similarity index 82% rename from src/testCase/DsTestSimple/utSTestDs.erl rename to src/measure/DsTestSimple/utSTestDs.erl index 8b5f193..04e2b2c 100644 --- a/src/testCase/DsTestSimple/utSTestDs.erl +++ b/src/measure/DsTestSimple/utSTestDs.erl @@ -6,6 +6,7 @@ , update = [] , for = [] , delete = [] + , size = [] }). %-define(V_NUM, [8, 16, 32, 64, 128, 256, 516, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072, 524288, 1048576]). @@ -48,7 +49,7 @@ runCnt(Cnt, Num, Ds) -> runExe(Num, Ds) -> Pid = erlang:spawn_link(Ds, start, [Num, self()]), receive - {over, Pid, InsertTU, ReadTU, UpdateTU, ForTU, DeleteTU} -> + {over, Pid, InsertTU, ReadTU, UpdateTU, ForTU, DeleteTU, TermSize} -> Insert = cvrTUnit(InsertTU), Read = cvrTUnit(ReadTU), Update = cvrTUnit(UpdateTU), @@ -56,8 +57,8 @@ runExe(Num, Ds) -> Delete = cvrTUnit(DeleteTU), storeStatistics(Ds, Num, Insert, Read, Update, For, Delete), {_, DsName} = lists:split(2, atom_to_list(Ds)), - printLog("~-10.s ~8.s ~12.s ~12.s ~10.s ~12.s ~10.s ~14.s ~10.s ~12.s ~12.s ~12.s ~n", - [DsName, integer_to_list(Num), timeToStr(Insert), calcPer(Insert, Num), timeToStr(Read), calcPer(Read, Num), timeToStr(Update), calcPer(Update, Num), timeToStr(For), calcPer(For, Num), timeToStr(Delete), calcPer(Delete, Num)]); + printLog("~-10.s ~8.s ~12.s ~12.s ~10.s ~12.s ~10.s ~14.s ~10.s ~12.s ~12.s ~12.s ~12.s ~n", + [DsName, integer_to_list(Num), timeToStr(Insert), calcPer(Insert, Num), timeToStr(Read), calcPer(Read, Num), timeToStr(Update), calcPer(Update, Num), timeToStr(For), calcPer(For, Num), timeToStr(Delete), calcPer(Delete, Num), sizeToStr(TermSize)]); {'EXIT', Pid, normal} -> ok; _ShutDown -> @@ -72,10 +73,10 @@ runAvg([], _VNumList) -> ok. runCal([Num | T], Ds) -> - #tempCnt{insert = InsertList, read = ReadList, update = UpdateList, for = ForList, delete = DeleteList} = getStatistics(Ds, Num), + #tempCnt{insert = InsertList, read = ReadList, update = UpdateList, for = ForList, delete = DeleteList, size = SizeList} = getStatistics(Ds, Num), {_, DsName} = lists:split(2, atom_to_list(Ds)), - printLog("~-10.s ~8.s ~12.s ~12.s ~14.s ~12.s ~12.s~n", - [DsName, integer_to_list(Num), calcAvg(InsertList, Num), calcAvg(ReadList, Num), calcAvg(UpdateList, Num), calcAvg(ForList, Num), calcAvg(DeleteList, Num)]), + printLog("~-10.s ~8.s ~12.s ~12.s ~14.s ~12.s ~12.s ~12.s~n", + [DsName, integer_to_list(Num), calcAvgT(InsertList, Num), calcAvgT(ReadList, Num), calcAvgT(UpdateList, Num), calcAvgT(ForList, Num), calcAvgT(DeleteList, Num), calcAvgS(SizeList, Num)]), runCal(T, Ds); runCal([], _Ds) -> ok. @@ -105,6 +106,11 @@ timeToStr(Time) when Time > ?US -> timeToStr(Time) -> integer_to_list(Time) ++ "ns". +sizeToStr(no_size) -> + <<"noSize">>; +sizeToStr(TermSize) -> + integer_to_list(TermSize). + calcPer(not_support, _Num) -> <<"notSupport">>; calcPer(skip, _Num) -> @@ -112,11 +118,20 @@ calcPer(skip, _Num) -> calcPer(Time, Num) -> float_to_list(Time / Num, [{decimals, 2}]) ++ "ns". -calcAvg([not_support | _], Num) -> +calcAvgS([no_zie | _], Num) -> + <<"noSize">>; +calcAvgS(CntList, Num) -> + %% 去掉最大值与最小值 然后求平均值 + AvgCnt = ?Cnt - 2, + SortList = lists:sort(CntList), + AvgList = lists:sublist(SortList, 2, AvgCnt), + float_to_list(lists:sum(AvgList) / AvgCnt / Num, [{decimals, 2}]). + +calcAvgT([not_support | _], Num) -> <<"notSupport">>; -calcAvg([skip | _], Num) -> +calcAvgT([skip | _], Num) -> <<"skip">>; -calcAvg(CntList, Num) -> +calcAvgT(CntList, Num) -> %% 去掉最大值与最小值 然后求平均值 AvgCnt = ?Cnt - 2, SortList = lists:sort(CntList), @@ -138,13 +153,13 @@ getStatistics(Ds, Num) -> erlang:get({Ds, Num}). printTitle() -> - printLog("~n~-10.s ~8.s ~12.s ~12.s ~10.s ~12.s ~10.s ~14.s ~10.s ~12.s ~12.s ~12.s ~n", - ["DsName", "V_Num", "insert", "insert/per", "read", "read/per", "update", "update/per", "for", "for/per", "delete", "delete/per"]), + printLog("~n~-10.s ~8.s ~12.s ~12.s ~10.s ~12.s ~10.s ~14.s ~10.s ~12.s ~12.s ~12.s ~12.s ~n", + ["DsName", "V_Num", "insert", "insert/per", "read", "read/per", "update", "update/per", "for", "for/per", "delete", "delete/per", "termSize"]), printLog("~s ~n", [[$= || _ <- lists:seq(1, 145)]]). printAvg() -> - printLog("~n~-10.s ~8.s ~12.s ~12.s ~14.s ~12.s ~12.s~n", - ["DsName", "V_Num", "insert/per", "read/per", "update/per", "for/per", "delete/per"]), + printLog("~n~-10.s ~8.s ~12.s ~12.s ~14.s ~12.s ~12.s ~12.s~n", + ["DsName", "V_Num", "insert/per", "read/per", "update/per", "for/per", "delete/per", "termSize"]), printLog("~s ~n", [[$= || _ <- lists:seq(1, 85)]]). printLog(Format, Args) -> diff --git a/src/testCase/DsTestSimple/utSTupleDs.erl b/src/measure/DsTestSimple/utSTupleDs.erl similarity index 88% rename from src/testCase/DsTestSimple/utSTupleDs.erl rename to src/measure/DsTestSimple/utSTupleDs.erl index 2c5256d..90fe760 100644 --- a/src/testCase/DsTestSimple/utSTupleDs.erl +++ b/src/measure/DsTestSimple/utSTupleDs.erl @@ -16,10 +16,10 @@ start(Num, Pid) when Num =< 65536 -> Time5 = erlang:monotonic_time(), delete(Num, NewDsF), Time6 = erlang:monotonic_time(), - erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support}), + erlang:send(Pid, {over, self(), Time2 - Time1, Time3 - Time2, Time4 - Time3, Time5 - Time4, not_support, utTermSize:byteSize(NewDsI)}), exit(normal); start(Num, Pid) -> - erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip}), + erlang:send(Pid, {over, self(), skip, skip, skip, skip, skip, no_size}), exit(normal). init(Num) -> diff --git a/src/testCase/ListPdTs/utListPdTs.erl b/src/measure/ListPdTs/utListPdTs.erl similarity index 100% rename from src/testCase/ListPdTs/utListPdTs.erl rename to src/measure/ListPdTs/utListPdTs.erl diff --git a/src/testCase/ListPdTs/utListTs.erl b/src/measure/ListPdTs/utListTs.erl similarity index 100% rename from src/testCase/ListPdTs/utListTs.erl rename to src/measure/ListPdTs/utListTs.erl diff --git a/src/testCase/ListPdTs/utPdTs.erl b/src/measure/ListPdTs/utPdTs.erl similarity index 100% rename from src/testCase/ListPdTs/utPdTs.erl rename to src/measure/ListPdTs/utPdTs.erl