aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-01-24 12:49:46 +0100
committerRickard Green <[email protected]>2014-01-24 12:49:46 +0100
commit5d2bacd788c7cd95b079fc152599cf26c1ddd51c (patch)
treeb2bf9ab68b62b2c81a840d870cad181272444f5a /erts
parent7a838c3dfa765054303c347068ff1d02c392e3ef (diff)
parent3ff735cc034dea43e593b5e58b91be95268cbf85 (diff)
downloadotp-5d2bacd788c7cd95b079fc152599cf26c1ddd51c.tar.gz
otp-5d2bacd788c7cd95b079fc152599cf26c1ddd51c.tar.bz2
otp-5d2bacd788c7cd95b079fc152599cf26c1ddd51c.zip
Merge branch 'rickard/load_balance/OTP-11385'
* rickard/load_balance/OTP-11385: Disable scheduler utilization balancing if +scl true is passed
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_init.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 1d4f617746..19088fd913 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -1439,8 +1439,10 @@ erl_start(int argc, char **argv)
}
else if (has_prefix("cl", sub_param)) {
arg = get_arg(sub_param+2, argv[i+1], &i);
- if (sys_strcmp("true", arg) == 0)
+ if (sys_strcmp("true", arg) == 0) {
erts_sched_compact_load = 1;
+ erts_sched_balance_util = 0;
+ }
else if (sys_strcmp("false", arg) == 0)
erts_sched_compact_load = 0;
else {