diff options
| author | Noel Grandin <noel@peralex.com> | 2015-12-23 16:52:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-12-24 07:27:05 +0000 |
| commit | 3f47ffcf587938508ee4949ac668a76334448c71 (patch) | |
| tree | f4da8e3a646980f366b4fa4128fc08fca734ad3e | |
| parent | 693fbbfacafed819798a99831ae7f642d10816c8 (diff) | |
OModule::onFirstClient is unused
also move the MutexGuard in revokeClient. No need to hold it while doing
an osl_atomic_increment. Save it until we actually need to call
onLastClient.
Change-Id: Ia87f24b66b0430604a2fe717c95223ff1f5ece6d
Reviewed-on: https://gerrit.libreoffice.org/20919
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | comphelper/source/misc/componentmodule.cxx | 13 | ||||
| -rw-r--r-- | include/comphelper/componentmodule.hxx | 5 | ||||
| -rw-r--r-- | include/unotools/componentresmodule.hxx | 1 | ||||
| -rw-r--r-- | unotools/source/misc/componentresmodule.cxx | 5 |
4 files changed, 4 insertions, 20 deletions
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index 37d5ae0c25d8..24c9a72c60a6 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -75,22 +75,17 @@ namespace comphelper void OModule::registerClient( OModule::ClientAccess ) { - ::osl::MutexGuard aGuard(m_aMutex); - if ( 1 == osl_atomic_increment( &m_nClients ) ) - onFirstClient(); + osl_atomic_increment( &m_nClients ); } void OModule::revokeClient( OModule::ClientAccess ) { - ::osl::MutexGuard aGuard(m_aMutex); if ( 0 == osl_atomic_decrement( &m_nClients ) ) + { + ::osl::MutexGuard aGuard(m_aMutex); onLastClient(); - } - - - void OModule::onFirstClient() - { + } } diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index 2f6bc6812113..9317916ae276 100644 --- a/include/comphelper/componentmodule.hxx +++ b/include/comphelper/componentmodule.hxx @@ -142,11 +142,6 @@ namespace comphelper void revokeClient( ClientAccess ); protected: - /** called when the first client has been registered - @precond - <member>m_aMutex</member> is locked - */ - virtual void onFirstClient(); /** called when the last client has been revoked @precond diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx index bf271db59650..bc35a6cd1a0c 100644 --- a/include/unotools/componentresmodule.hxx +++ b/include/unotools/componentresmodule.hxx @@ -57,7 +57,6 @@ namespace utl protected: // OModule overridables - virtual void onFirstClient() override; virtual void onLastClient() override; }; diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx index ed8a3381ab97..c0b23e179845 100644 --- a/unotools/source/misc/componentresmodule.cxx +++ b/unotools/source/misc/componentresmodule.cxx @@ -105,11 +105,6 @@ namespace utl return m_pImpl->getResManager(); } - void OComponentResourceModule::onFirstClient() - { - BaseClass::onFirstClient(); - } - void OComponentResourceModule::onLastClient() { m_pImpl->freeResManager(); |