commit 5baedd637806293e9da600af42ada8f75e7db580
author bsalomon <bsalomon@google.com> Mon Mar 09 12:15:53 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Mar 09 12:15:53 2015 -0700
tree 1f615014c9411855495c08f7c81f03f779ad117b
parent d2737ad7dd8f4ea94a74034027014fd3d78923cb

Use global GrMemoryPools protected by mutex for GrProcessor/GrBatch

BUG=chromium:464892

Review URL: https://codereview.chromium.org/991943002

src/gpu/GrProcessor.cpp

diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 08f437d..3b8cb67 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -12,7 +12,7 @@
 #include "GrInvariantOutput.h"
 #include "GrMemoryPool.h"
 #include "GrXferProcessor.h"
-#include "SkTLS.h"
+#include "SkMutex.h"
 
 #if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
 
@@ -96,24 +96,27 @@
 }
 }
 
-class GrProcessor_Globals {
+
+// We use a global pool protected by a mutex. Chrome may use the same GrContext on different
+// threads. The GrContext is not used concurrently on different threads and there is a memory
+// barrier between accesses of a context on different threads. Also, there may be multiple
+// GrContexts and those contexts may be in use concurrently on different threads.
+namespace {
+SK_DECLARE_STATIC_MUTEX(gProcessorPoolMutex);
+class MemoryPoolAccessor {
 public:
-    static GrMemoryPool* GetTLS() {
-        return (GrMemoryPool*)SkTLS::Get(CreateTLS, DeleteTLS);
-    }
+    MemoryPoolAccessor() { gProcessorPoolMutex.acquire(); }
 
-private:
-    static void* CreateTLS() {
-        return SkNEW_ARGS(GrMemoryPool, (4096, 4096));
-    }
+    ~MemoryPoolAccessor() { gProcessorPoolMutex.release(); }
 
-    static void DeleteTLS(void* pool) {
-        SkDELETE(reinterpret_cast<GrMemoryPool*>(pool));
+    GrMemoryPool* pool() const {
+        static GrMemoryPool gPool(4096, 4096);
+        return &gPool;
     }
 };
+}
 
-int32_t GrProcessor::gCurrProcessorClassID =
-        GrProcessor::kIllegalProcessorClassID;
+int32_t GrProcessor::gCurrProcessorClassID = GrProcessor::kIllegalProcessorClassID;
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -125,11 +128,11 @@
 }
 
 void* GrProcessor::operator new(size_t size) {
-    return GrProcessor_Globals::GetTLS()->allocate(size);
+    return MemoryPoolAccessor().pool()->allocate(size);
 }
 
 void GrProcessor::operator delete(void* target) {
-    GrProcessor_Globals::GetTLS()->release(target);
+    return MemoryPoolAccessor().pool()->release(target);
 }
 
 bool GrProcessor::hasSameTextureAccesses(const GrProcessor& that) const {