Implement WorkQueue::GetThreadId.

Refs #4758

diff --git a/components/db_ido_mysql/idomysqlconnection.h b/components/db_ido_mysql/idomysqlconnection.h
index d114e0c60eb97690810e157fe3ad9d717b7ac81f..df08820522376c956f40060e76698c2c89a47f63 100644 (file)
--- a/components/db_ido_mysql/idomysqlconnection.h
+++ b/components/db_ido_mysql/idomysqlconnection.h
@@ -23,6 +23,7 @@
 #include "db_ido_mysql/idomysqlconnection.th"
 #include "base/array.h"
 #include "base/timer.h"
+#include "base/workqueue.h"
 #include <mysql/mysql.h>
 
 namespace icinga
@@ -53,6 +54,8 @@ private:
        DbReference m_InstanceID;
         DbReference m_LastNotificationID;
 
+       WorkQueue m_QueryQueue;
+
        boost::mutex m_ConnectionMutex;
        bool m_Connected;
        MYSQL m_Connection;

diff --git a/lib/base/workqueue.cpp b/lib/base/workqueue.cpp
index aabb9ed27a391a4e3b10d58bd4a7774f17622d95..a0dab7e893c3c8de2ee49fa2aff066f9d3e9a70e 100644 (file)
--- a/lib/base/workqueue.cpp
+++ b/lib/base/workqueue.cpp
@@ -68,6 +68,11 @@ void WorkQueue::Join(void)
                m_CV.wait(lock);
 }
 
+boost::thread::id WorkQueue::GetThreadId(void) const
+{
+       return m_Thread.get_id();
+}
+
 void WorkQueue::WorkerThreadProc(void)
 {
        boost::mutex::scoped_lock lock(m_Mutex);

diff --git a/lib/base/workqueue.h b/lib/base/workqueue.h
index b1b4a2ccb7b3c34803e920b03fb15dd9ab345e32..923916d8d45cde66dfc54eefdb2ea8d3f71874ca 100644 (file)
--- a/lib/base/workqueue.h
+++ b/lib/base/workqueue.h
@@ -46,6 +46,8 @@ public:
        void Enqueue(const WorkCallback& item);
        void Join(void);
 
+       boost::thread::id GetThreadId(void) const;
+
 private:
        int m_ID;
        static int m_NextID;