diff options
| author | Richard Linden <none@none> | 2012-09-26 17:04:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-09-26 17:04:57 -0700 |
| commit | 05a3203d8274a0a0999faad128f629614b8d62c5 (patch) | |
| tree | 7d2e980d711576b9e05f2a36084d8712a3eba330 /indra/llcommon/llthread.cpp | |
| parent | 308ff886c3ab2aa561477921bc0d92e1bd7d399a (diff) | |
SH-3275 WIP Run viewer metrics for object update messages
fixed various issues related to unit tests and LLThreadLocalPtr initialization and teardown
Diffstat (limited to 'indra/llcommon/llthread.cpp')
| -rw-r--r-- | indra/llcommon/llthread.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index de1f0801a1..2e6eb085dc 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -66,7 +66,7 @@ U32 __thread LLThread::sThreadID = 0; #endif U32 LLThread::sIDIter = 0; -LLThreadLocalPtr<LLTrace::ThreadTraceData> LLThread::sTraceData; +LLThreadLocalPtr<LLTrace::SlaveThreadTrace> LLThread::sTraceData; LL_COMMON_API void assert_main_thread() @@ -99,6 +99,8 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap // We're done with the run function, this thread is done executing now. threadp->mStatus = STOPPED; + delete sTraceData.get(); + return NULL; } @@ -108,6 +110,7 @@ LLThread::LLThread(const std::string& name, apr_pool_t *poolp) : mAPRThreadp(NULL), mStatus(STOPPED) { + mID = ++sIDIter; // Thread creation probably CAN be paranoid about APR being initialized, if necessary |