rf: 代码整理

src/testCase/DsTest/utArrayDs.erl → 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) ->

src/testCase/DsTest/utArrayDs1.erl → 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) ->

src/testCase/DsTest/utAtomicsDs.erl → 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) ->

src/testCase/DsTest/utDictDs.erl → 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) ->

src/testCase/DsTest/utEtsOrdDs.erl → 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) ->

src/testCase/DsTest/utEtsSetDs.erl → 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) ->

src/testCase/DsTest/utGb_setsDs.erl → 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) ->

src/testCase/DsTest/utGb_treesDs.erl → 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) ->

src/testCase/DsTest/utHashBblDs.erl → 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) ->

src/testCase/DsTest/utHashBblDs1.erl → 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) ->

src/testCase/DsTest/utKhashDs.erl → 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) ->

src/testCase/DsTest/utListsDs.erl → 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) ->

src/testCase/DsTest/utMapsDs.erl → 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) ->

src/testCase/DsTest/utNifArrayDs.erl → 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) ->

src/testCase/DsTest/utNifHashbDs.erl → 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) ->

src/testCase/DsTest/utOrddictDs.erl → 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) ->

src/testCase/DsTest/utOrdsetsDs.erl → 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) ->

src/testCase/DsTest/utPTermDs.erl → 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) ->

src/testCase/DsTest/utPdDs.erl → 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) ->

src/testCase/DsTest/utSetsDs.erl → 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) ->

src/testCase/DsTest/utTestDs.erl → 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) ->

src/testCase/DsTest/utTupleDs.erl → 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) ->

src/testCase/DsTestSimple/utSArrayDs.erl → 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) ->

src/testCase/DsTestSimple/utSDictDs.erl → 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) ->

src/testCase/DsTestSimple/utSEtsOrdDs.erl → 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) ->

src/testCase/DsTestSimple/utSEtsSetDs.erl → 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) ->

src/testCase/DsTestSimple/utSGb_setsDs.erl → 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) ->

src/testCase/DsTestSimple/utSGb_treesDs.erl → 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) ->

src/testCase/DsTestSimple/utSListsDs.erl → 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) ->

src/testCase/DsTestSimple/utSMapsDs.erl → 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) ->

src/testCase/DsTestSimple/utSOrddictDs.erl → 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) ->

src/testCase/DsTestSimple/utSOrdsetsDs.erl → 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) ->

src/testCase/DsTestSimple/utSPdDs.erl → 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) ->

src/testCase/DsTestSimple/utSSetsDs.erl → 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) ->

src/testCase/DsTestSimple/utSTestDs.erl → 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) ->

src/testCase/DsTestSimple/utSTupleDs.erl → 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) ->