diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-30 14:07:59 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-30 14:07:59 -0700 |
| commit | 0b4b92cbbfff5cd5ef6ed697a7605db7686c9952 (patch) | |
| tree | 4211ad2db22cec252f2f45c1f47356b6fe73daf9 /indra/llcommon/llcoros.cpp | |
| parent | 168f4d8de0bf4f6a211366d5183a777b577b5cfe (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Pull merge from lindenlab/viewer-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 *****************************************************************************/ |