X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b331163bffd790ced0e88b73f44f86d49ccc48a5..ef6cf650f4a75c3f97de06b51fa104f2069b9ea2:/icuSources/common/sharedobject.cpp diff --git a/icuSources/common/sharedobject.cpp b/icuSources/common/sharedobject.cpp index 6affcd09..bffd8a3f 100644 --- a/icuSources/common/sharedobject.cpp +++ b/icuSources/common/sharedobject.cpp @@ -1,42 +1,68 @@ /* ****************************************************************************** -* Copyright (C) 2014, International Business Machines +* Copyright (C) 2015, International Business Machines * Corporation and others. All Rights Reserved. ****************************************************************************** * sharedobject.cpp */ #include "sharedobject.h" +#include "uassert.h" U_NAMESPACE_BEGIN + SharedObject::~SharedObject() {} +UnifiedCacheBase::~UnifiedCacheBase() {} + void -SharedObject::addRef() const { +SharedObject::addRef(UBool fromWithinCache) const { umtx_atomic_inc(&totalRefCount); + + // Although items in use may not be correct immediately, it + // will be correct eventually. + if (umtx_atomic_inc(&hardRefCount) == 1 && cachePtr != NULL) { + // If this object is cached, and the hardRefCount goes from 0 to 1, + // then the increment must happen from within the cache while the + // cache global mutex is locked. In this way, we can be rest assured + // that data races can't happen if the cache performs some task if + // the hardRefCount is zero while the global cache mutex is locked. + (void)fromWithinCache; // Suppress unused variable warning in non-debug builds. + U_ASSERT(fromWithinCache); + cachePtr->incrementItemsInUse(); + } } void -SharedObject::removeRef() const { - if(umtx_atomic_dec(&totalRefCount) == 0) { +SharedObject::removeRef(UBool fromWithinCache) const { + UBool decrementItemsInUse = (umtx_atomic_dec(&hardRefCount) == 0); + UBool allReferencesGone = (umtx_atomic_dec(&totalRefCount) == 0); + + // Although items in use may not be correct immediately, it + // will be correct eventually. + if (decrementItemsInUse && cachePtr != NULL) { + if (fromWithinCache) { + cachePtr->decrementItemsInUse(); + } else { + cachePtr->decrementItemsInUseWithLockingAndEviction(); + } + } + if (allReferencesGone) { delete this; } } void SharedObject::addSoftRef() const { - addRef(); - umtx_atomic_inc(&softRefCount); + umtx_atomic_inc(&totalRefCount); + ++softRefCount; } void SharedObject::removeSoftRef() const { - umtx_atomic_dec(&softRefCount); - removeRef(); -} - -UBool -SharedObject::allSoftReferences() const { - return umtx_loadAcquire(totalRefCount) == umtx_loadAcquire(softRefCount); + --softRefCount; + if (umtx_atomic_dec(&totalRefCount) == 0) { + delete this; + } } int32_t @@ -45,8 +71,8 @@ SharedObject::getRefCount() const { } int32_t -SharedObject::getSoftRefCount() const { - return umtx_loadAcquire(softRefCount); +SharedObject::getHardRefCount() const { + return umtx_loadAcquire(hardRefCount); } void