mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

migrate some of the biggest consumer of osl_*InterlockedCount to osl_atomic

Browse Source 
Change-Id: I0e6992afbeffaf3b993e6630fb396d93012890e0
Reviewed-on: https://gerrit.libreoffice.org/632
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Norbert Thiebaud 2012-09-16 02:00:14 -05:00
parent c9d3373dad
commit 195f17ee40
24 changed files with 98 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configmgr/source/access.cxx
View File

@ -108,11 +108,11 @@ namespace css = com::sun::star;
} }
oslInterlockedCount Access::acquireCounting() { oslInterlockedCount Access::acquireCounting() {
return osl_incrementInterlockedCount(&m_refCount); return osl_atomic_increment(&m_refCount);
} }
void Access::releaseNondeleting() { void Access::releaseNondeleting() {
osl_decrementInterlockedCount(&m_refCount); osl_atomic_decrement(&m_refCount);
} }
bool Access::isValue() { bool Access::isValue() {

2
cppu/inc/com/sun/star/uno/Sequence.hxx
View File

@ -56,7 +56,7 @@ inline Sequence< E >::Sequence() SAL_THROW(())
template< class E > template< class E >
inline Sequence< E >::Sequence( const Sequence< E > & rSeq ) SAL_THROW(()) inline Sequence< E >::Sequence( const Sequence< E > & rSeq ) SAL_THROW(())
{ {
::osl_incrementInterlockedCount( &rSeq._pSequence->nRefCount ); osl_atomic_increment( &rSeq._pSequence->nRefCount );
_pSequence = rSeq._pSequence; _pSequence = rSeq._pSequence;
} }

4
cppu/qa/test_any.cxx
View File

@ -66,13 +66,13 @@ public:
Base(): m_count(0) {} Base(): m_count(0) {}
void acquire() { void acquire() {
if (osl_incrementInterlockedCount(&m_count) == SAL_MAX_INT32) { if (osl_atomic_increment(&m_count) == SAL_MAX_INT32) {
abort(); abort();
} }
} }
void release() { void release() {
if (osl_decrementInterlockedCount(&m_count) == 0) { if (osl_atomic_decrement(&m_count) == 0) {
delete this; delete this;
} }
} }

4
cppu/qa/test_reference.cxx
View File

@ -67,12 +67,12 @@ public:
virtual void SAL_CALL acquire() throw () virtual void SAL_CALL acquire() throw ()
{ {
osl_incrementInterlockedCount( &m_refCount ); osl_atomic_increment( &m_refCount );
} }
virtual void SAL_CALL release() throw () virtual void SAL_CALL release() throw ()
{ {
if ( 0 == osl_decrementInterlockedCount( &m_refCount ) ) if ( 0 == osl_atomic_decrement( &m_refCount ) )
delete this; delete this;
} }

6
cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
View File

@ -284,12 +284,12 @@ void Base::acquire(void)
{ {
m_env_acquire(m_pEnv); m_env_acquire(m_pEnv);
osl_incrementInterlockedCount(&m_nRef); osl_atomic_increment(&m_nRef);
} }
void Base::release(void) void Base::release(void)
{ {
if (osl_decrementInterlockedCount(&m_nRef) == 0) if (osl_atomic_decrement(&m_nRef) == 0)
delete this; delete this;
else else
@ -299,7 +299,7 @@ void Base::release(void)
void Base::harden(uno_Environment ** ppHardEnv) void Base::harden(uno_Environment ** ppHardEnv)
{ {
m_env_harden(ppHardEnv, m_pEnv); m_env_harden(ppHardEnv, m_pEnv);
osl_incrementInterlockedCount(&m_nRef); osl_atomic_increment(&m_nRef);
} }
void Base::acquireWeak(void) void Base::acquireWeak(void)

4
cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
View File

@ -191,7 +191,7 @@ void Mapping::mapInterface(
void Mapping::acquire() SAL_THROW(()) void Mapping::acquire() SAL_THROW(())
{ {
if (osl_incrementInterlockedCount(&m_nCount) == 1) if (osl_atomic_increment(&m_nCount) == 1)
{ {
uno_Mapping * pMapping = this; uno_Mapping * pMapping = this;
@ -201,7 +201,7 @@ void Mapping::acquire() SAL_THROW(())
void Mapping::release() SAL_THROW(()) void Mapping::release() SAL_THROW(())
{ {
if (osl_decrementInterlockedCount(&m_nCount) == 0) if (osl_atomic_decrement(&m_nCount) == 0)
::uno_revokeMapping(this); ::uno_revokeMapping(this);
} }

4
cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
View File

@ -307,7 +307,7 @@ void Proxy::acquire(void)
NULL, NULL,
NULL); NULL);
if (osl_incrementInterlockedCount(&m_nRef) == 1) if (osl_atomic_increment(&m_nRef) == 1)
{ {
// rebirth of proxy zombie // rebirth of proxy zombie
void * pThis = this; void * pThis = this;
@ -350,7 +350,7 @@ void Proxy::release(void)
NULL, NULL,
NULL); NULL);
if (osl_decrementInterlockedCount(&m_nRef) == 0) if (osl_atomic_decrement(&m_nRef) == 0)
m_from.get()->pExtEnv->revokeInterface(m_from.get()->pExtEnv, this); m_from.get()->pExtEnv->revokeInterface(m_from.get()->pExtEnv, this);
if (probeFun) if (probeFun)

73
cppu/source/typelib/typelib.cxx
View File

@ -601,8 +601,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
typelib_IndirectTypeDescription * pIndirect = (typelib_IndirectTypeDescription *)pTmp; typelib_IndirectTypeDescription * pIndirect = (typelib_IndirectTypeDescription *)pTmp;
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nArrayTypeDescriptionCount );
&Init::get().nArrayTypeDescriptionCount );
#endif #endif
pIndirect->pType = 0; pIndirect->pType = 0;
pTmp->nDimensions = 0; pTmp->nDimensions = 0;
@ -616,8 +615,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
typelib_IndirectTypeDescription * pTmp = new typelib_IndirectTypeDescription(); typelib_IndirectTypeDescription * pTmp = new typelib_IndirectTypeDescription();
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nIndirectTypeDescriptionCount );
&Init::get().nIndirectTypeDescriptionCount );
#endif #endif
pTmp->pType = 0; pTmp->pType = 0;
} }
@ -629,8 +627,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
pTmp = new typelib_UnionTypeDescription(); pTmp = new typelib_UnionTypeDescription();
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nUnionTypeDescriptionCount );
&Init::get().nUnionTypeDescriptionCount );
#endif #endif
pTmp->nMembers = 0; pTmp->nMembers = 0;
pTmp->pDiscriminantTypeRef = 0; pTmp->pDiscriminantTypeRef = 0;
@ -648,8 +645,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
pTmp = new typelib_StructTypeDescription(); pTmp = new typelib_StructTypeDescription();
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nCompoundTypeDescriptionCount );
&Init::get().nCompoundTypeDescriptionCount );
#endif #endif
pTmp->aBase.pBaseTypeDescription = 0; pTmp->aBase.pBaseTypeDescription = 0;
pTmp->aBase.nMembers = 0; pTmp->aBase.nMembers = 0;
@ -667,8 +663,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
pTmp = new typelib_CompoundTypeDescription(); pTmp = new typelib_CompoundTypeDescription();
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nCompoundTypeDescriptionCount );
&Init::get().nCompoundTypeDescriptionCount );
#endif #endif
pTmp->pBaseTypeDescription = 0; pTmp->pBaseTypeDescription = 0;
pTmp->nMembers = 0; pTmp->nMembers = 0;
@ -683,8 +678,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
typelib_EnumTypeDescription * pTmp = new typelib_EnumTypeDescription(); typelib_EnumTypeDescription * pTmp = new typelib_EnumTypeDescription();
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nEnumTypeDescriptionCount );
&Init::get().nEnumTypeDescriptionCount );
#endif #endif
pTmp->nDefaultEnumValue = 0; pTmp->nDefaultEnumValue = 0;
pTmp->nEnumValues = 0; pTmp->nEnumValues = 0;
@ -698,8 +692,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
typelib_InterfaceTypeDescription * pTmp = new typelib_InterfaceTypeDescription(); typelib_InterfaceTypeDescription * pTmp = new typelib_InterfaceTypeDescription();
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nInterfaceTypeDescriptionCount );
&Init::get().nInterfaceTypeDescriptionCount );
#endif #endif
pTmp->pBaseTypeDescription = 0; pTmp->pBaseTypeDescription = 0;
pTmp->nMembers = 0; pTmp->nMembers = 0;
@ -719,8 +712,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
typelib_InterfaceMethodTypeDescription * pTmp = new typelib_InterfaceMethodTypeDescription(); typelib_InterfaceMethodTypeDescription * pTmp = new typelib_InterfaceMethodTypeDescription();
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nInterfaceMethodTypeDescriptionCount );
&Init::get().nInterfaceMethodTypeDescriptionCount );
#endif #endif
pTmp->aBase.pMemberName = 0; pTmp->aBase.pMemberName = 0;
pTmp->pReturnTypeRef = 0; pTmp->pReturnTypeRef = 0;
@ -739,8 +731,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
typelib_InterfaceAttributeTypeDescription * pTmp = new typelib_InterfaceAttributeTypeDescription(); typelib_InterfaceAttributeTypeDescription * pTmp = new typelib_InterfaceAttributeTypeDescription();
pRet = (typelib_TypeDescription *)pTmp; pRet = (typelib_TypeDescription *)pTmp;
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( osl_atomic_increment( &Init::get().nInterfaceAttributeTypeDescriptionCount );
&Init::get().nInterfaceAttributeTypeDescriptionCount );
#endif #endif
pTmp->aBase.pMemberName = 0; pTmp->aBase.pMemberName = 0;
pTmp->pAttributeTypeRef = 0; pTmp->pAttributeTypeRef = 0;
@ -758,7 +749,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
{ {
pRet = new typelib_TypeDescription(); pRet = new typelib_TypeDescription();
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( &Init::get().nTypeDescriptionCount ); osl_atomic_increment( &Init::get().nTypeDescriptionCount );
#endif #endif
} }
} }
@ -1429,7 +1420,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_acquire(
typelib_TypeDescription * pTypeDescription ) typelib_TypeDescription * pTypeDescription )
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
::osl_incrementInterlockedCount( &pTypeDescription->nRefCount ); osl_atomic_increment( &pTypeDescription->nRefCount );
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@ -1586,7 +1577,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release(
typelib_TypeDescription * pTD ) typelib_TypeDescription * pTD )
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
sal_Int32 ref = ::osl_decrementInterlockedCount( &pTD->nRefCount ); sal_Int32 ref = osl_atomic_decrement( &pTD->nRefCount );
OSL_ASSERT(ref >= 0); OSL_ASSERT(ref >= 0);
if (0 == ref) if (0 == ref)
{ {
@ -1625,32 +1616,32 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release(
switch( pTD->eTypeClass ) switch( pTD->eTypeClass )
{ {
case typelib_TypeClass_ARRAY: case typelib_TypeClass_ARRAY:
osl_decrementInterlockedCount( &rInit.nArrayTypeDescriptionCount ); osl_atomic_decrement( &rInit.nArrayTypeDescriptionCount );
break; break;
case typelib_TypeClass_SEQUENCE: case typelib_TypeClass_SEQUENCE:
osl_decrementInterlockedCount( &rInit.nIndirectTypeDescriptionCount ); osl_atomic_decrement( &rInit.nIndirectTypeDescriptionCount );
break; break;
case typelib_TypeClass_UNION: case typelib_TypeClass_UNION:
osl_decrementInterlockedCount( &rInit.nUnionTypeDescriptionCount ); osl_atomic_decrement( &rInit.nUnionTypeDescriptionCount );
break; break;
case typelib_TypeClass_STRUCT: case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION: case typelib_TypeClass_EXCEPTION:
osl_decrementInterlockedCount( &rInit.nCompoundTypeDescriptionCount ); osl_atomic_decrement( &rInit.nCompoundTypeDescriptionCount );
break; break;
case typelib_TypeClass_INTERFACE: case typelib_TypeClass_INTERFACE:
osl_decrementInterlockedCount( &rInit.nInterfaceTypeDescriptionCount ); osl_atomic_decrement( &rInit.nInterfaceTypeDescriptionCount );
break; break;
case typelib_TypeClass_INTERFACE_METHOD: case typelib_TypeClass_INTERFACE_METHOD:
osl_decrementInterlockedCount( &rInit.nInterfaceMethodTypeDescriptionCount ); osl_atomic_decrement( &rInit.nInterfaceMethodTypeDescriptionCount );
break; break;
case typelib_TypeClass_INTERFACE_ATTRIBUTE: case typelib_TypeClass_INTERFACE_ATTRIBUTE:
osl_decrementInterlockedCount( &rInit.nInterfaceAttributeTypeDescriptionCount ); osl_atomic_decrement( &rInit.nInterfaceAttributeTypeDescriptionCount );
break; break;
case typelib_TypeClass_ENUM: case typelib_TypeClass_ENUM:
osl_decrementInterlockedCount( &rInit.nEnumTypeDescriptionCount ); osl_atomic_decrement( &rInit.nEnumTypeDescriptionCount );
break; break;
default: default:
osl_decrementInterlockedCount( &rInit.nTypeDescriptionCount ); osl_atomic_decrement( &rInit.nTypeDescriptionCount );
} }
#endif #endif
@ -1681,7 +1672,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register(
// pRef->pType->pWeakRef == 0 means that the description is empty // pRef->pType->pWeakRef == 0 means that the description is empty
if (pTDR->pType->pWeakRef) if (pTDR->pType->pWeakRef)
{ {
if (osl_incrementInterlockedCount( &pTDR->pType->nRefCount ) > 1) if (osl_atomic_increment( &pTDR->pType->nRefCount ) > 1)
{ {
// The refence is incremented. The object cannot be destroyed. // The refence is incremented. The object cannot be destroyed.
// Release the guard at the earliest point. // Release the guard at the earliest point.
@ -1694,7 +1685,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register(
else else
{ {
// destruction of this type in progress (another thread!) // destruction of this type in progress (another thread!)
osl_decrementInterlockedCount( &pTDR->pType->nRefCount ); osl_atomic_decrement( &pTDR->pType->nRefCount );
} }
} }
// take new descr // take new descr
@ -2353,7 +2344,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new(
{ {
typelib_TypeDescriptionReference * pTDR = new typelib_TypeDescriptionReference(); typelib_TypeDescriptionReference * pTDR = new typelib_TypeDescriptionReference();
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_incrementInterlockedCount( &rInit.nTypeDescriptionReferenceCount ); osl_atomic_increment( &rInit.nTypeDescriptionReferenceCount );
#endif #endif
pTDR->nRefCount = 1; pTDR->nRefCount = 1;
pTDR->nStaticRefCount = 0; pTDR->nStaticRefCount = 0;
@ -2384,7 +2375,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire
typelib_TypeDescriptionReference * pRef ) typelib_TypeDescriptionReference * pRef )
SAL_THROW_EXTERN_C() SAL_THROW_EXTERN_C()
{ {
::osl_incrementInterlockedCount( &pRef->nRefCount ); osl_atomic_increment( &pRef->nRefCount );
} }
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@ -2395,7 +2386,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release
// Is it a type description? // Is it a type description?
if( reallyWeak( pRef->eTypeClass ) ) if( reallyWeak( pRef->eTypeClass ) )
{ {
if( ! ::osl_decrementInterlockedCount( &pRef->nRefCount ) ) if( ! osl_atomic_decrement( &pRef->nRefCount ) )
{ {
TypeDescriptor_Init_Impl &rInit = Init::get(); TypeDescriptor_Init_Impl &rInit = Init::get();
if( rInit.pWeakMap ) if( rInit.pWeakMap )
@ -2412,7 +2403,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release
rtl_uString_release( pRef->pTypeName ); rtl_uString_release( pRef->pTypeName );
OSL_ASSERT( pRef->pType == 0 ); OSL_ASSERT( pRef->pType == 0 );
#if OSL_DEBUG_LEVEL > 1 #if OSL_DEBUG_LEVEL > 1
osl_decrementInterlockedCount( &rInit.nTypeDescriptionReferenceCount ); osl_atomic_decrement( &rInit.nTypeDescriptionReferenceCount );
#endif #endif
delete pRef; delete pRef;
} }
@ -2437,7 +2428,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDesc
if( !reallyWeak( pRef->eTypeClass ) && pRef->pType && pRef->pType->pWeakRef ) if( !reallyWeak( pRef->eTypeClass ) && pRef->pType && pRef->pType->pWeakRef )
{ {
// reference is a description and initialized // reference is a description and initialized
osl_incrementInterlockedCount( &((typelib_TypeDescription *)pRef)->nRefCount ); osl_atomic_increment( &((typelib_TypeDescription *)pRef)->nRefCount );
*ppRet = (typelib_TypeDescription *)pRef; *ppRet = (typelib_TypeDescription *)pRef;
return; return;
} }
@ -2447,7 +2438,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDesc
// pRef->pType->pWeakRef == 0 means that the description is empty // pRef->pType->pWeakRef == 0 means that the description is empty
if( pRef->pType && pRef->pType->pWeakRef ) if( pRef->pType && pRef->pType->pWeakRef )
{ {
sal_Int32 n = ::osl_incrementInterlockedCount( &pRef->pType->nRefCount ); sal_Int32 n = osl_atomic_increment( &pRef->pType->nRefCount );
if( n > 1 ) if( n > 1 )
{ {
// The refence is incremented. The object cannot be destroyed. // The refence is incremented. The object cannot be destroyed.
@ -2457,7 +2448,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDesc
} }
else else
{ {
::osl_decrementInterlockedCount( &pRef->pType->nRefCount ); osl_atomic_decrement( &pRef->pType->nRefCount );
// detruction of this type in progress (another thread!) // detruction of this type in progress (another thread!)
// no acces through this weak reference // no acces through this weak reference
pRef->pType = 0; pRef->pType = 0;
@ -2489,7 +2480,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
WeakMap_Impl::const_iterator aIt = rInit.pWeakMap->find( (sal_Unicode*)pName->buffer ); WeakMap_Impl::const_iterator aIt = rInit.pWeakMap->find( (sal_Unicode*)pName->buffer );
if( !(aIt == rInit.pWeakMap->end()) ) // != failed on msc4.2 if( !(aIt == rInit.pWeakMap->end()) ) // != failed on msc4.2
{ {
sal_Int32 n = ::osl_incrementInterlockedCount( &(*aIt).second->nRefCount ); sal_Int32 n = osl_atomic_increment( &(*aIt).second->nRefCount );
if( n > 1 ) if( n > 1 )
{ {
// The refence is incremented. The object cannot be destroyed. // The refence is incremented. The object cannot be destroyed.
@ -2500,7 +2491,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
{ {
// detruction of this type in progress (another thread!) // detruction of this type in progress (another thread!)
// no acces through this weak reference // no acces through this weak reference
::osl_decrementInterlockedCount( &(*aIt).second->nRefCount ); osl_atomic_decrement( &(*aIt).second->nRefCount );
} }
} }
} }

4
cppu/source/uno/IdentityMapping.cxx
View File

@ -47,7 +47,7 @@ static void SAL_CALL s_acquire(uno_Mapping * pMapping) SAL_THROW(())
{ {
static rtl::OUString s_purpose; static rtl::OUString s_purpose;
if (1 == ::osl_incrementInterlockedCount(&static_cast<IdentityMapping *>(pMapping)->m_nRef)) if (1 == osl_atomic_increment(&static_cast<IdentityMapping *>(pMapping)->m_nRef))
{ {
uno_registerMapping( uno_registerMapping(
&pMapping, &pMapping,
@ -60,7 +60,7 @@ static void SAL_CALL s_acquire(uno_Mapping * pMapping) SAL_THROW(())
static void SAL_CALL s_release(uno_Mapping * pMapping) SAL_THROW(()) static void SAL_CALL s_release(uno_Mapping * pMapping) SAL_THROW(())
{ {
if (!::osl_decrementInterlockedCount(&static_cast<IdentityMapping *>(pMapping )->m_nRef)) if (!osl_atomic_decrement(&static_cast<IdentityMapping *>(pMapping )->m_nRef))
uno_revokeMapping(pMapping); uno_revokeMapping(pMapping);
} }

6
cppu/source/uno/assign.hxx
View File

@ -196,8 +196,7 @@ inline sal_Bool _assignArray(
case typelib_TypeClass_SEQUENCE: case typelib_TypeClass_SEQUENCE:
for (i=0; i < nTotalElements; i++) for (i=0; i < nTotalElements; i++)
{ {
::osl_incrementInterlockedCount( osl_atomic_increment( &(*((uno_Sequence **)pSource + i))->nRefCount );
&(*((uno_Sequence **)pSource + i))->nRefCount );
idestructSequence( idestructSequence(
*((uno_Sequence **)pDest + i), *((uno_Sequence **)pDest + i),
pElementTypeRef, pElementTypeDescr, release ); pElementTypeRef, pElementTypeDescr, release );
@ -566,8 +565,7 @@ inline sal_Bool _assignData(
return sal_True; return sal_True;
if (_type_equals( pDestType, pSourceType )) if (_type_equals( pDestType, pSourceType ))
{ {
::osl_incrementInterlockedCount( osl_atomic_increment( &(*(uno_Sequence **)pSource)->nRefCount );
&(*(uno_Sequence **)pSource)->nRefCount );
idestructSequence( idestructSequence(
*(uno_Sequence **)pDest, pDestType, pDestTypeDescr, release ); *(uno_Sequence **)pDest, pDestType, pDestTypeDescr, release );
*(uno_Sequence **)pDest = *(uno_Sequence **)pSource; *(uno_Sequence **)pDest = *(uno_Sequence **)pSource;

4
cppu/source/uno/cascade_mapping.cxx
View File

@ -115,14 +115,14 @@ void MediatorMapping::acquire(void)
{ {
LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl); LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl);
osl_incrementInterlockedCount(&m_refCount); osl_atomic_increment(&m_refCount);
} }
void MediatorMapping::release(void) void MediatorMapping::release(void)
{ {
LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl); LOG_LIFECYLE_MediatorMapping_emit(std::cerr << __FUNCTION__ << std::endl);
if (osl_decrementInterlockedCount(&m_refCount) == 0) if (osl_atomic_decrement(&m_refCount) == 0)
{ {
::uno_revokeMapping(this); ::uno_revokeMapping(this);
} }

4
cppu/source/uno/copy.hxx
View File

@ -506,7 +506,7 @@ inline uno_Sequence * icopyConstructSequence(
(eTypeClass <= typelib_TypeClass_ENUM && (eTypeClass <= typelib_TypeClass_ENUM &&
eTypeClass != typelib_TypeClass_ANY)) eTypeClass != typelib_TypeClass_ANY))
{ {
::osl_incrementInterlockedCount( &pSource->nRefCount ); osl_atomic_increment( &pSource->nRefCount );
return pSource; return pSource;
} }
else // create new sequence else // create new sequence
@ -828,7 +828,7 @@ inline void _copyConstructData(
} }
else else
{ {
::osl_incrementInterlockedCount( &(*(uno_Sequence **)pSource)->nRefCount ); osl_atomic_increment( &(*(uno_Sequence **)pSource)->nRefCount );
*(uno_Sequence **)pDest = *(uno_Sequence **)pSource; *(uno_Sequence **)pDest = *(uno_Sequence **)pSource;
} }
break; break;

2
cppu/source/uno/destr.hxx
View File

@ -327,7 +327,7 @@ inline void idestructSequence(
typelib_TypeDescription * pTypeDescr, typelib_TypeDescription * pTypeDescr,
uno_ReleaseFunc release ) uno_ReleaseFunc release )
{ {
if (::osl_decrementInterlockedCount( &pSeq->nRefCount ) == 0) if (osl_atomic_decrement( &pSeq->nRefCount ) == 0)
{ {
if (pSeq->nElements > 0) if (pSeq->nElements > 0)
{ {

16
cppu/source/uno/lbenv.cxx
View File

@ -537,15 +537,15 @@ static void SAL_CALL defenv_getRegisteredInterfaces(
static void SAL_CALL defenv_acquire( uno_Environment * pEnv ) static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
{ {
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
::osl_incrementInterlockedCount( &that->nWeakRef ); osl_atomic_increment( &that->nWeakRef );
::osl_incrementInterlockedCount( &that->nRef ); osl_atomic_increment( &that->nRef );
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static void SAL_CALL defenv_release( uno_Environment * pEnv ) static void SAL_CALL defenv_release( uno_Environment * pEnv )
{ {
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
if (! ::osl_decrementInterlockedCount( &that->nRef )) if (! osl_atomic_decrement( &that->nRef ))
{ {
// invoke dispose callback // invoke dispose callback
if (pEnv->environmentDisposing) if (pEnv->environmentDisposing)
@ -556,7 +556,7 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv )
OSL_ENSURE( that->aOId2ObjectMap.empty(), "### object entries left!" ); OSL_ENSURE( that->aOId2ObjectMap.empty(), "### object entries left!" );
} }
// free memory if no weak refs left // free memory if no weak refs left
if (! ::osl_decrementInterlockedCount( &that->nWeakRef )) if (! osl_atomic_decrement( &that->nWeakRef ))
{ {
delete that; delete that;
} }
@ -566,14 +566,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv )
static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv ) static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv )
{ {
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
::osl_incrementInterlockedCount( &that->nWeakRef ); osl_atomic_increment( &that->nWeakRef );
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv ) static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
{ {
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
if (! ::osl_decrementInterlockedCount( &that->nWeakRef )) if (! osl_atomic_decrement( &that->nWeakRef ))
{ {
delete that; delete that;
} }
@ -597,13 +597,13 @@ static void SAL_CALL defenv_harden(
uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv; uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
{ {
::osl::MutexGuard guard( rData.mutex ); ::osl::MutexGuard guard( rData.mutex );
if (1 == ::osl_incrementInterlockedCount( &that->nRef )) // is dead if (1 == osl_atomic_increment( &that->nRef )) // is dead
{ {
that->nRef = 0; that->nRef = 0;
return; return;
} }
} }
::osl_incrementInterlockedCount( &that->nWeakRef ); osl_atomic_increment( &that->nWeakRef );
*ppHardEnv = pEnv; *ppHardEnv = pEnv;
} }

4
cppu/source/uno/lbmap.cxx
View File

@ -205,7 +205,7 @@ static void SAL_CALL mediate_free( uno_Mapping * pMapping )
static void SAL_CALL mediate_acquire( uno_Mapping * pMapping ) static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
SAL_THROW(()) SAL_THROW(())
{ {
if (1 == ::osl_incrementInterlockedCount( if (1 == ::osl_atomic_increment(
& static_cast< uno_Mediate_Mapping * >( pMapping )->nRef )) & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
{ {
uno_registerMapping( uno_registerMapping(
@ -219,7 +219,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
static void SAL_CALL mediate_release( uno_Mapping * pMapping ) static void SAL_CALL mediate_release( uno_Mapping * pMapping )
SAL_THROW(()) SAL_THROW(())
{ {
if (! ::osl_decrementInterlockedCount( if (! ::osl_atomic_decrement(
& static_cast< uno_Mediate_Mapping * >( pMapping )->nRef )) & static_cast< uno_Mediate_Mapping * >( pMapping )->nRef ))
{ {
uno_revokeMapping( pMapping ); uno_revokeMapping( pMapping );

4
cppu/source/uno/prim.hxx
View File

@ -116,7 +116,7 @@ inline sal_uInt32 calcSeqMemSize(
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
inline uno_Sequence * createEmptySequence() SAL_THROW(()) inline uno_Sequence * createEmptySequence() SAL_THROW(())
{ {
::osl_incrementInterlockedCount( &g_emptySeq.nRefCount ); osl_atomic_increment( &g_emptySeq.nRefCount );
return &g_emptySeq; return &g_emptySeq;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -144,7 +144,7 @@ inline typelib_TypeDescriptionReference * _getVoidType()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
#define TYPE_ACQUIRE( pType ) \ #define TYPE_ACQUIRE( pType ) \
::osl_incrementInterlockedCount( &(pType)->nRefCount ); osl_atomic_increment( &(pType)->nRefCount );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
extern "C" void * binuno_queryInterface( extern "C" void * binuno_queryInterface(

10
cppu/source/uno/sequence.cxx
View File

@ -720,7 +720,7 @@ static inline bool ireallocSequence(
if (ret) if (ret)
{ {
// destruct sequence // destruct sequence
if (osl_decrementInterlockedCount( &pSeq->nRefCount ) == 0) if (osl_atomic_decrement( &pSeq->nRefCount ) == 0)
{ {
if (nElements > 0) if (nElements > 0)
{ {
@ -926,7 +926,7 @@ sal_Bool SAL_CALL uno_type_sequence_reference2One(
if (ret) if (ret)
{ {
// easy destruction of empty sequence: // easy destruction of empty sequence:
if (osl_decrementInterlockedCount( &pSequence->nRefCount ) == 0) if (osl_atomic_decrement( &pSequence->nRefCount ) == 0)
rtl_freeMemory( pSequence ); rtl_freeMemory( pSequence );
*ppSequence = pNew; *ppSequence = pNew;
} }
@ -969,7 +969,7 @@ sal_Bool SAL_CALL uno_sequence_reference2One(
if (ret) if (ret)
{ {
// easy destruction of empty sequence: // easy destruction of empty sequence:
if (osl_decrementInterlockedCount( &pSequence->nRefCount ) == 0) if (osl_atomic_decrement( &pSequence->nRefCount ) == 0)
rtl_freeMemory( pSequence ); rtl_freeMemory( pSequence );
*ppSequence = pNew; *ppSequence = pNew;
} }
@ -989,7 +989,7 @@ void SAL_CALL uno_sequence_assign(
{ {
if (*ppDest != pSource) if (*ppDest != pSource)
{ {
::osl_incrementInterlockedCount( &pSource->nRefCount ); osl_atomic_increment( &pSource->nRefCount );
idestructSequence( *ppDest, pTypeDescr->pWeakRef, pTypeDescr, release ); idestructSequence( *ppDest, pTypeDescr->pWeakRef, pTypeDescr, release );
*ppDest = pSource; *ppDest = pSource;
} }
@ -1005,7 +1005,7 @@ void SAL_CALL uno_type_sequence_assign(
{ {
if (*ppDest != pSource) if (*ppDest != pSource)
{ {
::osl_incrementInterlockedCount( &pSource->nRefCount ); osl_atomic_increment( &pSource->nRefCount );
idestructSequence( *ppDest, pType, 0, release ); idestructSequence( *ppDest, pType, 0, release );
*ppDest = pSource; *ppDest = pSource;
} }

4
cppuhelper/source/component.cxx
View File

@ -85,7 +85,7 @@ void OComponentHelper::release() throw()
Reference<XInterface > x( xDelegator ); Reference<XInterface > x( xDelegator );
if (! x.is()) if (! x.is())
{ {
if (osl_decrementInterlockedCount( &m_refCount ) == 0) if (osl_atomic_decrement( &m_refCount ) == 0)
{ {
if (! rBHelper.bDisposed) if (! rBHelper.bDisposed)
{ {
@ -117,7 +117,7 @@ void OComponentHelper::release() throw()
} }
} }
// restore the reference count // restore the reference count
osl_incrementInterlockedCount( &m_refCount ); osl_atomic_increment( &m_refCount );
} }
OWeakAggObject::release(); OWeakAggObject::release();
} }

6
cppuhelper/source/component_context.cxx
View File

@ -796,7 +796,7 @@ ComponentContext::ComponentContext(
Reference< lang::XMultiComponentFactory > xMgr( m_xDelegate->getServiceManager() ); Reference< lang::XMultiComponentFactory > xMgr( m_xDelegate->getServiceManager() );
if (xMgr.is()) if (xMgr.is())
{ {
osl_incrementInterlockedCount( &m_refCount ); osl_atomic_increment( &m_refCount );
try try
{ {
// create new smgr based on delegate's one // create new smgr based on delegate's one
@ -815,10 +815,10 @@ ComponentContext::ComponentContext(
} }
catch (...) catch (...)
{ {
osl_decrementInterlockedCount( &m_refCount ); osl_atomic_decrement( &m_refCount );
throw; throw;
} }
osl_decrementInterlockedCount( &m_refCount ); osl_atomic_decrement( &m_refCount );
OSL_ASSERT( m_xSMgr.is() ); OSL_ASSERT( m_xSMgr.is() );
} }
} }

8
cppuhelper/source/implbase.cxx
View File

@ -238,11 +238,11 @@ void WeakComponentImplHelperBase::acquire()
void WeakComponentImplHelperBase::release() void WeakComponentImplHelperBase::release()
throw () throw ()
{ {
if (osl_decrementInterlockedCount( &m_refCount ) == 0) { if (osl_atomic_decrement( &m_refCount ) == 0) {
// ensure no other references are created, via the weak connection point, from now on // ensure no other references are created, via the weak connection point, from now on
disposeWeakConnectionPoint(); disposeWeakConnectionPoint();
// restore reference count: // restore reference count:
osl_incrementInterlockedCount( &m_refCount ); osl_atomic_increment( &m_refCount );
if (! rBHelper.bDisposed) { if (! rBHelper.bDisposed) {
try { try {
dispose(); dispose();
@ -374,11 +374,11 @@ void WeakAggComponentImplHelperBase::release()
if (xDelegator_.is()) { if (xDelegator_.is()) {
OWeakAggObject::release(); OWeakAggObject::release();
} }
else if (osl_decrementInterlockedCount( &m_refCount ) == 0) { else if (osl_atomic_decrement( &m_refCount ) == 0) {
// ensure no other references are created, via the weak connection point, from now on // ensure no other references are created, via the weak connection point, from now on
disposeWeakConnectionPoint(); disposeWeakConnectionPoint();
// restore reference count: // restore reference count:
osl_incrementInterlockedCount( &m_refCount ); osl_atomic_increment( &m_refCount );
if (! rBHelper.bDisposed) { if (! rBHelper.bDisposed) {
try { try {
dispose(); dispose();

22
cppuhelper/source/weak.cxx
View File

@ -100,13 +100,13 @@ Any SAL_CALL OWeakConnectionPoint::queryInterface( const Type & rType )
// XInterface // XInterface
void SAL_CALL OWeakConnectionPoint::acquire() throw() void SAL_CALL OWeakConnectionPoint::acquire() throw()
{ {
osl_incrementInterlockedCount( &m_aRefCount ); osl_atomic_increment( &m_aRefCount );
} }
// XInterface // XInterface
void SAL_CALL OWeakConnectionPoint::release() throw() void SAL_CALL OWeakConnectionPoint::release() throw()
{ {
if (! osl_decrementInterlockedCount( &m_aRefCount )) if (! osl_atomic_decrement( &m_aRefCount ))
delete this; delete this;
} }
@ -141,7 +141,7 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::co
if (m_pObject) if (m_pObject)
{ {
oslInterlockedCount n = osl_incrementInterlockedCount( &m_pObject->m_refCount ); oslInterlockedCount n = osl_atomic_increment( &m_pObject->m_refCount );
if (n > 1) if (n > 1)
{ {
@ -150,11 +150,11 @@ Reference< XInterface > SAL_CALL OWeakConnectionPoint::queryAdapted() throw(::co
guard.clear(); guard.clear();
// WeakObject has a (XInterface *) cast operator // WeakObject has a (XInterface *) cast operator
ret = *m_pObject; ret = *m_pObject;
n = osl_decrementInterlockedCount( &m_pObject->m_refCount ); n = osl_atomic_decrement( &m_pObject->m_refCount );
} }
else else
// Another thread wait in the dispose method at the guard // Another thread wait in the dispose method at the guard
n = osl_decrementInterlockedCount( &m_pObject->m_refCount ); n = osl_atomic_decrement( &m_pObject->m_refCount );
} }
return ret; return ret;
@ -199,13 +199,13 @@ Any SAL_CALL OWeakObject::queryInterface( const Type & rType ) throw(::com::sun:
// XInterface // XInterface
void SAL_CALL OWeakObject::acquire() throw() void SAL_CALL OWeakObject::acquire() throw()
{ {
osl_incrementInterlockedCount( &m_refCount ); osl_atomic_increment( &m_refCount );
} }
// XInterface // XInterface
void SAL_CALL OWeakObject::release() throw() void SAL_CALL OWeakObject::release() throw()
{ {
if (osl_decrementInterlockedCount( &m_refCount ) == 0) { if (osl_atomic_decrement( &m_refCount ) == 0) {
// notify/clear all weak-refs before object's dtor is executed // notify/clear all weak-refs before object's dtor is executed
// (which may check weak-refs to this object): // (which may check weak-refs to this object):
disposeWeakConnectionPoint(); disposeWeakConnectionPoint();
@ -363,7 +363,7 @@ OWeakRefListener::OWeakRefListener(const OWeakRefListener& rRef) SAL_THROW(())
} }
} }
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected() catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
osl_decrementInterlockedCount( &m_aRefCount ); osl_atomic_decrement( &m_aRefCount );
} }
OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW(()) OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THROW(())
@ -384,7 +384,7 @@ OWeakRefListener::OWeakRefListener(const Reference< XInterface >& xInt) SAL_THRO
} }
} }
catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected() catch (RuntimeException &) { OSL_ASSERT( 0 ); } // assert here, but no unexpected()
osl_decrementInterlockedCount( &m_aRefCount ); osl_atomic_decrement( &m_aRefCount );
} }
OWeakRefListener::~OWeakRefListener() SAL_THROW(()) OWeakRefListener::~OWeakRefListener() SAL_THROW(())
@ -410,13 +410,13 @@ Any SAL_CALL OWeakRefListener::queryInterface( const Type & rType ) throw(Runtim
// XInterface // XInterface
void SAL_CALL OWeakRefListener::acquire() throw() void SAL_CALL OWeakRefListener::acquire() throw()
{ {
osl_incrementInterlockedCount( &m_aRefCount ); osl_atomic_increment( &m_aRefCount );
} }
// XInterface // XInterface
void SAL_CALL OWeakRefListener::release() throw() void SAL_CALL OWeakRefListener::release() throw()
{ {
if( ! osl_decrementInterlockedCount( &m_aRefCount ) ) if( ! osl_atomic_decrement( &m_aRefCount ) )
delete this; delete this;
} }

4
sal/rtl/source/strtmpl.cxx
View File

@ -1026,7 +1026,7 @@ static IMPL_RTL_STRCODE* IMPL_RTL_STRINGNAME( ImplNewCopy )( IMPL_RTL_STRINGDATA
#define IMPL_RTL_AQUIRE( pThis ) \ #define IMPL_RTL_AQUIRE( pThis ) \
{ \ { \
if (!SAL_STRING_IS_STATIC (pThis)) \ if (!SAL_STRING_IS_STATIC (pThis)) \
osl_incrementInterlockedCount( &((pThis)->refCount) ); \ osl_atomic_increment( &((pThis)->refCount) ); \
} }
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
@ -1055,7 +1055,7 @@ void SAL_CALL IMPL_RTL_STRINGNAME( release )( IMPL_RTL_STRINGDATA* pThis )
#endif #endif
if ( pThis->refCount == 1 || if ( pThis->refCount == 1 ||
!osl_decrementInterlockedCount( &(pThis->refCount) ) ) !osl_atomic_decrement( &(pThis->refCount) ) )
{ {
RTL_LOG_STRING_DELETE( pThis ); RTL_LOG_STRING_DELETE( pThis );
rtl_freeMemory( pThis ); rtl_freeMemory( pThis );

4
sal/rtl/source/ustring.cxx
View File

@ -951,7 +951,7 @@ internRelease (rtl_uString *pThis)
rtl_uString *pFree = NULL; rtl_uString *pFree = NULL;
if ( SAL_STRING_REFCOUNT( if ( SAL_STRING_REFCOUNT(
osl_decrementInterlockedCount( &(pThis->refCount) ) ) == 0) osl_atomic_decrement( &(pThis->refCount) ) ) == 0)
{ {
pPoolMutex = getInternMutex(); pPoolMutex = getInternMutex();
osl_acquireMutex( pPoolMutex ); osl_acquireMutex( pPoolMutex );
@ -960,7 +960,7 @@ internRelease (rtl_uString *pThis)
/* May have been separately acquired */ /* May have been separately acquired */
if ( SAL_STRING_REFCOUNT( if ( SAL_STRING_REFCOUNT(
osl_incrementInterlockedCount( &(pThis->refCount) ) ) == 1 ) osl_atomic_increment( &(pThis->refCount) ) ) == 1 )
{ {
/* we got the last ref */ /* we got the last ref */
pFree = pThis; pFree = pThis;

4
store/source/object.cxx
View File

@ -81,7 +81,7 @@ sal_Bool SAL_CALL OStoreObject::isKindOf (sal_uInt32 nTypeId)
*/ */
oslInterlockedCount SAL_CALL OStoreObject::acquire (void) oslInterlockedCount SAL_CALL OStoreObject::acquire (void)
{ {
oslInterlockedCount result = osl_incrementInterlockedCount (&m_nRefCount); oslInterlockedCount result = osl_atomic_increment (&m_nRefCount);
return (result); return (result);
} }
@ -90,7 +90,7 @@ oslInterlockedCount SAL_CALL OStoreObject::acquire (void)
*/ */
oslInterlockedCount SAL_CALL OStoreObject::release (void) oslInterlockedCount SAL_CALL OStoreObject::release (void)
{ {
oslInterlockedCount result = osl_decrementInterlockedCount (&m_nRefCount); oslInterlockedCount result = osl_atomic_decrement (&m_nRefCount);
if (result == 0) if (result == 0)
{ {
// Last reference released. // Last reference released.