diff options
author | Lukas Larsson <[email protected]> | 2013-02-25 17:34:56 +0100 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2013-02-25 17:34:56 +0100 |
commit | a246ae201136048d4d7545c66b2e790502654833 (patch) | |
tree | cac2ca98cd4c78caf7644d6f0d0fe993ca0869d2 /erts/emulator/beam | |
parent | d4d98b8649d24f0a8c267e360bf58e54f04ae505 (diff) | |
parent | c717fc6e0d660cb39f09dc079643991559168d40 (diff) | |
download | otp-a246ae201136048d4d7545c66b2e790502654833.tar.gz otp-a246ae201136048d4d7545c66b2e790502654833.tar.bz2 otp-a246ae201136048d4d7545c66b2e790502654833.zip |
Merge branch 'lukas/erts/default_ports_win32/OTP-10892'
* lukas/erts/default_ports_win32/OTP-10892:
Update to work with new default windows max ports
Set default max ports on win32 to 8192
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r-- | erts/emulator/beam/erl_port.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_port.h b/erts/emulator/beam/erl_port.h index 4052f4dbe8..377aa72ed5 100644 --- a/erts/emulator/beam/erl_port.h +++ b/erts/emulator/beam/erl_port.h @@ -31,7 +31,18 @@ typedef struct ErtsProc2PortSigData_ ErtsProc2PortSigData; #include "erl_thr_progress.h" #include "erl_trace.h" +#ifndef __WIN32__ #define ERTS_DEFAULT_MAX_PORTS (1 << 16) +#else +/* + * Do not default to as many max ports on Windows + * as there are no os limits to stop system + * from running amok. If allowed to go too high + * windows rarely recovers from the errors and + * other OS processes can be effected. + */ +#define ERTS_DEFAULT_MAX_PORTS (1 << 13) +#endif /* __WIN32__ */ #define ERTS_MIN_PORTS 1024 extern int erts_port_synchronous_ops; |