From 26ed48c4e616014ee760fd13d13dbdc8539c34e3 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 22 十二月 2020 19:21:55 +0800
Subject: [PATCH] 解决sendandrecv发送到一个不存在key的情况
---
src/socket/shm_socket.c | 77 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 20 deletions(-)
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index fe25e3c..efb3ef7 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -7,9 +7,12 @@
-void print_msg(char *head, shm_msg_t &msg) {
+static void print_msg(char *head, shm_msg_t &msg) {
// err_msg(0, "%s: key=%d, type=%d\n", head, msg.key, msg.type);
}
+
+static pthread_once_t _once_ = PTHREAD_ONCE_INIT;
+static pthread_key_t _tmp_recv_socket_key_;
static void *_server_run_msg_rev(void *_socket);
@@ -19,10 +22,14 @@
static int _shm_close_stream_socket(shm_socket_t *socket, bool notifyRemote);
+static void _destrory_tmp_recv_socket_(void *tmp_socket);
+static void _create_tmp_recv_socket_key(void);
+
+// 妫�鏌ey鏄惁宸茬粡琚娇鐢紝鏄繑鍥�0, 鍚﹁繑鍥�1
static inline int _shm_socket_check_key(shm_socket_t *socket) {
void *tmp_ptr = mm_get_by_key(socket->key);
if (tmp_ptr!= NULL && tmp_ptr != (void *)1 && !socket->force_bind ) {
- err_exit(0, "key %d has already been in used!", socket->key);
+ logger->error("key %d has already been in used!", socket->key);
return 0;
}
return 1;
@@ -37,6 +44,7 @@
}
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;
socket->key = -1;
@@ -44,12 +52,14 @@
socket->dispatch_thread = 0;
socket->status = SHM_CONN_CLOSED;
socket->mutex = SemUtil::get(IPC_PRIVATE, 1);
+ logger->debug("shm_open_socket\n");
return socket;
}
-int shm_close_socket(shm_socket_t *socket) {
+static int _shm_close_socket(shm_socket_t *socket) {
int ret;
+
switch (socket->socket_type) {
case SHM_SOCKET_STREAM:
ret = _shm_close_stream_socket(socket, true);
@@ -60,9 +70,17 @@
default:
break;
}
- SemUtil::remove(socket->mutex);
free(socket);
+ SemUtil::remove(socket->mutex);
+ logger->debug("shm_close_socket\n");
return ret;
+}
+
+int shm_close_socket(shm_socket_t *socket) {
+
+ // _destrory_tmp_recv_socket_((shm_socket_t *)pthread_getspecific(_tmp_recv_socket_key_));
+
+ return _shm_close_socket(socket);;
}
int shm_socket_bind(shm_socket_t *socket, int key) {
@@ -91,7 +109,9 @@
socket->key = key;
} else {
- _shm_socket_check_key(socket);
+ if(!_shm_socket_check_key(socket)) {
+ return -1;
+ }
}
socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
@@ -161,6 +181,9 @@
}
+/**
+ * @return 0鎴愬姛. 鍏朵粬鍊煎け璐�
+ */
int shm_connect(shm_socket_t *socket, int key) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
logger->error( "can not invoke shm_connect method with a socket which is not "
@@ -170,20 +193,22 @@
hashtable_t *hashtable = mm_get_hashtable();
if (hashtable_get(hashtable, key) == NULL) {
logger->error("shm_connect锛歝onnect at key %d failed!", key);
- exit(1);
+ return -1;
}
if (socket->key == -1) {
socket->key = hashtable_alloc_key(hashtable);
} else {
- _shm_socket_check_key(socket);
+ if(!_shm_socket_check_key(socket)) {
+ return -1;
+ }
}
socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
if ((socket->remoteQueue = _attach_remote_queue(key)) == NULL) {
logger->error("connect to %d failted", key);
- exit(1);
+ return -1;
}
socket->messageQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
@@ -209,7 +234,7 @@
} else {
logger->error( "connect failted!");
- exit(1);
+ return -1;
}
return 0;
@@ -280,17 +305,20 @@
socket->key = hashtable_alloc_key(hashtable);
} else {
- _shm_socket_check_key(socket);
+ if(!_shm_socket_check_key(socket)) {
+ return -1;
+ }
+
}
socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
}
SemUtil::inc(socket->mutex);
- if (key == socket->key) {
- logger->error( "can not send to your self!");
- return -1;
- }
+ // if (key == socket->key) {
+ // logger->error( "can not send to your self!");
+ // return -1;
+ // }
SHMQueue<shm_msg_t> *remoteQueue;
if ((remoteQueue = _attach_remote_queue(key)) == NULL) {
@@ -342,7 +370,9 @@
socket->key = hashtable_alloc_key(hashtable);
} else {
- _shm_socket_check_key(socket);
+ if(!_shm_socket_check_key(socket)) {
+ return -1;
+ }
}
socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
@@ -374,14 +404,20 @@
}
}
-static pthread_once_t _once_ = PTHREAD_ONCE_INIT;
-static pthread_key_t _tmp_recv_socket_key_;
/* Free thread-specific data buffer */
static void _destrory_tmp_recv_socket_(void *tmp_socket)
{
+ int rv;
+ if(tmp_socket == NULL)
+ return;
logger->debug("%d destroy tmp socket\n", pthread_self());
- shm_close_socket((shm_socket_t *)tmp_socket);
+ _shm_close_socket((shm_socket_t *)tmp_socket);
+ rv = pthread_setspecific(_tmp_recv_socket_key_, NULL);
+ if ( rv != 0) {
+ logger->error(rv, "shm_sendandrecv : pthread_setspecific");
+ exit(1);
+ }
}
/* One-time key creation function */
@@ -392,6 +428,7 @@
/* Allocate a unique thread-specific data key and save the address
of the destructor for thread-specific data buffers */
s = pthread_key_create(&_tmp_recv_socket_key_, _destrory_tmp_recv_socket_);
+ //s = pthread_key_create(&_tmp_recv_socket_key_, NULL);
if (s != 0) {
logger->error(s, "pthread_key_create");
abort(); /* dump core and terminate */
@@ -431,8 +468,8 @@
logger->debug("%d create tmp socket\n", pthread_self() );
tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
- rv = pthread_setspecific(_tmp_recv_socket_key_, tmp_socket);
- if (rv != 0) {
+ rv = pthread_setspecific(_tmp_recv_socket_key_, tmp_socket);
+ if ( rv != 0) {
logger->error(rv, "shm_sendandrecv : pthread_setspecific");
exit(1);
}
--
Gitblit v1.8.0