SkGlyphCache_Globals: SkMutex -> SkSpinlock

src/core/SkGlyphCache_Globals.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGlyphCache_Globals_DEFINED
 #define SkGlyphCache_Globals_DEFINED
 
 #include "SkGlyphCache.h"
+#include "SkSpinlock.h"
 #include "SkTLS.h"
 
 #ifndef SK_DEFAULT_FONT_CACHE_COUNT_LIMIT
     #define SK_DEFAULT_FONT_CACHE_COUNT_LIMIT   2048
 #endif
 
 #ifndef SK_DEFAULT_FONT_CACHE_LIMIT
     #define SK_DEFAULT_FONT_CACHE_LIMIT     (2 * 1024 * 1024)
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkMutex;
+class SkSpinlock;
 
 class SkGlyphCache_Globals {
 public:
+    using Lock = SkSpinlock;
     enum UseMutex {
         kNo_UseMutex,  // thread-local cache
         kYes_UseMutex  // shared cache
     };
 
     SkGlyphCache_Globals(UseMutex um) {
         fHead = NULL;
         fTotalMemoryUsed = 0;
         fCacheSizeLimit = SK_DEFAULT_FONT_CACHE_LIMIT;
         fCacheCount = 0;
         fCacheCountLimit = SK_DEFAULT_FONT_CACHE_COUNT_LIMIT;
 
-        fMutex = (kYes_UseMutex == um) ? SkNEW(SkMutex) : NULL;
+        fMutex = (kYes_UseMutex == um) ? SkNEW(SkSpinlock) : NULL;

[mtklein, 2015/07/08 19:33:47]

Lock?

[herb_g, 2015/07/08 20:21:57]

Ok. I have obviously botched the way TLS is being handled. Can I remove the TLS
code path from this to simplify the problem? 

     }
 
     ~SkGlyphCache_Globals() {
         SkGlyphCache* cache = fHead;
         while (cache) {
             SkGlyphCache* next = cache->fNext;
             SkDELETE(cache);
             cache = next;
         }
 
         SkDELETE(fMutex);
     }
 
-    SkMutex*        fMutex;
+    Lock*        fMutex;
 
     SkGlyphCache* internalGetHead() const { return fHead; }
     SkGlyphCache* internalGetTail() const;
 
     size_t getTotalMemoryUsed() const { return fTotalMemoryUsed; }
     int getCacheCountUsed() const { return fCacheCount; }
 
 #ifdef SK_DEBUG
     void validate() const;
 #else
@@ skipping 48 matching lines @@
     static void* CreateTLS() {
         return SkNEW_ARGS(SkGlyphCache_Globals, (kNo_UseMutex));
     }
 
     static void DeleteTLS(void* ptr) {
         SkDELETE((SkGlyphCache_Globals*)ptr);
     }
 };
 
 #endif