From e4130d29e80a40884310481ded90ff845c614f43 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 24 十二月 2020 10:03:14 +0800
Subject: [PATCH] bus force bind
---
src/socket/shm_socket.c | 15 ++++++++-------
src/socket/bus_server_socket_wrapper.c | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/socket/bus_server_socket_wrapper.c b/src/socket/bus_server_socket_wrapper.c
index fc0eb4f..0fd228e 100644
--- a/src/socket/bus_server_socket_wrapper.c
+++ b/src/socket/bus_server_socket_wrapper.c
@@ -31,7 +31,7 @@
int ret;
BusServerSocket *sockt = (BusServerSocket *)_socket;
- if( (ret = sockt->bind(BUS_KEY)) == 0) {
+ if( (ret = sockt->force_bind(BUS_KEY)) == 0) {
return sockt->start();
} else {
logger->error("start bus failed");
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index c1ac3c8..80674c1 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -60,7 +60,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);
@@ -73,7 +74,6 @@
}
free(socket);
SemUtil::remove(socket->mutex);
- logger->debug("shm_close_socket\n");
return ret;
}
@@ -247,11 +247,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;
@@ -523,6 +523,7 @@
return shm_sendandrecv_unsafe(socket, send_buf, send_size, send_key,recv_buf, recv_size, timeout, flags);
}
+
// ============================================================================================================
/**
--
Gitblit v1.8.0