diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-03-23 15:29:25 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-03-23 15:29:25 +0100 |
| commit | 1597a75419cd8049252cfbca6fce6ae95ef8b2c7 (patch) | |
| tree | 2b2c858df1dbe68c1d576cae06c4713fd2ad5c40 /cpp/src/Ice/ThreadPool.cpp | |
| parent | Use Ice\None with PHP namespace mapping (diff) | |
| download | ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.tar.bz2 ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.tar.xz ice-1597a75419cd8049252cfbca6fce6ae95ef8b2c7.zip | |
Fix for ICE-7125 - Added support for Ice.ClassGraphDepthMax
Diffstat (limited to 'cpp/src/Ice/ThreadPool.cpp')
| -rw-r--r-- | cpp/src/Ice/ThreadPool.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp index 946a05e2b08..4b14a7e1ce8 100644 --- a/cpp/src/Ice/ThreadPool.cpp +++ b/cpp/src/Ice/ThreadPool.cpp @@ -346,7 +346,16 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p _selector.setup(_sizeIO); #endif - int stackSize = properties->getPropertyAsInt(_prefix + ".StackSize"); +#if defined(__APPLE__) + // + // We use a default stack size of 1MB on macOS and the new C++11 mapping to allow transmitting + // class graphs with a depth of 100 (maximum default), 512KB is not enough otherwise. + // + int defaultStackSize = 1024 * 1024; // 1MB +#else + int defaultStackSize = 0; +#endif + int stackSize = properties->getPropertyAsIntWithDefault(_prefix + ".StackSize", defaultStackSize); if(stackSize < 0) { Warning out(_instance->initializationData().logger); |