From 0a94312fe0cb1fa2bb971919fb8bfce7f7a7ad73 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 02 二月 2021 15:04:15 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.cpp | 148 +++++++++++++++++--------------------------------
1 files changed, 52 insertions(+), 96 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 5df83a3..31598d0 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -16,24 +16,8 @@
static pthread_once_t _once_ = PTHREAD_ONCE_INIT;
static pthread_key_t _perthread_socket_key_;
-
-
-static int _shm_close_dgram_socket(shm_socket_t *socket);
-
-
static void _destrory_socket_perthread(void *tmp_socket);
static void _create_socket_key_perthread(void);
-
-// 妫�鏌ey鏄惁宸茬粡琚娇鐢紝鏄繑鍥�0, 鍚﹁繑鍥�1
-// static 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 ) {
-// bus_errno = EBUS_KEY_INUSED;
-// logger->error("%s. key = %d ", bus_strerror(EBUS_KEY_INUSED), socket->key);
-// return 0;
-// }
-// return 1;
-// }
// 妫�鏌ey鏄惁宸茬粡琚娇鐢紝 鏈浣跨敤鍒欑粦瀹歬ey
static LockFreeQueue<shm_msg_t> * shm_socket_bind_queue(int key, bool force) {
@@ -41,11 +25,16 @@
LockFreeQueue<shm_msg_t> *queue;
hashtable_lock(hashtable);
void *tmp_ptr = hashtable_get(hashtable, key);
- if (tmp_ptr == NULL || tmp_ptr == (void *)1 || force ) {
+
+
+ if (tmp_ptr == NULL || tmp_ptr == (void *)1 ) {
queue = new LockFreeQueue<shm_msg_t>(16);
hashtable_put(hashtable, key, (void *)queue);
hashtable_unlock(hashtable);
return queue;
+ } else if(force) {
+ hashtable_unlock(hashtable);
+ return (LockFreeQueue<shm_msg_t> *) queue;
}
hashtable_unlock(hashtable);
@@ -58,7 +47,6 @@
static LockFreeQueue<shm_msg_t> * shm_socket_attach_queue(int key) {
LockFreeQueue<shm_msg_t> * queue;
hashtable_t *hashtable = mm_get_hashtable();
- // hashtable_lock(hashtable);
void *tmp_ptr = hashtable_get(hashtable, key);
if (tmp_ptr == NULL || tmp_ptr == (void *)1) {
//logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
@@ -94,7 +82,7 @@
socket->socket_type = socket_type;
socket->key = 0;
socket->force_bind = false;
- // socket->dispatch_thread = 0;
+ socket->queue = NULL;
s = pthread_mutexattr_init(&mtxAttr);
@@ -119,7 +107,10 @@
int s;
logger->debug("shm_close_socket\n");
- _shm_close_dgram_socket(socket);
+ if(socket->queue != NULL) {
+ delete socket->queue;
+ socket->queue = NULL;
+ }
s = pthread_mutex_destroy(&(socket->mutex) );
if(s != 0) {
@@ -130,12 +121,6 @@
return 0;
}
-// int shm_close_socket(shm_socket_t *socket) {
-
-// // _destrory_socket_perthread((shm_socket_t *)pthread_getspecific(_perthread_socket_key_));
-
-// return shm_close_socket(socket);;
-// }
int shm_socket_bind(shm_socket_t *socket, int key) {
socket->key = key;
@@ -159,20 +144,13 @@
int shm_sendto(shm_socket_t *sockt, const void *buf, const int size,
const int key, const struct timespec *timeout, const int flag) {
- int s;
int rv;
- if (sockt->socket_type != SHM_SOCKET_DGRAM) {
- 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 ",
- sockt->socket_type);
- exit(0);
- }
hashtable_t *hashtable = mm_get_hashtable();
- if ((s = pthread_mutex_lock(&(sockt->mutex))) != 0)
- err_exit(s, "shm_sendto : pthread_mutex_lock");
+ if ((rv = pthread_mutex_lock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_sendto : pthread_mutex_lock");
if (sockt->queue == NULL) {
if (sockt->key == 0) {
@@ -180,12 +158,13 @@
}
sockt->queue = shm_socket_bind_queue( sockt->key, sockt->force_bind);
if(sockt->queue == NULL ) {
+ logger->error("%s. key = %d", bus_strerror(EBUS_KEY_INUSED), sockt->key);
return EBUS_KEY_INUSED;
}
}
- if ((s = pthread_mutex_unlock(&(sockt->mutex))) != 0)
- err_exit(s, "shm_sendto : pthread_mutex_unlock");
+ if ((rv = pthread_mutex_unlock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_sendto : pthread_mutex_unlock");
// There is some case where a sockt need to send to himeself, for example when bus server need to stop, he need to send himself
// a top message.
@@ -216,44 +195,42 @@
return 0;
} else {
mm_free(dest.buf);
- logger->debug("====%d sendto key %d failed %s", shm_socket_get_key(sockt), key, bus_strerror(rv));
- return rv;
+ if(rv == ETIMEDOUT)
+ return EBUS_TIMEOUT;
+ else {
+ logger->debug("====%d sendto key %d failed %s", shm_socket_get_key(sockt), key, bus_strerror(rv));
+ return rv;
+ }
}
}
// 鐭繛鎺ユ柟寮忔帴鍙�
-int shm_recvfrom(shm_socket_t *sokt, void **buf, int *size, int *key, const struct timespec *timeout, int flag) {
- int s;
+int shm_recvfrom(shm_socket_t *sockt, void **buf, int *size, int *key, const struct timespec *timeout, int flag) {
int rv;
-
- if (sokt->socket_type != SHM_SOCKET_DGRAM) {
- 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 ",
- sokt->socket_type);
- exit(1);
- }
+
hashtable_t *hashtable = mm_get_hashtable();
- if ((s = pthread_mutex_lock(&(sokt->mutex))) != 0)
- err_exit(s, "shm_recvfrom : pthread_mutex_lock");
+ if ((rv = pthread_mutex_lock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_recvfrom : pthread_mutex_lock");
- if (sokt->queue == NULL) {
- if (sokt->key == 0) {
- sokt->key = hashtable_alloc_key(hashtable);
+ if (sockt->queue == NULL) {
+ if (sockt->key == 0) {
+ sockt->key = hashtable_alloc_key(hashtable);
}
- sokt->queue = shm_socket_bind_queue( sokt->key, sokt->force_bind);
- if(sokt->queue == NULL ) {
+ sockt->queue = shm_socket_bind_queue( sockt->key, sockt->force_bind);
+ if(sockt->queue == NULL ) {
+ logger->error("%s. key = %d", bus_strerror(EBUS_KEY_INUSED), sockt->key);
return EBUS_KEY_INUSED;
}
}
- if ((s = pthread_mutex_unlock(&(sokt->mutex))) != 0)
- err_exit(s, "shm_recvfrom : pthread_mutex_unlock");
+ if ((rv = pthread_mutex_unlock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_recvfrom : pthread_mutex_unlock");
shm_msg_t src;
- rv = sokt->queue->pop(src, timeout, flag);
+ rv = sockt->queue->pop(src, timeout, flag);
if (rv == 0) {
if(buf != NULL) {
@@ -271,8 +248,13 @@
mm_free(src.buf);
return 0;
} else {
- logger->debug("shm_recvfrom failed %s", bus_strerror(rv));
- return rv;
+ if(rv == ETIMEDOUT)
+ return EBUS_TIMEOUT;
+ else {
+ logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ return rv;
+ }
+
}
}
@@ -312,7 +294,7 @@
// use thread local
-int _shm_sendandrecv_thread_local(shm_socket_t *socket, const void *send_buf,
+int _shm_sendandrecv_thread_local(shm_socket_t *sockt, const void *send_buf,
const int send_size, const int send_key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags) {
int recv_key;
@@ -320,13 +302,6 @@
// 鐢╰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_socket_key_perthread);
@@ -352,14 +327,19 @@
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);
if(rv != 0) {
- printf("_shm_sendandrecv_thread_local : %s\n", bus_strerror(rv));
+ logger->error("_shm_sendandrecv_thread_local : %s\n", bus_strerror(rv));
}
else if(rv == 0 ) {
+ logger->debug("======%d use tmp_socket %d, send to %d, receive from %d\n", shm_socket_get_key(sockt), shm_socket_get_key(tmp_socket), send_key, recv_key);
+
+ if(recv_key == shm_socket_get_key(sockt)) {
+ logger->debug("=====鏀跺埌浜嗚嚜宸卞彂缁欒嚜宸辩殑娑堟伅\n");
+ }
assert( send_key == recv_key);
if(send_key != recv_key) {
- err_exit(0, "_shm_sendandrecv_thread_local: send key expect to equal to recv key! send key =%d , recv key=%d", send_key, recv_key);
+ logger->error( "_shm_sendandrecv_alloc_new: send key expect to equal to recv key! send key =%d , recv key=%d", send_key, recv_key);
+ exit(1);
}
-
}
return rv;
} else {
@@ -375,13 +355,6 @@
// 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
shm_socket_t *tmp_socket;
-
- if (sockt->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 ",
- sockt->socket_type);
- exit(1);
- }
/* If first call from this thread, allocate buffer for thread, and save its location */
// logger->debug("%d create tmp socket\n", pthread_self() );
@@ -416,22 +389,5 @@
const int send_size, const int send_key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags) {
- return _shm_sendandrecv_alloc_new(socket, send_buf, send_size, send_key,recv_buf, recv_size, timeout, flags);
+ return _shm_sendandrecv_thread_local(socket, send_buf, send_size, send_key,recv_buf, recv_size, timeout, flags);
}
-
-
-// ============================================================================================================
-
-
-
-int _shm_close_dgram_socket(shm_socket_t *socket){
- if(socket->queue != NULL) {
- delete socket->queue;
- socket->queue = NULL;
- }
-
- return 0;
-}
-
-
-
--
Gitblit v1.8.0