summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-01-30 08:01:36 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-01-30 08:01:36 -0800
commit471108f2e4b1b9ed56d9d14dfd4531401cea5679 (patch)
tree9000c77d7f05d0c36a001a356ff17dfd35b72cf6
parent2ceb162df0b6d0ce5984aed749680d2379b830bd (diff)
downloadinfinitytier-471108f2e4b1b9ed56d9d14dfd4531401cea5679.tar.gz
infinitytier-471108f2e4b1b9ed56d9d14dfd4531401cea5679.zip
Slightly increase thread stack size for safety (primary Alpine related) possibly GitHub #443
-rw-r--r--node/Constants.hpp5
-rw-r--r--osdep/Thread.hpp3
2 files changed, 7 insertions, 1 deletions
diff --git a/node/Constants.hpp b/node/Constants.hpp
index ac1919b3..a73d4d89 100644
--- a/node/Constants.hpp
+++ b/node/Constants.hpp
@@ -419,6 +419,11 @@
#define ZT_UDP_DESIRED_BUF_SIZE 131072
#endif
+/**
+ * Desired / recommended min stack size for threads (used on some platforms to reset thread stack size)
+ */
+#define ZT_THREAD_MIN_STACK_SIZE 1048576
+
/* Ethernet frame types that might be relevant to us */
#define ZT_ETHERTYPE_IPV4 0x0800
#define ZT_ETHERTYPE_ARP 0x0806
diff --git a/osdep/Thread.hpp b/osdep/Thread.hpp
index 9f6fb5a8..227c2cfe 100644
--- a/osdep/Thread.hpp
+++ b/osdep/Thread.hpp
@@ -28,6 +28,7 @@
#include <WinSock2.h>
#include <Windows.h>
#include <string.h>
+
#include "../node/Mutex.hpp"
namespace ZeroTier {
@@ -128,7 +129,7 @@ public:
pthread_attr_init(&_tattr);
// This corrects for systems with abnormally small defaults (musl) and also
// shrinks the stack on systems with large defaults to save a bit of memory.
- pthread_attr_setstacksize(&_tattr,524288);
+ pthread_attr_setstacksize(&_tattr,ZT_THREAD_MIN_STACK_SIZE);
_started = false;
}