diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-06 16:46:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-06 16:46:31 -0400 |
| commit | a2fa9a2bc26bb67c0bb952d3295c380dcb853eb5 (patch) | |
| tree | 5f2e8de9027fc924947b304c20e1aaf81ce1234a /indra/llcommon/llcoros.cpp | |
| parent | 72e7269da376d660385f3c66ac2a25a5e50871ea (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/llcommon/llcoros.cpp')
| -rwxr-xr-x | indra/llcommon/llcoros.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp index 9122704306..a629f71d4b 100755 --- a/indra/llcommon/llcoros.cpp +++ b/indra/llcommon/llcoros.cpp @@ -39,7 +39,12 @@ #include "llerror.h" #include "stringize.h" -LLCoros::LLCoros() +LLCoros::LLCoros(): + // MAINT-2724: default coroutine stack size too small on Windows. + // Previously we used + // boost::context::guarded_stack_allocator::default_stacksize(); + // empirically this is 64KB on Windows and Linux. Try quadrupling. + mStackSize(256*1024) { // Register our cleanup() method for "mainloop" ticks LLEventPumps::instance().obtain("mainloop").listen( @@ -125,6 +130,12 @@ std::string LLCoros::getNameByID(const void* self_id) const return ""; } +void LLCoros::setStackSize(S32 stacksize) +{ + LL_INFOS("LLCoros") << "Setting coroutine stack size to " << stacksize << LL_ENDL; + mStackSize = stacksize; +} + /***************************************************************************** * MUST BE LAST *****************************************************************************/ |