From e44ff1978344600cd9b1f41949697f0e877fd5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@qt.io>
Date: Wed, 21 Jun 2017 11:48:09 +0200
Subject: Add QThreadPool::stackSize
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allows setting the stack size for the thread pool
worker threads. Implemented using QThread::stackSize.

Task-number: QTBUG-2568
Change-Id: Ic7f3981289290685195bbaee977a23e0c3c49bf0
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
---
 src/corelib/thread/qthreadpool.cpp | 28 +++++++++++++++++++++++++++-
 src/corelib/thread/qthreadpool.h   |  4 ++++
 src/corelib/thread/qthreadpool_p.h |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

(limited to 'src/corelib/thread')

diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp
index 71310b0ebf..9937201619 100644
--- a/src/corelib/thread/qthreadpool.cpp
+++ b/src/corelib/thread/qthreadpool.cpp
@@ -74,7 +74,9 @@ public:
 */
 QThreadPoolThread::QThreadPoolThread(QThreadPoolPrivate *manager)
     :manager(manager), runnable(0)
-{ }
+{
+    setStackSize(manager->stackSize);
+}
 
 /*
     \internal
@@ -604,6 +606,30 @@ void QThreadPool::reserveThread()
     ++d->reservedThreads;
 }
 
+/*! \property QThreadPool::stacksize
+
+    This property contains the stack size for the thread pool worker
+    threads.
+
+    The value of the property is uses when the thread pool creates
+    new threads only. Changing it has no effect for already created
+    or running threads.
+
+    The default value is 0, which makes QThread use the operating
+    system default stack stize.
+*/
+void QThreadPool::setStackSize(uint stackSize)
+{
+    Q_D(QThreadPool);
+    d->stackSize = stackSize;
+}
+
+uint QThreadPool::stackSize() const
+{
+    Q_D(const QThreadPool);
+    return d->stackSize;
+}
+
 /*!
     Releases a thread previously reserved by a call to reserveThread().
 
diff --git a/src/corelib/thread/qthreadpool.h b/src/corelib/thread/qthreadpool.h
index 09b7f96f48..a65eacc996 100644
--- a/src/corelib/thread/qthreadpool.h
+++ b/src/corelib/thread/qthreadpool.h
@@ -58,6 +58,7 @@ class Q_CORE_EXPORT QThreadPool : public QObject
     Q_PROPERTY(int expiryTimeout READ expiryTimeout WRITE setExpiryTimeout)
     Q_PROPERTY(int maxThreadCount READ maxThreadCount WRITE setMaxThreadCount)
     Q_PROPERTY(int activeThreadCount READ activeThreadCount)
+    Q_PROPERTY(uint stackSize READ stackSize WRITE setStackSize)
     friend class QFutureInterfaceBase;
 
 public:
@@ -77,6 +78,9 @@ public:
 
     int activeThreadCount() const;
 
+    void setStackSize(uint stackSize);
+    uint stackSize() const;
+
     void reserveThread();
     void releaseThread();
 
diff --git a/src/corelib/thread/qthreadpool_p.h b/src/corelib/thread/qthreadpool_p.h
index 0eff69d440..8b6a8cc476 100644
--- a/src/corelib/thread/qthreadpool_p.h
+++ b/src/corelib/thread/qthreadpool_p.h
@@ -96,6 +96,7 @@ public:
     int maxThreadCount = QThread::idealThreadCount();
     int reservedThreads = 0;
     int activeThreads = 0;
+    uint stackSize = 0;
     bool isExiting = false;
 };
 
-- 
cgit v1.2.3