From 3a124d1e88c8cbac6fbaf4709b8b4ee92f58ff30 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Fri, 26 Jan 2024 09:40:41 -0800
Subject: [PATCH] Increase stack size on macOS as well as Linux

The code works fine on macOS, but the default stack size we attempt to
set is larger than what my system will allow (Nix attempts to set the
stack size to 67108864, but the maximum allowed is 67092480), so I've
instead used the requested stack size or the maximum allowed, whichever
is smaller.

I've also added an error message if setting the stack size fails. It
looks like this:

> Failed to increase stack size from 8372224 to 67108864 (maximum
> allowed stack size: 67092480): Invalid argument
---
 src/libutil/current-process.cc | 26 +++++++++++++++++---------
 src/libutil/current-process.hh |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/libutil/current-process.cc b/src/libutil/current-process.cc
index 352a6a0fb..01f64f211 100644
--- a/src/libutil/current-process.cc
+++ b/src/libutil/current-process.cc
@@ -1,3 +1,6 @@
+#include <algorithm>
+#include <cstring>
+
 #include "current-process.hh"
 #include "namespaces.hh"
 #include "util.hh"
@@ -49,20 +52,27 @@ unsigned int getMaxCPU()
 //////////////////////////////////////////////////////////////////////
 
 
-#if __linux__
 rlim_t savedStackSize = 0;
-#endif
 
-void setStackSize(size_t stackSize)
+void setStackSize(rlim_t stackSize)
 {
-    #if __linux__
     struct rlimit limit;
     if (getrlimit(RLIMIT_STACK, &limit) == 0 && limit.rlim_cur < stackSize) {
         savedStackSize = limit.rlim_cur;
-        limit.rlim_cur = stackSize;
-        setrlimit(RLIMIT_STACK, &limit);
+        limit.rlim_cur = std::min(stackSize, limit.rlim_max);
+        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
 }
 
 void restoreProcessContext(bool restoreMounts)
@@ -72,7 +82,6 @@ void restoreProcessContext(bool restoreMounts)
         restoreMountNamespace();
     }
 
-    #if __linux__
     if (savedStackSize) {
         struct rlimit limit;
         if (getrlimit(RLIMIT_STACK, &limit) == 0) {
@@ -80,7 +89,6 @@ void restoreProcessContext(bool restoreMounts)
             setrlimit(RLIMIT_STACK, &limit);
         }
     }
-    #endif
 }
 
 
diff --git a/src/libutil/current-process.hh b/src/libutil/current-process.hh
index 826d6fe20..97ea70bf4 100644
--- a/src/libutil/current-process.hh
+++ b/src/libutil/current-process.hh
@@ -16,7 +16,7 @@ unsigned int getMaxCPU();
 /**
  * Change the stack size.
  */
-void setStackSize(size_t stackSize);
+void setStackSize(rlim_t stackSize);
 
 /**
  * Restore the original inherited Unix process context (such as signal