New upstream version 2.3.2+dfsgupstream/2.3.2+dfsg

1 files changed, 6 insertions, 10 deletions

diff --git a/src/lib/base/Log.cpp b/src/lib/base/Log.cpp
index 823bf6d..1252ed9 100644
--- a/src/lib/base/Log.cpp
+++ b/src/lib/base/Log.cpp
@@ -63,9 +63,6 @@ Log::Log()
 {
     assert(s_log == NULL);
 
-    // create mutex for multithread safe operation
-    m_mutex = ARCH->newMutex();
-
     // other initalization
     m_maxPriority = g_defaultMaxPriority;
     m_maxNewlineLength = 0;
@@ -90,7 +87,6 @@ Log::~Log()
                                     index != m_alwaysOutputters.end(); ++index) {
         delete *index;
     }
-    ARCH->closeMutex(m_mutex);
 }
 
 Log*
@@ -214,7 +210,7 @@ Log::insert(ILogOutputter* outputter, bool alwaysAtHead)
 {
     assert(outputter != NULL);
 
-    ArchMutexLock lock(m_mutex);
+    std::lock_guard<std::mutex> lock(m_mutex);
     if (alwaysAtHead) {
         m_alwaysOutputters.push_front(outputter);
     }
@@ -237,7 +233,7 @@ Log::insert(ILogOutputter* outputter, bool alwaysAtHead)
 void
 Log::remove(ILogOutputter* outputter)
 {
-    ArchMutexLock lock(m_mutex);
+    std::lock_guard<std::mutex> lock(m_mutex);
     m_outputters.remove(outputter);
     m_alwaysOutputters.remove(outputter);
 }
@@ -245,7 +241,7 @@ Log::remove(ILogOutputter* outputter)
 void
 Log::pop_front(bool alwaysAtHead)
 {
-    ArchMutexLock lock(m_mutex);
+    std::lock_guard<std::mutex> lock(m_mutex);
     OutputterList* list = alwaysAtHead ? &m_alwaysOutputters : &m_outputters;
     if (!list->empty()) {
         delete list->front();
@@ -271,14 +267,14 @@ Log::setFilter(const char* maxPriority)
 void
 Log::setFilter(int maxPriority)
 {
-    ArchMutexLock lock(m_mutex);
+    std::lock_guard<std::mutex> lock(m_mutex);
     m_maxPriority = maxPriority;
 }
 
 int
 Log::getFilter() const
 {
-    ArchMutexLock lock(m_mutex);
+    std::lock_guard<std::mutex> lock(m_mutex);
     return m_maxPriority;
 }
 
@@ -289,7 +285,7 @@ Log::output(ELevel priority, char* msg)
     assert(msg != NULL);
     if (!msg) return;
 
-    ArchMutexLock lock(m_mutex);
+    std::lock_guard<std::mutex> lock(m_mutex);
 
     OutputterList::const_iterator i;