From 18705acc13f78ac65458b3dd832545e62fbc9172 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 08 二月 2021 10:44:29 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.cpp | 134 ++++++++++++++++++--------------------------
1 files changed, 54 insertions(+), 80 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index f55a111..c0ddeee 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -75,57 +75,57 @@
}
//鍒犻櫎鍖呭惈鍦╧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;
-}
+// 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;
-}
+// // 鍒犻櫎涓嶅湪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 +151,14 @@
return sockt;
}
-int shm_close_socket(shm_socket_t *sockt) {
+int shm_socket_close(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 +166,7 @@
rv = pthread_mutex_destroy(&(sockt->mutex) );
if(rv != 0) {
- err_exit(rv, "shm_close_socket");
+ err_exit(rv, "shm_socket_close");
}
free(sockt);
@@ -320,7 +324,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");
@@ -453,7 +457,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) {
@@ -461,36 +465,6 @@
exit(1);
}
}
- // int rv;
- // int tryn = 0;
- // int recv_key;
- // rv = shm_sendto(tmp_socket, send_buf, send_size, send_key, timeout, flags);
-
- // if (() == 0) {
-
- // 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;
- // }
-
- // return 0;
- // }
-
- // return EBUS_RECVFROM_WRONG_END;
- // }
-
sendpak.key = tmp_socket->key;
@@ -569,7 +543,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);
@@ -595,7 +569,7 @@
return EBUS_RECVFROM_WRONG_END;
}
- shm_close_socket(tmp_socket);
+ shm_socket_close(tmp_socket);
return rv;
}
--
Gitblit v1.8.0