(logging-log4cxx) 04/04: Synchonization should not depend on APR threads

[swebb2066]

This is an automated email from the ASF dual-hosted git repository.

swebb2066 pushed a commit to branch reduce_apr_influence
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git

commit e2c8333d84e3de6cd6976a90a62c01e56d246636
Author: Stephen Webb <swebb2...@gmail.com>
AuthorDate: Sun Nov 19 16:55:06 2023 +1100

    Synchonization should not depend on APR threads
---
 src/main/cpp/aprinitializer.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/cpp/aprinitializer.cpp b/src/main/cpp/aprinitializer.cpp
index b27e55af..30e54a85 100644
--- a/src/main/cpp/aprinitializer.cpp
+++ b/src/main/cpp/aprinitializer.cpp
@@ -110,9 +110,7 @@ APRInitializer::~APRInitializer()
 
 void APRInitializer::stopWatchDogs()
 {
-#if APR_HAS_THREADS
        std::unique_lock<std::mutex> lock(m_priv->mutex);
-#endif
 
        while (!m_priv->watchdogs.empty())
        {
@@ -153,18 +151,14 @@ apr_threadkey_t* APRInitializer::getTlsKey()
 void APRInitializer::registerCleanup(FileWatchdog* watchdog)
 {
        APRInitializer& instance(getInstance());
-#if APR_HAS_THREADS
        std::unique_lock<std::mutex> lock(instance.m_priv->mutex);
-#endif
        instance.m_priv->watchdogs.push_back(watchdog);
 }
 
 void APRInitializer::unregisterCleanup(FileWatchdog* watchdog)
 {
        APRInitializer& instance(getInstance());
-#if APR_HAS_THREADS
        std::unique_lock<std::mutex> lock(instance.m_priv->mutex);
-#endif
 
        for (std::list<FileWatchdog*>::iterator iter = 
instance.m_priv->watchdogs.begin();
                iter != instance.m_priv->watchdogs.end();
@@ -180,17 +174,13 @@ void APRInitializer::unregisterCleanup(FileWatchdog* 
watchdog)
 
 void APRInitializer::addObject(size_t key, const ObjectPtr& pObject)
 {
-#if APR_HAS_THREADS
        std::unique_lock<std::mutex> lock(m_priv->mutex);
-#endif
        m_priv->objects[key] = pObject;
 }
 
 const ObjectPtr& APRInitializer::findOrAddObject(size_t key, 
std::function<ObjectPtr()> creator)
 {
-#if APR_HAS_THREADS
        std::unique_lock<std::mutex> lock(m_priv->mutex);
-#endif
        auto pItem = m_priv->objects.find(key);
        if (m_priv->objects.end() == pItem)
                pItem = m_priv->objects.emplace(key, creator()).first;