Merge branch 'bmk/megaco/megaco31601_integration/r15' into maint

9 files changed, 132 insertions, 37 deletions

diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index d9c575885f..393064fbb5 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2000</year><year>2011</year>
+      <year>2000</year><year>2012</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -36,6 +36,75 @@
     section is the version number of Megaco.</p>
 
 
+  <section><title>Megaco 3.16.0.1</title>
+
+    <p>Version 3.16.0.1 supports code replacement in runtime from/to
+      version 3.16, 3.15.1.1, 3.15.1 and 3.15.</p>
+
+    <section>
+      <title>Improvements and new features</title>
+
+<!--
+      <p>-</p>
+-->
+
+      <list type="bulleted">
+        <item>
+	  <p>Fixed some faulty test cases. </p>
+<!--
+          <p>Own Id: OTP-9795</p>
+-->
+        </item>
+
+        <item>
+          <p>Removed use of deprecated system flag, 
+	  <c>scheduler_bind_type</c>, in the measurement tool 
+	  <c>mstone1</c>. </p>
+          <p>Own Id: OTP-9949</p>
+        </item>
+
+     </list>
+
+    </section>
+
+    <section>
+      <title>Fixed bugs and malfunctions</title>
+      
+      <p>-</p>
+      
+ <!--
+      <list type="bulleted">
+	<item>
+	  <p>Fixing miscellaneous things detected by dialyzer. </p>
+	  <p>Own Id: OTP-9075</p>
+	</item>
+	
+      </list>
+ -->
+      
+    </section>
+
+    <section>
+      <title>Incompatibilities</title>
+      <p>-</p>
+
+<!--
+      <list type="bulleted">
+        <item>
+	  <p>Due to the change in the flex driver API, 
+	  we may no longer be able to build and/or use 
+	  the flex driver without reentrant support. </p>
+          <p>Own Id: OTP-9795</p>
+        </item>
+
+      </list>
+-->
+
+    </section>
+
+  </section> <!-- 3.16.0.1 -->
+
+
   <section><title>Megaco 3.16</title>
 
     <p>Version 3.16 supports code replacement in runtime from/to
@@ -50,7 +119,7 @@
 
       <list type="bulleted">
         <item>
-          <p>Minor improvemnts to the emasurement tool mstone1. </p>
+          <p>Minor improvements to the measurement tool <c>mstone1</c>. </p>
           <p>Own Id: OTP-9604</p>
         </item>
 
diff --git a/lib/megaco/examples/meas/meas.sh.skel.src b/lib/megaco/examples/meas/meas.sh.skel.src
index c7bd6cdd2a..ecf463b9c6 100644
--- a/lib/megaco/examples/meas/meas.sh.skel.src
+++ b/lib/megaco/examples/meas/meas.sh.skel.src
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 2007-2011. All Rights Reserved.
+# Copyright Ericsson AB 2007-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -32,6 +32,7 @@ STOP="-s init stop"
 
 ERL="erl \
      -noshell \
+     +sbt tnnps \
      -pa $MEAS_HOME \
      $MEAS_DEFAULT \
      $STOP"
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone1.erl b/lib/megaco/examples/meas/megaco_codec_mstone1.erl
index 9ab7822df8..2133cd633c 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone1.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -191,7 +191,6 @@ mstone_init(MessagePackage, Factor, Codecs, DrvInclude) ->
 			 
 do_mstone(MessagePackage, Factor, Codecs, DrvInclude) ->
     io:format("~n", []),
-    ?LIB:set_default_sched_bind(),
     ?LIB:display_os_info(),
     ?LIB:display_system_info(),
     ?LIB:display_app_info(),
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone2.erl b/lib/megaco/examples/meas/megaco_codec_mstone2.erl
index f3588f2e3d..54b889345f 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone2.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone2.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -40,7 +40,7 @@
 %%            When the finished timer expires, it will stop respawing
 %%            the worker processes, and instead just wait for them all
 %%            to finish. 
-%%            The test is finished by printing the statistics.
+%%            The test is finishes by printing the statistics.
 %%          - A worker process for each codec combination.
 %%            This process is spawned by the loader process. It receives
 %%            at start a list of messages. It shall decode and then 
@@ -162,7 +162,6 @@ parse_message_package(BadMessagePackage) ->
 
 mstone_init(MessagePackage, DrvInclude) ->
     io:format("~n", []),
-    ?LIB:set_default_sched_bind(), 
     ?LIB:display_os_info(),
     ?LIB:display_system_info(),
     ?LIB:display_app_info(),
diff --git a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
index 040af9826b..ca8016d65f 100644
--- a/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
+++ b/lib/megaco/examples/meas/megaco_codec_mstone_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2006-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -30,7 +30,6 @@
 -compile({no_auto_import,[error/1]}).
 -export([start_flex_scanner/0, stop_flex_scanner/1,
 	 expanded_messages/2, expanded_messages/3, 
-	 set_default_sched_bind/0,
 	 display_os_info/0, 
 	 display_system_info/0, 
 	 display_alloc_info/0, 
@@ -70,16 +69,6 @@ detect_version(Codec, Conf, Bin) ->
 
 %%----------------------------------------------------------------------
 %% 
-%% S c h e d u l e r   b i n d   t y p e
-%% 
-%%----------------------------------------------------------------------
-
-set_default_sched_bind() ->
-    (catch erlang:system_flag(scheduler_bind_type, default_bind)).
-
-
-%%----------------------------------------------------------------------
-%% 
 %% D i s p l a y   O s   I n f o 
 %% 
 %%----------------------------------------------------------------------
diff --git a/lib/megaco/examples/meas/mstone1.sh.skel.src b/lib/megaco/examples/meas/mstone1.sh.skel.src
index 54a6c61a58..b1935acef6 100644
--- a/lib/megaco/examples/meas/mstone1.sh.skel.src
+++ b/lib/megaco/examples/meas/mstone1.sh.skel.src
@@ -3,7 +3,7 @@
 #
 # %CopyrightBegin%
 # 
-# Copyright Ericsson AB 2007-2011. All Rights Reserved.
+# Copyright Ericsson AB 2007-2012. All Rights Reserved.
 # 
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -55,6 +55,15 @@ Options:
                                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.
 "
 
@@ -67,6 +76,7 @@ MODULE=megaco_codec_mstone1
 STARTF="start"
 FACTOR=""
 MSG_PACK=time_test
+SBT="+sbt tnnps"
 
 while test $# != 0; do
     # echo "DBG: Value = $1"
@@ -107,6 +117,17 @@ while test $# != 0; do
 		    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;;
+	    
         -f)
             if [ "x$SCHED" != "x" ]; then
                 echo "option(s) -s and -f cannot both be given" ;
@@ -177,6 +198,7 @@ if [ $TYPE = factor ]; then
 
         ERL="erl \
           -noshell \
+          $SBT \
           $PHS \
           $ATP \
           $SMP_OPTS \
@@ -218,6 +240,7 @@ elif [ $TYPE = sched ]; then
 
         ERL="erl \
           -noshell \
+          $SBT \
           $PHS \
           $ATP \
           $SMP_OPTS \
diff --git a/lib/megaco/src/app/megaco.appup.src b/lib/megaco/src/app/megaco.appup.src
index 3c9740818a..7f89fa8bc2 100644
--- a/lib/megaco/src/app/megaco.appup.src
+++ b/lib/megaco/src/app/megaco.appup.src
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2012. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -142,10 +142,17 @@
 %%      |
 %%      v
 %%    3.16
+%%      |
+%%      v
+%%   3.16.0.1
 %%
 %%
 {"%VSN%",
  [
+  {"3.16", 
+   [
+   ]
+  },
   {"3.15.1.1", 
    [
     {restart_application, megaco}
@@ -163,6 +170,10 @@
   }
  ],
  [
+  {"3.16", 
+   [
+   ]
+  },
   {"3.15.1.1", 
    [
     {restart_application, megaco}
diff --git a/lib/megaco/test/megaco_mess_test.erl b/lib/megaco/test/megaco_mess_test.erl
index 8bafab1aba..663ac8c329 100644
--- a/lib/megaco/test/megaco_mess_test.erl
+++ b/lib/megaco/test/megaco_mess_test.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2012. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -324,9 +324,6 @@
 min(M) -> timer:minutes(M).
 
 %% Test server callbacks
-% init_per_testcase(pending_ack = Case, Config) ->
-%     put(dbg,true),
-%     megaco_test_lib:init_per_testcase(Case, Config);
 init_per_testcase(otp_7189 = Case, Config) ->
     C = lists:keydelete(tc_timeout, 1, Config),
     megaco_test_lib:init_per_testcase(Case, [{tc_timeout, min(2)} |C]);
@@ -337,9 +334,6 @@ init_per_testcase(Case, Config) ->
     C = lists:keydelete(tc_timeout, 1, Config),
     megaco_test_lib:init_per_testcase(Case, [{tc_timeout, min(1)} |C]).
 
-% end_per_testcase(pending_ack = Case, Config) ->
-%     erase(dbg),
-%     megaco_test_lib:end_per_testcase(Case, Config);
 end_per_testcase(Case, Config) ->
     megaco_test_lib:end_per_testcase(Case, Config).
 
@@ -434,6 +428,7 @@ connect(suite) ->
 connect(doc) ->
     [];
 connect(Config) when is_list(Config) ->
+    %% ?SKIP("Needs a re-write..."),
     ?ACQUIRE_NODES(1, Config),
     PrelMid = preliminary_mid,
     MgMid   = ipv4_mid(4711),
@@ -457,16 +452,25 @@ connect(Config) when is_list(Config) ->
     ?VERIFY(bad_send_mod, megaco:conn_info(PrelCH, send_mod)),
     SC = service_change_request(),
     case megaco:call(PrelCH, [SC], []) of
-	{error, 
-	 {send_message_failed, 
-	  {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _]} | _]}}}} ->
+	{_Version, 
+	 {error, 
+	  {send_message_failed, 
+	   {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _]} | _]}}}}
+	} ->
+	    %% R14B and previous
+	    ?LOG("expected send failure (1)", []),
 	    ok;
 	
 	%% As of R15, we also get some extra info (e.g. line numbers)
-	{error, 
-	 {send_message_failed, 
-	  {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _], _} | _]}}}} ->
+	{_Version, 
+	 {error, 
+	  {send_message_failed, 
+	   {'EXIT', {undef, [{bad_send_mod, send_message, [sh, _], _} | _]}}}}
+	} ->
+	    %% R15B and later
+	    ?LOG("expected send failure (2)", []),
 	    ok;
+
 	Unexpected ->
 	    ?ERROR(Unexpected)
     end,
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index bb6f5f554a..11a951a23e 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -2,7 +2,7 @@
 
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2011. All Rights Reserved.
+# Copyright Ericsson AB 1997-2012. All Rights Reserved.
 #
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
@@ -18,6 +18,6 @@
 # %CopyrightEnd%
 
 APPLICATION = megaco
-MEGACO_VSN  = 3.16
+MEGACO_VSN  = 3.16.0.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"