diff options
author | Richard Linden <none@none> | 2013-12-05 21:58:45 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2013-12-05 21:58:45 -0800 |
commit | 6b84d405582e87e0b7e0a3b0cbc5635651af5e3b (patch) | |
tree | 52587eba74686f8ad6a62077ad500422e5857c14 /indra/llcommon | |
parent | 526be23096671e8916ec2b5644a46020f33479a8 (diff) |
added some comments and changed calls from get_master_thread_recorder()
over to get_thread_recorder() to be agnostic about which thread we're running on
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-x | indra/llcommon/llthread.cpp | 2 | ||||
-rw-r--r-- | indra/llcommon/lltrace.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index cbf78bb363..cf105098ef 100755 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -131,7 +131,7 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap set_thread_name(-1, threadp->mName.c_str()); #endif - + // for now, hard code all LLThreads to report to single master thread recorder, which is known to be running on main thread LLTrace::ThreadRecorder thread_recorder(*LLTrace::get_master_thread_recorder()); #if !LL_DARWIN diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp index 5c4b7b5bb4..14e830af7d 100644 --- a/indra/llcommon/lltrace.cpp +++ b/indra/llcommon/lltrace.cpp @@ -40,7 +40,7 @@ StatBase::StatBase( const char* name, const char* description ) mDescription(description ? description : "") { #ifndef LL_RELEASE_FOR_DOWNLOAD - if (LLTrace::get_master_thread_recorder() != NULL) + if (LLTrace::get_thread_recorder() != NULL) { LL_ERRS() << "Attempting to declare trace object after program initialization. Trace objects should be statically initialized." << LL_ENDL; } |