diff options
| author | John Högberg <[email protected]> | 2018-03-23 08:19:25 +0100 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-03-23 08:19:25 +0100 |
| commit | 837cf1979852b439dd8fed555ad8c6cb10d9a794 (patch) | |
| tree | 9d2795b423502b667a36b8bf656965b5941648a2 /erts | |
| parent | bf7206f13aae8d55e4d54320a179e11ad8f90765 (diff) | |
| parent | f338d0011cbc83e82b4ff2264a7e37f52190828f (diff) | |
| download | otp-837cf1979852b439dd8fed555ad8c6cb10d9a794.tar.gz otp-837cf1979852b439dd8fed555ad8c6cb10d9a794.tar.bz2 otp-837cf1979852b439dd8fed555ad8c6cb10d9a794.zip | |
Merge branch 'john/erts/async-thread-defaults/OTP-14928'
* john/erts/async-thread-defaults/OTP-14928:
Change default async thread count to 1
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/erl.xml | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 99f0421080..00dec37590 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -572,7 +572,7 @@ <tag><marker id="async_thread_pool_size"/><c><![CDATA[+A size]]></c></tag> <item> <p>Sets the number of threads in async thread pool. Valid range - is 0-1024. Defaults to 10 if thread support is available.</p> + is 0-1024. Defaults to 1.</p> </item> <tag><c><![CDATA[+B [c | d | i]]]></c></tag> <item> diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 83ed2e4cd6..1e20d48a73 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -62,7 +62,7 @@ # include <sys/resource.h> #endif -#define ERTS_DEFAULT_NO_ASYNC_THREADS 10 +#define ERTS_DEFAULT_NO_ASYNC_THREADS 1 #define ERTS_DEFAULT_SCHED_STACK_SIZE 128 #define ERTS_DEFAULT_DCPU_SCHED_STACK_SIZE 40 |