mirror of
https://github.com/NixOS/nix
synced 2025-06-28 13:41:15 +02:00
Totally exclude nix::setStackSize on Windows
This commit is contained in:
parent
b644e5750e
commit
7c8c71f8e9
3 changed files with 7 additions and 2 deletions
|
@ -51,11 +51,11 @@ unsigned int getMaxCPU()
|
||||||
//////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
size_t savedStackSize = 0;
|
size_t savedStackSize = 0;
|
||||||
|
|
||||||
void setStackSize(size_t stackSize)
|
void setStackSize(size_t stackSize)
|
||||||
{
|
{
|
||||||
#ifndef _WIN32
|
|
||||||
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;
|
||||||
|
@ -73,8 +73,8 @@ void setStackSize(size_t stackSize)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void restoreProcessContext(bool restoreMounts)
|
void restoreProcessContext(bool restoreMounts)
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,10 +17,13 @@ namespace nix {
|
||||||
*/
|
*/
|
||||||
unsigned int getMaxCPU();
|
unsigned int getMaxCPU();
|
||||||
|
|
||||||
|
// It does not seem possible to dynamically change stack size on Windows.
|
||||||
|
#ifndef _WIN32
|
||||||
/**
|
/**
|
||||||
* Change the stack size.
|
* Change the stack size.
|
||||||
*/
|
*/
|
||||||
void setStackSize(size_t stackSize);
|
void setStackSize(size_t stackSize);
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Restore the original inherited Unix process context (such as signal
|
* Restore the original inherited Unix process context (such as signal
|
||||||
|
|
|
@ -557,9 +557,11 @@ void mainWrapped(int argc, char * * argv)
|
||||||
|
|
||||||
int main(int argc, char * * argv)
|
int main(int argc, char * * argv)
|
||||||
{
|
{
|
||||||
|
#ifndef _WIN32
|
||||||
// Increase the default stack size for the evaluator and for
|
// Increase the default stack size for the evaluator and for
|
||||||
// libstdc++'s std::regex.
|
// libstdc++'s std::regex.
|
||||||
nix::setStackSize(64 * 1024 * 1024);
|
nix::setStackSize(64 * 1024 * 1024);
|
||||||
|
#endif
|
||||||
|
|
||||||
return nix::handleExceptions(argv[0], [&]() {
|
return nix::handleExceptions(argv[0], [&]() {
|
||||||
nix::mainWrapped(argc, argv);
|
nix::mainWrapped(argc, argv);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue