From 5add39f46c8323875fb56bc764a8ff627ad82f18 Mon Sep 17 00:00:00 2001
From: Fu Juntang <StrongTiger_001@163.com>
Date: 星期五, 08 十月 2021 11:12:06 +0800
Subject: [PATCH] Adjust the free action independent of the return value from the function return.
---
src/socket/shm_socket.cpp | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 1912772..709505f 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -68,7 +68,6 @@
}
queue = ( LockFreeQueue<shm_packet_t> *)tmp_ptr;
- // hashtable_unlock(hashtable);
return queue;
}
@@ -195,7 +194,6 @@
int shm_sendandrecv(shm_socket_t *sockt, const void *send_buf,
const int send_size, const int key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags) {
- // return _shm_sendandrecv_uuid(sockt, send_buf, send_size, key, recv_buf, recv_size, timeout, flags);
return _shm_sendandrecv_thread_local(sockt, send_buf, send_size, key, recv_buf, recv_size, timeout, flags);
}
@@ -411,7 +409,6 @@
shm_packet_t sendpak;
shm_packet_t recvpak;
std::map<int, shm_packet_t>::iterator recvbufIter;
- // 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
shm_socket_t *tmp_socket = NULL;
rv = pthread_once(&_once_, _create_threadlocal_socket_key_);
@@ -423,15 +420,13 @@
tmp_socket = (shm_socket_t *)pthread_getspecific(_localthread_socket_key_);
if (tmp_socket == NULL)
{
- /* If first call from this thread, allocate buffer for thread, and save its location */
tmp_socket = shm_socket_open(SHM_SOCKET_DGRAM);
- }
-
- rv = pthread_setspecific(_localthread_socket_key_, tmp_socket);
- if ( rv != 0) {
- logger->error(rv, "shm_sendandrecv : pthread_setspecific");
- exit(1);
+ rv = pthread_setspecific(_localthread_socket_key_, tmp_socket);
+ if ( rv != 0) {
+ logger->error(rv, "shm_sendandrecv : pthread_setspecific");
+ exit(1);
+ }
}
sendpak.key = tmp_socket->key;
@@ -443,6 +438,10 @@
rv = shm_sendpakto(tmp_socket, &sendpak, key, timeout, flags);
if(rv != 0) {
+ if(send_buf != NULL) {
+ mm_free(sendpak.buf);
+ }
+
return rv;
}
@@ -463,10 +462,11 @@
}
if (key == recvpak.key) {
- // 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
+
goto LABLE_SUC;
+
} else {
- // 绛旈潪鎵�闂紝鏀惧埌缂撳瓨閲�
+
tmp_socket->recvbuf2.insert({recvpak.key, recvpak});
continue;
}
@@ -622,13 +622,6 @@
sendpak->key = sockt->key;
}
rv = remoteQueue->push(*sendpak, timeout, flag);
-
- if(rv != 0) {
- mm_free(sendpak->buf);
- }
- if(rv == ETIMEDOUT) {
- return EBUS_TIMEOUT;
- }
return rv;
ERR_CLOSED:
--
Gitblit v1.8.0