diff options
| author | Erlang/OTP <[email protected]> | 2010-04-15 04:37:55 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-15 04:37:55 +0000 |
| commit | ab47252a5f7d540d4119d38dffe69acca86d2a41 (patch) | |
| tree | 9817bba0553bcd409c36fb330f7408ec7ca2369c /erts/emulator/beam/erl_init.c | |
| parent | 4e315422de9bb1b5c8d6668cbccf8fe1084f536c (diff) | |
| parent | f43718785523cb4635d1c22a78a7620ed5e86609 (diff) | |
| download | otp-ab47252a5f7d540d4119d38dffe69acca86d2a41.tar.gz otp-ab47252a5f7d540d4119d38dffe69acca86d2a41.tar.bz2 otp-ab47252a5f7d540d4119d38dffe69acca86d2a41.zip | |
Merge branch 'ms/pcre-compile-workspace-overrun' into dev
* ms/pcre-compile-workspace-overrun:
re_SUITE: Add pcre_compile_workspace_overflow/1
MacOS X: Boost default stack size
Fix check for compile workspace overflow
OTP-8539 ms/pcre-compile-workspace-overrun
Diffstat (limited to 'erts/emulator/beam/erl_init.c')
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index e97ab328cd..41cfcd74aa 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -819,7 +819,13 @@ erl_start(int argc, char **argv) if (erts_sys_getenv("ERL_THREAD_POOL_SIZE", envbuf, &envbufsz) == 0) { async_max_threads = atoi(envbuf); } - + +#if (defined(__APPLE__) && defined(__MACH__)) || defined(__DARWIN__) + /* + * The default stack size on MacOS X is too small for pcre. + */ + erts_sched_thread_suggested_stack_size = 256; +#endif #ifdef DEBUG verbose = DEBUG_DEFAULT; |