github
/
bitcoin
mirror of https://github.com/bitcoin/bitcoin
1
Fork 0
Code Releases Activity

Merge 44872b32bc into a46065e36c

This commit is contained in:
Benjamin Woosley 2024-04-29 04:32:15 +02:00 committed by GitHub
parent a46065e36c 44872b32bc
commit cf9963e411
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/init.cpp
View File

@ -147,6 +147,7 @@ static constexpr bool DEFAULT_STOPAFTERBLOCKIMPORT{false};
#else
#define MIN_CORE_FILEDESCRIPTORS 150
#endif
static const int RESERVED_FILE_DESCRIPTORS = MIN_CORE_FILEDESCRIPTORS + MAX_ADDNODE_CONNECTIONS + NUM_FDS_MESSAGE_CAPTURE;
static const char* DEFAULT_ASMAP_FILENAME="ip_asn.map";
@ -970,23 +971,21 @@ bool AppInitParameterInteraction(const ArgsManager& args)
}
// Make sure enough file descriptors are available
int nBind = std::max(nUserBind, size_t(1));
const int nBind = std::max(nUserBind, size_t(1));
nUserMaxConnections = args.GetIntArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
nMaxConnections = std::max(nUserMaxConnections, 0);
const int nRpcThreads = std::max<int>(args.GetIntArg("-rpcthreads", DEFAULT_HTTP_THREADS), 1L);
const int nFDMin = nBind + nRpcThreads + RESERVED_FILE_DESCRIPTORS;
nFD = RaiseFileDescriptorLimit(nMaxConnections + MIN_CORE_FILEDESCRIPTORS + MAX_ADDNODE_CONNECTIONS + nBind + NUM_FDS_MESSAGE_CAPTURE);
nFD = RaiseFileDescriptorLimit(nMaxConnections + nFDMin);
if (nFD < nFDMin) {
return InitError(strprintf(_("Not enough file descriptors available. %d available, %d required."), nFD, nFDMin));
}
#ifdef USE_POLL
int fd_max = nFD;
#else
int fd_max = FD_SETSIZE;
#endif
// Trim requested connection counts, to fit into system limitations
// <int> in std::min<int>(...) to work around FreeBSD compilation issue described in #2695
nMaxConnections = std::max(std::min<int>(nMaxConnections, fd_max - nBind - MIN_CORE_FILEDESCRIPTORS - MAX_ADDNODE_CONNECTIONS - NUM_FDS_MESSAGE_CAPTURE), 0);
if (nFD < MIN_CORE_FILEDESCRIPTORS)
return InitError(_("Not enough file descriptors available."));
nMaxConnections = std::min(nFD - MIN_CORE_FILEDESCRIPTORS - MAX_ADDNODE_CONNECTIONS - NUM_FDS_MESSAGE_CAPTURE, nMaxConnections);
nMaxConnections = std::max(std::min<int>(nFD - nFDMin, nMaxConnections), 0);
LogPrintf("There are %d file descriptors available, %d required, %d reserved, and %d requested.\n", nFD, nFDMin, nFDMin + nMaxConnections, nFDMin + nUserMaxConnections);
if (nMaxConnections < nUserMaxConnections)
InitWarning(strprintf(_("Reducing -maxconnections from %d to %d, because of system limitations."), nUserMaxConnections, nMaxConnections));