diff options
| author | Richard Linden <none@none> | 2012-11-07 00:38:21 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-07 00:38:21 -0800 |
| commit | 860ff2f7e2a7fe932dfb7c148f0dbc0067018038 (patch) | |
| tree | f6356524dd5d2cecccae3934771a3f81ba31c90a /indra/llcommon/llqueuedthread.cpp | |
| parent | 0007114cf5a60779319ab8cbd0a23a0d462b8010 (diff) | |
SH-3499 WIP Ensure asset stats output is correct
fixed trace data gathering and routing from background thread
simplified slave->master thread communication (eliminated redundant recording and proxy object)
improved performance of fast timer data gathering (slow iterators)
Diffstat (limited to 'indra/llcommon/llqueuedthread.cpp')
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index 218f6dbcd0..956642e97a 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -112,8 +112,6 @@ void LLQueuedThread::shutdown() // virtual S32 LLQueuedThread::update(F32 max_time_ms) { - LLTrace::get_thread_recorder()->pushToMaster(); - if (!mStarted) { if (!mThreaded) @@ -511,6 +509,9 @@ void LLQueuedThread::run() threadedUpdate(); int res = processNextRequest(); + + LLTrace::get_thread_recorder()->pushToMaster(); + if (res == 0) { mIdleThread = TRUE; |