Use a quick exit with code 66 to signal out of memory.

2 files changed, 6 insertions, 6 deletions

diff --git a/vespamalloc/src/vespamalloc/malloc/mmappool.cpp b/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
index cee709ed0ed..ba330d14125 100644
--- a/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
+++ b/vespamalloc/src/vespamalloc/malloc/mmappool.cpp
@@ -58,9 +58,9 @@ MMapPool::mmap(size_t sz) {
             }
             buf = ::mmap(nullptr, sz, prot, flags, -1, 0);
             if (buf == MAP_FAILED) {
-                fprintf(_G_logFile, "Failed mmaping anonymous of size %ld errno(%d) from : ", sz, errno);
+                fprintf(_G_logFile, "Will exit due to: Failed mmaping anonymous of size %ld errno(%d) from : ", sz, errno);
                 logStackTrace();
-                abort();
+                std::quick_exit(66);
             }
         } else {
             if (_has_hugepage_failure_just_happened) {
diff --git a/vespamalloc/src/vespamalloc/util/callstack.cpp b/vespamalloc/src/vespamalloc/util/callstack.cpp
index b8449c89a72..87938da8b7f 100644
--- a/vespamalloc/src/vespamalloc/util/callstack.cpp
+++ b/vespamalloc/src/vespamalloc/util/callstack.cpp
@@ -1,6 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <dlfcn.h>
-#include <ctype.h>
+#include <cctype>
 #include <vespamalloc/util/callstack.h>
 
 namespace vespamalloc {
@@ -33,7 +33,7 @@ verifyAndCopy(const void *addr, char *v, size_t sz) {
 void
 StackReturnEntry::info(FILE * os) const
 {
-    static char tmp[0x400];
+    char tmp[0x400];
     verifyAndCopy(_return, tmp, sizeof(tmp));
     fprintf(os, "%s(%p)", tmp, _return);
 }
@@ -41,8 +41,8 @@ StackReturnEntry::info(FILE * os) const
 asciistream &
 operator << (asciistream & os, const StackReturnEntry & v)
 {
-    static char tmp[0x100];
-    static char t[0x200];
+    char tmp[0x100];
+    char t[0x200];
     verifyAndCopy(v._return, tmp, sizeof(tmp));
     snprintf(t, sizeof(t), "%s(%p)", tmp, v._return);
     return os << t;