lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #9860 from 9999years/set-stack-darwin

Browse source 
Increase stack size on macOS as well as Linux

(cherry picked from commit efb91d5979a625d5c50558aeabfd24e802ed9173,
4a2444b3f32a2f5d42c4d65302793b987d1ac667)
Change-Id: Ieb72283c61bb9e360683f531d6635697b293c313
This commit is contained in:
eldritch horrors 2024-03-06 05:45:40 +01:00
parent a499383187
commit e9b5929b22
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/libutil/util.cc
View file

@ -1856,20 +1856,27 @@ static void restoreSignals()
throw SysError("restoring signals"); throw SysError("restoring signals");
} }
#if __linux__
rlim_t savedStackSize = 0; rlim_t savedStackSize = 0;
#endif
void setStackSize(size_t stackSize) void setStackSize(rlim_t stackSize)
{ {
#if __linux__
struct rlimit limit; struct rlimit limit;
if (getrlimit(RLIMIT_STACK, &limit) == 0 && limit.rlim_cur < stackSize) { if (getrlimit(RLIMIT_STACK, &limit) == 0 && limit.rlim_cur < stackSize) {
savedStackSize = limit.rlim_cur; savedStackSize = limit.rlim_cur;
limit.rlim_cur = stackSize; limit.rlim_cur = std::min(stackSize, limit.rlim_max);
setrlimit(RLIMIT_STACK, &limit); if (setrlimit(RLIMIT_STACK, &limit) != 0) {
logger->log(
lvlError,
hintfmt(
"Failed to increase stack size from %1% to %2% (maximum allowed stack size: %3%): %4%",
savedStackSize,
stackSize,
limit.rlim_max,
std::strerror(errno)
).str()
);
}
} }
#endif
} }
#if __linux__ #if __linux__
@ -1930,7 +1937,6 @@ void restoreProcessContext(bool restoreMounts)
restoreMountNamespace(); restoreMountNamespace();
} }
#if __linux__
if (savedStackSize) { if (savedStackSize) {
struct rlimit limit; struct rlimit limit;
if (getrlimit(RLIMIT_STACK, &limit) == 0) { if (getrlimit(RLIMIT_STACK, &limit) == 0) {
@ -1938,7 +1944,6 @@ void restoreProcessContext(bool restoreMounts)
setrlimit(RLIMIT_STACK, &limit); setrlimit(RLIMIT_STACK, &limit);
} }
} }
#endif
} }
/* RAII helper to automatically deregister a callback. */ /* RAII helper to automatically deregister a callback. */

3
src/libutil/util.hh
View file

@ -8,6 +8,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/resource.h>
#include <dirent.h> #include <dirent.h>
#include <unistd.h> #include <unistd.h>
#include <signal.h> #include <signal.h>
@ -447,7 +448,7 @@ void runProgram2(const RunOptions & options);
/** /**
* Change the stack size. * Change the stack size.
*/ */
void setStackSize(size_t stackSize); void setStackSize(rlim_t stackSize);
/** /**