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/socket/shm_socket.cpp | 77 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 94b3fdd..978eda9 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -41,21 +41,16 @@
static LockFreeQueue<shm_packet_t> * shm_socket_bind_queue(int key, bool force) {
hashtable_t *hashtable = mm_get_hashtable();
LockFreeQueue<shm_packet_t> *queue;
- hashtable_lock(hashtable);
void *tmp_ptr = hashtable_get(hashtable, key);
-
if (tmp_ptr == NULL || tmp_ptr == (void *)1 ) {
- queue = new LockFreeQueue<shm_packet_t>(16);
+ queue = new LockFreeQueue<shm_packet_t>(32);
hashtable_put(hashtable, key, (void *)queue);
- hashtable_unlock(hashtable);
return queue;
} else if(force) {
- hashtable_unlock(hashtable);
return (LockFreeQueue<shm_packet_t> *) tmp_ptr;
}
- hashtable_unlock(hashtable);
return NULL;
}
@@ -67,7 +62,6 @@
hashtable_t *hashtable = mm_get_hashtable();
void *tmp_ptr = hashtable_get(hashtable, key);
if (tmp_ptr == NULL || tmp_ptr == (void *)1) {
- //logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
return NULL;
}
@@ -112,23 +106,33 @@
static int _shm_socket_close_(shm_socket_t *sockt) {
- int rv;
+ int rv, i;
+ hashtable_t *hashtable = mm_get_hashtable();
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);
- if(it != shmQueueStMap->end()) {
- it->second.status = SHM_QUEUE_ST_CLOSED;
- it->second.closeTime = time(NULL);
- }
- }
-
+ // if(sockt->key != 0) {
+ // auto it = shmQueueStMap->find(sockt->key);
+ // if(it != shmQueueStMap->end()) {
+ // it->second.status = SHM_QUEUE_ST_CLOSED;
+ // it->second.closeTime = time(NULL);
+ // }
+ // }
+
+
+
+ if(sockt->queue != NULL) {
+ sockt->queue->close();
+ for( i = 0; i < sockt->queue->size(); i++) {
+ mm_free((*(sockt->queue))[i].buf);
+ logger->info("======= %d free queue element buf\n", sockt->key);
+ }
+ sleep(1);
+
+ hashtable_remove(hashtable, sockt->key);
+ // sockt->queue = NULL;
+ }
+
pthread_mutex_destroy(&(sockt->mutex) );
free(sockt);
return 0;
@@ -168,8 +172,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,
@@ -234,7 +236,7 @@
shm_packet_t sendpak = {0};
sendpak.key = sockt->key;
sendpak.size = sendsize;
- memcpy(sendpak.uuid, recvpak.uuid, sizeof sendpak.uuid);
+ memcpy(sendpak.uuid, recvpak.uuid, sizeof(sendpak.uuid));
if(sendbuf !=NULL && sendsize > 0) {
sendpak.buf = mm_malloc(sendsize);
memcpy(sendpak.buf, sendbuf, sendsize);
@@ -264,11 +266,14 @@
}
-
- if(buf != NULL && recvpak.buf != NULL) {
- void *_buf = malloc(recvpak.size);
- memcpy(_buf, recvpak.buf, recvpak.size);
- *buf = _buf;
+ if(recvpak.buf != NULL) {
+ if (buf == NULL) {
+ logger->warn("!!!Alert: buf should be not NULL!\n");
+ } else {
+ void *_buf = malloc(recvpak.size);
+ memcpy(_buf, recvpak.buf, recvpak.size);
+ *buf = _buf;
+ }
}
if(size != NULL)
@@ -372,7 +377,7 @@
logger->debug("send uuid:%s, recv uuid: %s", uuid.c_str(), recvpak.uuid);
if(strlen(recvpak.uuid) == 0) {
continue;
- } else if (strncmp(uuid.c_str(), recvpak.uuid, sizeof recvpak.uuid) == 0) {
+ } else if (strncmp(uuid.c_str(), recvpak.uuid, sizeof(recvpak.uuid)) == 0) {
// 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
goto LABLE_SUC;
} else {
@@ -406,6 +411,8 @@
int rv = 0, tryn = 16;
+ static int Counter_suc = 0;
+ static int Counter_fail = 0;
shm_packet_t sendpak;
shm_packet_t recvpak;
std::map<int, shm_packet_t>::iterator recvbufIter;
@@ -422,7 +429,6 @@
if (tmp_socket == NULL)
{
/* If first call from this thread, allocate buffer for thread, and save its location */
- logger->debug("%lu create threadlocal socket\n", (long)pthread_self() );
tmp_socket = shm_socket_open(SHM_SOCKET_DGRAM);
rv = pthread_setspecific(_localthread_socket_key_, tmp_socket);
@@ -449,7 +455,6 @@
recvbufIter = tmp_socket->recvbuf2.find(key);
if(recvbufIter != tmp_socket->recvbuf2.end()) {
// 鍦ㄧ紦瀛橀噷鏌ュ埌浜唊ey鍖归厤鎴愬姛鐨�
- // logger->info("get from recvbuf: %d", key);
recvpak = recvbufIter->second;
tmp_socket->recvbuf2.erase(recvbufIter);
goto LABLE_SUC;
@@ -462,7 +467,7 @@
return rv;
}
- if (key == recvpak.key) {
+ if (key == recvpak.key) {
// 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
goto LABLE_SUC;
} else {
@@ -596,10 +601,16 @@
if (remoteQueue == NULL ) {
goto ERR_CLOSED;
+ } else if(remoteQueue->isClosed()) {
+ goto ERR_CLOSED;
}
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