Use fast thread-local for logging

1 files changed, 5 insertions, 3 deletions

diff --git a/src/mongo/util/log.cpp b/src/mongo/util/log.cpp
index 3af6467a6d5..f69ffbd5450 100644
--- a/src/mongo/util/log.cpp
+++ b/src/mongo/util/log.cpp
@@ -19,6 +19,7 @@
 #include "mongo/pch.h"
 
 #include "mongo/util/assert_util.h"
+#include "mongo/util/concurrency/threadlocal.h"
 #include "mongo/util/stacktrace.h"
 #include "mongo/util/time_support.h"
 
@@ -66,7 +67,8 @@ namespace mongo {
     Nullstream nullstream;
     vector<Tee*>* Logstream::globalTees = 0;
 
-    thread_specific_ptr<Logstream> Logstream::tsp;
+    TSP_DECLARE(Logstream, Logstream_tsp);
+    TSP_DEFINE(Logstream, Logstream_tsp);
 
     Nullstream& tlog( int level ) {
         if ( !debug && level > tlogLevel )
@@ -423,9 +425,9 @@ namespace mongo {
         if ( StaticObserver::_destroyingStatics ) {
             cout << "Logstream::get called in uninitialized state" << endl;
         }
-        Logstream *p = tsp.get();
+        Logstream *p = Logstream_tsp.get();
         if( p == 0 )
-            tsp.reset( p = new Logstream() );
+            Logstream_tsp.reset( p = new Logstream() );
         return *p;
     }