openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 

Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
This commit is contained in:
Mathias Agopian 2011-06-12 18:05:53 -07:00 committed by Alex Ray
parent a538e268e6
commit 9b6259aa57
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/utils/RefBase.h
View File

@ -116,17 +116,23 @@ public:
typedef RefBase basetype;
// used to override the RefBase destruction.
class Destroyer {
friend class RefBase;
public:
virtual ~Destroyer();
private:
virtual void destroy(RefBase const* base) = 0;
};
// Make sure to never acquire a strong reference from this function. The
// same restrictions than for destructors apply.
void setDestroyer(Destroyer* destroyer);
protected:
RefBase();
virtual ~RefBase();
// called when the last reference goes away. this is responsible for
// calling the destructor. The default implementation just does
// "delete this;".
// Make sure to never acquire a strong reference from this function. The
// same restrictions than for destructors apply.
virtual void destroy() const;
//! Flags for extendObjectLifetime()
enum {
OBJECT_LIFETIME_WEAK = 0x0001,

34
libs/utils/RefBase.cpp
View File

@ -48,6 +48,11 @@ namespace android {
// ---------------------------------------------------------------------------
RefBase::Destroyer::~Destroyer() {
}
// ---------------------------------------------------------------------------
class RefBase::weakref_impl : public RefBase::weakref_type
{
public:
@ -55,7 +60,7 @@ public:
volatile int32_t mWeak;
RefBase* const mBase;
volatile int32_t mFlags;
Destroyer* mDestroyer;
#if !DEBUG_REFS
@ -64,6 +69,7 @@ public:
, mWeak(0)
, mBase(base)
, mFlags(0)
, mDestroyer(0)
{
}
@ -298,10 +304,6 @@ void RefBase::incStrong(const void* id) const
const_cast<RefBase*>(this)->onFirstRef();
}
void RefBase::destroy() const {
delete this;
}
void RefBase::decStrong(const void* id) const
{
weakref_impl* const refs = mRefs;
@ -314,7 +316,11 @@ void RefBase::decStrong(const void* id) const
if (c == 1) {
const_cast<RefBase*>(this)->onLastStrongRef(id);
if ((refs->mFlags&OBJECT_LIFETIME_WEAK) != OBJECT_LIFETIME_WEAK) {
destroy();
if (refs->mDestroyer) {
refs->mDestroyer->destroy(this);
} else {
delete this;
}
}
}
refs->removeWeakRef(id);
@ -349,7 +355,9 @@ int32_t RefBase::getStrongCount() const
return mRefs->mStrong;
}
void RefBase::setDestroyer(RefBase::Destroyer* destroyer) {
mRefs->mDestroyer = destroyer;
}
RefBase* RefBase::weakref_type::refBase() const
{
@ -375,7 +383,11 @@ void RefBase::weakref_type::decWeak(const void* id)
if ((impl->mFlags&OBJECT_LIFETIME_WEAK) != OBJECT_LIFETIME_WEAK) {
if (impl->mStrong == INITIAL_STRONG_VALUE) {
if (impl->mBase) {
impl->mBase->destroy();
if (impl->mDestroyer) {
impl->mDestroyer->destroy(impl->mBase);
} else {
delete impl->mBase;
}
}
} else {
// LOGV("Freeing refs %p of old RefBase %p\n", this, impl->mBase);
@ -385,7 +397,11 @@ void RefBase::weakref_type::decWeak(const void* id)
impl->mBase->onLastWeakRef(id);
if ((impl->mFlags&OBJECT_LIFETIME_FOREVER) != OBJECT_LIFETIME_FOREVER) {
if (impl->mBase) {
impl->mBase->destroy();
if (impl->mDestroyer) {
impl->mDestroyer->destroy(impl->mBase);
} else {
delete impl->mBase;
}
}
}
}