sync upstream cppmyth (2.9.6)

janbar · Nov 13, 2017 · 5e3e854 · 5e3e854
1 parent 376cdb0
commit 5e3e854
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/lib/cppmyth/CMakeLists.txt b/lib/cppmyth/CMakeLists.txt
@@ -22,7 +22,7 @@ endif ()
 
 ###############################################################################
 # set lib version here
-set (CPPMYTH_LIB_VERSION "2.9.5")
+set (CPPMYTH_LIB_VERSION "2.9.6")
 set (CPPMYTH_LIB_SOVERSION "2")
 
 ###############################################################################

diff --git a/lib/cppmyth/src/private/os/threads/threadpool.cpp b/lib/cppmyth/src/private/os/threads/threadpool.cpp
@@ -72,7 +72,7 @@ CThreadPool::~CThreadPool()
     for (std::set<CWorkerThread*>::iterator it = m_pool.begin(); it != m_pool.end(); ++it)
       (*it)->StopThread(false);
     // Wake sleeper
-    m_queueContent.Broadcast();
+    m_queueFill.Broadcast();
     // Waiting all finalized
     m_condition.Wait(m_mutex, m_empty);
   }
@@ -91,7 +91,7 @@ bool CThreadPool::Enqueue(CWorker* worker)
       if (m_waitingCount)
       {
         // Wake a thread
-        m_queueContent.Signal();
+        m_queueFill.Signal();
         return true;
       }
       else
@@ -132,6 +132,22 @@ unsigned CThreadPool::QueueSize() const
   return static_cast<unsigned>(m_queue.size());
 }
 
+bool CThreadPool::IsQueueEmpty() const
+{
+  CLockGuard lock(m_mutex);
+  return m_queue.empty();
+}
+
+bool CThreadPool::waitEmpty(unsigned millisec)
+{
+  return IsQueueEmpty() || m_queueEmpty.Wait(millisec);
+}
+
+bool CThreadPool::waitEmpty()
+{
+  return IsQueueEmpty() || m_queueEmpty.Wait();
+}
+
 void CThreadPool::Suspend()
 {
   CLockGuard lock(m_mutex);
@@ -185,11 +201,15 @@ CWorker* CThreadPool::PopQueue(CWorkerThread* _thread)
 {
   (void)_thread;
   CLockGuard lock(m_mutex);
-  if (!m_suspended && !m_queue.empty())
+  if (!m_suspended)
   {
-    CWorker* worker = m_queue.front();
-    m_queue.pop();
-    return worker;
+    m_queueEmpty.Signal();
+    if (!m_queue.empty())
+    {
+      CWorker* worker = m_queue.front();
+      m_queue.pop();
+      return worker;
+    }
   }
   return NULL;
 }
@@ -201,7 +221,7 @@ void CThreadPool::WaitQueue(CWorkerThread* _thread)
   ++m_waitingCount;
   unsigned millisec = m_keepAlive;
   lock.Unlock();
-  m_queueContent.Wait(millisec);
+  m_queueFill.Wait(millisec);
   lock.Lock();
   --m_waitingCount;
 }
@@ -254,6 +274,6 @@ void CThreadPool::__resize()
     }
     // Wake up the waiting threads to stop
     if (m_waitingCount)
-        m_queueContent.Broadcast();
+        m_queueFill.Broadcast();
   }
 }
diff --git a/lib/cppmyth/src/private/os/threads/threadpool.h b/lib/cppmyth/src/private/os/threads/threadpool.h
@@ -55,6 +55,9 @@ namespace OS
     unsigned Size() const;
 
     unsigned QueueSize() const;
+    bool IsQueueEmpty() const;
+    bool waitEmpty(unsigned millisec);
+    bool waitEmpty();
 
     void Suspend();
     void Resume();
@@ -78,7 +81,8 @@ namespace OS
     std::set<CWorkerThread*>  m_pool;
     mutable CMutex            m_mutex;
     CCondition<volatile bool> m_condition;
-    CEvent                    m_queueContent;
+    CEvent                    m_queueFill;
+    CEvent                    m_queueEmpty;
 
     CWorker* PopQueue(CWorkerThread* _thread);
     void WaitQueue(CWorkerThread* _thread);

diff --git a/lib/cppmyth/src/private/sajson.h b/lib/cppmyth/src/private/sajson.h
@@ -103,7 +103,7 @@ namespace sajson {
             return text;
         }
 
-        const size_t length() const {
+        size_t length() const {
             return _length;
         }