diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-02-16 13:05:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-02-17 08:59:01 +0100 |
| commit | 6be9ae8aa1d3b164f3953dbc1cb7f0f1c1976d9b (patch) | |
| tree | 244d93b2f30894d9367aae54d76b962e53a165f2 /include/ucbhelper | |
| parent | ea0701aab307a549cf6cad1d309cab1bf11ef436 (diff) | |
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>
Diffstat (limited to 'include/ucbhelper')
| -rw-r--r-- | include/ucbhelper/contenthelper.hxx | 7 | ||||
| -rw-r--r-- | include/ucbhelper/interactionrequest.hxx | 56 |
2 files changed, 31 insertions, 32 deletions
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index 957ff4353b7e..76a2e290b497 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -308,10 +308,9 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual void SAL_CALL acquire() throw() override + { cppu::OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override; // XTypeProvider virtual css::uno::Sequence< sal_Int8 > SAL_CALL diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index e7f56c7ffcf6..b7f40c8f176f 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -166,10 +166,10 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual void SAL_CALL acquire() throw() override + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override + { OWeakObject::release(); } // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL @@ -199,10 +199,10 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual void SAL_CALL acquire() throw() override + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override + { OWeakObject::release(); } // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL @@ -232,10 +232,10 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual void SAL_CALL acquire() throw() override + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override + { OWeakObject::release(); } // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL @@ -265,10 +265,10 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual void SAL_CALL acquire() throw() override + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override + { OWeakObject::release(); } // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL @@ -357,10 +357,10 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual void SAL_CALL acquire() throw() override + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override + { OWeakObject::release(); } // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL @@ -494,10 +494,10 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual void SAL_CALL acquire() throw() override + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override + { OWeakObject::release(); } // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL @@ -522,10 +522,10 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual void SAL_CALL acquire() throw() override + { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() override + { OWeakObject::release(); } // XInteractionContinuation virtual void SAL_CALL select() override; |