From a38304f7f6b91aaa1b0aa76cc9d3e5b6aef1f85f Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 13 三月 2021 17:07:22 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.cpp | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 2b3e626..1f5d47b 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -46,7 +46,7 @@
if (tmp_ptr == NULL || tmp_ptr == (void *)1 ) {
- queue = new LockFreeQueue<shm_packet_t>(16);
+ queue = new LockFreeQueue<shm_packet_t>(1024);
hashtable_put(hashtable, key, (void *)queue);
hashtable_unlock(hashtable);
return queue;
@@ -112,12 +112,9 @@
static int _shm_socket_close_(shm_socket_t *sockt) {
- int rv;
+ int rv, i;
logger->debug("shm_socket_close\n");
- // hashtable_remove(hashtable, mkey);
- // if(sockt->queue != NULL) {
- // sockt->queue = NULL;
- // }
+
if(sockt->key != 0) {
auto it = shmQueueStMap->find(sockt->key);
@@ -127,6 +124,24 @@
}
}
+
+ printf("====sockt->queue addr = %p\n", sockt->queue);
+
+ if(sockt->queue != NULL) {
+ for( i = 0; i < sockt->queue->size(); i++) {
+ mm_free((*(sockt->queue))[i].buf);
+ logger->info("======= %d free queue element buf\n", sockt->key);
+ }
+
+ // hashtable_remove(hashtable, mkey);
+ // sockt->queue = NULL;
+ }
+
+
+ // hashtable_remove(hashtable, mkey);
+ // if(sockt->queue != NULL) {
+ // sockt->queue = NULL;
+ // }
pthread_mutex_destroy(&(sockt->mutex) );
@@ -168,8 +183,6 @@
int shm_socket_get_key(shm_socket_t *sockt){
return sockt->key;
}
-
-
// 鐭繛鎺ユ柟寮忓彂閫�
int shm_sendto(shm_socket_t *sockt, const void *buf, const int size,
@@ -292,7 +305,7 @@
{
int rv;
- logger->debug("%d destroy threadlocal socket\n", pthread_self());
+ logger->debug("%lu destroy threadlocal socket\n", pthread_self());
if(tmp_socket == NULL)
return;
@@ -325,7 +338,7 @@
const int send_size, const int key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags) {
- int rv, tryn = 6;
+ int rv, tryn = 16;
shm_packet_t sendpak;
shm_packet_t recvpak;
std::map<std::string, shm_packet_t>::iterator recvbufIter;
@@ -600,6 +613,10 @@
sendpak->key = sockt->key;
rv = remoteQueue->push(*sendpak, timeout, flag);
+
+ if(rv != 0) {
+ mm_free(sendpak->buf);
+ }
if(rv == ETIMEDOUT) {
return EBUS_TIMEOUT;
}
--
Gitblit v1.8.0