From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit

---
 src/queue/shm_queue.h |   40 ++--------------------------------------
 1 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/src/queue/shm_queue.h b/src/queue/shm_queue.h
index 24a4dfc..74b9b33 100644
--- a/src/queue/shm_queue.h
+++ b/src/queue/shm_queue.h
@@ -45,8 +45,6 @@
 
   ELEM_T &operator[](unsigned i);
 
- // @deprecate
-  static size_t remove_queues_exclude(int keys[], size_t length);
 
 private:
 protected:
@@ -60,34 +58,7 @@
   SHMQueue<ELEM_T>(const SHMQueue<ELEM_T> &a_src);
 };
 
-// @deprecate
-// template <typename ELEM_T>
-// size_t SHMQueue<ELEM_T>::remove_queues_exclude(int keys[], size_t length) {
-//   hashtable_t *hashtable = mm_get_hashtable();
-//   std::set<int> *keyset = hashtable_keyset(hashtable);
-//   std::set<int>::iterator keyItr;
-//   LockFreeQueue<ELEM_T, SHM_Allocator> *mqueue;
-//   bool found;
-//   size_t count = 0;
-//   for (keyItr = keyset->begin(); keyItr != keyset->end(); keyItr++) {
-//     found = false;
-//     for (size_t i = 0; i < length; i++) {
-//       if (*keyItr == keys[i]) {
-//         found = true;
-//         break;
-//       }
-//     }
-//     if (!found && *keyItr > 100) {
-//       // 閿�姣佸叡浜唴瀛樼殑queue
-//       mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
-//       delete mqueue;
-//       hashtable_remove(hashtable, *keyItr);
-//       count++;
-//     }
-//   }
-//   delete keyset;
-//   return count;
-// }
+
 
 
 
@@ -108,10 +79,7 @@
 
 template <typename ELEM_T> SHMQueue<ELEM_T>::~SHMQueue() {
   LoggerFactory::getLogger()->debug("SHMQueue destroy");
-  if(owner) {
-    delete queue;
-    hashtable_remove(hashtable, mkey);
-  }
+  
 
   
 }
@@ -119,19 +87,15 @@
 template <typename ELEM_T>
 bool SHMQueue<ELEM_T>::bind(int key, bool force)  {
 
-
-  hashtable_lock(hashtable);
   void *tmp_ptr = hashtable_get(hashtable, key);
   if (tmp_ptr == NULL || tmp_ptr == (void *)1 || force) {
     queue = new LockFreeQueue<ELEM_T, SHM_Allocator>(mqsize);
     hashtable_put(hashtable, key, (void *)queue);
     mkey = key;
     owner = true;
-    hashtable_unlock(hashtable);
     return true;
   }
   
-  hashtable_unlock(hashtable);
   return  false;
 }
 

--
Gitblit v1.8.0