commit b4874ebb31f99704d1c71a23da2ccb37f9a7f77b
author James Kuszmaul <jabukuszmaul@gmail.com> Sat Jan 18 17:50:35 2020 -0800
committer James Kuszmaul <jabukuszmaul@gmail.com> Sun Jan 19 16:27:42 2020 -0800
tree df1ca5d120d8829884ea67cd0ce58b39d63928f0
parent 394150c112e6ea8a2f2f439cb2994a03a0224c48

Make 2020v10 roborio image work

Something changed from v9 to v10 that either reduced the stack size or
caused the roborio to start enforcing the stack size or *something*.
Bump up the stack size on all of our binaries.

Change-Id: I47df1aabfa8439f7bd12e78b1e6cdbef45c97b5a

aos/realtime.cc

diff --git a/aos/realtime.cc b/aos/realtime.cc
index 6a80550..60f712b 100644
--- a/aos/realtime.cc
+++ b/aos/realtime.cc
@@ -33,15 +33,31 @@
 
 namespace {
 
-void SetSoftRLimit(int resource, rlim64_t soft, bool set_for_root) {
+enum class SetLimitForRoot {
+  kYes,
+  kNo
+};
+
+enum class AllowSoftLimitDecrease {
+  kYes,
+  kNo
+};
+
+void SetSoftRLimit(
+    int resource, rlim64_t soft, SetLimitForRoot set_for_root,
+    AllowSoftLimitDecrease allow_decrease = AllowSoftLimitDecrease::kYes) {
   bool am_root = getuid() == 0;
-  if (set_for_root || !am_root) {
+  if (set_for_root == SetLimitForRoot::kYes || !am_root) {
     struct rlimit64 rlim;
     PCHECK(getrlimit64(resource, &rlim) == 0)
         << ": " << program_invocation_short_name << "-init: getrlimit64("
         << resource << ") failed";
 
-    rlim.rlim_cur = soft;
+    if (allow_decrease == AllowSoftLimitDecrease::kYes) {
+      rlim.rlim_cur = soft;
+    } else {
+      rlim.rlim_cur = std::max(rlim.rlim_cur, soft);
+    }
     rlim.rlim_max = ::std::max(rlim.rlim_max, soft);
 
     PCHECK(setrlimit64(resource, &rlim) == 0)
@@ -55,7 +71,7 @@
 
 void LockAllMemory() {
   // Allow locking as much as we want into RAM.
-  SetSoftRLimit(RLIMIT_MEMLOCK, RLIM_INFINITY, false);
+  SetSoftRLimit(RLIMIT_MEMLOCK, RLIM_INFINITY, SetLimitForRoot::kNo);
 
   WriteCoreDumps();
   PCHECK(mlockall(MCL_CURRENT | MCL_FUTURE) == 0)
@@ -87,10 +103,10 @@
   LockAllMemory();
 
   // Only let rt processes run for 3 seconds straight.
-  SetSoftRLimit(RLIMIT_RTTIME, 3000000, true);
+  SetSoftRLimit(RLIMIT_RTTIME, 3000000, SetLimitForRoot::kYes);
 
   // Allow rt processes up to priority 40.
-  SetSoftRLimit(RLIMIT_RTPRIO, 40, false);
+  SetSoftRLimit(RLIMIT_RTPRIO, 40, SetLimitForRoot::kNo);
 }
 
 void UnsetCurrentThreadRealtimePriority() {
@@ -111,7 +127,7 @@
 
 void SetCurrentThreadRealtimePriority(int priority) {
   // Make sure we will only be allowed to run for 3 seconds straight.
-  SetSoftRLimit(RLIMIT_RTTIME, 3000000, true);
+  SetSoftRLimit(RLIMIT_RTTIME, 3000000, SetLimitForRoot::kYes);
 
   struct sched_param param;
   param.sched_priority = priority;
@@ -121,7 +137,12 @@
 
 void WriteCoreDumps() {
   // Do create core files of unlimited size.
-  SetSoftRLimit(RLIMIT_CORE, RLIM_INFINITY, true);
+  SetSoftRLimit(RLIMIT_CORE, RLIM_INFINITY, SetLimitForRoot::kYes);
+}
+
+void ExpandStackSize() {
+  SetSoftRLimit(RLIMIT_STACK, 1000000, SetLimitForRoot::kYes,
+                AllowSoftLimitDecrease::kNo);
 }
 
 }  // namespace aos