From b90ba316b54db321d3e8aaac7df93b46d80b9d9c Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 22 十二月 2020 15:47:41 +0800
Subject: [PATCH] 三个没有回收的信号
---
src/socket/shm_socket.c | 150 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 114 insertions(+), 36 deletions(-)
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index 3041568..9581b69 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -19,10 +19,11 @@
static int _shm_close_stream_socket(shm_socket_t *socket, bool notifyRemote);
+// 妫�鏌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;
@@ -79,8 +80,9 @@
int shm_listen(shm_socket_t *socket) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_listen method with a socket which is not a "
+ logger->error("can not invoke shm_listen method with a socket which is not a "
"SHM_SOCKET_STREAM socket");
+ exit(1);
}
int key;
@@ -90,7 +92,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);
@@ -109,8 +113,9 @@
*/
shm_socket_t *shm_accept(shm_socket_t *socket) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_accept method with a socket which is not a "
+ logger->error("can not invoke shm_accept method with a socket which is not a "
"SHM_SOCKET_STREAM socket");
+ exit(1);
}
hashtable_t *hashtable = mm_get_hashtable();
int client_key;
@@ -148,7 +153,7 @@
client_socket->status = SHM_CONN_ESTABLISHED;
return client_socket;
} else {
- err_msg(0, "shm_accept: 鍙戦�乷pen_reply澶辫触");
+ logger->error( "shm_accept: 鍙戦�乷pen_reply澶辫触");
return NULL;
}
@@ -159,26 +164,34 @@
}
+/**
+ * @return 0鎴愬姛. 鍏朵粬鍊煎け璐�
+ */
int shm_connect(shm_socket_t *socket, int key) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_connect method with a socket which is not "
+ logger->error( "can not invoke shm_connect method with a socket which is not "
"a SHM_SOCKET_STREAM socket");
+ exit(1);
}
hashtable_t *hashtable = mm_get_hashtable();
if (hashtable_get(hashtable, key) == NULL) {
- err_exit(0, "shm_connect锛歝onnect at key %d failed!", key);
+ logger->error("shm_connect锛歝onnect at key %d failed!", key);
+ 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) {
- err_exit(0, "connect to %d failted", key);
+ logger->error("connect to %d failted", key);
+ return -1;
}
socket->messageQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
@@ -198,11 +211,13 @@
pthread_create(&(socket->dispatch_thread), NULL, _client_run_msg_rev,
(void *)socket);
} else {
- err_exit(0, "shm_connect: 涓嶅尮閰嶇殑搴旂瓟淇℃伅!");
+ logger->error( "shm_connect: 涓嶅尮閰嶇殑搴旂瓟淇℃伅!");
+ exit(1);
}
} else {
- err_exit(0, "connect failted!");
+ logger->error( "connect failted!");
+ return -1;
}
return 0;
@@ -210,8 +225,9 @@
int shm_send(shm_socket_t *socket, const void *buf, const int size) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_send method with a socket which is not a "
+ logger->error("shm_socket.shm_send: can not invoke shm_send method with a socket which is not a "
"SHM_SOCKET_STREAM socket");
+ exit(1);
}
// hashtable_t *hashtable = mm_get_hashtable();
// if(socket->remoteQueue == NULL) {
@@ -228,16 +244,17 @@
if (socket->remoteQueue->push(dest)) {
return 0;
} else {
- err_msg(errno, "connection has been closed!");
+ logger->error(errno, "connection has been closed!");
return -1;
}
}
int shm_recv(shm_socket_t *socket, void **buf, int *size) {
if (socket->socket_type != SHM_SOCKET_STREAM) {
- err_exit(0, "can not invoke shm_recv method in a %d type socket which is "
+ logger->error( "shm_socket.shm_recv: can not invoke shm_recv method in a %d type socket which is "
"not a SHM_SOCKET_STREAM socket ",
socket->socket_type);
+ exit(1);
}
shm_msg_t src;
@@ -258,9 +275,10 @@
int shm_sendto(shm_socket_t *socket, const void *buf, const int size,
const int key, const struct timespec *timeout, const int flags) {
if (socket->socket_type != SHM_SOCKET_DGRAM) {
- err_exit(0, "Can't invoke shm_sendto method in a %d type socket which is "
+ logger->error( "shm_socket.shm_sendto: Can't invoke shm_sendto method in a %d type socket which is "
"not a SHM_SOCKET_DGRAM socket ",
socket->socket_type);
+ exit(0);
}
hashtable_t *hashtable = mm_get_hashtable();
@@ -270,21 +288,24 @@
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) {
- err_msg(0, "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) {
- err_msg(0, "shm_sendto failed, the other end has been closed, or has not been opened!");
+ logger->error( "shm_sendto failed, the other end has been closed, or has not been opened!");
return SHM_SOCKET_ECONNFAILED;
}
@@ -312,7 +333,7 @@
} else {
delete remoteQueue;
mm_free(dest.buf);
- err_msg(errno, "sendto key %d failed!", key);
+ logger->error(errno, "sendto key %d failed!", key);
return -1;
}
}
@@ -320,9 +341,10 @@
// 鐭繛鎺ユ柟寮忔帴鍙�
int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *key, struct timespec *timeout, int flags) {
if (socket->socket_type != SHM_SOCKET_DGRAM) {
- err_exit(0, "Can't invoke shm_recvfrom method in a %d type socket which "
+ logger->error("shm_socket.shm_recvfrom: Can't invoke shm_recvfrom method in a %d type socket which "
"is not a SHM_SOCKET_DGRAM socket ",
socket->socket_type);
+ exit(1);
}
hashtable_t *hashtable = mm_get_hashtable();
SemUtil::dec(socket->mutex);
@@ -331,7 +353,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);
@@ -363,24 +387,76 @@
}
}
+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)
+{
+ logger->debug("%d destroy tmp socket\n", pthread_self());
+ shm_close_socket((shm_socket_t *)tmp_socket);
+}
+
+/* One-time key creation function */
+static void _create_tmp_recv_socket_key(void)
+{
+ int s;
+
+ /* 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_);
+ if (s != 0) {
+ logger->error(s, "pthread_key_create");
+ abort(); /* dump core and terminate */
+ exit(1);
+ }
+}
+
+
+
int shm_sendandrecv(shm_socket_t *socket, const void *send_buf,
const int send_size, const int send_key, void **recv_buf,
int *recv_size, struct timespec *timeout, int flags) {
- if (socket->socket_type != SHM_SOCKET_DGRAM) {
- err_exit(0, "Can't invoke shm_sendandrecv method in a %d type socket "
- "which is not a SHM_SOCKET_DGRAM socket ",
- socket->socket_type);
- }
int recv_key;
int rv;
- shm_socket_t *tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
+ // 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
+ shm_socket_t *tmp_socket;
+
+ if (socket->socket_type != SHM_SOCKET_DGRAM) {
+ logger->error( "shm_socket.shm_sendandrecv: Can't invoke shm_sendandrecv method in a %d type socket "
+ "which is not a SHM_SOCKET_DGRAM socket ",
+ socket->socket_type);
+ exit(1);
+ }
+
+
+ rv = pthread_once(&_once_, _create_tmp_recv_socket_key);
+ if (rv != 0) {
+ logger->error(rv, "shm_sendandrecv pthread_once");
+ exit(1);
+ }
+
+ tmp_socket = (shm_socket_t *)pthread_getspecific(_tmp_recv_socket_key_);
+ if (tmp_socket == NULL)
+ {
+ /* If first call from this thread, allocate buffer for thread, and save its location */
+ 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) {
+ logger->error(rv, "shm_sendandrecv : pthread_setspecific");
+ exit(1);
+ }
+ }
+
if ((rv = shm_sendto(tmp_socket, send_buf, send_size, send_key, timeout, flags)) == 0) {
rv = shm_recvfrom(tmp_socket, recv_buf, recv_size, &recv_key, timeout, flags);
- shm_close_socket(tmp_socket);
+
return rv;
} else {
- shm_close_socket(tmp_socket);
+
return rv;
}
return -1;
@@ -390,9 +466,10 @@
const int send_size, const int send_key, void **recv_buf,
int *recv_size, struct timespec *timeout, int flags) {
if (socket->socket_type != SHM_SOCKET_DGRAM) {
- err_exit(0, "Can't invoke shm_sendandrecv method in a %d type socket "
+ logger->error( "shm_socket.shm_sendandrecv_unsafe : Can't invoke shm_sendandrecv method in a %d type socket "
"which is not a SHM_SOCKET_DGRAM socket ",
socket->socket_type);
+ exit(1);
}
int recv_key;
int rv;
@@ -413,9 +490,10 @@
* 缁戝畾key鍒伴槦鍒楋紝浣嗘槸骞朵笉浼氬垱寤洪槦鍒椼�傚鏋滄病鏈夊搴旀寚瀹歬ey鐨勯槦鍒楁彁绀洪敊璇苟閫�鍑�
*/
SHMQueue<shm_msg_t> *_attach_remote_queue(int key) {
+
hashtable_t *hashtable = mm_get_hashtable();
if (hashtable_get(hashtable, key) == NULL) {
- err_msg(0, "_remote_queue_attach锛歝onnet at key %d failed!", key);
+ logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
return NULL;
}
@@ -467,7 +545,7 @@
break;
default:
- err_msg(0, "socket.__shm_rev__: undefined message type.");
+ logger->error("shm_socket._server_run_msg_rev: undefined message type.");
}
}
@@ -498,7 +576,7 @@
socket->messageQueue->push_timeout(src, &timeout);
break;
default:
- err_msg(0, "socket.__shm_rev__: undefined message type.");
+ logger->error( "shm_socket._client_run_msg_rev: undefined message type.");
}
}
--
Gitblit v1.8.0