aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2013-02-25 17:35:08 +0100
committerLukas Larsson <[email protected]>2013-02-25 17:35:08 +0100
commitf616e2011a0ee575c4f51e191648752779e8e64b (patch)
treea943a51309e31f9cd54f486acdc9c7ad3e85a551
parenta246ae201136048d4d7545c66b2e790502654833 (diff)
parent8df6e3868c742be5763ed4ee57a928bfac56616d (diff)
downloadotp-f616e2011a0ee575c4f51e191648752779e8e64b.tar.gz
otp-f616e2011a0ee575c4f51e191648752779e8e64b.tar.bz2
otp-f616e2011a0ee575c4f51e191648752779e8e64b.zip
Merge branch 'lukas/erts/add_ERL_MAX_PORTS_env/OTP-10895'
* lukas/erts/add_ERL_MAX_PORTS_env/OTP-10895: Undo removal of ERL_MAX_PORTS os variable
-rw-r--r--erts/emulator/beam/erl_init.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 83853dcd43..e7e4030900 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -935,6 +935,12 @@ erl_start(int argc, char **argv)
(erts_aint32_t) max_gen_gcs);
}
+ envbufsz = sizeof(envbuf);
+ if (erts_sys_getenv_raw("ERL_MAX_PORTS", envbuf, &envbufsz) == 0) {
+ port_tab_sz = atoi(envbuf);
+ port_tab_sz_ignore_files = 1;
+ }
+
#if (defined(__APPLE__) && defined(__MACH__)) || defined(__DARWIN__)
/*
* The default stack size on MacOS X is too small for pcre.