File 0382-megaco-test-example-Adjust-mstone1-test-ca... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0382-megaco-test-example-Adjust-mstone1-test-case.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Currently displaying revision 57cf7c87cb80e2aaaf3f20327bf57529 , Show latest

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

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

OTP-17839
---
 .../examples/meas/megaco_codec_mstone1.erl    |  2 +-
 .../examples/meas/megaco_codec_mstone_lib.erl |  4 +--
 lib/megaco/examples/meas/mstone1.sh.skel.src  |  4 +--
 lib/megaco/test/megaco_examples_SUITE.erl     | 33 ++++++++++++++++---
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/lib/megaco/examples/meas/megaco_codec_mstone1.erl b/lib/megaco/examples/meas/megaco_codec_mstone1.erl
index 2cd1106d4f..ceb2bf630c 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone1.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone1.erl
@@ -29,7 +29,7 @@
 
 %% API
 -export([
-	 start/0,          start/1,          start/2,
+	 start/0, start/1, start/2, start/3,
 	 start_flex/0,     start_flex/1,     start_flex/2,
 	 start_no_drv/0,   start_no_drv/1,   start_no_drv/2,
 	 start_only_drv/0, start_only_drv/1, start_only_drv/2
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
index 0fe1f78b1b..c3d9f666c3 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
@@ -289,11 +289,11 @@ display_asn1_info() ->
 %% 
 %%----------------------------------------------------------------------
 
-expanded_messages(Codecs, DrvInclude) ->
+expanded_messages(Codecs, DrvInclude) when is_list(Codecs) ->
     MessagePackage = time_test, 
     expanded_messages(MessagePackage, Codecs, DrvInclude).
 
-expanded_messages(MessagePackage, Codecs, DrvInclude) ->
+expanded_messages(MessagePackage, Codecs, DrvInclude) when is_list(Codecs) ->
     ECodecs  = expand_codecs(Codecs, DrvInclude), 
     Messages = megaco_codec_transform:messages(MessagePackage), 
     expanded_messages2(ECodecs, Messages, []).
diff --git a/lib/megaco/examples/meas/mstone1.sh.skel.src b/lib/megaco/examples/meas/mstone1.sh.skel.src
index 700da75454..564f6f6ede 100644
--- a/lib/megaco/examples/meas/mstone1.sh.skel.src
+++ b/lib/megaco/examples/meas/mstone1.sh.skel.src
@@ -46,8 +46,8 @@ Options:
                            h: hours
                         If no unit is provided, minutes is assumed.
                         defaults to 10 minutes
- -f <factor>            normally the test is run with 16 processes 
-                        (factor 1), one for each codec config. The test 
+ -f <factor>            normally the test is run with one process per codec
+                        (= 12) (factor 1), one for each codec config. The test 
                         can however be run with other factors, e.g. 
                         factor 10 means that 10 processes will be started 
                         for each megaco codec config.
diff --git a/lib/megaco/test/megaco_examples_SUITE.erl b/lib/megaco/test/megaco_examples_SUITE.erl
index 91002075ac..75c7d7641e 100644
--- a/lib/megaco/test/megaco_examples_SUITE.erl
+++ b/lib/megaco/test/megaco_examples_SUITE.erl
@@ -638,6 +638,10 @@ do_meas(SName, Node, Mod, Func, Args) ->
             p("<ERROR> worker process terminated: "
               "~n      ~p", [Reason]),
             ?FAIL(Reason);
+        {'DOWN', MRef, process, Pid, {badrpc, BadRpc}} ->
+            p("<ERROR> worker process terminated - badrpc: "
+              "~n      ~p", [BadRpc]),
+            ?FAIL(BadRpc);
         {'DOWN', MRef, process, Pid, Reason} ->
             p("worker process terminated: "
               "~n      ~p", [Reason]),
@@ -654,9 +658,22 @@ mstone1(suite) ->
     [];
 mstone1(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    ct:timetrap(?MINS(2)),
     WorkerNode = ?config(worker_node, Config),
-    do_meas(?FUNCTION_NAME, WorkerNode, megaco_codec_mstone1, start, [1, default]).
+    %% 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],
+    p("Run with: "
+      "~n      Run Time: ~p min(s)"
+      "~n      Factor:   ~p", [RunTime, Factor]),
+    ct:timetrap(?MINS(RunTime + 1)),
+    do_meas(?FUNCTION_NAME, WorkerNode, Mod, Func, Args).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -667,9 +684,17 @@ mstone2(suite) ->
     [];
 mstone2(Config) when is_list(Config) ->
     process_flag(trap_exit, true),
-    ct:timetrap(?MINS(2)),
     WorkerNode = ?config(worker_node, Config),
-    do_meas(?FUNCTION_NAME, WorkerNode, megaco_codec_mstone2, start, [1, standard]).
+    RunTime = 1, % Minutes
+    Mode    = standard,
+    Mod     = megaco_codec_mstone2,
+    Func    = start,
+    Args    = [RunTime, Mode],
+    p("Run with: "
+      "~n      Run Time: ~p min(s)"
+      "~n      Mode:     ~p", [RunTime, Mode]),
+    ct:timetrap(?MINS(RunTime + 1)),
+    do_meas(?FUNCTION_NAME, WorkerNode, Mod, Func, Args).
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-- 
2.31.1

Places

File 0382-megaco-test-example-Adjust-mstone1-test-case.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Places