From 00dba6082e245d917cb7d6eed3c627211ff41cd7 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 25 九月 2020 15:53:21 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.c | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index f95379a..ea2f674 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -30,6 +30,12 @@
SHMQueue<shm_msg_t> *_attach_remote_queue(int port);
+
+
+size_t shm_socket_remove_keys(int keys[], size_t length) {
+ return SHMQueue<shm_msg_t>::remove_queues(keys, length);
+}
+
shm_socket_t *shm_open_socket(shm_socket_type_t socket_type) {
shm_socket_t *socket = (shm_socket_t *)calloc(1, sizeof(shm_socket_t));
socket->socket_type = socket_type;
@@ -267,6 +273,12 @@
return -1;
}
+ SHMQueue<shm_msg_t> *remoteQueue;
+ if ((remoteQueue = _attach_remote_queue(port)) == NULL) {
+ err_msg(0, "shm_sendto failed, the other end has been closed, or has not been opened!");
+ return SHM_SOCKET_ECONNFAILED;
+ }
+
shm_msg_t dest;
dest.type = SHM_COMMON_MSG;
dest.port = socket->port;
@@ -274,11 +286,6 @@
dest.buf = mm_malloc(size);
memcpy(dest.buf, buf, size);
- SHMQueue<shm_msg_t> *remoteQueue;
- if ((remoteQueue = _attach_remote_queue(port)) == NULL) {
- err_msg(0, "shm_sendto failed, the other end has been closed, or has not been opened!");
- return -1;
- }
// printf("shm_sendto push before\n");
bool rv;
if(flags & SHM_MSG_NOWAIT != 0) {
@@ -295,6 +302,7 @@
return 0;
} else {
delete remoteQueue;
+ mm_free(dest.buf);
err_msg(errno, "sendto port %d failed!", port);
return -1;
}
@@ -356,10 +364,13 @@
int rv;
shm_socket_t *tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
- if (shm_sendto(tmp_socket, send_buf, send_size, send_port, timeout, flags) == 0) {
+ if ((rv = shm_sendto(tmp_socket, send_buf, send_size, send_port, timeout, flags)) == 0) {
rv = shm_recvfrom(tmp_socket, recv_buf, recv_size, &recv_port, timeout, flags);
shm_close_socket(tmp_socket);
return rv;
+ } else {
+ shm_close_socket(tmp_socket);
+ return rv;
}
return -1;
}
--
Gitblit v1.8.0