From cb85aa8a8d02a3d6dc16e3f32e78da9e70f9c7f5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 02 二月 2021 17:49:21 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.cpp | 156 +++++++++++++++++++++-------------------------------
1 files changed, 63 insertions(+), 93 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index f5ae328..9544827 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -9,47 +9,32 @@
-static void print_msg(char *head, shm_msg_t &msg) {
+static void print_msg(char *head, shm_packet_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 _perthread_socket_key_;
-
-
-
-
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) {
+static LockFreeQueue<shm_packet_t> * shm_socket_bind_queue(int key, bool force) {
hashtable_t *hashtable = mm_get_hashtable();
- LockFreeQueue<shm_msg_t> *queue;
+ LockFreeQueue<shm_packet_t> *queue;
hashtable_lock(hashtable);
void *tmp_ptr = hashtable_get(hashtable, key);
if (tmp_ptr == NULL || tmp_ptr == (void *)1 ) {
- queue = new LockFreeQueue<shm_msg_t>(16);
+ queue = new LockFreeQueue<shm_packet_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;
+ return (LockFreeQueue<shm_packet_t> *) queue;
}
hashtable_unlock(hashtable);
@@ -59,8 +44,8 @@
/**
* 缁戝畾key鍒伴槦鍒楋紝浣嗘槸骞朵笉浼氬垱寤洪槦鍒椼��
*/
-static LockFreeQueue<shm_msg_t> * shm_socket_attach_queue(int key) {
- LockFreeQueue<shm_msg_t> * queue;
+static LockFreeQueue<shm_packet_t> * shm_socket_attach_queue(int key) {
+ LockFreeQueue<shm_packet_t> * queue;
hashtable_t *hashtable = mm_get_hashtable();
void *tmp_ptr = hashtable_get(hashtable, key);
if (tmp_ptr == NULL || tmp_ptr == (void *)1) {
@@ -68,7 +53,7 @@
return NULL;
}
- queue = ( LockFreeQueue<shm_msg_t> *)tmp_ptr;
+ queue = ( LockFreeQueue<shm_packet_t> *)tmp_ptr;
// hashtable_unlock(hashtable);
return queue;
}
@@ -76,11 +61,11 @@
size_t shm_socket_remove_keys(int keys[], size_t length) {
hashtable_t *hashtable = mm_get_hashtable();
- LockFreeQueue<shm_msg_t> *mqueue;
+ LockFreeQueue<shm_packet_t> *mqueue;
size_t count = 0;
for(int i = 0; i< length; i++) {
// 閿�姣佸叡浜唴瀛樼殑queue
- mqueue = (LockFreeQueue<shm_msg_t> *)hashtable_get(hashtable, keys[i]);
+ mqueue = (LockFreeQueue<shm_packet_t> *)hashtable_get(hashtable, keys[i]);
delete mqueue;
hashtable_remove(hashtable, keys[i]);
count++;
@@ -136,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;
@@ -165,14 +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;
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) {
@@ -185,8 +163,8 @@
}
}
- 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.
@@ -196,15 +174,14 @@
return EBUS_SENDTO_SELF;
}
- LockFreeQueue<shm_msg_t> *remoteQueue;
+ LockFreeQueue<shm_packet_t> *remoteQueue;
if ((remoteQueue = shm_socket_attach_queue(key)) == NULL) {
bus_errno = EBUS_CLOSED;
logger->error("sendto key %d failed, %s", key, bus_strerror(bus_errno));
return EBUS_CLOSED;
}
- shm_msg_t dest;
- dest.type = SHM_COMMON_MSG;
+ shm_packet_t dest;
dest.key = sockt->key;
dest.size = size;
dest.buf = mm_malloc(size);
@@ -229,14 +206,12 @@
// 鐭繛鎺ユ柟寮忔帴鍙�
int shm_recvfrom(shm_socket_t *sockt, void **buf, int *size, int *key, const struct timespec *timeout, int flag) {
- int s;
int rv;
-
hashtable_t *hashtable = mm_get_hashtable();
- if ((s = pthread_mutex_lock(&(sockt->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 (sockt->queue == NULL) {
if (sockt->key == 0) {
@@ -249,10 +224,10 @@
}
}
- if ((s = pthread_mutex_unlock(&(sockt->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;
+ shm_packet_t src;
rv = sockt->queue->pop(src, timeout, flag);
@@ -311,7 +286,6 @@
//s = pthread_key_create(&_perthread_socket_key_, NULL);
if (s != 0) {
logger->error(s, "pthread_key_create");
- abort(); /* dump core and terminate */
exit(1);
}
}
@@ -323,11 +297,13 @@
int *recv_size, const struct timespec *timeout, int flags) {
int recv_key;
int rv;
+ int tryn = 0;
// 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
shm_socket_t *tmp_socket;
-
+ /* If first call from this thread, allocate buffer for thread, and save its location */
+ // logger->debug("%d create tmp socket\n", pthread_self() );
rv = pthread_once(&_once_, _create_socket_key_perthread);
if (rv != 0) {
logger->error(rv, "shm_sendandrecv pthread_once");
@@ -349,26 +325,31 @@
}
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) {
- 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");
+
+ while(tryn < 3) {
+ tryn++;
+ rv = shm_recvfrom(tmp_socket, recv_buf, recv_size, &recv_key, timeout, flags);
+ if(rv != 0) {
+ logger->error("_shm_sendandrecv_thread_local : %s\n", bus_strerror(rv));
+ return rv;
}
- assert( send_key == recv_key);
+
+ // 瓒呮椂瀵艰嚧鎺ュ彂閫佸璞★紝涓庤繑鍥炲璞′笉瀵瑰簲鐨勬儏鍐�
if(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);
+ 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);
+ // 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);
+ continue;
+ // return EBUS_RECVFROM_WRONG_END;
}
+
+ return 0;
}
- return rv;
- } else {
- return rv;
- }
+
+ return EBUS_RECVFROM_WRONG_END;
+ }
+
+ return rv;
}
int _shm_sendandrecv_alloc_new(shm_socket_t *sockt, const void *send_buf,
@@ -377,38 +358,34 @@
int recv_key;
int rv;
- // 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
+ int tryn = 0;
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() );
+
tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
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_alloc_new : %s\n", bus_strerror(rv));
- }
- else if(rv == 0 ) {
- printf("======%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)) {
- printf("=====鏀跺埌浜嗚嚜宸卞彂缁欒嚜宸辩殑娑堟伅\n");
- }
- assert( send_key == recv_key);
- if(send_key != recv_key) {
- err_exit(0, "_shm_sendandrecv_alloc_new: send key expect to equal to recv key! send key =%d , recv key=%d", send_key, recv_key);
+ while(tryn < 3) {
+ tryn++;
+ rv = shm_recvfrom(tmp_socket, recv_buf, recv_size, &recv_key, timeout, flags);
+ if(rv != 0) {
+ logger->error("_shm_sendandrecv_thread_local : %s\n", bus_strerror(rv));
+ return rv;
}
+ // 瓒呮椂瀵艰嚧鎺ュ彂閫佸璞★紝涓庤繑鍥炲璞′笉瀵瑰簲鐨勬儏鍐�
+ if(send_key != recv_key) {
+ // 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);
+ // logger->error( "_shm_sendandrecv_alloc_new: send key expect to equal to recv key! send key =%d , recv key=%d", send_key, recv_key);
+
+ continue;
+ }
+ return 0;
}
+
+ return EBUS_RECVFROM_WRONG_END;
}
shm_close_socket(tmp_socket);
@@ -422,10 +399,3 @@
return _shm_sendandrecv_thread_local(socket, send_buf, send_size, send_key,recv_buf, recv_size, timeout, flags);
}
-
-
-// ============================================================================================================
-
-
-
-
--
Gitblit v1.8.0