Permalink
Browse files

disable smp by default on client beams (TSUN-97)

SVN Revision: 960
  • Loading branch information...
nniclausse committed Nov 27, 2008
1 parent 00ba153 commit 688f3c98b7b495c5aea16d4f2ce74e2a15e1852c
Showing with 10 additions and 4 deletions.
  1. +4 −1 src/tsung/ts_utils.erl
  2. +4 −3 src/tsung_controller/tsung_controller.app.src.in
  3. +2 −0 tsung.sh.in
View
@@ -275,7 +275,10 @@ erl_system_args(extended)->
end,
Shared = SetArg(shared),
Hybrid = SetArg(hybrid),
- Smp = SetArg(smp),
+ case ?config(smp_disable) of
+ true -> Smp = " -smp disable ";
+ _ -> Smp = SetArg(smp)
+ end,
Inet = case init:get_argument(kernel) of
{ok,[["inetrc",InetRcFile]]} ->
?LOGF("Get inetrc= ~p~n",[InetRcFile],?NOTICE),
@@ -21,10 +21,11 @@
]},
{env, [
{debug_level, 6},
+ {smp_disable, true}, % disable smp on clients
{ts_cookie, "humhum"},
- {clients_timeout, 60000}, %% timeout for global synchro
- {file_server_timeout, 30000}, %% timeout for reading file
- {warm_time, 10}, %% (seconds) initial waiting time when launching clients
+ {clients_timeout, 60000}, % timeout for global synchro
+ {file_server_timeout, 30000},% timeout for reading file
+ {warm_time, 10}, % (seconds) initial waiting time when launching clients
{thinktime_value, "5"}, % default value = 5sec
{thinktime_override, "false"},
View
@@ -22,6 +22,7 @@ PGSQL_SERVER_PORT=5432
NAME=tsung
CONTROLLER=tsung_controller
RECORDER=tsung_recorder
+SMP_DISABLE=true
TSUNGPATH=$INSTALL_DIR/lib/tsung-$VERSION/ebin
CONTROLLERPATH=$INSTALL_DIR/lib/tsung_controller-$VERSION/ebin
@@ -87,6 +88,7 @@ start() {
echo "Starting Tsung"
$ERL $ERL_OPTS $ERL_RSH -noshell $NAMETYPE $CONTROLLER -setcookie $COOKIE $BOOT_OPT \
-pa $TSUNGPATH -pa $CONTROLLERPATH \
+ -tsung_controller smp_disable $SMP \
-tsung_controller debug_level $DEBUG_LEVEL \
-tsung_controller config_file \"$CONF_OPT_FILE\" -tsung_controller $LOG_OPT
}

0 comments on commit 688f3c9

Please sign in to comment.