From 8bfe9f711612efde96a0d7b7aa3ba7178ab51640 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 20 二月 2021 15:10:11 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/shm/shm_mm_wrapper.cpp | 95 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 92 insertions(+), 3 deletions(-)
diff --git a/src/shm/shm_mm_wrapper.cpp b/src/shm/shm_mm_wrapper.cpp
index 6175923..f726f8a 100644
--- a/src/shm/shm_mm_wrapper.cpp
+++ b/src/shm/shm_mm_wrapper.cpp
@@ -1,15 +1,104 @@
-#include "shm_mm_wraper.h"
+#include "shm_mm_wrapper.h"
#include "mem_pool.h"
#include "hashtable.h"
+#include "lock_free_queue.h"
+#include "shm_socket.h"
+
+#define BUFFER_TIME 10
+
void shm_mm_wrapper_init(int size) {
- mem_pool_init(size);
+ shm_mm_init(size);
+
}
void shm_mm_wrapper_destroy() {
- mem_pool_destroy();
+ shm_mm_destroy();
}
int shm_mm_wrapper_alloc_key() {
return mm_alloc_key();
}
+
+
+/**
+ * 鍥炴敹鍋囧垹闄ょ殑key
+ */
+int shm_mm_wrapper_start_resycle() {
+ ShmQueueStMap * shmQueueStMap = shm_mm_attach<ShmQueueStMap>(SHM_QUEUE_ST_KEY);
+ hashtable_t *hashtable = mm_get_hashtable();
+ LockFreeQueue<shm_packet_t> *mqueue;
+ while(true) {
+ for(auto it = shmQueueStMap->begin(); it != shmQueueStMap->end(); ++it ) {
+ if(it->second.status = SHM_QUEUE_ST_CLOSED && difftime(time(NULL), it->second.closeTime) > 2 ) {
+ mqueue = (LockFreeQueue<shm_packet_t> *)hashtable_get(hashtable, keys[i]);
+ if(mqueue != NULL) {
+ delete mqueue;
+ hashtable_remove(hashtable, it->first);
+ printf("reove queue %d\n", it->first);
+ // 涓嶈兘 erase ,鍚﹀垯浼氬嚭鐜板杩涚▼涔嬮棿鐨勫悓姝ラ棶棰橈紝 鑰岃繖姝ｆ槸杩欓噷瑕佽В鍐崇殑闂
+ // it = shmQueueStMap->erase(it);
+ // continue;
+ }
+ }
+ }
+
+ sleep(1);
+ }
+}
+
+//鍒犻櫎鍖呭惈鍦╧eys鍐呯殑queue
+int shm_mm_wrapper_remove_keys(int keys[], int length) {
+ hashtable_t *hashtable = mm_get_hashtable();
+ LockFreeQueue<shm_packet_t> *mqueue;
+ int count = 0;
+ for(int i = 0; i< length; i++) {
+ // 閿�姣佸叡浜唴瀛樼殑queue
+ mqueue = (LockFreeQueue<shm_packet_t> *)hashtable_get(hashtable, keys[i]);
+ if(mqueue == NULL) {
+ continue;
+ }
+ if(difftime(time(NULL), mqueue->getCreateTime()) > BUFFER_TIME ) {
+ delete mqueue;
+ hashtable_remove(hashtable, keys[i]);
+ LoggerFactory::getLogger()->debug("remove queue %d", keys[i]);
+ count++;
+ }
+
+ }
+ return count;
+}
+
+
+// 鍒犻櫎涓嶅湪keys鍐呯殑queue
+int shm_mm_wrapper_remove_keys_exclude(int keys[], int length) {
+ hashtable_t *hashtable = mm_get_hashtable();
+ std::set<int> *keyset = hashtable_keyset(hashtable);
+ std::set<int>::iterator keyItr;
+ LockFreeQueue<shm_packet_t> *mqueue;
+ bool found;
+ int 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;
+ }
+ }
+ // 100鍐呯殑鏄痓us鍐呴儴鑷繁鐢ㄧ殑
+ if (!found && *keyItr > 100) {
+ // 閿�姣佸叡浜唴瀛樼殑queue
+ mqueue = (LockFreeQueue<shm_packet_t> *)hashtable_get(hashtable, *keyItr);
+ if(difftime(time(NULL), mqueue->getCreateTime()) > BUFFER_TIME ) {
+ delete mqueue;
+ hashtable_remove(hashtable, *keyItr);
+ LoggerFactory::getLogger()->debug("remove queue %d", *keyItr);
+ count++;
+ }
+
+ }
+ }
+ delete keyset;
+ return count;
+}
--
Gitblit v1.8.0