slow task locker

docker198 · Nov 16, 2016 · 290c8a3 · 290c8a3
1 parent b108821
commit 290c8a3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/hustdb/db/server/module/hustdb.cpp b/hustdb/db/server/module/hustdb.cpp
@@ -26,6 +26,8 @@ hustdb_t::hustdb_t ( )
 , m_rdb_ok ( false )
 , m_timer ( )
 , m_slow_tasks ( )
+, m_mq_locker ( )
+, m_tb_locker ( )
 , m_server_conf ( )
 , m_store_conf ( )
 {

diff --git a/hustdb/db/server/module/tasks/slow_task_thread.cpp b/hustdb/db/server/module/tasks/slow_task_thread.cpp
@@ -21,7 +21,7 @@ void slow_task_thread_t::stop ( )
 
     TASK_THREAD::stop ();
 
-    scope_lock_t lock ( m_lock );
+    scope_wlock_t lock ( m_lock );
 
     if ( ! m_tasks.empty () )
     {
@@ -64,7 +64,8 @@ bool slow_task_thread_t::push (
         return false;
     }
 
-    scope_lock_t lock ( m_lock );
+    scope_wlock_t lock ( m_lock );
+
     try
     {
         m_tasks.push_back ( task );
@@ -81,11 +82,15 @@ bool slow_task_thread_t::push (
 
 bool slow_task_thread_t::empty ( )
 {
+    scope_rlock_t lock ( m_lock );
+
     return m_tasks.empty ();
 }
 
 bool slow_task_thread_t::le_one ( )
 {
+    scope_rlock_t lock ( m_lock );
+
     return m_tasks.size () <= 1;
 }
 
@@ -106,7 +111,8 @@ void slow_task_thread_t::run ( )
             task2_t * p = NULL;
 
             {
-                scope_lock_t lock ( m_lock );
+                scope_wlock_t lock ( m_lock );
+
                 if ( m_tasks.empty () )
                 {
                     break;
@@ -140,6 +146,8 @@ void slow_task_thread_t::info (
                                 std::string & info
                                 )
 {
+    scope_rlock_t lock ( m_lock );
+
     char s[ 128 ] = { };
 
     sprintf ( s,
@@ -156,7 +164,7 @@ slow_task_type_t slow_task_thread_t::status (
                                               task2_t * task
                                               )
 {
-    scope_lock_t lock ( m_lock );
+    scope_rlock_t lock ( m_lock );
 
     tasks_t::iterator it;
 

diff --git a/hustdb/db/server/module/tasks/slow_task_thread.h b/hustdb/db/server/module/tasks/slow_task_thread.h
@@ -235,7 +235,7 @@ class slow_task_thread_t : public TASK_THREAD
     tasks_t m_tasks;
     tasks_t m_doing_tasks;
     tasks_t m_done_tasks;
-    lockable_t m_lock;
+    rwlockable_t m_lock;
     event2_t m_event;
 
 private: