diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-13 18:54:08 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-06-13 18:54:08 +0000 |
| commit | 4d73ac22a1b99402fc8cff78a4eb4b27aa8fe019 (patch) | |
| tree | e12e9be96cdc105dfc275ee9ada6982d81d3e4fb /include/core | |
| parent | 972265db219ce25b5159879c75e6c62efaf0fa79 (diff) | |
Version 2 of the Instance Counting system. This one simplifies the print out of information.
http://codereview.appspot.com/6296069/
git-svn-id: http://skia.googlecode.com/svn/trunk@4255 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkInstCnt.h | 90 | ||||
| -rw-r--r-- | include/core/SkRefCnt.h | 4 |
2 files changed, 65 insertions, 29 deletions
diff --git a/include/core/SkInstCnt.h b/include/core/SkInstCnt.h index 3c63ef7e28..f3519a14dd 100644 --- a/include/core/SkInstCnt.h +++ b/include/core/SkInstCnt.h @@ -12,40 +12,74 @@ /* * The instance counting system consists of three macros that create the * instance counting machinery. A class is added to the system by adding: - * DECLARE_INST_COUNT at the top of its declaration - * DEFINE_INST_COUNT at the top of its .cpp file - * and a PRINT_INST_COUNT line at the application's end point + * 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 + * SK_DEFINE_INST_COUNT at the top of its .cpp file (for both kinds). + * At the end of an application a call to all the "root" objects' + * CheckInstanceCount methods should be made */ #ifdef SK_DEBUG -#define DECLARE_INST_COUNT \ - class SkInstanceCountHelper { \ - public: \ - SkInstanceCountHelper() { \ - gInstanceCount++; \ - } \ - \ - ~SkInstanceCountHelper() { \ - gInstanceCount--; \ - } \ - \ - static int32_t gInstanceCount; \ - } fInstanceCountHelper; \ - \ - static int32_t GetInstanceCount() { \ - return SkInstanceCountHelper::gInstanceCount; \ +#include "SkTArray.h" + +#define SK_DECLARE_INST_COUNT(className) \ + SK_DECLARE_INST_COUNT_INTERNAL(className, \ + INHERITED::AddInstChild(CheckInstanceCount);) + +#define SK_DECLARE_INST_COUNT_ROOT(className) \ + SK_DECLARE_INST_COUNT_INTERNAL(className, ;) + +#define SK_DECLARE_INST_COUNT_INTERNAL(className, initStep) \ + class SkInstanceCountHelper { \ + public: \ + typedef void (*PFCheckInstCnt)(); \ + SkInstanceCountHelper() { \ + if (!gInited) { \ + initStep \ + gInited = true; \ + } \ + gInstanceCount++; \ + } \ + \ + SkInstanceCountHelper(const SkInstanceCountHelper& other) { \ + gInstanceCount++; \ + } \ + \ + ~SkInstanceCountHelper() { \ + gInstanceCount--; \ + } \ + \ + static int32_t gInstanceCount; \ + static bool gInited; \ + static SkTArray<PFCheckInstCnt> gChildren; \ + } fInstanceCountHelper; \ + \ + static void CheckInstanceCount() { \ + if (0 != SkInstanceCountHelper::gInstanceCount) { \ + SkDebugf("Leaked %s objects: %d\n", #className, \ + SkInstanceCountHelper::gInstanceCount); \ + } \ + for (int i = 0; i < SkInstanceCountHelper::gChildren.count(); ++i) { \ + (*SkInstanceCountHelper::gChildren[i])(); \ + } \ + } \ + \ + static void AddInstChild(SkInstanceCountHelper::PFCheckInstCnt \ + childCheckInstCnt) { \ + if (CheckInstanceCount != childCheckInstCnt) { \ + SkInstanceCountHelper::gChildren.push_back(childCheckInstCnt); \ + } \ } -#define DEFINE_INST_COUNT(className) \ - int32_t className::SkInstanceCountHelper::gInstanceCount = 0; +#define SK_DEFINE_INST_COUNT(className) \ + int32_t className::SkInstanceCountHelper::gInstanceCount = 0; \ + bool className::SkInstanceCountHelper::gInited = false; \ + SkTArray<className::SkInstanceCountHelper::PFCheckInstCnt> \ + className::SkInstanceCountHelper::gChildren; -#define PRINT_INST_COUNT(className) \ - SkDebugf("Leaked %s objects: %d\n", \ - #className, \ - className::GetInstanceCount()); #else -#define DECLARE_INST_COUNT -#define DEFINE_INST_COUNT(className) -#define PRINT_INST_COUNT(className) +#define SK_DECLARE_INST_COUNT(className) +#define SK_DECLARE_INST_COUNT_ROOT(className) +#define SK_DEFINE_INST_COUNT(className) #endif #endif // SkInstCnt_DEFINED diff --git a/include/core/SkRefCnt.h b/include/core/SkRefCnt.h index 761546b12b..a00bc3e3f1 100644 --- a/include/core/SkRefCnt.h +++ b/include/core/SkRefCnt.h @@ -25,7 +25,7 @@ */ class SK_API SkRefCnt : SkNoncopyable { public: - DECLARE_INST_COUNT + SK_DECLARE_INST_COUNT_ROOT(SkRefCnt) /** Default construct, initializing the reference count to 1. */ @@ -83,6 +83,8 @@ private: friend class SkWeakRefCnt; mutable int32_t fRefCnt; + + typedef SkNoncopyable INHERITED; }; /////////////////////////////////////////////////////////////////////////////// |