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

revert surfaceflinger leak fix as it uncovered a crasher on xoom 

Bug: 4600244
Change-Id: Ia68ebf0f243a051ff6a21b3863e3e5d259bbf7ac
This commit is contained in:
Mathias Agopian 2011-06-15 19:20:52 -07:00 committed by Alex Ray
parent 0151ac8945
commit dace0b45d0
2 changed files with 9 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/utils/RefBase.h
View File

@ -116,20 +116,6 @@ public:
typedef RefBase basetype;
// used to override the RefBase destruction.
class Destroyer {
friend class RefBase;
friend class weakref_type;
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();

44
libs/utils/RefBase.cpp
View File

@ -48,11 +48,6 @@ namespace android {
// ---------------------------------------------------------------------------
RefBase::Destroyer::~Destroyer() {
}
// ---------------------------------------------------------------------------
class RefBase::weakref_impl : public RefBase::weakref_type
{
public:
@ -60,7 +55,7 @@ public:
volatile int32_t mWeak;
RefBase* const mBase;
volatile int32_t mFlags;
Destroyer* mDestroyer;
#if !DEBUG_REFS
@ -69,7 +64,6 @@ public:
, mWeak(0)
, mBase(base)
, mFlags(0)
, mDestroyer(0)
{
}
@ -316,11 +310,7 @@ 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) {
if (refs->mDestroyer) {
refs->mDestroyer->destroy(this);
} else {
delete this;
}
delete this;
}
}
refs->removeWeakRef(id);
@ -355,9 +345,7 @@ int32_t RefBase::getStrongCount() const
return mRefs->mStrong;
}
void RefBase::setDestroyer(RefBase::Destroyer* destroyer) {
mRefs->mDestroyer = destroyer;
}
RefBase* RefBase::weakref_type::refBase() const
{
@ -381,28 +369,16 @@ void RefBase::weakref_type::decWeak(const void* id)
if (c != 1) return;
if ((impl->mFlags&OBJECT_LIFETIME_WEAK) != OBJECT_LIFETIME_WEAK) {
if (impl->mStrong == INITIAL_STRONG_VALUE) {
if (impl->mBase) {
if (impl->mDestroyer) {
impl->mDestroyer->destroy(impl->mBase);
} else {
delete impl->mBase;
}
}
} else {
if (impl->mStrong == INITIAL_STRONG_VALUE)
delete impl->mBase;
else {
// LOGV("Freeing refs %p of old RefBase %p\n", this, impl->mBase);
delete impl;
}
} else {
impl->mBase->onLastWeakRef(id);
if ((impl->mFlags&OBJECT_LIFETIME_FOREVER) != OBJECT_LIFETIME_FOREVER) {
if (impl->mBase) {
if (impl->mDestroyer) {
impl->mDestroyer->destroy(impl->mBase);
} else {
delete impl->mBase;
}
}
delete impl->mBase;
}
}
}
@ -526,10 +502,8 @@ RefBase::RefBase()
RefBase::~RefBase()
{
if ((mRefs->mFlags & OBJECT_LIFETIME_WEAK) == OBJECT_LIFETIME_WEAK) {
if (mRefs->mWeak == 0) {
delete mRefs;
}
if (mRefs->mWeak == 0) {
delete mRefs;
}
}