diff options
| author | Rickard Green <[email protected]> | 2013-01-23 09:04:01 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-01-23 09:04:01 +0100 |
| commit | d777ca94944b6a9dbcfd7defc21f59935989e1a4 (patch) | |
| tree | 5801b030d06535898c9583bdc86cea19968a67e0 | |
| parent | a2dd848d7d0b184b7c5c9103f9aa8791d89d158c (diff) | |
| parent | 706fea8a950196661b9f8038d3b0d9b63bd607db (diff) | |
| download | otp-d777ca94944b6a9dbcfd7defc21f59935989e1a4.tar.gz otp-d777ca94944b6a9dbcfd7defc21f59935989e1a4.tar.bz2 otp-d777ca94944b6a9dbcfd7defc21f59935989e1a4.zip | |
Merge branch 'rickard/async-default/OTP-10736'
* rickard/async-default/OTP-10736:
Use async threads by default
| -rw-r--r-- | erts/doc/src/erl.xml | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 5352fad143..b069b85be5 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -479,7 +479,7 @@ <tag><marker id="async_thread_pool_size"><c><![CDATA[+A size]]></c></marker></tag> <item> <p>Sets the number of threads in async thread pool, valid range - is 0-1024. Default is 0.</p> + is 0-1024. If thread support is available, the default is 10.</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 1fdaba548f..516f7b3cb3 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -55,6 +55,8 @@ # include <sys/resource.h> #endif +#define ERTS_DEFAULT_NO_ASYNC_THREADS 10 + /* * The variables below (prefixed with etp_) are for erts/etc/unix/etp-commands * only. Do not remove even though they aren't used elsewhere in the emulator! @@ -631,7 +633,7 @@ early_init(int *argc, char **argv) /* erts_disable_tolerant_timeofday = 0; display_items = 200; erts_backtrace_depth = DEFAULT_BACKTRACE_SIZE; - erts_async_max_threads = 0; + erts_async_max_threads = ERTS_DEFAULT_NO_ASYNC_THREADS; erts_async_thread_suggested_stack_size = ERTS_ASYNC_THREAD_MIN_STACK_SIZE; H_MIN_SIZE = H_DEFAULT_SIZE; BIN_VH_MIN_SIZE = VH_DEFAULT_SIZE; @@ -700,7 +702,7 @@ early_init(int *argc, char **argv) /* if (erts_sys_getenv__("ERL_THREAD_POOL_SIZE", envbuf, &envbufsz) == 0) erts_async_max_threads = atoi(envbuf); else - erts_async_max_threads = 0; + erts_async_max_threads = ERTS_DEFAULT_NO_ASYNC_THREADS; if (erts_async_max_threads > ERTS_MAX_NO_OF_ASYNC_THREADS) erts_async_max_threads = ERTS_MAX_NO_OF_ASYNC_THREADS; |