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 | 75 ++++---------------------------------
1 files changed, 8 insertions(+), 67 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 82eaa1f..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,53 +74,6 @@
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_socket_open(shm_socket_type_t socket_type) {
int s, type;
pthread_mutexattr_t mtxAttr;
@@ -151,11 +104,8 @@
return sockt;
}
+
int shm_socket_close(shm_socket_t *sockt) {
-
-}
-
-int _shm_socket_close_(shm_socket_t *sockt) {
int rv;
logger->debug("shm_socket_close\n");
@@ -221,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);
}
@@ -348,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) {
@@ -411,7 +362,6 @@
LABLE_FAIL:
return EBUS_RECVFROM_WRONG_END;
- // return rv;
LABLE_SUC:
if(recv_buf != NULL) {
@@ -424,12 +374,7 @@
if(recv_size != NULL)
*recv_size = recvpak.size;
-
-
return 0;
-
-
-
}
// use thread local
@@ -438,7 +383,7 @@
int *recv_size, const struct timespec *timeout, int flags) {
- int rv, tryn = 3;
+ int rv, tryn = 6;
shm_packet_t sendpak;
shm_packet_t recvpak;
std::map<int, shm_packet_t>::iterator recvbufIter;
@@ -480,18 +425,14 @@
return rv;
}
- if(rv != 0) {
- return rv;
- }
-
while(tryn > 0) {
tryn--;
recvbufIter = tmp_socket->recvbuf2.find(key);
if(recvbufIter != tmp_socket->recvbuf2.end()) {
- // 鍦ㄧ紦瀛橀噷鏌ュ埌浜哢UID鍖归厤鎴愬姛鐨�
-// logger->debug("get from recvbuf: %s", uuid.c_str());
+ // 鍦ㄧ紦瀛橀噷鏌ュ埌浜唊ey鍖归厤鎴愬姛鐨�
+ // logger->info("get from recvbuf: %d", key);
recvpak = recvbufIter->second;
- sockt->recvbuf2.erase(recvbufIter);
+ tmp_socket->recvbuf2.erase(recvbufIter);
goto LABLE_SUC;
}
--
Gitblit v1.8.0