From bc2afe32e8db4318f2a2adea49d85b10d0d4cc97 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 08 二月 2021 16:51:24 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.cpp | 170 ++++++++++++++++++++++++++------------------------------
1 files changed, 79 insertions(+), 91 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index bd6473c..0d82be0 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -27,7 +27,7 @@
const int key, const struct timespec *timeout, const int flag);
-static int _shm_sendandrecv_use_uuid(shm_socket_t *sockt, const void *send_buf,
+static int _shm_sendandrecv_uuid(shm_socket_t *sockt, const void *send_buf,
const int send_size, const int key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags);
@@ -74,58 +74,11 @@
return queue;
}
-//鍒犻櫎鍖呭惈鍦╧eys鍐呯殑queue
-size_t shm_socket_remove_keys(int keys[], size_t length) {
- hashtable_t *hashtable = mm_get_hashtable();
- LockFreeQueue<shm_packet_t> *mqueue;
- size_t count = 0;
- for(int i = 0; i< length; i++) {
- // 閿�姣佸叡浜唴瀛樼殑queue
- mqueue = (LockFreeQueue<shm_packet_t> *)hashtable_get(hashtable, keys[i]);
- delete mqueue;
- hashtable_remove(hashtable, keys[i]);
- count++;
- }
- return count;
-}
-
-
-// 鍒犻櫎涓嶅湪keys鍐呯殑queue
-size_t shm_socket_remove_keys_exclude(int keys[], size_t length) {
- hashtable_t *hashtable = mm_get_hashtable();
- std::set<int> *keyset = hashtable_keyset(hashtable);
- std::set<int>::iterator keyItr;
- LockFreeQueue<shm_packet_t> *mqueue;
- bool found;
- size_t count = 0;
- for (keyItr = keyset->begin(); keyItr != keyset->end(); keyItr++) {
- found = false;
- for (size_t i = 0; i < length; i++) {
- if (*keyItr == keys[i]) {
- found = true;
- break;
- }
- }
- // 100鍐呯殑鏄痓us鍐呴儴鑷繁鐢ㄧ殑
- if (!found && *keyItr > 100) {
- // 閿�姣佸叡浜唴瀛樼殑queue
- mqueue = (LockFreeQueue<shm_packet_t> *)hashtable_get(hashtable, *keyItr);
- delete mqueue;
- hashtable_remove(hashtable, *keyItr);
- count++;
- }
- }
- delete keyset;
- return count;
-}
-
-
-
-shm_socket_t *shm_open_socket(shm_socket_type_t socket_type) {
+shm_socket_t *shm_socket_open(shm_socket_type_t socket_type) {
int s, type;
pthread_mutexattr_t mtxAttr;
- logger->debug("shm_open_socket\n");
+ logger->debug("shm_socket_open\n");
// shm_socket_t *socket = (shm_socket_t *)calloc(1, sizeof(shm_socket_t));
shm_socket_t *sockt = new shm_socket_t;
sockt->socket_type = socket_type;
@@ -151,10 +104,11 @@
return sockt;
}
-int shm_close_socket(shm_socket_t *sockt) {
+
+int shm_socket_close(shm_socket_t *sockt) {
int rv;
- logger->debug("shm_close_socket\n");
+ logger->debug("shm_socket_close\n");
if(sockt->queue != NULL) {
delete sockt->queue;
sockt->queue = NULL;
@@ -162,7 +116,7 @@
rv = pthread_mutex_destroy(&(sockt->mutex) );
if(rv != 0) {
- err_exit(rv, "shm_close_socket");
+ err_exit(rv, "shm_socket_close");
}
free(sockt);
@@ -217,6 +171,7 @@
int shm_sendandrecv(shm_socket_t *sockt, const void *send_buf,
const int send_size, const int key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags) {
+ // return _shm_sendandrecv_uuid(sockt, send_buf, send_size, key, recv_buf, recv_size, timeout, flags);
return _shm_sendandrecv_thread_local(sockt, send_buf, send_size, key, recv_buf, recv_size, timeout, flags);
}
@@ -320,7 +275,7 @@
return;
logger->debug("%d destroy tmp socket\n", pthread_self());
- shm_close_socket((shm_socket_t *)tmp_socket);
+ shm_socket_close((shm_socket_t *)tmp_socket);
rv = pthread_setspecific(_perthread_socket_key_, NULL);
if ( rv != 0) {
logger->error(rv, "shm_sendandrecv : pthread_setspecific");
@@ -344,7 +299,7 @@
}
-static int _shm_sendandrecv_use_uuid(shm_socket_t *sockt, const void *send_buf,
+static int _shm_sendandrecv_uuid(shm_socket_t *sockt, const void *send_buf,
const int send_size, const int key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags) {
@@ -407,34 +362,31 @@
LABLE_FAIL:
return EBUS_RECVFROM_WRONG_END;
- // return rv;
LABLE_SUC:
if(recv_buf != NULL) {
void *_buf = malloc(recvpak.size);
memcpy(_buf, recvpak.buf, recvpak.size);
*recv_buf = _buf;
+ mm_free(recvpak.buf);
}
if(recv_size != NULL)
*recv_size = recvpak.size;
- mm_free(recvpak.buf);
-
return 0;
-
-
-
}
// use thread local
static int _shm_sendandrecv_thread_local(shm_socket_t *sockt, const void *send_buf,
- const int send_size, const int send_key, void **recv_buf,
+ const int send_size, const int key, void **recv_buf,
int *recv_size, const struct timespec *timeout, int flags) {
- int recv_key;
- int rv;
- int tryn = 0;
-
+
+
+ int rv, tryn = 6;
+ shm_packet_t sendpak;
+ shm_packet_t recvpak;
+ std::map<int, shm_packet_t>::iterator recvbufIter;
// 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
shm_socket_t *tmp_socket;
@@ -451,7 +403,7 @@
{
/* If first call from this thread, allocate buffer for thread, and save its location */
logger->debug("%ld create tmp socket\n", (long)pthread_self() );
- tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
+ tmp_socket = shm_socket_open(SHM_SOCKET_DGRAM);
rv = pthread_setspecific(_perthread_socket_key_, tmp_socket);
if ( rv != 0) {
@@ -459,33 +411,69 @@
exit(1);
}
}
+
- if ((rv = shm_sendto(tmp_socket, send_buf, send_size, send_key, timeout, flags)) == 0) {
+ sendpak.key = tmp_socket->key;
+ sendpak.size = send_size;
+ if(send_buf != NULL) {
+ sendpak.buf = mm_malloc(send_size);
+ memcpy(sendpak.buf, send_buf, send_size);
+ }
+ rv = shm_sendpakto(tmp_socket, &sendpak, key, timeout, flags);
- 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);
- // exit(1);
- continue;
- // return EBUS_RECVFROM_WRONG_END;
- }
+ if(rv != 0) {
+ return rv;
+ }
- return 0;
+ while(tryn > 0) {
+ tryn--;
+ recvbufIter = tmp_socket->recvbuf2.find(key);
+ if(recvbufIter != tmp_socket->recvbuf2.end()) {
+ // 鍦ㄧ紦瀛橀噷鏌ュ埌浜唊ey鍖归厤鎴愬姛鐨�
+ // logger->info("get from recvbuf: %d", key);
+ recvpak = recvbufIter->second;
+ tmp_socket->recvbuf2.erase(recvbufIter);
+ goto LABLE_SUC;
}
-
- return EBUS_RECVFROM_WRONG_END;
- }
- return rv;
+ rv = shm_recvpakfrom(tmp_socket, &recvpak, timeout, flags);
+
+ if (rv != 0) {
+
+ if(rv == ETIMEDOUT) {
+ return EBUS_TIMEOUT;
+ }
+
+ logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(tmp_socket), bus_strerror(rv));
+ return rv;
+ }
+
+ if (key == recvpak.key) {
+ // 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
+ goto LABLE_SUC;
+ } else {
+ // 绛旈潪鎵�闂紝鏀惧埌缂撳瓨閲�
+ tmp_socket->recvbuf2.insert({recvpak.key, recvpak});
+ continue;
+ }
+ }
+
+LABLE_FAIL:
+ return EBUS_RECVFROM_WRONG_END;
+
+LABLE_SUC:
+ if(recv_buf != NULL) {
+ void *_buf = malloc(recvpak.size);
+ memcpy(_buf, recvpak.buf, recvpak.size);
+ *recv_buf = _buf;
+ mm_free(recvpak.buf);
+ }
+
+ if(recv_size != NULL)
+ *recv_size = recvpak.size;
+
+
+ return 0;
}
static int _shm_sendandrecv_alloc_new(shm_socket_t *sockt, const void *send_buf,
@@ -498,7 +486,7 @@
shm_socket_t *tmp_socket;
- tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
+ tmp_socket = shm_socket_open(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);
@@ -524,7 +512,7 @@
return EBUS_RECVFROM_WRONG_END;
}
- shm_close_socket(tmp_socket);
+ shm_socket_close(tmp_socket);
return rv;
}
--
Gitblit v1.8.0