diff options
| author | Peter Powell <petpow@saberuk.com> | 2017-07-09 22:36:40 +0100 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2017-07-09 22:45:00 +0100 |
| commit | c0aba5b728b0a921d95ec120aa638dab1520b42f (patch) | |
| tree | 5470b2e12cc40ba8ea5cafe36fc254c73192cb48 /src/socketengines | |
| parent | e97ee390cf1a3f5e897aed85d62e29a34c4632f9 (diff) | |
| parent | b7facc2474ff5fb229c66ed130ed67207620f55d (diff) | |
Merge v2.0.23 and v2.0.24 into master.
Diffstat (limited to 'src/socketengines')
| -rw-r--r-- | src/socketengines/socketengine_epoll.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp index 7602dd201..f0a7c2016 100644 --- a/src/socketengines/socketengine_epoll.cpp +++ b/src/socketengines/socketengine_epoll.cpp @@ -22,7 +22,7 @@ #include "exitcodes.h" #include <sys/epoll.h> -#include <ulimit.h> +#include <sys/resource.h> #include <iostream> /** A specialisation of the SocketEngine class, designed to use linux 2.6 epoll(). @@ -38,8 +38,12 @@ namespace void SocketEngine::Init() { - // MAX_DESCRIPTORS is mainly used for display purposes, no problem if ulimit() fails and returns a negative number - MAX_DESCRIPTORS = ulimit(4, 0); + // MAX_DESCRIPTORS is mainly used for display purposes, no problem if getrlimit() fails + struct rlimit limit; + if (!getrlimit(RLIMIT_NOFILE, &limit)) + { + MAX_DESCRIPTORS = limit.rlim_cur; + } // 128 is not a maximum, just a hint at the eventual number of sockets that may be polled, // and it is completely ignored by 2.6.8 and later kernels, except it must be larger than zero. |