File 0383-megaco-test-example-Adjust-mstone2-test-ca... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0383-megaco-test-example-Adjust-mstone2-test-case.patch of Package erlang (Revision 62614e362dc3ec433dd252b94460863a)

Currently displaying revision 62614e362dc3ec433dd252b94460863a , Show latest

From daba01d0328f7b4cd97f367a4920defab3d9a153 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Thu, 13 Jan 2022 15:00:00 +0100
Subject: [PATCH 13/13] [megaco|test|example] Adjust mstone2 test case

Adjusted to make use of "all" processor core(s).

OTP-17839
---
 .../examples/meas/megaco_codec_mstone2.erl    | 87 ++++++++++++++-----
 lib/megaco/test/megaco_examples_SUITE.erl     | 36 ++++----
 2 files changed, 88 insertions(+), 35 deletions(-)

diff --git a/lib/megaco/examples/meas/megaco_codec_mstone2.erl b/lib/megaco/examples/meas/megaco_codec_mstone2.erl
index d1f033dc6a..52ac5d85f0 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone2.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone2.erl
@@ -52,7 +52,7 @@
 
 %% Exports
 -export([
-	 start/0, start/1, start/2, start/3
+	 start/0, start/1, start/2, start/3, start/4
 	]).
 
 
@@ -74,6 +74,7 @@
 -define(DEFAULT_MESSAGE_PACKAGE, megaco_codec_transform:default_message_package()).
 -define(DEFAULT_MODE,            standard).
 -define(DEFAULT_TIME,            1).
+-define(DEFAULT_FACTOR,          1).
 -define(DEFAULT_RUN_TIME,        timer:minutes(?DEFAULT_TIME)).
 
 %% -define(MSTONE_RUNNER_MIN_HEAP_SZ, 16#7fff).
@@ -101,17 +102,21 @@
 %%%----------------------------------------------------------------------
 
 start() ->
-    do_start(?DEFAULT_RUN_TIME, ?DEFAULT_MODE, ?DEFAULT_MESSAGE_PACKAGE).
+    do_start(?DEFAULT_FACTOR,
+             ?DEFAULT_RUN_TIME, ?DEFAULT_MODE, ?DEFAULT_MESSAGE_PACKAGE).
 
 start([RunTimeAtom, Mode, MessagePackage])
   when is_atom(RunTimeAtom) andalso
        is_atom(Mode) andalso
        is_atom(MessagePackage) ->
-    do_start(?LIB:parse_runtime(RunTimeAtom), Mode, MessagePackage);
+    do_start(?DEFAULT_FACTOR,
+             ?LIB:parse_runtime(RunTimeAtom), Mode, MessagePackage);
 start(RunTime) when is_integer(RunTime) andalso (RunTime > 0) ->
-    do_start(time:minutes(RunTime), ?DEFAULT_MODE, ?DEFAULT_MESSAGE_PACKAGE);
+    do_start(?DEFAULT_FACTOR,
+             time:minutes(RunTime), ?DEFAULT_MODE, ?DEFAULT_MESSAGE_PACKAGE);
 start(MessagePackage) ->
-    do_start(?DEFAULT_RUN_TIME, ?DEFAULT_MODE, MessagePackage).
+    do_start(?DEFAULT_FACTOR,
+             ?DEFAULT_RUN_TIME, ?DEFAULT_MODE, MessagePackage).
 
 start(RunTime, Mode)
   when is_integer(RunTime) andalso
@@ -120,15 +125,25 @@ start(RunTime, Mode)
         (Mode =:= flex) orelse
         (Mode =:= no_drv) orelse
         (Mode =:= only_drv)) ->
-    do_start(timer:minutes(RunTime), Mode, ?DEFAULT_MESSAGE_PACKAGE);
+    do_start(?DEFAULT_FACTOR,
+             timer:minutes(RunTime), Mode, ?DEFAULT_MESSAGE_PACKAGE);
+start(Factor, RunTime)
+  when is_integer(Factor) andalso
+       (Factor > 0) andalso
+       is_integer(RunTime) andalso
+       (RunTime > 0) ->
+    do_start(Factor, timer:minutes(RunTime),
+             ?DEFAULT_MODE, ?DEFAULT_MESSAGE_PACKAGE);
 start(RunTime, MessagePackage) when is_integer(RunTime) andalso (RunTime > 0) ->
-    do_start(timer:minutes(RunTime), ?DEFAULT_MODE, MessagePackage);
+    do_start(?DEFAULT_FACTOR,
+             timer:minutes(RunTime), ?DEFAULT_MODE, MessagePackage);
 start(Mode, MessagePackage)
   when (Mode =:= standard) orelse
        (Mode =:= flex) orelse
        (Mode =:= no_drv) orelse
        (Mode =:= only_drv) ->
-    do_start(?DEFAULT_RUN_TIME, Mode, MessagePackage).
+    do_start(?DEFAULT_FACTOR,
+             ?DEFAULT_RUN_TIME, Mode, MessagePackage).
 
 start(RunTime, Mode, MessagePackage)
   when is_integer(RunTime) andalso
@@ -137,11 +152,35 @@ start(RunTime, Mode, MessagePackage)
         (Mode =:= flex) orelse
         (Mode =:= no_drv) orelse
         (Mode =:= only_drv)) ->
-    do_start(timer:minutes(RunTime), Mode, MessagePackage).
+    do_start(?DEFAULT_FACTOR,
+             timer:minutes(RunTime), Mode, MessagePackage);
+start(Factor, RunTime, Mode)
+  when is_integer(Factor) andalso
+       (Factor > 0) andalso
+       is_integer(RunTime) andalso
+       (RunTime > 0) andalso
+       ((Mode =:= standard) orelse
+        (Mode =:= flex) orelse
+        (Mode =:= no_drv) orelse
+        (Mode =:= only_drv)) ->
+    do_start(Factor,
+             timer:minutes(RunTime), Mode, ?DEFAULT_MESSAGE_PACKAGE).
+
+
+start(Factor, RunTime, Mode, MessagePackage)
+  when is_integer(Factor) andalso
+       (Factor > 0) andalso
+       is_integer(RunTime) andalso
+       (RunTime > 0) andalso
+       ((Mode =:= standard) orelse
+        (Mode =:= flex) orelse
+        (Mode =:= no_drv) orelse
+        (Mode =:= only_drv)) ->
+    do_start(Factor, timer:minutes(RunTime), Mode, MessagePackage).
 
-do_start(RunTime, Mode, MessagePackageRaw) ->
+do_start(Factor, RunTime, Mode, MessagePackageRaw) ->
     MessagePackage = parse_message_package(MessagePackageRaw),
-    mstone_init(RunTime, Mode, MessagePackage).
+    mstone_init(Factor, RunTime, Mode, MessagePackage).
     
 parse_message_package(MessagePackageRaw) when is_list(MessagePackageRaw) ->
     list_to_atom(MessagePackageRaw);
@@ -151,7 +190,7 @@ parse_message_package(BadMessagePackage) ->
     throw({error, {bad_message_package, BadMessagePackage}}).
 
 
-mstone_init(RunTime, Mode, MessagePackage) ->
+mstone_init(Factor, RunTime, Mode, MessagePackage) ->
     io:format("~n", []),
     %% io:format("MStone init with"
     %%           "~n   Run Time:        ~p ms"
@@ -164,7 +203,7 @@ mstone_init(RunTime, Mode, MessagePackage) ->
     io:format("~n", []),
     Ref = erlang:monitor(process, 
 			 spawn(fun() -> 
-				       loader(RunTime, Mode, MessagePackage) 
+				       loader(Factor, RunTime, Mode, MessagePackage) 
 			       end)),
     receive
 	{'DOWN', Ref, process, _Pid, {done, Result}} ->
@@ -251,8 +290,8 @@ erl_image(Erl, Conf) ->
 
 %%%----------------------------------------------------------------------
 
-loader(RunTime, Mode, MessagePackage) ->
-    loader(RunTime, Mode, ?MSTONE_CODECS, MessagePackage).
+loader(Factor, RunTime, Mode, MessagePackage) ->
+    loader(Factor, RunTime, Mode, ?MSTONE_CODECS, MessagePackage).
 
 
 %% Codecs is a list of megaco codec shortnames: 
@@ -260,16 +299,16 @@ loader(RunTime, Mode, MessagePackage) ->
 %%    pretty | compact | ber | per | erlang
 %%
 
-loader(RunTime, Mode, Codecs, MessagePackage) ->
+loader(Factor, RunTime, Mode, Codecs, MessagePackage) ->
     process_flag(trap_exit, true),
-    case (catch init(RunTime, Mode, Codecs, MessagePackage)) of
+    case (catch init(Factor, RunTime, Mode, Codecs, MessagePackage)) of
 	{ok, State} ->
 	    loader_loop(running, State);
 	Error ->
 	    exit(Error)
     end.
 
-init(RunTime, Mode, Codecs, MessagePackage) ->
+init(Factor, RunTime, Mode, Codecs, MessagePackage) ->
     ets:new(mstone, [set, private, named_table, {keypos, 1}]),
     ets:insert(mstone, {worker_cnt, 0}),
     case ?LIB:start_flex_scanner() of
@@ -277,9 +316,9 @@ init(RunTime, Mode, Codecs, MessagePackage) ->
             io:format("prepare messages", []),
             EMessages = ?LIB:expanded_messages(MessagePackage, Codecs, Mode), 
             io:format("~ninit codec data", []),
-            CodecData = init_codec_data(EMessages, FlexConf),
+            CodecData = init_codec_data(Factor, EMessages, FlexConf),
             Timer = erlang:send_after(RunTime, self(), mstone_finished), 
-            io:format("~n", []),
+            io:format(" => ~w concurrent workers~n", [length(CodecData)]),
             {ok, #state{timer        = Timer, 
                         idle         = CodecData, 
                         flex_handler = Pid, 
@@ -290,6 +329,14 @@ init(RunTime, Mode, Codecs, MessagePackage) ->
             ERROR
     end.
 
+init_codec_data(Factor, EMsgs, FlexConf) ->
+    init_codec_data_expand(Factor, init_codec_data(EMsgs, FlexConf)).
+
+init_codec_data_expand(1 = _Factor, CodecData) ->
+    CodecData;
+init_codec_data_expand(Factor, CodecData) ->
+    lists:flatten(lists:duplicate(Factor, CodecData)).
+
 init_codec_data(EMsgs, FlexConf) ->
     [init_codec_data(Codec, Mod, Conf, Msgs, FlexConf) || 
 	{Codec, Mod, Conf, Msgs} <- EMsgs].
diff --git a/lib/megaco/test/megaco_examples_SUITE.erl b/lib/megaco/test/megaco_examples_SUITE.erl
index 75c7d7641e..0fca06b8dd 100644
--- a/lib/megaco/test/megaco_examples_SUITE.erl
+++ b/lib/megaco/test/megaco_examples_SUITE.erl
@@ -614,7 +614,8 @@ meas(Config) when is_list(Config) ->
             true ->
                 {6, 400}
         end,
-    p("    Timetrap: ~p mins"
+    p("Run with: "
+      "~n      Timetrap: ~p mins"
       "~n      Factor:   ~p", [Time, Factor]),
     ct:timetrap(?MINS(Time)),
     WorkerNode = ?config(worker_node, Config),
@@ -661,14 +662,14 @@ mstone1(Config) when is_list(Config) ->
     WorkerNode = ?config(worker_node, Config),
     %% The point of this is
     %% to make sure we utilize as much of the host as possible...
-    RunTime    = 1, % Minute
-    NumSched   = try erlang:system_info(schedulers_online) of N -> N
-                 catch _:_:_ -> 1
-                 end,
-    Factor     = 1 + (NumSched div 12),
-    Mod        = megaco_codec_mstone1,
-    Func       = start,
-    Args       = [RunTime, Factor],
+    RunTime   = 1, % Minute
+    NumSched  = try erlang:system_info(schedulers_online) of N -> N
+                catch _:_:_ -> 1
+                end,
+    Factor    = 1 + (NumSched div 12),
+    Mod       = megaco_codec_mstone1,
+    Func      = start,
+    Args      = [RunTime, Factor],
     p("Run with: "
       "~n      Run Time: ~p min(s)"
       "~n      Factor:   ~p", [RunTime, Factor]),
@@ -685,14 +686,19 @@ mstone2(suite) ->
 mstone2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
     WorkerNode = ?config(worker_node, Config),
-    RunTime = 1, % Minutes
-    Mode    = standard,
-    Mod     = megaco_codec_mstone2,
-    Func    = start,
-    Args    = [RunTime, Mode],
+    RunTime   = 1, % Minutes
+    NumSched  = try erlang:system_info(schedulers_online) of N -> N
+                catch _:_:_ -> 1
+                end,
+    Factor    = 1 + (NumSched div 12),
+    Mode      = standard,
+    Mod       = megaco_codec_mstone2,
+    Func      = start,
+    Args      = [Factor, RunTime, Mode],
     p("Run with: "
+      "~n      Factor:   ~p"
       "~n      Run Time: ~p min(s)"
-      "~n      Mode:     ~p", [RunTime, Mode]),
+      "~n      Mode:     ~p", [Factor, RunTime, Mode]),
     ct:timetrap(?MINS(RunTime + 1)),
     do_meas(?FUNCTION_NAME, WorkerNode, Mod, Func, Args).
 
-- 
2.31.1

Places

File 0383-megaco-test-example-Adjust-mstone2-test-case.patch of Package erlang (Revision 62614e362dc3ec433dd252b94460863a)

Places