File 0372-megaco-examples-Update-meas-test-tools-and... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0372-megaco-examples-Update-meas-test-tools-and-add-test-.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Currently displaying revision 57cf7c87cb80e2aaaf3f20327bf57529 , Show latest

From 209a5540b53a9792dc5cb13ff3b9b021beb77f87 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Tue, 4 Jan 2022 18:11:49 +0100
Subject: [PATCH 02/13] [megaco|examples] Update meas test tools and add test
 cases

Update the mstone2 meas test tool.
Also added a frontend script for the tool.
Add test cases for the (three) meas test tools.

OTP-17839
---
 lib/megaco/.gitignore                         |   1 +
 lib/megaco/examples/meas/Makefile.in          |   7 +-
 .../examples/meas/megaco_codec_meas.erl       |  91 +++---
 .../examples/meas/megaco_codec_mstone1.erl    |  52 ++--
 .../examples/meas/megaco_codec_mstone2.erl    | 168 +++++------
 .../examples/meas/megaco_codec_mstone_lib.erl |  34 ++-
 .../examples/meas/megaco_codec_transform.erl  |   3 +-
 lib/megaco/examples/meas/modules.mk           |   5 +-
 lib/megaco/examples/meas/mstone2.sh.skel.src  | 178 ++++++++++++
 lib/megaco/test/megaco_examples_SUITE.erl     | 269 ++++++++++++++++--
 lib/megaco/test/megaco_test_lib.erl           |   1 -
 lib/megaco/test/megaco_test_lib.hrl           |   6 +
 12 files changed, 624 insertions(+), 191 deletions(-)
 create mode 100644 lib/megaco/examples/meas/mstone2.sh.skel.src

diff --git a/lib/megaco/examples/meas/Makefile.in b/lib/megaco/examples/meas/Makefile.in
index 6b2c0930ad..4ff5cd2703 100644
--- a/lib/megaco/examples/meas/Makefile.in
+++ b/lib/megaco/examples/meas/Makefile.in
@@ -1,7 +1,7 @@
 # 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2021. All Rights Reserved.
+# Copyright Ericsson AB 2002-2022. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,6 +28,7 @@ MEGACO_INCLUDEDIR = ../../include
 
 include $(ERL_TOP)/make/$(TARGET)/otp.mk
 
+
 # ----------------------------------------------------
 # Application version
 # ----------------------------------------------------
@@ -151,6 +152,10 @@ mstone1.sh.skel: mstone1.sh.skel.src
 	$(V_colon)@echo "transforming $< to $@"
 	$(vsn_verbose)$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
 
+mstone2.sh.skel: mstone2.sh.skel.src
+	$(V_colon)@echo "transforming $< to $@"
+	$(vsn_verbose)$(PERL) -p -e 's?%VSN%?$(VSN)? ' < $< > $@
+
 megaco_codec_transform.$(EMULATOR): megaco_codec_transform.erl
 
 megaco_codec_meas.$(EMULATOR): megaco_codec_meas.erl
diff --git a/lib/megaco/examples/meas/megaco_codec_meas.erl b/lib/megaco/examples/meas/megaco_codec_meas.erl
index ee040d35e2..56acf972fb 100644
--- a/lib/megaco/examples/meas/megaco_codec_meas.erl
+++ b/lib/megaco/examples/meas/megaco_codec_meas.erl
@@ -50,7 +50,7 @@
 -export([start1/0]).
 
 %% Internal exports
--export([do_measure_codec/7, do_measure_codec_loop/7]).
+-export([do_measure_codec/8, do_measure_codec_loop/7]).
 -export([flex_scanner_handler/1]).
 
 
@@ -84,16 +84,18 @@ start1() ->
     start().
 
 start() ->
-    meas_init(?DEFAULT_MESSAGE_PACKAGE, ?MEASURE_CODECS).
+    meas_init(1, ?DEFAULT_MESSAGE_PACKAGE, ?MEASURE_CODECS).
 
 start([MessagePackage]) ->
-    do_start(MessagePackage, ?MEASURE_CODECS);
+    do_start(1, MessagePackage, ?MEASURE_CODECS);
+start(Factor) when is_integer(Factor) andalso (Factor > 0) ->
+    do_start(Factor, ?DEFAULT_MESSAGE_PACKAGE, ?MEASURE_CODECS);
 start(MessagePackage) ->
-    do_start(MessagePackage, ?MEASURE_CODECS).
+    do_start(1, MessagePackage, ?MEASURE_CODECS).
 
-do_start(MessagePackageRaw, Codecs) ->
+do_start(Factor, MessagePackageRaw, Codecs) ->
     MessagePackage = parse_message_package(MessagePackageRaw), 
-    meas_init(MessagePackage, Codecs).
+    meas_init(Factor, MessagePackage, Codecs).
     
 parse_message_package(MessagePackageRaw) when is_list(MessagePackageRaw) ->
     list_to_atom(MessagePackageRaw);
@@ -113,7 +115,7 @@ parse_message_package(BadMessagePackage) ->
 %%    pretty | compact | ber | per | erlang
 %%
 
-meas_init(MessagePackage, Codecs) ->
+meas_init(Factor, MessagePackage, Codecs) ->
     %% process_flag(trap_exit, true),
     io:format("~nRun meas on message package: ~p~n~n", [MessagePackage]),
     display_os_info(),
@@ -124,7 +126,7 @@ meas_init(MessagePackage, Codecs) ->
     case megaco_codec_transform:messages(MessagePackage) of
 	Messages when is_list(Messages) ->
 	    ExpandedMessages = expand_messages(Codecs, Messages),
-	    Results = t1(ExpandedMessages, []), 
+	    Results = t1(Factor, ExpandedMessages, []), 
 	    display_time(Started, os:timestamp()),
 	    store_results(Results);
 	Error ->
@@ -228,41 +230,41 @@ format_diff(Start, Fin) ->
     
     
 			      
-t1([], Results) ->
+t1(_Factor, [], Results) ->
     lists:reverse(Results);
-t1([{Id, Codec, Conf, _, _} = ECodec|EMsgs], Results) ->
-    case (catch measure(ECodec)) of
+t1(Factor, [{Id, Codec, Conf, _, _} = ECodec|EMsgs], Results) ->
+    case (catch measure(Factor, ECodec)) of
 	{'EXIT', Reason} ->
 	    error("measure of codec ~p exited: ~n~p", [Codec, Reason]),
-	    t1(EMsgs, Results);
+	    t1(Factor, EMsgs, Results);
 	{error, Reason} ->
 	    error("skipping codec ~p: ~n~p", [Codec, Reason]),
-	    t1(EMsgs, Results);
+	    t1(Factor, EMsgs, Results);
 	{ok, Res} ->
-	    t1(EMsgs, [{Id, Conf, Res}| Results])
+	    t1(Factor, EMsgs, [{Id, Conf, Res}| Results])
     end.
 
 
-measure({Id, Codec, Conf, Count, Msgs}) ->
+measure(Factor, {Id, Codec, Conf, Count, Msgs}) ->
     io:format("measure using codec ~p ~p~n ", [Codec, Conf]),
     {Init, Conf1} = measure_init(Conf),
     Conf2 = [{version3,?V3}|Conf1],
-    Res = measure(Id, Codec, Conf2, Msgs, [], Count),
+    Res = measure(Factor, Id, Codec, Conf2, Msgs, [], Count),
     measure_fin(Init),
     Res.
 
 
 expand_messages(Codecs, Messages) ->
     ECodecs = expand_codecs(Codecs, []),
-    expand_messages(ECodecs, Messages, []).
+    do_expand_messages(ECodecs, Messages, []).
 
-expand_messages([], _, EMessages) ->
+do_expand_messages([], _, EMessages) ->
     lists:reverse(EMessages);
-expand_messages([{Id, Codec, Conf, Count} | ECodecs], Messages, EMessages) ->
+do_expand_messages([{Id, Codec, Conf, Count} | ECodecs], Messages, EMessages) ->
     case lists:keysearch(Id, 1, Messages) of
 	{value, {Id, Msgs}} ->
-	    expand_messages(ECodecs, Messages, 
-			    [{Id, Codec, Conf, Count, Msgs}|EMessages]);
+	    do_expand_messages(ECodecs, Messages, 
+                               [{Id, Codec, Conf, Count, Msgs}|EMessages]);
 	false ->
 	    exit({error, {no_such_codec_data, Id}})
     end.
@@ -273,6 +275,8 @@ expand_codecs([Codec|Codecs], ECodecs) when is_atom(Codec) ->
     ECodec = expand_codec(Codec),
     expand_codecs(Codecs, [ECodec|ECodecs]).
 
+%% Make "sure" the factor is evenly divisible by the message count
+%% for *all* codec's.
 expand_codec(Codec) ->
     case Codec of
 	pretty ->
@@ -312,10 +316,10 @@ measure_fin(_) ->
     ok.
 
 
-measure(_Dir, _Codec, _Conf, [], [], _MCount) ->
+measure(_Factor, _Dir, _Codec, _Conf, [], [], _MCount) ->
     {error, no_messages};
 
-measure(_Dir, _Codec, _Conf, [], Res, _MCount) ->
+measure(_Factor, _Dir, _Codec, _Conf, [], Res, _MCount) ->
 
     Eavg = avg([Etime/Ecnt || #stat{ecount = Ecnt, etime = Etime} <- Res]),
     Davg = avg([Dtime/Dcnt || #stat{dcount = Dcnt, dtime = Dtime} <- Res]),
@@ -329,16 +333,16 @@ measure(_Dir, _Codec, _Conf, [], Res, _MCount) ->
 
     {ok, lists:reverse(Res)};
 
-measure(Dir, Codec, Conf, [{Name, Bin}|Msgs], Results, MCount) ->
+measure(Factor, Dir, Codec, Conf, [{Name, Bin}|Msgs], Results, MCount) ->
     io:format(" ~p", [Name]),
-    case (catch do_measure(Dir, Codec, Conf, Name, Bin, MCount)) of
+    case (catch do_measure(Factor, Dir, Codec, Conf, Name, Bin, MCount)) of
 	{ok, Stat} ->
-	    measure(Dir, Codec, Conf, Msgs, [Stat | Results], MCount);
+	    measure(Factor, Dir, Codec, Conf, Msgs, [Stat | Results], MCount);
 
 	{error, S} ->
 	    io:format("~n~s failed: ~n", [Name]),
 	    error(S,[]),
-	    measure(Dir, Codec, Conf, Msgs, Results, MCount);
+	    measure(Factor, Dir, Codec, Conf, Msgs, Results, MCount);
 
 	{info, S} ->
 	    case get(verbose) of
@@ -348,16 +352,16 @@ measure(Dir, Codec, Conf, [{Name, Bin}|Msgs], Results, MCount) ->
 		_ ->
 		    io:format("~n~s skipped~n", [Name])
 	    end,
-	    measure(Dir, Codec, Conf, Msgs, Results, MCount)
+	    measure(Factor, Dir, Codec, Conf, Msgs, Results, MCount)
 
     end.
 
 
-do_measure(_Id, Codec, Conf, Name, BinMsg, MCount) ->
+do_measure(Factor, _Id, Codec, Conf, Name, BinMsg, MCount) ->
     %% io:format("~n~s~n", [binary_to_list(BinMsg)]),
     {Version, NewBin}  = detect_version(Codec, Conf, BinMsg),
-    {Msg, Dcnt, Dtime} = measure_decode(Codec, Conf, Version, NewBin, MCount),
-    {_,   Ecnt, Etime} = measure_encode(Codec, Conf, Version, Msg, MCount),
+    {Msg, Dcnt, Dtime} = measure_decode(Factor, Codec, Conf, Version, NewBin, MCount),
+    {_,   Ecnt, Etime} = measure_encode(Factor, Codec, Conf, Version, Msg, MCount),
 
     {ok, #stat{name   = Name, 
 	       ecount = Ecnt, etime = Etime, 
@@ -378,8 +382,8 @@ detect_version(Codec, Conf, Bin) ->
     end.
 	    
 
-measure_decode(Codec, Conf, Version, Bin, MCount) ->
-    case measure_codec(Codec, decode_message, Conf, Version, Bin, MCount) of
+measure_decode(Factor, Codec, Conf, Version, Bin, MCount) ->
+    case measure_codec(Factor, Codec, decode_message, Conf, Version, Bin, MCount) of
 	{ok, Res} ->
 	    Res;
 	{error, Reason} ->
@@ -387,8 +391,8 @@ measure_decode(Codec, Conf, Version, Bin, MCount) ->
 	    throw({error, S})
     end.
 
-measure_encode(Codec, Conf, Version, Bin, MCount) ->
-    case measure_codec(Codec, encode_message, Conf, Version, Bin, MCount) of
+measure_encode(Factor, Codec, Conf, Version, Bin, MCount) ->
+    case measure_codec(Factor, Codec, encode_message, Conf, Version, Bin, MCount) of
 	{ok, Res} ->
 	    Res;
 	{error, Reason} ->
@@ -397,9 +401,9 @@ measure_encode(Codec, Conf, Version, Bin, MCount) ->
     end.
 
 
-measure_codec(Codec, Func, Conf, Version, Bin, MCount) ->
+measure_codec(Factor, Codec, Func, Conf, Version, Bin, MCount) ->
     Pid = spawn_link(?MODULE, do_measure_codec, 
-                     [self(), Codec, Func, Conf, Version, Bin, MCount]),
+                     [Factor, self(), Codec, Func, Conf, Version, Bin, MCount]),
     receive
 	{measure_result, Pid, Func, Res} ->
 	    {ok, Res};
@@ -420,21 +424,26 @@ measure_codec(Codec, Func, Conf, Version, Bin, MCount) ->
     end.
 
 
-do_measure_codec(Parent, Codec, Func, Conf, Version, Bin, MCount) ->
+do_measure_codec(Factor, Parent, Codec, Func, Conf, Version, Bin, MCount) ->
     {ok, Count} = measure_warmup(Codec, Func, Conf, Version, Bin, MCount),
+    Count2      = Count div Factor,
+    %% io:format("do_measure_codec(~w, ~w) -> warmed up:"
+    %%           "~n      MCount: ~w"
+    %%           "~n      Count:  ~w"
+    %%           "~n      Count2: ~w", [Codec, Func, MCount, Count, Count2]),
     Res = timer:tc(?MODULE, do_measure_codec_loop, 
-		   [Codec, Func, Conf, Version, Bin, Count, dummy]),
+		   [Codec, Func, Conf, Version, Bin, Count2, dummy]),
     case Res of
 	{Time, {ok, M}} ->
 	    %% io:format("~w ", [Time]),
-	    Parent ! {measure_result, self(), Func, {M, Count, Time}};
+	    Parent ! {measure_result, self(), Func, {M, Count2, Time}};
 	{_Time, Error} ->
 	    Parent ! {error, self(), Error}
     end,
     unlink(Parent). % Make sure Parent don't get our exit signal
 
 
-%% This function does more mor less what the real measure function
+%% This function does more or less what the real measure function
 %% above does. But with the diff:
 %% 1) Warmup to ensure that all used code are loaded
 %% 2) To aproximate the encoding time, to ensure that 
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone1.erl b/lib/megaco/examples/meas/megaco_codec_mstone1.erl
index 8dbf7439b4..e2df04b683 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone1.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone1.erl
@@ -81,7 +81,14 @@ start([MessagePackage, RunTime, Factor]) ->
 start(Factor) ->
     start(?DEFAULT_MESSAGE_PACKAGE, ?MSTONE_RUN_TIME, Factor).
 
-start(MessagePackage, Factor) ->
+start(RunTime, default = _Factor)
+  when is_integer(RunTime) ->
+    start(?DEFAULT_MESSAGE_PACKAGE, RunTime, ?DEFAULT_FACTOR);
+start(RunTime, Factor)
+  when is_integer(RunTime) andalso is_integer(Factor) ->
+    start(?DEFAULT_MESSAGE_PACKAGE, RunTime, Factor);
+start(MessagePackage, Factor)
+  when is_atom(MessagePackage) andalso is_integer(Factor) ->
     start(MessagePackage, ?MSTONE_RUN_TIME, Factor).
 
 start(MessagePackage, RunTime, Factor) ->
@@ -152,34 +159,8 @@ do_start(MessagePackageRaw, RunTimeRaw, FactorRaw, DrvInclude) ->
     mstone_init(MessagePackage, RunTime, Factor, DrvInclude).
 
 
-parse_runtime(RunTimeAtom) when is_atom(RunTimeAtom) ->
-    parse_runtime_str(atom_to_list(RunTimeAtom));
-parse_runtime(RunTimeStr) when is_list(RunTimeStr) ->
-    parse_runtime_str(RunTimeStr);
-parse_runtime(RunTime) when is_integer(RunTime) andalso (RunTime > 0) ->
-    timer:minutes(RunTime);
-parse_runtime(BadRunTime) ->
-    throw({error, {bad_runtime, BadRunTime}}).
-
-parse_runtime_str(RuneTimeStr) ->
-    try
-        begin
-            case lists:reverse(RuneTimeStr) of
-                [$s|Rest] ->
-                    timer:seconds(list_to_integer(lists:reverse(Rest)));
-                [$m|Rest] ->
-                    timer:minutes(list_to_integer(lists:reverse(Rest)));
-                [$h|Rest] ->
-                    timer:hours(list_to_integer(lists:reverse(Rest)));
-                _ ->
-                    timer:minutes(list_to_integer(RuneTimeStr))
-            end
-        end
-    catch
-        _:_:_ ->
-            throw({error, {bad_runtime, RuneTimeStr}})
-    end.
-
+parse_runtime(RunTimeAtom) ->
+    ?LIB:parse_runtime(RunTimeAtom).
 
 parse_factor(FactorAtom) when is_atom(FactorAtom) ->
     case (catch list_to_integer(atom_to_list(FactorAtom))) of
@@ -217,12 +198,12 @@ parse_message_package(BadMessagePackage) ->
 %%
 
 mstone_init(MessagePackage, RunTime, Factor, DrvInclude) ->
-%%     io:format("mstone_init -> entry with"
-%% 	      "~n   MessagePackage: ~p"
-%% 	      "~n   RunTime:        ~p"
-%% 	      "~n   Factor:         ~p"
-%% 	      "~n   DrvInclude:     ~p"
-%% 	      "~n", [MessagePackage, RunTime, Factor, DrvInclude]),
+    %% io:format("MStone init with:"
+    %%           "~n   MessagePackage: ~p"
+    %%           "~n   RunTime:        ~p ms"
+    %%           "~n   Factor:         ~p"
+    %%           "~n   DrvInclude:     ~p"
+    %%           "~n", [MessagePackage, RunTime, Factor, DrvInclude]),
     Codecs = ?MSTONE_CODECS, 
     mstone_init(MessagePackage, RunTime, Factor, Codecs, DrvInclude).
 
@@ -246,7 +227,6 @@ do_mstone(MessagePackage, RunTime, Factor, Codecs, DrvInclude) ->
     ?LIB:display_system_info(),
     ?LIB:display_app_info(),
     io:format("~n", []),
-    (catch asn1rt_driver_handler:load_driver()),
     {Pid, Conf} = ?LIB:start_flex_scanner(),
     put(flex_scanner_conf, Conf),
     EMessages = ?LIB:expanded_messages(MessagePackage, Codecs, DrvInclude), 
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone2.erl b/lib/megaco/examples/meas/megaco_codec_mstone2.erl
index 07ed82a9f0..d0c376a0a7 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone2.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone2.erl
@@ -22,8 +22,6 @@
 %%----------------------------------------------------------------------
 %% 
 %% megaco_codec_mstone2:start().
-%% megaco_codec_mstone2:start_no_drv().
-%% megaco_codec_mstone2:start_only_drv().
 %% 
 %%----------------------------------------------------------------------
 %% Purpose: mstone 2 measurement
@@ -54,10 +52,7 @@
 
 %% Exports
 -export([
-	 start/0,          start/1, 
-	 start_flex/0,     start_flex/1, 
-	 start_no_drv/0,   start_no_drv/1, 
-	 start_only_drv/0, start_only_drv/1
+	 start/0, start/1, start/2, start/3
 	]).
 
 
@@ -67,11 +62,6 @@
 
 -define(LIB, megaco_codec_mstone_lib).
 
--ifndef(MSTONE_TIME).
--define(MSTONE_TIME, 10).
--endif.
--define(MSTONE_RUN_TIME, timer:minutes(?MSTONE_TIME)).
-
 -ifndef(MSTONE_VERSION3).
 -define(MSTONE_VERSION3, v3).
 -endif.
@@ -82,18 +72,14 @@
 -endif.
 
 -define(DEFAULT_MESSAGE_PACKAGE, megaco_codec_transform:default_message_package()).
--define(DEFAULT_FACTOR,          1).
--define(DEFAULT_DRV_INCLUDE,     ignore).
+-define(DEFAULT_MODE,            standard).
+-define(DEFAULT_TIME,            1).
+-define(DEFAULT_RUN_TIME,        timer:minutes(?DEFAULT_TIME)).
 
--ifndef(MSTONE_RUNNER_MIN_HEAP_SZ).
-%% -define(MSTONE_RUNNER_MIN_HEAP_SZ,  16#7fff).
--define(MSTONE_RUNNER_MIN_HEAP_SZ,  16#ffff).
+%% -define(MSTONE_RUNNER_MIN_HEAP_SZ, 16#7fff).
+%% -define(MSTONE_RUNNER_MIN_HEAP_SZ, 16#ffff).
 %% -define(MSTONE_RUNNER_MIN_HEAP_SZ, 16#17ffe).
 %% -define(MSTONE_RUNNER_MIN_HEAP_SZ, 16#1ffff).
-%% -define(MSTONE_RUNNER_OPTS, [link]).
--endif.
--define(MSTONE_RUNNER_OPTS, 
-        [link, {min_heap_size, ?MSTONE_RUNNER_MIN_HEAP_SZ}]).
 
 
 %%%----------------------------------------------------------------------
@@ -102,7 +88,12 @@
 
 -record(codec_data, {ref, mod, config = [], msgs = []}).
 
--record(state, {timer, running = [], idle = [], flex_handler, flex_conf}).
+-record(state, {min_heap_sz = default, % ?MSTONE_RUNNER_MIN_HEAP_SZ
+                timer,
+                running     = [],
+                idle        = [],
+                flex_handler,
+                flex_conf}).
 
 
 %%%----------------------------------------------------------------------
@@ -110,48 +101,47 @@
 %%%----------------------------------------------------------------------
 
 start() ->
-    start(?DEFAULT_MESSAGE_PACKAGE).
-
-start([MessagePackage]) ->
-    do_start(MessagePackage, ?DEFAULT_DRV_INCLUDE);
+    do_start(?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);
+start(RunTime) when is_integer(RunTime) andalso (RunTime > 0) ->
+    do_start(time:minutes(RunTime), ?DEFAULT_MODE, ?DEFAULT_MESSAGE_PACKAGE);
 start(MessagePackage) ->
-    do_start(MessagePackage, ?DEFAULT_DRV_INCLUDE).
-
-
-start_flex() ->
-    start_flex(?DEFAULT_MESSAGE_PACKAGE).
-
-start_flex([MessagePackage]) ->
-    do_start(MessagePackage, flex);
-start_flex(MessagePackage) ->
-    do_start(MessagePackage, flex).
-
-
-start_no_drv() ->
-    start_no_drv(?DEFAULT_MESSAGE_PACKAGE).
-
-start_no_drv([MessagePackage]) ->
-    do_start(MessagePackage, no_drv);
-start_no_drv(MessagePackage) ->
-    do_start(MessagePackage, no_drv).
-
-
-start_only_drv() ->
-    start_only_drv(?DEFAULT_MESSAGE_PACKAGE).
-
-start_only_drv([MessagePackage]) ->
-    do_start(MessagePackage, only_drv);
-start_only_drv(MessagePackage) ->
-    do_start(MessagePackage, only_drv).
-
-
-do_start(MessagePackageRaw, DrvInclude) ->
-%%     io:format("do_start -> entry with"
-%% 	      "~n   MessagePackageRaw: ~p"
-%% 	      "~n   DrvInclude:        ~p"
-%% 	      "~n", [MessagePackageRaw, DrvInclude]), 
+    do_start(?DEFAULT_RUN_TIME, ?DEFAULT_MODE, MessagePackage).
+
+start(RunTime, Mode)
+  when is_integer(RunTime) andalso
+       (RunTime > 0) andalso
+       ((Mode =:= standard) orelse
+        (Mode =:= flex) orelse
+        (Mode =:= no_drv) orelse
+        (Mode =:= only_drv)) ->
+    do_start(timer:minutes(RunTime), Mode, ?DEFAULT_MESSAGE_PACKAGE);
+start(RunTime, MessagePackage) when is_integer(RunTime) andalso (RunTime > 0) ->
+    do_start(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).
+
+start(RunTime, Mode, MessagePackage)
+  when is_integer(RunTime) andalso
+       (RunTime > 0) andalso
+       ((Mode =:= standard) orelse
+        (Mode =:= flex) orelse
+        (Mode =:= no_drv) orelse
+        (Mode =:= only_drv)) ->
+    do_start(timer:minutes(RunTime), Mode, MessagePackage).
+
+do_start(RunTime, Mode, MessagePackageRaw) ->
     MessagePackage = parse_message_package(MessagePackageRaw),
-    mstone_init(MessagePackage, DrvInclude).
+    mstone_init(RunTime, Mode, MessagePackage).
     
 parse_message_package(MessagePackageRaw) when is_list(MessagePackageRaw) ->
     list_to_atom(MessagePackageRaw);
@@ -161,21 +151,28 @@ parse_message_package(BadMessagePackage) ->
     throw({error, {bad_message_package, BadMessagePackage}}).
 
 
-mstone_init(MessagePackage, DrvInclude) ->
+mstone_init(RunTime, Mode, MessagePackage) ->
     io:format("~n", []),
+    %% io:format("MStone init with"
+    %%           "~n   Run Time:        ~p ms"
+    %%           "~n   Mode:            ~p"
+    %%           "~n   Message Package: ~p"
+    %%           "~n", [RunTime, Mode, MessagePackage]),
     ?LIB:display_os_info(),
     ?LIB:display_system_info(),
     ?LIB:display_app_info(),
     io:format("~n", []),
     Ref = erlang:monitor(process, 
 			 spawn(fun() -> 
-				       loader(MessagePackage, DrvInclude) 
+				       loader(RunTime, Mode, MessagePackage) 
 			       end)),
     receive
 	{'DOWN', Ref, process, _Pid, {done, Result}} ->
 	    display_result(Result);
 	{'DOWN', Ref, process, _Pid, Result} ->
-	    io:format("Unexpected result:~n~p~n", [Result]),
+	    io:format("Unexpected result:"
+                      "~n      ~p"
+                      "~n", [Result]),
 	    ok
     end.
 
@@ -213,13 +210,6 @@ image_of(megaco_erl_dist_encoder, Conf) ->
     erl_image("erl_dist", Conf).
 
 bin_image(Bin, Conf) ->
-    Drv = 
-	case lists:member(driver, Conf) of
-	    true ->
-		[driver];
-	    false ->
-		[]
-	end,
     Nat = 
 	case lists:member(native, Conf) of
 	    true ->
@@ -227,7 +217,7 @@ bin_image(Bin, Conf) ->
 	    false ->
 		[]
 	end,
-    io_lib:format("~s ~w", [Bin, Drv ++ Nat]).
+    io_lib:format("~s ~w", [Bin, Nat]).
 
 text_image(Txt, Conf) ->
     Flex = 
@@ -259,8 +249,8 @@ erl_image(Erl, Conf) ->
 
 %%%----------------------------------------------------------------------
 
-loader(MessagePackage, DrvInclude) ->
-    loader(?MSTONE_CODECS, MessagePackage, DrvInclude).
+loader(RunTime, Mode, MessagePackage) ->
+    loader(RunTime, Mode, ?MSTONE_CODECS, MessagePackage).
 
 
 %% Codecs is a list of megaco codec shortnames: 
@@ -268,24 +258,24 @@ loader(MessagePackage, DrvInclude) ->
 %%    pretty | compact | ber | per | erlang
 %%
 
-loader(Codecs, MessagePackage, DrvInclude) ->
+loader(RunTime, Mode, Codecs, MessagePackage) ->
     process_flag(trap_exit, true),
-    case (catch init(Codecs, MessagePackage, DrvInclude)) of
+    case (catch init(RunTime, Mode, Codecs, MessagePackage)) of
 	{ok, State} ->
 	    loader_loop(running, State);
 	Error ->
 	    exit(Error)
     end.
 
-init(Codecs, MessagePackage, DrvInclude) ->
+init(RunTime, Mode, Codecs, MessagePackage) ->
     ets:new(mstone, [set, private, named_table, {keypos, 1}]),
     ets:insert(mstone, {worker_cnt, 0}),
     {Pid, FlexConf} = ?LIB:start_flex_scanner(),
     io:format("prepare messages", []),
-    EMessages = ?LIB:expanded_messages(MessagePackage, Codecs, DrvInclude), 
+    EMessages = ?LIB:expanded_messages(MessagePackage, Codecs, Mode), 
     io:format("~ninit codec data", []),
     CodecData = init_codec_data(EMessages, FlexConf),
-    Timer = erlang:send_after(?MSTONE_RUN_TIME, self(), mstone_finished), 
+    Timer = erlang:send_after(RunTime, self(), mstone_finished), 
     io:format("~n", []),
     {ok, #state{timer        = Timer, 
 		idle         = CodecData, 
@@ -325,28 +315,34 @@ loader_loop(finishing, #state{flex_handler = Pid, running = []}) ->
 loader_loop(finishing, State) ->
     receive
 	{'DOWN', Ref, process, _Pid, {mstone_done, Codec, Conf, Cnt}} ->
+            %% io:format("[loader:finishing] worker done~n", []),
 	    loader_loop(finishing, done_worker(Ref, Codec, Conf, Cnt, State))
     end;
 
 loader_loop(running, #state{idle = []} = State) ->	    
     receive
 	mstone_finished ->
+            %% io:format("[loader:running,idle] -> finish~n", []),
 	    loader_loop(finishing, State);
 
 	{'DOWN', Ref, process, _Pid, {mstone_done, Codec, Conf, Cnt}} ->
+            %% io:format("[loader:running] worker done~n", []),
 	    loader_loop(running, done_worker(Ref, Codec, Conf, Cnt, State))
     end;
 
 loader_loop(running, State) ->	
     receive
 	mstone_finished ->
+            %% io:format("[loader:running] -> finish~n", []),
 	    loader_loop(finishing, State);
 
 	{'DOWN', Ref, process, _Pid, {mstone_done, Codec, Conf, Cnt}} ->
+            %% io:format("[loader:running] worker done~n", []),
 	    State2 = done_worker(Ref, Codec, Conf, Cnt, State),
 	    loader_loop(running, State2)
 
     after 0 ->
+            %% io:format("[loader:running] start worker~n", []),
 	    loader_loop(running, start_worker(State))
     end.
 
@@ -359,14 +355,22 @@ done_worker(Ref, Codec, Conf, Cnt,
     CD = Running -- Running2,
     State#state{running = Running2, idle = lists:append(Idle, CD)}.
 
-start_worker(#state{running = Running, idle = [H|T]} = State) ->
+start_worker(#state{min_heap_sz = SZ,
+                    running = Running, idle = [H|T]} = State) ->
     #codec_data{mod = Codec, config = Conf, msgs = Msgs} = H,
-    Worker = fun() -> worker(Codec, Conf, Msgs, 0) end, 
-    Ref    = erlang:monitor(process, spawn(Worker)),
+    Worker = fun() -> worker(Codec, Conf, Msgs, 0) end,
+    {_, Ref} = erlang:spawn_opt(Worker, worker_spawn_opts(SZ)),
+    %% Ref    = erlang:monitor(process, spawn(Worker)),
     CD = H#codec_data{ref = Ref},
     State#state{running = [CD | Running], idle = T}.
 
 
+worker_spawn_opts(SZ) when is_integer(SZ) andalso (SZ > 0) ->
+    [monitor, {min_heap_size, SZ}];
+worker_spawn_opts(_) ->
+    [monitor].
+
+
 %%%----------------------------------------------------------------------
 
 worker(Codec, Conf, [], Cnt) ->
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
index 060f7ebeca..0fe1f78b1b 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
@@ -35,7 +35,8 @@
 	 display_system_info/0, 
 	 display_alloc_info/0, 
 	 display_app_info/0,
-	 detect_version/3]).
+	 detect_version/3,
+         parse_runtime/1]).
 
 %% Internal exports
 -export([flex_scanner_handler/1]).
@@ -430,6 +431,37 @@ expand_codec(Codec, _) ->
     end.
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+parse_runtime(RunTimeAtom) when is_atom(RunTimeAtom) ->
+    parse_runtime_str(atom_to_list(RunTimeAtom));
+parse_runtime(RunTimeStr) when is_list(RunTimeStr) ->
+    parse_runtime_str(RunTimeStr);
+parse_runtime(RunTime) when is_integer(RunTime) andalso (RunTime > 0) ->
+    timer:minutes(RunTime);
+parse_runtime(BadRunTime) ->
+    throw({error, {bad_runtime, BadRunTime}}).
+
+parse_runtime_str(RuneTimeStr) ->
+    try
+        begin
+            case lists:reverse(RuneTimeStr) of
+                [$s|Rest] ->
+                    timer:seconds(list_to_integer(lists:reverse(Rest)));
+                [$m|Rest] ->
+                    timer:minutes(list_to_integer(lists:reverse(Rest)));
+                [$h|Rest] ->
+                    timer:hours(list_to_integer(lists:reverse(Rest)));
+                _ ->
+                    timer:minutes(list_to_integer(RuneTimeStr))
+            end
+        end
+    catch
+        _:_:_ ->
+            throw({error, {bad_runtime, RuneTimeStr}})
+    end.
+
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
diff --git a/lib/megaco/examples/meas/megaco_codec_transform.erl b/lib/megaco/examples/meas/megaco_codec_transform.erl
index 7960e08dc2..50d9711001 100644
--- a/lib/megaco/examples/meas/megaco_codec_transform.erl
+++ b/lib/megaco/examples/meas/megaco_codec_transform.erl
@@ -112,7 +112,8 @@ load_messages(Dir, MessagePackage) ->
 	    {error, {bad_messages, Crap}};
 	
 	Error ->
-	    Error
+	    %% exit({Error, Dir, MessagePackage, Filename})
+            Error
     end.
     
 messages(BaseCodec, Msgs) ->
diff --git a/lib/megaco/examples/meas/modules.mk b/lib/megaco/examples/meas/modules.mk
index b8ea8a69f5..50c59a79b0 100644
--- a/lib/megaco/examples/meas/modules.mk
+++ b/lib/megaco/examples/meas/modules.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2002-2016. All Rights Reserved.
+# Copyright Ericsson AB 2002-2022. All Rights Reserved.
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@
 
 SCRIPT_SKELETON_SRC = \
 	meas.sh.skel.src \
-	mstone1.sh.skel.src
+	mstone1.sh.skel.src \
+	mstone2.sh.skel.src
 
 MESSAGE_PACKAGES = \
 	time_test.msgs
diff --git a/lib/megaco/examples/meas/mstone2.sh.skel.src b/lib/megaco/examples/meas/mstone2.sh.skel.src
new file mode 100644
index 0000000000..67621f9ea6
--- /dev/null
+++ b/lib/megaco/examples/meas/mstone2.sh.skel.src
@@ -0,0 +1,178 @@
+#!/bin/sh
+
+#
+# %CopyrightBegin%
+# 
+# Copyright Ericsson AB 2022-2022. All Rights Reserved.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# 
+# %CopyrightEnd%
+
+# Skeleton for a script intended to run the mstone1(N) 
+# performance test.
+#
+
+# Get the name of the program
+program=`echo $0 | sed 's#.*/##g'`
+
+usage="\
+Usage: $program [options]
+
+This shell script is used to run the mstone 1 (factor) performance 
+test. It is not intended to test the megaco stack but instead to 
+give a \"performance value\" of the host on which it is run.
+
+Options:
+ -help                  display this help and exit.
+ -mp <message package>  message package to use for test
+                        default is time_test
+ -h <num>               default process heap size
+ -a <num>               async thread pool size (default is 0)
+ -t <run time>          The runtime of the test
+                        Format: <value>[unit], where unit can be:
+                           s: seconds
+                           m: minutes (default)
+                           h: hours
+                        If no unit is provided, minutes is assumed.
+                        defaults to 10 minutes
+ -s <num sched>         normally we let the VM decide the number of schedulers
+                        but if this option is given, the number of
+                        schedulers is fixed (to the value set by this option).
+                        The options -s and -f cannot both be present.
+ -d <drv-mode>          driver mode for the test:
+                        std  - all codec config(s) will be used
+                        flex - only the text codec config(s) utilizing the 
+                               flex scanner will be used
+                        nd   - only codec config(s) without drivers will be used
+                        od   - only codec config(s) with drivers will be used
+ -sbt <bind-type>       Set scheduler bind type. See erl man page for more info.
+                        tnnps - Thread no node processor spread (default)
+                        u     - Unbound
+                        ns    - No spread
+                        ts    - Thread spread
+                        ps    - Processor spread
+                        s     - Spread
+                        nnts  - No node thread spread
+                        nnps  - No node processor spread
+ --                     everything after this is just passed on to erl.
+"
+
+ERL_HOME=<path to otp top dir>
+MEGACO_HOME=$ERL_HOME/lib/erlang/lib/megaco-%VSN%
+MEAS_HOME=$MEGACO_HOME/examples/meas
+PATH=$ERL_HOME/bin:$PATH
+
+MODULE=megaco_codec_mstone2
+STARTF="start"
+MODE=standard
+MSG_PACK=time_test
+SBT="+sbt tnnps"
+RT=1
+SCHED=default
+
+while test $# != 0; do
+    # echo "DBG: Value = $1"
+    case  $1 in
+        -help)
+            echo "$usage" ;
+            exit 0;;
+
+        -mp)
+            MSG_PACK="$2";
+            shift ; shift ;;
+
+        -h)
+            PHS="+h $2";
+            shift ; shift ;;
+
+        -a)
+            ATP="+A $2";
+            shift ; shift ;;
+
+        -t)
+            RT="$2";
+            shift ; shift ;;
+
+        -d)
+	    case $2 in
+		std)
+		    MODE="standard";
+		    shift ; shift ;;
+		flex)
+		    MODE="flex";
+		    shift ; shift ;;
+		nd)
+		    MODE="no_drv";
+		    shift ; shift ;;
+		od)
+		    MODE="only_drv";
+		    shift ; shift ;;
+		*)
+		    echo "unknown driver mode: $2";
+		    echo "$usage" ;
+		    exit 0
+	    esac;;
+	    
+        -sbt)
+	    case $2 in
+		tnnps|u|ns|ts|ps|s|nnts|nnps)
+		    SBT="+sbt $2";
+		    shift ; shift ;;
+		*)
+		    echo "unknown scheduler bind type: $2";
+		    echo "$usage" ;
+		    exit 0
+	    esac;;
+	    
+        -s)
+            SCHED="$2";
+            shift ; shift ;;
+
+        --)
+            shift ;
+            break;;
+
+        *)
+            echo "unknown option: $1";
+            echo "$usage" ;
+            exit 0
+    esac
+done
+
+MSTONE="-s $MODULE $STARTF $RT $MODE $MSG_PACK"
+
+if [ $SCHED = default ]; then
+    SMP_OPTS=""
+else
+    SMP_OPTS="-smp +S $SCHED"
+fi
+LOG="mstone2-$SCHED.log"
+
+echo ""
+echo "---------------------------------------------"
+echo ""
+
+ERL="erl \
+     -noshell \
+     $SBT \
+     $PHS \
+     $ATP \
+     $SMP_OPTS \
+     -pa $MEAS_HOME \
+     $MSTONE \
+     $* \
+     -s init stop"
+
+echo $ERL
+$ERL | tee $LOG
diff --git a/lib/megaco/test/megaco_examples_SUITE.erl b/lib/megaco/test/megaco_examples_SUITE.erl
index 549840e280..bf56202eda 100644
--- a/lib/megaco/test/megaco_examples_SUITE.erl
+++ b/lib/megaco/test/megaco_examples_SUITE.erl
@@ -31,11 +31,16 @@
          init_per_group/2,    end_per_group/2,
 	 init_per_testcase/2, end_per_testcase/2, 
 
-         simple/1
+         simple/1,
+         
+         meas/1,
+         mstone1/1,
+         mstone2/1
 
         ]).
 
 
+-include_lib("common_test/include/ct.hrl").
 -include("megaco_test_lib.hrl").
 -include_lib("megaco/include/megaco.hrl").
 -include_lib("megaco/include/megaco_message_v1.hrl").
@@ -50,11 +55,21 @@ suite() ->
 
 all() -> 
     [
-     simple
+     simple,
+     {group, meas}
     ].
 
 groups() -> 
-    [].
+    [
+     {meas, [], meas_cases()}
+    ].
+
+meas_cases() ->
+    [
+     meas,
+     mstone1,
+     mstone2
+    ].
 
 
 
@@ -122,22 +137,65 @@ end_per_group(_GroupName, Config) ->
 %% -----
 %%
 
-init_per_testcase(Case, Config) ->
+init_per_testcase(simple = Case, Config) ->
 
     p("init_per_testcase -> entry with"
       "~n   Config: ~p"
       "~n   Nodes:  ~p", [Config, erlang:nodes()]),
-    
+
     megaco_test_global_sys_monitor:reset_events(),
 
     put(dbg,true),
-    purge_examples(),
-    load_examples(),
+    purge_example_simple(),
+    load_example_simple(),
     megaco:enable_trace(max, io),
 
-    megaco_test_lib:init_per_testcase(Case, Config).
+    megaco_test_lib:init_per_testcase(Case, Config);
+
+init_per_testcase(meas = Case, Config) ->
+
+    p("init_per_testcase -> entry with"
+      "~n   Config: ~p"
+      "~n   Nodes:  ~p", [Config, erlang:nodes()]),
+
+    megaco_test_global_sys_monitor:reset_events(),
+    init_per_testcase_meas(Case, example_meas_meas_modules(), Config);
+
+init_per_testcase(mstone1 = Case, Config) ->
+
+    p("init_per_testcase -> entry with"
+      "~n   Config: ~p"
+      "~n   Nodes:  ~p", [Config, erlang:nodes()]),
+
+    megaco_test_global_sys_monitor:reset_events(),
+    init_per_testcase_meas(Case, example_meas_mstone1_modules(), Config);
+
+init_per_testcase(mstone2 = Case, Config) ->
+
+    p("init_per_testcase -> entry with"
+      "~n   Config: ~p"
+      "~n   Nodes:  ~p", [Config, erlang:nodes()]),
+
+    megaco_test_global_sys_monitor:reset_events(),
+    init_per_testcase_meas(Case, example_meas_mstone2_modules(), Config).
+
 
-end_per_testcase(Case, Config) ->
+init_per_testcase_meas(Case, Mods, Config) ->
+    purge_example(Mods),
+    load_example_meas(),
+
+    p("try start worker node"),
+    try start_unique_node(Case) of
+        WorkerNode ->
+            megaco_test_lib:init_per_testcase(Case, [{worker_node, WorkerNode} | Config])
+    catch
+        _:{failed_starting_node, NodePre, Reason} ->
+            {skip, ?F("Failed starting node ~p: ~p", [NodePre, Reason])}
+    end.
+    
+
+
+end_per_testcase(simple = Case, Config) ->
 
     p("end_per_testcase -> entry with"
       "~n   Config: ~p"
@@ -146,43 +204,117 @@ end_per_testcase(Case, Config) ->
     p("system events during test: "
       "~n   ~p", [megaco_test_global_sys_monitor:events()]),
 
-    purge_examples(),
+    purge_example_simple(),
     erase(dbg),
     megaco:disable_trace(),
 
-    megaco_test_lib:end_per_testcase(Case, Config).
+    megaco_test_lib:end_per_testcase(Case, Config);
 
+end_per_testcase(meas = Case, Config) ->
+
+    p("end_per_testcase -> entry with"
+      "~n   Config: ~p"
+      "~n   Nodes:  ~p", [Config, erlang:nodes()]),
+
+    p("system events during test: "
+      "~n   ~p", [megaco_test_global_sys_monitor:events()]),
+
+    end_per_testcase_meas(Case, example_meas_meas_modules(), Config);
+
+end_per_testcase(mstone1 = Case, Config) ->
+
+    p("end_per_testcase -> entry with"
+      "~n   Config: ~p"
+      "~n   Nodes:  ~p", [Config, erlang:nodes()]),
+
+    p("system events during test: "
+      "~n   ~p", [megaco_test_global_sys_monitor:events()]),
+
+    end_per_testcase_meas(Case, example_meas_mstone1_modules(), Config);
+
+end_per_testcase(mstone2 = Case, Config) ->
+
+    p("end_per_testcase -> entry with"
+      "~n   Config: ~p"
+      "~n   Nodes:  ~p", [Config, erlang:nodes()]),
+
+    p("system events during test: "
+      "~n   ~p", [megaco_test_global_sys_monitor:events()]),
+
+    end_per_testcase_meas(Case, example_meas_mstone2_modules(), Config).
+
+end_per_testcase_meas(Case, Mods, Config) ->
+    purge_example(Mods),
+    case lists:keysearch(worker_node, 1, Config) of
+        {value, {worker_node, WorkerNode}} ->
+            ?STOP_NODE(WorkerNode),
+            megaco_test_lib:end_per_testcase(Case, lists:keydelete(worker_node, 1, Config));
+        false ->
+            megaco_test_lib:end_per_testcase(Case, Config)
+    end.
 
-example_modules() ->
-    [
-     megaco_simple_mg,
-     megaco_simple_mgc
-    ].
 
-load_examples() ->
+load_example_simple() ->
+    load_example(simple).
+
+load_example_meas() ->
+    load_example(meas).
+
+load_example(Example) ->
     case code:lib_dir(megaco) of
 	{error, Reason} ->
 	    {error, Reason};
 	Dir ->
-	    SimpleDir = filename:join([Dir, examples, simple]),
-	    case code:add_path(SimpleDir) of
+	    ExampleDir = filename:join([Dir, examples, Example]),
+	    case code:add_path(ExampleDir) of
 		true ->
 		    ok;
 		{error, What} ->
-		    error_logger:error_msg("failed adding examples path: "
+		    error_logger:error_msg("failed adding examples ~p path: "
 					   "~n   ~p"
-					   "~n", [What]),
-		    {error, {failed_add_path, What}}
+					   "~n", [Example, What]),
+		    {error, {failed_add_path, Example, What}}
 	    end
     end.
 
 
-purge_examples() ->
+example_simple_modules() ->
+    [
+     megaco_simple_mg,
+     megaco_simple_mgc
+    ].
+
+purge_example_simple() ->
+    purge_example(example_simple_modules()).
+
+
+example_meas_meas_modules() ->
+    [
+     megaco_codec_meas,
+     megaco_codec_transform
+    ].
+
+example_meas_mstone1_modules() ->
+    [
+     megaco_codec_mstone1,
+     megaco_codec_mstone_lib,
+     megaco_codec_transform
+    ].
+
+example_meas_mstone2_modules() ->
+    [
+     megaco_codec_mstone2,
+     megaco_codec_mstone_lib,
+     megaco_codec_transform
+    ].
+
+
+purge_example(Mods) ->
     case code:lib_dir(megaco) of
 	{error, Reason} ->
 	    {error, Reason};
 	_Dir ->
-	    [code:purge(M) || M <- example_modules()]
+	    [code:purge(M) || M <- Mods]
     end.
 
 
@@ -443,10 +575,95 @@ users(Proxy) ->
     end.
 
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% ------------------ meas:meas ------------------------
+
+meas(suite) ->
+    [];
+meas(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_meas, start, [100]).
+
+do_meas(SName, Node, Mod, Func, Args) ->
+    put(sname, SName),
+    F = fun() ->
+                exit( rpc:call(Node, Mod, Func, Args) )
+        end,
+    p("start worker process"),
+    {Pid, MRef} = spawn_monitor(F),
+    p("await completion"),
+    receive
+        {'DOWN', MRef, process, Pid, {error, Reason}} ->
+            p("<ERROR> worker process terminated: "
+              "~n      ~p", [Reason]),
+            ?FAIL(Reason);
+        {'DOWN', MRef, process, Pid, Reason} ->
+            p("worker process terminated: "
+              "~n      ~p", [Reason]),
+            ok
+    end,
+    ok.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% ------------------ meas:mstone1 ------------------------
+
+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]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% ------------------ meas:mstone2 ------------------------
+
+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]).
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+start_unique_node(Pre) ->
+    start_unique_node(Pre, 3).
+
+start_unique_node(Pre, 0) -> 
+    ?FAIL({failed_starting_node, Pre, tries});
+start_unique_node(Pre, N) when is_integer(N) andalso (N > 0) ->
+    Node = unique_node_name(Pre),
+    try ?START_NODE(Node, true) of
+        ok ->
+            Node
+    catch
+        exit:{skip, {fatal, {node_already_running, _}, _, _}} ->
+            ?SLEEP(100),
+            start_unique_node(Pre, N-1);
+        exit:{skip, {fatal, {cannot_start_node, _, Reason}, _, _}} ->
+            ?FAIL({failed_starting_node, Pre, Reason})
+    end.
+
+
+unique_node_name(Pre) ->
+    [_, Host] = string:tokens(atom_to_list(node()), [$@]),
+    list_to_atom(?F("~s@~s", [?UNIQUE(Pre), Host])).
+
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% p(F) ->
-%%     p(F, []).
+p(F) ->
+    p(F, []).
 
 p(F, A) ->
     p(get(sname), F, A).
diff --git a/lib/megaco/test/megaco_test_lib.erl b/lib/megaco/test/megaco_test_lib.erl
index e39e1e3e8a..89c57b2e6e 100644
--- a/lib/megaco/test/megaco_test_lib.erl
+++ b/lib/megaco/test/megaco_test_lib.erl
@@ -2187,7 +2187,6 @@ stop_nodes([Node|Nodes], Acc, File, Line) ->
     
 
 stop_node(Node, File, Line) when is_atom(Node) ->
-    p("try stop node ~p", [Node]),
     case stop_node(Node) of
         ok ->
             ok;
diff --git a/lib/megaco/test/megaco_test_lib.hrl b/lib/megaco/test/megaco_test_lib.hrl
index 653af70da4..9e69fecf40 100644
--- a/lib/megaco/test/megaco_test_lib.hrl
+++ b/lib/megaco/test/megaco_test_lib.hrl
@@ -49,6 +49,9 @@
 -define(SKIP(Reason),
 	?LIB:skip(Reason, ?MODULE, ?LINE)).
 
+-define(FAIL(Reason),
+	exit({Reason, ?MODULE, ?LINE})).
+
 -define(VERIFYL(Expected, Expr),
 	fun(A,B) when list(A), list(B) ->
 		A1 = lists:sort(A),
@@ -125,3 +128,6 @@
 	io:format(user, "~n*** ~s *** case ~w:~w init~n~n", 
 		  [?FTS(), ?MODULE, C])).
 
+-define(UNIQUE(__PreName__),
+        list_to_atom(
+          ?F("~w_~w", [__PreName__, erlang:system_time(millisecond)]))).
-- 
2.31.1

Places

File 0372-megaco-examples-Update-meas-test-tools-and-add-test-.patch of Package erlang (Revision 57cf7c87cb80e2aaaf3f20327bf57529)

Places