Make leak counters thread-safe

include/core/SkInstCnt.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkInstCnt_DEFINED
 #define SkInstCnt_DEFINED
 
 /*
  * The instance counting system consists of three macros that create the
  * instance counting machinery. A class is added to the system by adding:
  *   SK_DECLARE_INST_COUNT at the top of its declaration for derived classes
  *   SK_DECLARE_INST_COUNT_ROOT at the top of its declaration for a root class
  * At the end of an application a call to all the "root" objects'
  * CheckInstanceCount methods should be made
  */
 #include "SkTypes.h"
 
 #if SK_ENABLE_INST_COUNT
+#include "SkOnce.h"
 #include "SkTArray.h"
 #include "SkThread_platform.h"
 
 extern bool gPrintInstCount;
 
+SkBaseMutex& SkGetInstCntAddInstChildMutex();
+
 // The non-root classes just register themselves with their parent
 #define SK_DECLARE_INST_COUNT(className)                                    \
     SK_DECLARE_INST_COUNT_INTERNAL(className,                               \
                                    INHERITED::AddInstChild(CheckInstanceCount);)
 
 // The root classes registers a function to print out the memory stats when
 // the app ends
 #define SK_DECLARE_INST_COUNT_ROOT(className)                               \
     SK_DECLARE_INST_COUNT_INTERNAL(className, atexit(exitPrint);)
 
 #define SK_DECLARE_INST_COUNT_INTERNAL(className, initStep)                 \
     class SkInstanceCountHelper {                                           \
     public:                                                                 \
         typedef int (*PFCheckInstCnt)(int level, bool cleanUp);             \
         SkInstanceCountHelper() {                                           \
-            static bool gInited;                                            \
-            if (!gInited) {                                                 \
-                initStep                                                    \
-                GetChildren() = new SkTArray<PFCheckInstCnt>;               \
-                gInited = true;                                             \
-            }                                                               \
+            SK_DECLARE_STATIC_ONCE(once);                                   \
+            SkOnce<void*>(&once, init, NULL);                               \
             sk_atomic_inc(GetInstanceCountPtr());                           \
         }                                                                   \
                                                                             \
+        static void init(void*) {                                           \
+            initStep                                                        \
+        }                                                                   \
+                                                                            \
         SkInstanceCountHelper(const SkInstanceCountHelper&) {               \
             sk_atomic_inc(GetInstanceCountPtr());                           \
         }                                                                   \
                                                                             \
         ~SkInstanceCountHelper() {                                          \
             sk_atomic_dec(GetInstanceCountPtr());                           \
         }                                                                   \
                                                                             \
         static int32_t* GetInstanceCountPtr() {                             \
             static int32_t gInstanceCount;                                  \
@@ skipping 17 matching lines @@
                                                                             \
     static int CheckInstanceCount(int level = 0, bool cleanUp = false) {    \
         if (gPrintInstCount && 0 != GetInstanceCount()) {                   \
             SkDebugf("%*c Leaked %s: %d\n",                                 \
                      4*level, ' ', #className,                              \
                      GetInstanceCount());                                   \
         }                                                                   \
         if (NULL == SkInstanceCountHelper::GetChildren()) {                 \
             return GetInstanceCount();                                      \
         }                                                                   \
-        SkTArray<int (*)(int, bool)>* children =                            \
+        SkTArray<typename SkInstanceCountHelper::PFCheckInstCnt>* children = \
             SkInstanceCountHelper::GetChildren();                           \
         int childCount = children->count();                                 \
         int count = GetInstanceCount();                                     \
         for (int i = 0; i < childCount; ++i) {                              \
             count -= (*(*children)[i])(level+1, cleanUp);                   \
         }                                                                   \
         SkASSERT(count >= 0);                                               \
         if (gPrintInstCount && childCount > 0 && count > 0) {               \
             SkDebugf("%*c Leaked ???: %d\n", 4*(level + 1), ' ', count);    \
         }                                                                   \
         if (cleanUp) {                                                      \
             delete children;                                                \
             SkInstanceCountHelper::GetChildren() = NULL;                    \
         }                                                                   \
         return GetInstanceCount();                                          \
     }                                                                       \
                                                                             \
     static void AddInstChild(int (*childCheckInstCnt)(int, bool)) {         \
-        if (CheckInstanceCount != childCheckInstCnt &&                      \
-            NULL != SkInstanceCountHelper::GetChildren()) {                 \
+        if (CheckInstanceCount != childCheckInstCnt) {                      \
+            SkAutoMutexAcquire ama(SkGetInstCntAddInstChildMutex());        \

[mtklein, 2013/12/05 16:06:54]

Does this one really need to be a global mutex?  Seems like each
SkInstanceCountHelper class could have its own static mutex() method?

[Kimmo Kinnunen, 2013/12/09 07:54:51]

Well, they could.. I didn't think they should.

Changed so that each helper has their own mutex.
Done.

+            if (NULL == SkInstanceCountHelper::GetChildren()) {             \
+                SkInstanceCountHelper::GetChildren() =                      \
+                    new SkTArray<typename SkInstanceCountHelper::PFCheckInstCnt>; \
+            }                                                               \
             SkInstanceCountHelper::GetChildren()->push_back(childCheckInstCnt); \
         }                                                                   \
     }
 
 #else
 // Typically SK_ENABLE_INST_COUNT=0. Make sure the class declares public typedef INHERITED by
 // causing a compile-time error if the typedef is missing. This way SK_ENABLE_INST_COUNT=1 stays
 // compiling.
 #define SK_DECLARE_INST_COUNT(className) static void AddInstChild() { INHERITED::AddInstChild(); }
 #define SK_DECLARE_INST_COUNT_ROOT(className) static void AddInstChild() { }
 #endif
 
 // Following are deprecated. They are defined only for backwards API compatibility.
 #define SK_DECLARE_INST_COUNT_TEMPLATE(className) SK_DECLARE_INST_COUNT(className)
 #define SK_DEFINE_INST_COUNT(className)
 #define SK_DEFINE_INST_COUNT_TEMPLATE(templateInfo, className)
 
 #endif // SkInstCnt_DEFINED