Merge branch 'maint'

5 files changed, 30 insertions, 19 deletions

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 \