From 0fd19aa1c8a2bf543099d6b1077ff19078f9074e Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 24 十二月 2020 11:35:12 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/socket/shm_socket.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index f53b520..c75114d 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -61,7 +61,8 @@
int shm_close_socket(shm_socket_t *socket) {
int ret;
-
+
+ logger->debug("shm_close_socket\n");
switch (socket->socket_type) {
case SHM_SOCKET_STREAM:
ret = _shm_close_stream_socket(socket, true);
@@ -74,7 +75,6 @@
}
free(socket);
SemUtil::remove(socket->mutex);
- logger->debug("shm_close_socket\n");
return ret;
}
@@ -248,11 +248,11 @@
"SHM_SOCKET_STREAM socket");
exit(1);
}
- // hashtable_t *hashtable = mm_get_hashtable();
- // if(socket->remoteQueue == NULL) {
- // err_msg(errno, "褰撳墠瀹㈡埛绔棤杩炴帴!");
- // return -1;
- // }
+ hashtable_t *hashtable = mm_get_hashtable();
+ if(socket->remoteQueue == NULL) {
+ err_msg(errno, "褰撳墠瀹㈡埛绔棤杩炴帴!");
+ return -1;
+ }
shm_msg_t dest;
dest.type = SHM_COMMON_MSG;
dest.key = socket->key;
@@ -533,6 +533,7 @@
return shm_sendandrecv_unsafe(socket, send_buf, send_size, send_key,recv_buf, recv_size, timeout, flags);
}
+
// ============================================================================================================
/**
--
Gitblit v1.8.0