From 6be9ae8aa1d3b164f3953dbc1cb7f0f1c1976d9b Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Sun, 16 Feb 2020 13:05:12 +0200
Subject: inline some acquire/release calls

because these are all on the hot path, and in the best case, with
enough inlining, the compiler can skip the call altogether and just
do a locked CMPXHG instruction

Change-Id: I099d6385f602e40e1767f9f1002b7514ecf436e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88775
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 ucbhelper/source/provider/contenthelper.cxx      |   6 --
 ucbhelper/source/provider/interactionrequest.cxx | 110 -----------------------
 2 files changed, 116 deletions(-)

(limited to 'ucbhelper')

diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 01ebcee1ca71..c29442978af8 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.cxx
@@ -138,12 +138,6 @@ ContentImplHelper::~ContentImplHelper()
 {
 }
 
-void SAL_CALL ContentImplHelper::acquire()
-    throw()
-{
-    cppu::OWeakObject::acquire();
-}
-
 void SAL_CALL ContentImplHelper::release()
     throw()
 {
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 0dbc568fcaa7..95ed4199426e 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -151,22 +151,6 @@ void InteractionContinuation::recordSelection()
 // XInterface methods.
 
 
-// virtual
-void SAL_CALL InteractionAbort::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionAbort::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-
 // virtual
 uno::Any SAL_CALL
 InteractionAbort::queryInterface( const uno::Type & rType )
@@ -218,22 +202,6 @@ void SAL_CALL InteractionAbort::select()
 // XInterface methods.
 
 
-// virtual
-void SAL_CALL InteractionRetry::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionRetry::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-
 // virtual
 uno::Any SAL_CALL
 InteractionRetry::queryInterface( const uno::Type & rType )
@@ -285,22 +253,6 @@ void SAL_CALL InteractionRetry::select()
 // XInterface methods.
 
 
-// virtual
-void SAL_CALL InteractionApprove::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionApprove::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-
 // virtual
 uno::Any SAL_CALL
 InteractionApprove::queryInterface( const uno::Type & rType )
@@ -352,22 +304,6 @@ void SAL_CALL InteractionApprove::select()
 // XInterface methods.
 
 
-// virtual
-void SAL_CALL InteractionDisapprove::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionDisapprove::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-
 // virtual
 uno::Any SAL_CALL
 InteractionDisapprove::queryInterface( const uno::Type & rType )
@@ -419,22 +355,6 @@ void SAL_CALL InteractionDisapprove::select()
 // XInterface methods.
 
 
-// virtual
-void SAL_CALL InteractionSupplyAuthentication::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionSupplyAuthentication::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-
 // virtual
 uno::Any SAL_CALL
 InteractionSupplyAuthentication::queryInterface( const uno::Type & rType )
@@ -626,22 +546,6 @@ void SAL_CALL InteractionSupplyAuthentication::setUseSystemCredentials(
 // XInterface methods.
 
 
-// virtual
-void SAL_CALL InteractionReplaceExistingData::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-
-// virtual
-void SAL_CALL InteractionReplaceExistingData::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
-
 // virtual
 uno::Any SAL_CALL
 InteractionReplaceExistingData::queryInterface( const uno::Type & rType )
@@ -691,20 +595,6 @@ void SAL_CALL InteractionReplaceExistingData::select()
 
 // XInterface methods.
 
-// virtual
-void SAL_CALL InteractionAuthFallback::acquire()
-    throw()
-{
-    OWeakObject::acquire();
-}
-
-// virtual
-void SAL_CALL InteractionAuthFallback::release()
-    throw()
-{
-    OWeakObject::release();
-}
-
 // virtual
 uno::Any SAL_CALL
 InteractionAuthFallback::queryInterface( const uno::Type & rType )
-- 
cgit