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

stoc: replace double-checked locking with static initializers

Browse Source 
Change-Id: I2a36033d0377a58dc27564e903e2c7ce02696206
Reviewed-on: https://gerrit.libreoffice.org/55900
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
This commit is contained in:
Jochen Nitschke
2018-06-15 21:18:54 +02:00
parent 1b897f16e3
commit 02a7f9e15a
7 changed files with 41 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
stoc/source/corereflection/crarray.cxx
View File

@@ -52,19 +52,11 @@ void ArrayIdlClassImpl::release() throw()
Sequence< Type > ArrayIdlClassImpl::getTypes()
{
static ::cppu::OTypeCollection * s_pTypes = nullptr;
if (! s_pTypes)
{
::osl::MutexGuard aGuard( getMutexAccess() );
if (! s_pTypes)
{
static ::cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlArray>::get(),
IdlClassImpl::getTypes() );
s_pTypes = &s_aTypes;
}
}
return s_pTypes->getTypes();
static cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlArray>::get(),
IdlClassImpl::getTypes() );
return s_aTypes.getTypes();
}
Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId()

14
stoc/source/corereflection/crbase.cxx
View File

@@ -35,17 +35,9 @@ ClassNameVector g_aClassNames;
::osl::Mutex & getMutexAccess()
{
static ::osl::Mutex * s_pMutex = nullptr;
if (! s_pMutex)
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if (! s_pMutex)
{
static ::osl::Mutex s_aMutex;
s_pMutex = &s_aMutex;
}
}
return *s_pMutex;
static osl::Mutex s_aMutex;
return s_aMutex;
}

20
stoc/source/corereflection/crcomp.cxx
View File

@@ -94,20 +94,12 @@ void IdlCompFieldImpl::release() throw()
Sequence< Type > IdlCompFieldImpl::getTypes()
{
static ::cppu::OTypeCollection * s_pTypes = nullptr;
if (! s_pTypes)
{
::osl::MutexGuard aGuard( getMutexAccess() );
if (! s_pTypes)
{
static ::cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlField2>::get(),
cppu::UnoType<XIdlField>::get(),
IdlMemberImpl::getTypes() );
s_pTypes = &s_aTypes;
}
}
return s_pTypes->getTypes();
static cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlField2>::get(),
cppu::UnoType<XIdlField>::get(),
IdlMemberImpl::getTypes() );
return s_aTypes.getTypes();
}
Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId()

22
stoc/source/corereflection/crefl.cxx
View File

@@ -82,21 +82,13 @@ void IdlReflectionServiceImpl::release() throw()
Sequence< Type > IdlReflectionServiceImpl::getTypes()
{
static OTypeCollection * s_pTypes = nullptr;
if (! s_pTypes)
{
MutexGuard aGuard( _aComponentMutex );
if (! s_pTypes)
{
static OTypeCollection s_aTypes(
cppu::UnoType<XIdlReflection>::get(),
cppu::UnoType<XHierarchicalNameAccess>::get(),
cppu::UnoType<XServiceInfo>::get(),
OComponentHelper::getTypes() );
s_pTypes = &s_aTypes;
}
}
return s_pTypes->getTypes();
static OTypeCollection s_aTypes(
cppu::UnoType<XIdlReflection>::get(),
cppu::UnoType<XHierarchicalNameAccess>::get(),
cppu::UnoType<XServiceInfo>::get(),
OComponentHelper::getTypes() );
return s_aTypes.getTypes();
}
Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId()

20
stoc/source/corereflection/crenum.cxx
View File

@@ -88,20 +88,12 @@ void IdlEnumFieldImpl::release() throw()
Sequence< Type > IdlEnumFieldImpl::getTypes()
{
static ::cppu::OTypeCollection * s_pTypes = nullptr;
if (! s_pTypes)
{
::osl::MutexGuard aGuard( getMutexAccess() );
if (! s_pTypes)
{
static ::cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlField2>::get(),
cppu::UnoType<XIdlField>::get(),
IdlMemberImpl::getTypes() );
s_pTypes = &s_aTypes;
}
}
return s_pTypes->getTypes();
static cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlField2>::get(),
cppu::UnoType<XIdlField>::get(),
IdlMemberImpl::getTypes() );
return s_aTypes.getTypes();
}
Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId()

38
stoc/source/corereflection/criface.cxx
View File

@@ -121,20 +121,12 @@ void IdlAttributeFieldImpl::release() throw()
Sequence< Type > IdlAttributeFieldImpl::getTypes()
{
static ::cppu::OTypeCollection * s_pTypes = nullptr;
if (! s_pTypes)
{
::osl::MutexGuard aGuard( getMutexAccess() );
if (! s_pTypes)
{
static ::cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlField2>::get(),
cppu::UnoType<XIdlField>::get(),
IdlMemberImpl::getTypes() );
s_pTypes = &s_aTypes;
}
}
return s_pTypes->getTypes();
static cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlField2>::get(),
cppu::UnoType<XIdlField>::get(),
IdlMemberImpl::getTypes() );
return s_aTypes.getTypes();
}
Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId()
@@ -383,19 +375,11 @@ void IdlInterfaceMethodImpl::release() throw()
Sequence< Type > IdlInterfaceMethodImpl::getTypes()
{
static ::cppu::OTypeCollection * s_pTypes = nullptr;
if (! s_pTypes)
{
::osl::MutexGuard aGuard( getMutexAccess() );
if (! s_pTypes)
{
static ::cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlMethod>::get(),
IdlMemberImpl::getTypes() );
s_pTypes = &s_aTypes;
}
}
return s_pTypes->getTypes();
static cppu::OTypeCollection s_aTypes(
cppu::UnoType<XIdlMethod>::get(),
IdlMemberImpl::getTypes() );
return s_aTypes.getTypes();
}
Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId()

14
stoc/source/implementationregistration/implreg.cxx
View File

@@ -99,17 +99,9 @@ struct StringPool
const StringPool &spool()
{
static StringPool *pPool = nullptr;
if( ! pPool )
{
MutexGuard guard( Mutex::getGlobalMutex() );
if( ! pPool )
{
static StringPool pool;
pPool = &pool;
}
}
return *pPool;
static StringPool s_pool;
return s_pool;
}