From ed1f486e2c2d8c02d675363d848a3460edfe80e3 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 29 十二月 2020 16:22:34 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.c | 117 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 86 insertions(+), 31 deletions(-)
diff --git a/src/socket/shm_socket.c b/src/socket/shm_socket.c
index 0ac71cb..ddc26fa 100644
--- a/src/socket/shm_socket.c
+++ b/src/socket/shm_socket.c
@@ -2,14 +2,18 @@
#include "hashtable.h"
#include "logger_factory.h"
#include <map>
+#include "bus_error.h"
static Logger *logger = LoggerFactory::getLogger();
-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,11 +23,15 @@
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 ) {
- logger->error("key %d has already been in used!", socket->key);
+ bus_errno = EBUS_KEY_INUSED;
+ logger->error("%s. key = %d ", bus_strerror(bus_errno), socket->key);
return 0;
}
return 1;
@@ -38,6 +46,8 @@
}
shm_socket_t *shm_open_socket(shm_socket_type_t socket_type) {
+
+ logger->debug("shm_open_socket\n");
shm_socket_t *socket = (shm_socket_t *)calloc(1, sizeof(shm_socket_t));
socket->socket_type = socket_type;
socket->key = -1;
@@ -45,12 +55,15 @@
socket->dispatch_thread = 0;
socket->status = SHM_CONN_CLOSED;
socket->mutex = SemUtil::get(IPC_PRIVATE, 1);
+
return socket;
}
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);
@@ -61,10 +74,17 @@
default:
break;
}
- SemUtil::remove(socket->mutex);
free(socket);
+ SemUtil::remove(socket->mutex);
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) {
socket->key = key;
@@ -93,7 +113,8 @@
} else {
if(!_shm_socket_check_key(socket)) {
- return -1;
+ bus_errno = EBUS_KEY_INUSED;
+ return EBUS_KEY_INUSED;
}
}
@@ -183,7 +204,8 @@
socket->key = hashtable_alloc_key(hashtable);
} else {
if(!_shm_socket_check_key(socket)) {
- return -1;
+ bus_errno = EBUS_KEY_INUSED;
+ return EBUS_KEY_INUSED;
}
}
@@ -229,11 +251,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;
@@ -289,7 +311,8 @@
} else {
if(!_shm_socket_check_key(socket)) {
- return -1;
+ bus_errno = EBUS_KEY_INUSED;
+ return EBUS_KEY_INUSED;
}
}
@@ -298,15 +321,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) {
- logger->error( "shm_sendto failed, the other end has been closed, or has not been opened!");
- return SHM_SOCKET_ECONNFAILED;
+ bus_errno = EBUS_CLOSED;
+ logger->error("sendto key %d failed, %s", key, bus_strerror(bus_errno));
+ return EBUS_CLOSED;
}
shm_msg_t dest;
@@ -333,8 +357,16 @@
} else {
delete remoteQueue;
mm_free(dest.buf);
- logger->error(errno, "sendto key %d failed!", key);
- return -1;
+ if(errno == EAGAIN) {
+ bus_errno = EBUS_TIMEOUT;
+ logger->error("sendto key %d failed, %s", key, bus_strerror(bus_errno));
+ return EBUS_TIMEOUT;
+ } else {
+ logger->error(errno, "sendto key %d failed!", key);
+ return -1;
+ }
+
+
}
}
@@ -354,7 +386,8 @@
} else {
if(!_shm_socket_check_key(socket)) {
- return -1;
+ bus_errno = EBUS_KEY_INUSED;
+ return EBUS_KEY_INUSED;
}
}
@@ -374,11 +407,18 @@
}
if (rv) {
- void *_buf = malloc(src.size);
- memcpy(_buf, src.buf, src.size);
- *buf = _buf;
- *size = src.size;
- *key = src.key;
+ if(buf != NULL) {
+ void *_buf = malloc(src.size);
+ memcpy(_buf, src.buf, src.size);
+ *buf = _buf;
+ }
+
+ if(size != NULL)
+ *size = src.size;
+
+ if(key != NULL)
+ *key = src.key;
+
mm_free(src.buf);
// printf("shm_recvfrom pop after\n");
return 0;
@@ -387,14 +427,21 @@
}
}
-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);
+ 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 */
@@ -405,6 +452,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 */
@@ -414,7 +462,7 @@
-int shm_sendandrecv(shm_socket_t *socket, const void *send_buf,
+int shm_sendandrecv_safe(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) {
int recv_key;
@@ -444,8 +492,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);
}
@@ -484,6 +532,13 @@
return -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) {
+ return shm_sendandrecv_unsafe(socket, send_buf, send_size, send_key,recv_buf, recv_size, timeout, flags);
+}
+
+
// ============================================================================================================
/**
@@ -493,7 +548,7 @@
hashtable_t *hashtable = mm_get_hashtable();
if (hashtable_get(hashtable, key) == NULL) {
- logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
+ //logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
return NULL;
}
--
Gitblit v1.8.0