ab1c13864d
Add INHERITED declarations to class declarations that prevent compilation with the flag. Remove SK_DEFINE_INST_COUNT from all class implementations. Instead, use function-local static variables in the reference count helper classes to create the global instances to store the needed info. The accessor functions are defined inline in the helper classes, so definitions are not needed. The initialization point of the variables should be as well defined as previously. Remove SK_DECLARE_INST_COUNT_TEMPLATE and use SK_DECLARE_INST_COUNT instead. This avoids possible future compilation errors further. For SK_ENABLE_INST_COUNT=0 compilation, add an empty static member function to all classes that use SK_DECLARE_INST_COUNT and SK_DECLARE_INST_COUNT_ROOT macros. The function ensures that classes contain public INHERITED typedef. This member function seems to be compiled away. This shouĺd ensure that part of the compilation errors are caught earlier. Also adds DSK_DECLARE_INST_COUNT to few SkPDFDict subclasses. R=robertphillips@google.com, richardlin@chromium.org, bsalomon@google.com Author: kkinnunen@nvidia.com Review URL: https://codereview.chromium.org/98703002 git-svn-id: http://skia.googlecode.com/svn/trunk@12501 2bbb7eff-a529-9590-31e7-b0007b416f81
201 lines
4.7 KiB
C++
201 lines
4.7 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "SkBenchmark.h"
|
|
#include "SkRefCnt.h"
|
|
#include "SkThread.h"
|
|
#include "SkWeakRefCnt.h"
|
|
#include <memory>
|
|
|
|
enum {
|
|
M = 2
|
|
};
|
|
|
|
class RefCntBench_Stack : public SkBenchmark {
|
|
public:
|
|
virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return "ref_cnt_stack";
|
|
}
|
|
|
|
virtual void onDraw(const int loops, SkCanvas*) {
|
|
for (int i = 0; i < loops; ++i) {
|
|
SkRefCnt ref;
|
|
for (int j = 0; j < M; ++j) {
|
|
ref.ref();
|
|
ref.unref();
|
|
}
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SkBenchmark INHERITED;
|
|
};
|
|
|
|
class PlacedRefCnt : public SkRefCnt {
|
|
public:
|
|
SK_DECLARE_INST_COUNT(PlacedRefCnt)
|
|
|
|
PlacedRefCnt() : SkRefCnt() { }
|
|
void operator delete(void*) { }
|
|
|
|
private:
|
|
typedef SkRefCnt INHERITED;
|
|
};
|
|
|
|
class RefCntBench_Heap : public SkBenchmark {
|
|
public:
|
|
virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return "ref_cnt_heap";
|
|
}
|
|
|
|
virtual void onDraw(const int loops, SkCanvas*) {
|
|
char memory[sizeof(PlacedRefCnt)];
|
|
for (int i = 0; i < loops; ++i) {
|
|
PlacedRefCnt* ref = new (memory) PlacedRefCnt();
|
|
for (int j = 0; j < M; ++j) {
|
|
ref->ref();
|
|
ref->unref();
|
|
}
|
|
ref->unref();
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SkBenchmark INHERITED;
|
|
};
|
|
|
|
class RefCntBench_New : public SkBenchmark {
|
|
public:
|
|
virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return "ref_cnt_new";
|
|
}
|
|
|
|
virtual void onDraw(const int loops, SkCanvas*) {
|
|
for (int i = 0; i < loops; ++i) {
|
|
SkRefCnt* ref = new SkRefCnt();
|
|
for (int j = 0; j < M; ++j) {
|
|
ref->ref();
|
|
ref->unref();
|
|
}
|
|
ref->unref();
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SkBenchmark INHERITED;
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
class WeakRefCntBench_Stack : public SkBenchmark {
|
|
public:
|
|
virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return "ref_cnt_stack_weak";
|
|
}
|
|
|
|
virtual void onDraw(const int loops, SkCanvas*) {
|
|
for (int i = 0; i < loops; ++i) {
|
|
SkWeakRefCnt ref;
|
|
for (int j = 0; j < M; ++j) {
|
|
ref.ref();
|
|
ref.unref();
|
|
}
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SkBenchmark INHERITED;
|
|
};
|
|
|
|
class PlacedWeakRefCnt : public SkWeakRefCnt {
|
|
public:
|
|
PlacedWeakRefCnt() : SkWeakRefCnt() { }
|
|
void operator delete(void*) { }
|
|
};
|
|
|
|
class WeakRefCntBench_Heap : public SkBenchmark {
|
|
public:
|
|
virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return "ref_cnt_heap_weak";
|
|
}
|
|
|
|
virtual void onDraw(const int loops, SkCanvas*) {
|
|
char memory[sizeof(PlacedWeakRefCnt)];
|
|
for (int i = 0; i < loops; ++i) {
|
|
PlacedWeakRefCnt* ref = new (memory) PlacedWeakRefCnt();
|
|
for (int j = 0; j < M; ++j) {
|
|
ref->ref();
|
|
ref->unref();
|
|
}
|
|
ref->unref();
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SkBenchmark INHERITED;
|
|
};
|
|
|
|
class WeakRefCntBench_New : public SkBenchmark {
|
|
public:
|
|
virtual bool isSuitableFor(Backend backend) SK_OVERRIDE {
|
|
return backend == kNonRendering_Backend;
|
|
}
|
|
|
|
protected:
|
|
virtual const char* onGetName() {
|
|
return "ref_cnt_new_weak";
|
|
}
|
|
|
|
virtual void onDraw(const int loops, SkCanvas*) {
|
|
for (int i = 0; i < loops; ++i) {
|
|
SkWeakRefCnt* ref = new SkWeakRefCnt();
|
|
for (int j = 0; j < M; ++j) {
|
|
ref->ref();
|
|
ref->unref();
|
|
}
|
|
ref->unref();
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef SkBenchmark INHERITED;
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_BENCH( return new RefCntBench_Stack(); )
|
|
DEF_BENCH( return new RefCntBench_Heap(); )
|
|
DEF_BENCH( return new RefCntBench_New(); )
|
|
|
|
DEF_BENCH( return new WeakRefCntBench_Stack(); )
|
|
DEF_BENCH( return new WeakRefCntBench_Heap(); )
|
|
DEF_BENCH( return new WeakRefCntBench_New(); )
|