Unify ThreadID.

include/private/SkMutex.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkMutex_DEFINED
 #define SkMutex_DEFINED
 
@@ skipping 12 matching lines @@
 // Using POD-style initialization prevents the generation of a static initializer.
 //
 // Without magic statics there are no thread safety guarantees on initialization
 // of local statics (even POD). As a result, it is illegal to use
 // SK_DECLARE_STATIC_MUTEX in a function.
 //
 // Because SkBaseMutex is not a primitive, a static SkBaseMutex cannot be
 // initialized in a class with this macro.
 #define SK_DECLARE_STATIC_MUTEX(name) namespace {} static SkBaseMutex name = SK_BASE_MUTEX_INIT;
 
-// TODO(herb): unify this with the ThreadID in SkSharedMutex.cpp.
 #ifdef SK_DEBUG
-    #ifdef SK_BUILD_FOR_WIN
-        #include <windows.h>
-        inline int64_t sk_get_thread_id() { return GetCurrentThreadId(); }
-    #else
-        #include <pthread.h>
-        inline int64_t sk_get_thread_id() { return (int64_t)pthread_self(); }
-    #endif
+    #include "../private/SkThreadID.h"
+    static const SkThreadID kNoOwner = 0;

[mtklein, 2015/09/29 19:52:40]

Think it makes sense to move this knowledge into SkThreadID.h?

[herb_g, 2015/09/29 20:25:02]

Done.

 #endif
 
-typedef int64_t SkThreadID;
-
-SkDEBUGCODE(static const SkThreadID kNoOwner = 0;)
-
 struct SkBaseMutex {
     void acquire() {
         fSemaphore.wait();
-        SkDEBUGCODE(fOwner = sk_get_thread_id();)
+        SkDEBUGCODE(fOwner = SkGetThreadID();)
     }
 
     void release() {
         this->assertHeld();
         SkDEBUGCODE(fOwner = kNoOwner;)
         fSemaphore.signal();
     }
 
     void assertHeld() {
-        SkASSERT(fOwner == sk_get_thread_id());
+        SkASSERT(fOwner == SkGetThreadID());
     }
 
     SkBaseSemaphore fSemaphore;
     SkDEBUGCODE(SkThreadID fOwner;)
 };
 
 // This needs to use subclassing instead of encapsulation to make SkAutoMutexAcquire to work.
 class SkMutex : public SkBaseMutex {
 public:
     SkMutex () {
@@ skipping 41 matching lines @@
     }
 
 private:
     Lock* fMutex;
 };
 
 typedef SkAutoTAcquire<SkBaseMutex> SkAutoMutexAcquire;
 #define SkAutoMutexAcquire(...) SK_REQUIRE_LOCAL_VAR(SkAutoMutexAcquire)
 
 #endif//SkMutex_DEFINED