From: Roger Pau Monne <roger.pau@citrix.com>
Date: Fri, 7 Mar 2014 12:22:58 +0000 (+0100)
Subject: xenstore: set READ_THREAD_STACKSIZE to a sane value
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~5366
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=da6a0e86d6a079102abdd0858a19f1e1fae584fc;p=xen.git

xenstore: set READ_THREAD_STACKSIZE to a sane value

On FreeBSD PTHREAD_STACK_MIN is 2048 by default, which is obviously
too low. Set the default back to the previous value (16 * 1024), or if
that's too low set it to PTHREAD_STACK_MIN.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@citrix.com>
---

diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c
index dd03a85755..968141dede 100644
--- a/tools/xenstore/xs.c
+++ b/tools/xenstore/xs.c
@@ -724,7 +724,10 @@ bool xs_watch(struct xs_handle *h, const char *path, const char *token)
 	struct iovec iov[2];
 
 #ifdef USE_PTHREAD
-#define READ_THREAD_STACKSIZE PTHREAD_STACK_MIN
+#define DEFAULT_THREAD_STACKSIZE (16 * 1024)
+#define READ_THREAD_STACKSIZE 					\
+	((DEFAULT_THREAD_STACKSIZE < PTHREAD_STACK_MIN) ? 	\
+	PTHREAD_STACK_MIN : DEFAULT_THREAD_STACKSIZE)
 
 	/* We dynamically create a reader thread on demand. */
 	mutex_lock(&h->request_mutex);