From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit
---
src/socket/shm_socket.cpp | 1173 +++++++++++++++++++++++++++------------------------------
1 files changed, 555 insertions(+), 618 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 0ae3027..978eda9 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -2,60 +2,86 @@
#include "hashtable.h"
#include "logger_factory.h"
#include <map>
+#include <cassert>
#include "bus_error.h"
+#include "sole.h"
+#include "shm_mm.h"
+#include "key_def.h"
static Logger *logger = LoggerFactory::getLogger();
+ShmQueueStMap * shmQueueStMap ;
-
-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 _tmp_recv_socket_key_;
+static pthread_key_t _localthread_socket_key_;
-static void *_server_run_msg_rev(void *_socket);
+static void _destrory_threadlocal_socket_(void *tmp_socket);
+static void _create_threadlocal_socket_key_(void);
-static void *_client_run_msg_rev(void *_socket);
+static int shm_recvpakfrom(shm_socket_t *sockt, shm_packet_t *recvpak , const struct timespec *timeout, int flag);
-static int _shm_close_dgram_socket(shm_socket_t *socket);
+
+static int shm_sendpakto(shm_socket_t *sockt, shm_packet_t *sendpak,
+ const int key, const struct timespec *timeout, const int flag);
-static int _shm_close_stream_socket(shm_socket_t *socket, bool notifyRemote);
-static void _destrory_tmp_recv_socket_(void *tmp_socket);
-static void _create_tmp_recv_socket_key(void);
+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);
-// 妫�鏌ey鏄惁宸茬粡琚娇鐢紝鏄繑鍥�0, 鍚﹁繑鍥�1
-static inline 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 = ESHM_BUS_KEY_INUSED;
- logger->error("%s. key = %d ", bus_strerror(bus_errno), socket->key);
- return 0;
- }
- return 1;
+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,
+ int *recv_size, const struct timespec *timeout, int flags) ;
+
+// 妫�鏌ey鏄惁宸茬粡琚娇鐢紝 鏈浣跨敤鍒欑粦瀹歬ey
+static LockFreeQueue<shm_packet_t> * shm_socket_bind_queue(int key, bool force) {
+ hashtable_t *hashtable = mm_get_hashtable();
+ LockFreeQueue<shm_packet_t> *queue;
+ void *tmp_ptr = hashtable_get(hashtable, key);
+
+ if (tmp_ptr == NULL || tmp_ptr == (void *)1 ) {
+ queue = new LockFreeQueue<shm_packet_t>(32);
+ hashtable_put(hashtable, key, (void *)queue);
+ return queue;
+ } else if(force) {
+ return (LockFreeQueue<shm_packet_t> *) tmp_ptr;
+ }
+
+ return NULL;
}
-SHMQueue<shm_msg_t> *_attach_remote_queue(int key);
+/**
+ * 缁戝畾key鍒伴槦鍒楋紝浣嗘槸骞朵笉浼氬垱寤洪槦鍒椼��
+ */
+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) {
+ return NULL;
+ }
-
-
-size_t shm_socket_remove_keys(int keys[], size_t length) {
- return SHMQueue<shm_msg_t>::remove_queues(keys, length);
+ queue = ( LockFreeQueue<shm_packet_t> *)tmp_ptr;
+ // hashtable_unlock(hashtable);
+ return queue;
}
-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");
- shm_socket_t *socket = (shm_socket_t *)calloc(1, sizeof(shm_socket_t));
- socket->socket_type = socket_type;
- socket->key = -1;
- socket->force_bind = false;
- socket->dispatch_thread = 0;
- socket->status = SHM_CONN_CLOSED;
+ 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;
+ sockt->key = 0;
+ sockt->force_bind = false;
+ sockt->queue = NULL;
+
s = pthread_mutexattr_init(&mtxAttr);
if (s != 0)
@@ -63,7 +89,7 @@
s = pthread_mutexattr_settype(&mtxAttr, PTHREAD_MUTEX_ERRORCHECK);
if (s != 0)
err_exit(s, "pthread_mutexattr_settype");
- s = pthread_mutex_init(&(socket->mutex), &mtxAttr);
+ s = pthread_mutex_init(&(sockt->mutex), &mtxAttr);
if (s != 0)
err_exit(s, "pthread_mutex_init");
@@ -71,410 +97,213 @@
if (s != 0)
err_exit(s, "pthread_mutexattr_destroy");
- return socket;
+
+ shmQueueStMap = shm_mm_attach<ShmQueueStMap>(SHM_QUEUE_ST_KEY);
+
+ return sockt;
}
-int shm_close_socket(shm_socket_t *socket) {
-
- int ret, s;
-
- logger->debug("shm_close_socket\n");
- switch (socket->socket_type) {
- case SHM_SOCKET_STREAM:
- ret = _shm_close_stream_socket(socket, true);
- break;
- case SHM_SOCKET_DGRAM:
- ret = _shm_close_dgram_socket(socket);
- break;
- default:
- break;
- }
- s = pthread_mutex_destroy(&(socket->mutex) );
- if(s != 0) {
- err_exit(s, "shm_close_socket");
- }
-
- free(socket);
- return ret;
-}
-
-// int shm_close_socket(shm_socket_t *socket) {
+static int _shm_socket_close_(shm_socket_t *sockt) {
-// // _destrory_tmp_recv_socket_((shm_socket_t *)pthread_getspecific(_tmp_recv_socket_key_));
+ int rv, i;
+ hashtable_t *hashtable = mm_get_hashtable();
+ logger->debug("shm_socket_close\n");
-// return shm_close_socket(socket);;
-// }
-int shm_socket_bind(shm_socket_t *socket, int key) {
- socket->key = key;
- return 0;
-}
-
-int shm_socket_force_bind(shm_socket_t *socket, int key) {
- socket->force_bind = true;
- socket->key = key;
- return 0;
-}
-
-int shm_listen(shm_socket_t *socket) {
-
- if (socket->socket_type != SHM_SOCKET_STREAM) {
- logger->error("can not invoke shm_listen method with a socket which is not a "
- "SHM_SOCKET_STREAM socket");
- exit(1);
- }
-
- int key;
- hashtable_t *hashtable = mm_get_hashtable();
- if (socket->key == -1) {
- key = hashtable_alloc_key(hashtable);
- socket->key = key;
- } else {
-
- if(!_shm_socket_check_key(socket)) {
- bus_errno = ESHM_BUS_KEY_INUSED;
- return ESHM_BUS_KEY_INUSED;
- }
- }
-
- socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
- socket->acceptQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
- socket->clientSocketMap = new std::map<int, shm_socket_t *>;
- socket->status = SHM_CONN_LISTEN;
- pthread_create(&(socket->dispatch_thread), NULL, _server_run_msg_rev,
- (void *)socket);
-
- return 0;
-}
-
-/**
- * 鎺ュ彈瀹㈡埛绔缓绔嬫柊杩炴帴鐨勮姹�
- *
-*/
-shm_socket_t *shm_accept(shm_socket_t *socket) {
- if (socket->socket_type != SHM_SOCKET_STREAM) {
- logger->error("can not invoke shm_accept method with a socket which is not a "
- "SHM_SOCKET_STREAM socket");
- exit(1);
- }
- hashtable_t *hashtable = mm_get_hashtable();
- int client_key;
- shm_socket_t *client_socket;
- shm_msg_t src;
-
- if (socket->acceptQueue->pop(src)) {
-
- // print_msg("===accept:", src);
- client_key = src.key;
- // client_socket = (shm_socket_t *)malloc(sizeof(shm_socket_t));
- client_socket = shm_open_socket(socket->socket_type);
- client_socket->key = socket->key;
- // client_socket->queue= socket->queue;
- //鍒濆鍖栨秷鎭痲ueue
- client_socket->messageQueue =
- new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
- //杩炴帴鍒板鏂筿ueue
- client_socket->remoteQueue = _attach_remote_queue(client_key);
-
- socket->clientSocketMap->insert({client_key, client_socket});
-
- /*
-* shm_accept 鐢ㄦ埛鎵ц鐨勬柟娉�
-* 涓巁server_run_msg_rev鍦ㄤ袱涓笉鍚岀殑闄愬埗宸ヤ綔,accept瑕佷繚璇佸湪瀹㈡埛鐨勫彂閫佹秷鎭箣鍓嶅畬鎴愯祫婧愮殑鍑嗗宸ヤ綔锛屼互閬垮厤鍑虹幇绔炴�侀棶棰�
- */
- //鍙戦�乷pen_reply,鍥炲簲瀹㈡埛绔殑connect璇锋眰
- struct timespec timeout = {1, 0};
- shm_msg_t msg;
- msg.key = socket->key;
- msg.size = 0;
- msg.type = SHM_SOCKET_OPEN_REPLY;
-
- if (client_socket->remoteQueue->push_timeout(msg, &timeout)) {
- client_socket->status = SHM_CONN_ESTABLISHED;
- return client_socket;
- } else {
- logger->error( "shm_accept: 鍙戦�乷pen_reply澶辫触");
- return NULL;
- }
-
- } else {
- err_exit(errno, "shm_accept");
- }
- return NULL;
-}
-
-
-/**
- * @return 0鎴愬姛. 鍏朵粬鍊煎け璐�
- */
-int shm_connect(shm_socket_t *socket, int key) {
- if (socket->socket_type != SHM_SOCKET_STREAM) {
- logger->error( "can not invoke shm_connect method with a socket which is not "
- "a SHM_SOCKET_STREAM socket");
- exit(1);
- }
- hashtable_t *hashtable = mm_get_hashtable();
- if (hashtable_get(hashtable, key) == NULL) {
- logger->error("shm_connect锛歝onnect at key %d failed!", key);
- return -1;
- }
-
- if (socket->key == -1) {
- socket->key = hashtable_alloc_key(hashtable);
- } else {
- if(!_shm_socket_check_key(socket)) {
- bus_errno = ESHM_BUS_KEY_INUSED;
- return ESHM_BUS_KEY_INUSED;
- }
- }
-
- socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
-
- if ((socket->remoteQueue = _attach_remote_queue(key)) == NULL) {
- logger->error("connect to %d failted", key);
- return -1;
- }
- socket->messageQueue = new LockFreeQueue<shm_msg_t, DM_Allocator>(16);
-
- //鍙戦�乷pen璇锋眰
- struct timespec timeout = {1, 0};
- shm_msg_t msg;
- msg.key = socket->key;
- msg.size = 0;
- msg.type = SHM_SOCKET_OPEN;
- socket->remoteQueue->push_timeout(msg, &timeout);
-
- //鎺ュ彈open reply
- if (socket->queue->pop(msg)) {
- // 鍦ㄨ繖閲宻erver绔凡缁忓噯澶囧ソ鎺ュ彈瀹㈡埛绔彂閫佽姹備簡,瀹屾垚涓庢湇鍔＄鐨勮繛鎺�
- if (msg.type == SHM_SOCKET_OPEN_REPLY) {
- socket->status = SHM_CONN_ESTABLISHED;
- pthread_create(&(socket->dispatch_thread), NULL, _client_run_msg_rev,
- (void *)socket);
- } else {
- logger->error( "shm_connect: 涓嶅尮閰嶇殑搴旂瓟淇℃伅!");
- exit(1);
- }
-
- } else {
- logger->error( "connect failted!");
- return -1;
- }
-
- return 0;
-}
-
-int shm_send(shm_socket_t *socket, const void *buf, const int size) {
- if (socket->socket_type != SHM_SOCKET_STREAM) {
- logger->error("shm_socket.shm_send: can not invoke shm_send method with a socket which is not a "
- "SHM_SOCKET_STREAM socket");
- exit(1);
- }
- hashtable_t *hashtable = mm_get_hashtable();
- if(socket->remoteQueue == NULL) {
- err_msg(errno, "褰撳墠瀹㈡埛绔棤杩炴帴!");
- return -1;
- }
- shm_msg_t dest;
- dest.type = SHM_COMMON_MSG;
- dest.key = socket->key;
- dest.size = size;
- dest.buf = mm_malloc(size);
- memcpy(dest.buf, buf, size);
-
- if (socket->remoteQueue->push(dest)) {
- return 0;
- } else {
- logger->error(errno, "connection has been closed!");
- return -1;
- }
-}
-
-int shm_recv(shm_socket_t *socket, void **buf, int *size) {
- if (socket->socket_type != SHM_SOCKET_STREAM) {
- logger->error( "shm_socket.shm_recv: can not invoke shm_recv method in a %d type socket which is "
- "not a SHM_SOCKET_STREAM socket ",
- socket->socket_type);
- exit(1);
- }
- shm_msg_t src;
-
- if (socket->messageQueue->pop(src)) {
- void *_buf = malloc(src.size);
- memcpy(_buf, src.buf, src.size);
- *buf = _buf;
- *size = src.size;
- mm_free(src.buf);
- return 0;
- } else {
- return -1;
- }
-}
-
-
-// 鐭繛鎺ユ柟寮忓彂閫�
-int shm_sendto(shm_socket_t *socket, const void *buf, const int size,
- const int key, const struct timespec *timeout, const int flags) {
-
- int s;
- bool rv;
-
- if (socket->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 ",
- socket->socket_type);
- exit(0);
- }
- hashtable_t *hashtable = mm_get_hashtable();
-
-
- if ((s = pthread_mutex_lock(&(socket->mutex))) != 0)
- err_exit(s, "shm_sendto : pthread_mutex_lock");
-
- if (socket->queue == NULL) {
- if (socket->key == -1) {
- socket->key = hashtable_alloc_key(hashtable);
- } else {
-
- if(!_shm_socket_check_key(socket)) {
- bus_errno = ESHM_BUS_KEY_INUSED;
- return ESHM_BUS_KEY_INUSED;
- }
-
- }
-
- socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
- }
-
- if ((s = pthread_mutex_unlock(&(socket->mutex))) != 0)
- err_exit(s, "shm_sendto : pthread_mutex_unlock");
-
- // if (key == socket->key) {
- // logger->error( "can not send to your self!");
- // return -1;
+ // if(sockt->key != 0) {
+ // auto it = shmQueueStMap->find(sockt->key);
+ // if(it != shmQueueStMap->end()) {
+ // it->second.status = SHM_QUEUE_ST_CLOSED;
+ // it->second.closeTime = time(NULL);
+ // }
// }
- SHMQueue<shm_msg_t> *remoteQueue;
- if ((remoteQueue = _attach_remote_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;
- dest.key = socket->key;
- dest.size = size;
- dest.buf = mm_malloc(size);
- memcpy(dest.buf, buf, size);
- // printf("shm_sendto push before\n");
-
- if(flags & SHM_MSG_NOWAIT != 0) {
- rv = remoteQueue->push_nowait(dest);
- } else if(timeout != NULL) {
- rv = remoteQueue->push_timeout(dest, timeout);
- } else {
- rv = remoteQueue->push(dest);
- }
-
- if (rv) {
- // printf("shm_sendto push after\n");
- delete remoteQueue;
- return 0;
- } else {
- delete remoteQueue;
- mm_free(dest.buf);
- if(errno == EAGAIN) {
- bus_errno = EBUS_TIMEOUT;
- logger->error("sendto key %d failed, %s", key, bus_strerror(bus_errno));
- return EBUS_TIMEOUT;
- } else {
- logger->error(errno, "sendto key %d failed!", key);
- return -1;
+ if(sockt->queue != NULL) {
+ sockt->queue->close();
+ for( i = 0; i < sockt->queue->size(); i++) {
+ mm_free((*(sockt->queue))[i].buf);
+ logger->info("======= %d free queue element buf\n", sockt->key);
}
-
-
+ sleep(1);
+
+ hashtable_remove(hashtable, sockt->key);
+ // sockt->queue = NULL;
}
+
+ pthread_mutex_destroy(&(sockt->mutex) );
+ free(sockt);
+ return 0;
+}
+
+
+int shm_socket_close(shm_socket_t *sockt) {
+
+ shm_socket_t * threadlocal_socket = (shm_socket_t *)pthread_getspecific(_localthread_socket_key_);
+ if(threadlocal_socket != NULL) {
+ _destrory_threadlocal_socket_(threadlocal_socket);
+ }
+ return _shm_socket_close_(sockt);
+}
+
+
+int shm_socket_stop(shm_socket_t *sockt) {
+ struct timespec timeout = {5, 0};
+ shm_packet_t sendpak = {0};
+ sendpak.key = sockt->key;
+ sendpak.action = BUS_ACTION_STOP;
+ sendpak.size = 0;
+ return shm_sendpakto(sockt, &sendpak, sockt->key, &timeout, BUS_TIMEOUT_FLAG);
+}
+
+int shm_socket_bind(shm_socket_t *sockt, int key) {
+ sockt->key = key;
+ return 0;
+}
+
+int shm_socket_force_bind(shm_socket_t *sockt, int key) {
+ sockt->force_bind = true;
+ sockt->key = key;
+ return 0;
+}
+
+int shm_socket_get_key(shm_socket_t *sockt){
+ return sockt->key;
+}
+
+// 鐭繛鎺ユ柟寮忓彂閫�
+int shm_sendto(shm_socket_t *sockt, const void *buf, const int size,
+ const int key, const struct timespec *timeout, const int flag) {
+
+ int rv;
+
+ shm_packet_t sendpak = {0};
+ sendpak.key = sockt->key;
+ sendpak.size = size;
+ if(buf != NULL) {
+ sendpak.buf = mm_malloc(size);
+ memcpy(sendpak.buf, buf, size);
+ }
+
+ rv = shm_sendpakto(sockt, &sendpak, key, timeout, flag);
+ return rv;
+}
+
+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);
+}
+
+
+/**
+ * @callback void (*recvandsend_callback_fn)(void *recvbuf, int recvsize, int key, void **sendbuf, int *sendsize)
+ * sendbuf 鍜� sendsize鏄痗allbak_fn鍥炶皟鍑芥暟鐨勮繑鍥炲��, 鍒嗗埆琛ㄧず鍙戦�佹暟鎹紝鍜屽彂閫佹暟鎹殑澶у皬銆�
+ *
+ */
+int shm_recvandsend(shm_socket_t *sockt, recvandsend_callback_fn callback,
+ const struct timespec *timeout, int flag, void *user_data) {
+
+ int rv;
+
+ void *sendbuf, *recvbuf = NULL;
+ int sendsize = 0;
+ shm_packet_t recvpak = {0};
+
+ rv = shm_recvpakfrom(sockt , &recvpak, timeout, flag);
+
+ if (rv != 0) {
+ if(rv == ETIMEDOUT){
+ logger->debug("%d shm_recvandsend failed %s", shm_socket_get_key(sockt), bus_strerror(EBUS_TIMEOUT));
+ return EBUS_TIMEOUT;
+ }
+
+ logger->error("%d shm_recvandsend failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ return rv;
+ }
+
+ if(recvpak.buf != NULL) {
+ recvbuf = malloc(recvpak.size);
+ memcpy(recvbuf, recvpak.buf, recvpak.size);
+ mm_free(recvpak.buf);
+ }
+
+ callback(recvbuf, recvpak.size, recvpak.key, &sendbuf, &sendsize, user_data);
+
+ shm_packet_t sendpak = {0};
+ sendpak.key = sockt->key;
+ sendpak.size = sendsize;
+ memcpy(sendpak.uuid, recvpak.uuid, sizeof(sendpak.uuid));
+ if(sendbuf !=NULL && sendsize > 0) {
+ sendpak.buf = mm_malloc(sendsize);
+ memcpy(sendpak.buf, sendbuf, sendsize);
+ } else {
+
+ logger->warn("%d shm_recvandsend : sendbuf is null", shm_socket_get_key(sockt));
+ // return -1;
+ }
+
+ rv = shm_sendpakto(sockt, &sendpak, recvpak.key, timeout, flag);
+
+ return 0;
+
}
// 鐭繛鎺ユ柟寮忔帴鍙�
-int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *key, struct timespec *timeout, int flags) {
- int s;
- bool rv;
-
- if (socket->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 ",
- socket->socket_type);
- exit(1);
- }
- hashtable_t *hashtable = mm_get_hashtable();
-
- if ((s = pthread_mutex_lock(&(socket->mutex))) != 0)
- err_exit(s, "shm_recvfrom : pthread_mutex_lock");
-
- if (socket->queue == NULL) {
- if (socket->key == -1) {
- socket->key = hashtable_alloc_key(hashtable);
- } else {
-
- if(!_shm_socket_check_key(socket)) {
- bus_errno = ESHM_BUS_KEY_INUSED;
- return ESHM_BUS_KEY_INUSED;
- }
- }
-
- socket->queue = new SHMQueue<shm_msg_t>(socket->key, 16);
- }
+int shm_recvfrom(shm_socket_t *sockt, void **buf, int *size, int *key, const struct timespec *timeout, int flag) {
+ int rv;
- if ((s = pthread_mutex_unlock(&(socket->mutex))) != 0)
- err_exit(s, "shm_recvfrom : pthread_mutex_unlock");
+ shm_packet_t recvpak;
+ rv = shm_recvpakfrom(sockt , &recvpak, timeout, flag);
- shm_msg_t src;
- // printf("shm_recvfrom pop before\n");
-
- if(flags & SHM_MSG_NOWAIT != 0) {
- rv = socket->queue->pop_nowait(src);
- } else if(timeout != NULL) {
- rv = socket->queue->pop_timeout(src, timeout);
- } else {
- rv = socket->queue->pop(src);
- }
+ if (rv != 0) {
- if (rv) {
- if(buf != NULL) {
- void *_buf = malloc(src.size);
- memcpy(_buf, src.buf, src.size);
+ logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ return rv;
+
+ }
+
+ if(recvpak.buf != NULL) {
+ if (buf == NULL) {
+ logger->warn("!!!Alert: buf should be not NULL!\n");
+ } else {
+ void *_buf = malloc(recvpak.size);
+ memcpy(_buf, recvpak.buf, recvpak.size);
*buf = _buf;
}
-
- if(size != NULL)
- *size = src.size;
-
- if(key != NULL)
- *key = src.key;
-
- mm_free(src.buf);
- // printf("shm_recvfrom pop after\n");
- return 0;
- } else {
- return -1;
}
+
+ if(size != NULL)
+ *size = recvpak.size;
+
+ if(key != NULL)
+ *key = recvpak.key;
+
+ if(recvpak.key == 0) {
+ err_exit(0, "key = %d, pid= %d, recvpak.key == 0", shm_socket_get_key(sockt), getpid());
+ }
+ mm_free(recvpak.buf);
+ return 0;
}
+// =================================================================================================
+
/* Free thread-specific data buffer */
-static void _destrory_tmp_recv_socket_(void *tmp_socket)
+static void _destrory_threadlocal_socket_(void *tmp_socket)
{
int rv;
+
+ logger->debug("%lu destroy threadlocal socket\n", pthread_self());
+
if(tmp_socket == NULL)
return;
-
- logger->debug("%d destroy tmp socket\n", pthread_self());
- shm_close_socket((shm_socket_t *)tmp_socket);
- rv = pthread_setspecific(_tmp_recv_socket_key_, NULL);
+
+ _shm_socket_close_((shm_socket_t *)tmp_socket);
+ rv = pthread_setspecific(_localthread_socket_key_, NULL);
if ( rv != 0) {
logger->error(rv, "shm_sendandrecv : pthread_setspecific");
exit(1);
@@ -482,265 +311,373 @@
}
/* One-time key creation function */
-static void _create_tmp_recv_socket_key(void)
+static void _create_threadlocal_socket_key_(void)
{
int s;
/* Allocate a unique thread-specific data key and save the address
of the destructor for thread-specific data buffers */
- s = pthread_key_create(&_tmp_recv_socket_key_, _destrory_tmp_recv_socket_);
- //s = pthread_key_create(&_tmp_recv_socket_key_, NULL);
+ s = pthread_key_create(&_localthread_socket_key_, _destrory_threadlocal_socket_);
+ //s = pthread_key_create(&_localthread_socket_key_, NULL);
if (s != 0) {
logger->error(s, "pthread_key_create");
- abort(); /* dump core and terminate */
exit(1);
}
}
+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) {
-int shm_sendandrecv_safe(shm_socket_t *socket, const void *send_buf,
- const int send_size, const int send_key, void **recv_buf,
- int *recv_size, struct timespec *timeout, int flags) {
- int recv_key;
- int rv;
+ int rv, tryn = 16;
+ shm_packet_t sendpak;
+ shm_packet_t recvpak;
+ std::map<std::string, shm_packet_t>::iterator recvbufIter;
- // 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
- shm_socket_t *tmp_socket;
+ std::string uuid = sole::uuid4().str();
+
+ sendpak.key = sockt->key;
+ sendpak.size = send_size;
+ if(send_buf != NULL) {
+ sendpak.buf = mm_malloc(send_size);
+ memcpy(sendpak.buf, send_buf, send_size);
+ }
+ memcpy(sendpak.uuid, uuid.c_str(), uuid.length() + 1);
+ // uuid.copy(sendpak.uuid, sizeof sendpak.uuid);
+ rv = shm_sendpakto(sockt, &sendpak, key, timeout, flags);
- 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);
+ if(rv != 0) {
+ return rv;
+ }
+
+ while(tryn > 0) {
+ tryn--;
+ recvbufIter = sockt->recvbuf.find(uuid);
+ if(recvbufIter != sockt->recvbuf.end()) {
+ // 鍦ㄧ紦瀛橀噷鏌ュ埌浜哢UID鍖归厤鎴愬姛鐨�
+logger->debug("get from recvbuf: %s", uuid.c_str());
+ recvpak = recvbufIter->second;
+ sockt->recvbuf.erase(recvbufIter);
+ goto LABLE_SUC;
+ }
+
+ rv = shm_recvpakfrom(sockt, &recvpak, timeout, flags);
+
+ if (rv != 0) {
+
+ if(rv == ETIMEDOUT) {
+ return EBUS_TIMEOUT;
+ }
+
+ logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ return rv;
+ }
+
+logger->debug("send uuid:%s, recv uuid: %s", uuid.c_str(), recvpak.uuid);
+ if(strlen(recvpak.uuid) == 0) {
+ continue;
+ } else if (strncmp(uuid.c_str(), recvpak.uuid, sizeof(recvpak.uuid)) == 0) {
+ // 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
+ goto LABLE_SUC;
+ } else {
+ // 绛旈潪鎵�闂紝鏀惧埌缂撳瓨閲�
+ sockt->recvbuf.insert({recvpak.uuid, 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;
- rv = pthread_once(&_once_, _create_tmp_recv_socket_key);
+ 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 key, void **recv_buf,
+ int *recv_size, const struct timespec *timeout, int flags) {
+
+
+ int rv = 0, tryn = 16;
+ static int Counter_suc = 0;
+ static int Counter_fail = 0;
+ shm_packet_t sendpak;
+ shm_packet_t recvpak;
+ std::map<int, shm_packet_t>::iterator recvbufIter;
+ // 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
+ shm_socket_t *tmp_socket = NULL;
+
+ rv = pthread_once(&_once_, _create_threadlocal_socket_key_);
if (rv != 0) {
logger->error(rv, "shm_sendandrecv pthread_once");
exit(1);
}
- tmp_socket = (shm_socket_t *)pthread_getspecific(_tmp_recv_socket_key_);
+ tmp_socket = (shm_socket_t *)pthread_getspecific(_localthread_socket_key_);
if (tmp_socket == NULL)
{
/* 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);
+ tmp_socket = shm_socket_open(SHM_SOCKET_DGRAM);
- rv = pthread_setspecific(_tmp_recv_socket_key_, tmp_socket);
+ rv = pthread_setspecific(_localthread_socket_key_, tmp_socket);
if ( rv != 0) {
logger->error(rv, "shm_sendandrecv : pthread_setspecific");
exit(1);
}
}
-
- 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);
-
- return rv;
- } else {
-
- return rv;
- }
- return -1;
-}
-
-int shm_sendandrecv_unsafe(shm_socket_t *socket, const void *send_buf,
- const int send_size, const int send_key, void **recv_buf,
- int *recv_size, struct timespec *timeout, int flags) {
- if (socket->socket_type != SHM_SOCKET_DGRAM) {
- logger->error( "shm_socket.shm_sendandrecv_unsafe : Can't invoke shm_sendandrecv method in a %d type socket "
- "which is not a SHM_SOCKET_DGRAM socket ",
- socket->socket_type);
- exit(1);
- }
- int recv_key;
- int rv;
-
- if ((rv = shm_sendto(socket, send_buf, send_size, send_key, timeout, flags)) == 0) {
- rv = shm_recvfrom(socket, recv_buf, recv_size, &recv_key, timeout, flags);
- return rv;
- } else {
+ 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);
+
+ if(rv != 0) {
return rv;
}
- return -1;
-}
-int shm_sendandrecv(shm_socket_t *socket, const void *send_buf,
- const int send_size, const int send_key, void **recv_buf,
- int *recv_size, struct timespec *timeout, int flags) {
- return shm_sendandrecv_safe(socket, send_buf, send_size, send_key,recv_buf, recv_size, timeout, flags);
-}
+ while(tryn > 0) {
+ tryn--;
+ recvbufIter = tmp_socket->recvbuf2.find(key);
+ if(recvbufIter != tmp_socket->recvbuf2.end()) {
+ // 鍦ㄧ紦瀛橀噷鏌ュ埌浜唊ey鍖归厤鎴愬姛鐨�
+ recvpak = recvbufIter->second;
+ tmp_socket->recvbuf2.erase(recvbufIter);
+ goto LABLE_SUC;
+ }
+ rv = shm_recvpakfrom(tmp_socket, &recvpak, timeout, flags);
-// ============================================================================================================
+ if (rv != 0) {
+ logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(tmp_socket), bus_strerror(rv));
+ return rv;
+ }
-/**
- * 缁戝畾key鍒伴槦鍒楋紝浣嗘槸骞朵笉浼氬垱寤洪槦鍒椼�傚鏋滄病鏈夊搴旀寚瀹歬ey鐨勯槦鍒楁彁绀洪敊璇苟閫�鍑�
- */
-SHMQueue<shm_msg_t> *_attach_remote_queue(int key) {
-
- hashtable_t *hashtable = mm_get_hashtable();
- if (hashtable_get(hashtable, key) == NULL) {
- //logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
- return NULL;
- }
-
- SHMQueue<shm_msg_t> *queue = new SHMQueue<shm_msg_t>(key, 0);
- return queue;
-}
-
-void _server_close_conn_to_client(shm_socket_t *socket, int key) {
- shm_socket_t *client_socket;
- std::map<int, shm_socket_t *>::iterator iter =
- socket->clientSocketMap->find(key);
- if (iter != socket->clientSocketMap->end()) {
- client_socket = iter->second;
- free((void *)client_socket);
- socket->clientSocketMap->erase(iter);
- }
-}
-
-/**
- * server绔悇绉嶇被鍨嬫秷鎭紙锛夊湪杩欓噷杩涚▼鍒嗘嫞
- */
-void *_server_run_msg_rev(void *_socket) {
- pthread_detach(pthread_self());
- shm_socket_t *socket = (shm_socket_t *)_socket;
- struct timespec timeout = {1, 0};
- shm_msg_t src;
- shm_socket_t *client_socket;
- std::map<int, shm_socket_t *>::iterator iter;
-
- while (socket->queue->pop(src)) {
-
- switch (src.type) {
- case SHM_SOCKET_OPEN:
- socket->acceptQueue->push_timeout(src, &timeout);
- break;
- case SHM_SOCKET_CLOSE:
- _server_close_conn_to_client(socket, src.key);
- break;
- case SHM_COMMON_MSG:
-
- iter = socket->clientSocketMap->find(src.key);
- if (iter != socket->clientSocketMap->end()) {
- client_socket = iter->second;
- // print_msg("_server_run_msg_rev push before", src);
- client_socket->messageQueue->push_timeout(src, &timeout);
- // print_msg("_server_run_msg_rev push after", src);
- }
-
- break;
-
- default:
- logger->error("shm_socket._server_run_msg_rev: undefined message type.");
+ if (key == recvpak.key) {
+ // 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
+ goto LABLE_SUC;
+ } else {
+ // 绛旈潪鎵�闂紝鏀惧埌缂撳瓨閲�
+ tmp_socket->recvbuf2.insert({recvpak.key, recvpak});
+ continue;
}
}
- return NULL;
-}
-
-void _client_close_conn_to_server(shm_socket_t *socket) {
-
- _shm_close_stream_socket(socket, false);
-}
-
-/**
- * client绔殑鍚勭绫诲瀷娑堟伅锛堬級鍦ㄨ繖閲岃繘绋嬪垎鎷�
- */
-void *_client_run_msg_rev(void *_socket) {
- pthread_detach(pthread_self());
- shm_socket_t *socket = (shm_socket_t *)_socket;
- struct timespec timeout = {1, 0};
- shm_msg_t src;
-
- while (socket->queue->pop(src)) {
- switch (src.type) {
-
- case SHM_SOCKET_CLOSE:
- _client_close_conn_to_server(socket);
- break;
- case SHM_COMMON_MSG:
- socket->messageQueue->push_timeout(src, &timeout);
- break;
- default:
- logger->error( "shm_socket._client_run_msg_rev: undefined message type.");
- }
+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);
}
-
- return NULL;
-}
-
-int _shm_close_stream_socket(shm_socket_t *socket, bool notifyRemote) {
- socket->status = SHM_CONN_CLOSED;
- //缁欏鏂瑰彂閫佷竴涓叧闂繛鎺ョ殑娑堟伅
- struct timespec timeout = {1, 0};
- shm_msg_t close_msg;
-
- close_msg.key = socket->key;
- close_msg.size = 0;
- close_msg.type = SHM_SOCKET_CLOSE;
- if (notifyRemote && socket->remoteQueue != NULL) {
- socket->remoteQueue->push_timeout(close_msg, &timeout);
- }
-
- if (socket->queue != NULL) {
- delete socket->queue;
- socket->queue = NULL;
- }
-
- if (socket->remoteQueue != NULL) {
- delete socket->remoteQueue;
- socket->remoteQueue = NULL;
- }
-
- if (socket->messageQueue != NULL) {
- delete socket->messageQueue;
- socket->messageQueue = NULL;
- }
-
- if (socket->acceptQueue != NULL) {
- delete socket->acceptQueue;
- socket->acceptQueue = NULL;
- }
-
- if (socket->clientSocketMap != NULL) {
- shm_socket_t *client_socket;
- for (auto iter = socket->clientSocketMap->begin();
- iter != socket->clientSocketMap->end(); iter++) {
- client_socket = iter->second;
-
- client_socket->remoteQueue->push_timeout(close_msg, &timeout);
- delete client_socket->remoteQueue;
- client_socket->remoteQueue = NULL;
-
- delete client_socket->messageQueue;
- client_socket->messageQueue = NULL;
- free((void *)client_socket);
- }
- delete socket->clientSocketMap;
- }
-
- if (socket->dispatch_thread != 0)
- pthread_cancel(socket->dispatch_thread);
+
+ if(recv_size != NULL)
+ *recv_size = recvpak.size;
return 0;
-
}
-int _shm_close_dgram_socket(shm_socket_t *socket){
- if(socket->queue != NULL) {
- delete socket->queue;
- socket->queue = NULL;
- }
-
- return 0;
-}
+static int _shm_sendandrecv_alloc_new(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;
+ int rv;
+ int tryn = 0;
+ shm_socket_t *tmp_socket;
+
+
+ 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);
+
+ while(tryn < 3) {
+ tryn++;
+ rv = shm_recvfrom(tmp_socket, recv_buf, recv_size, &recv_key, timeout, flags);
+ if(rv != 0) {
+ logger->error("_shm_sendandrecv_alloc_new : %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_socket_close_(tmp_socket);
+ return rv;
+
+}
+
+static int shm_sendpakto(shm_socket_t *sockt, shm_packet_t *sendpak,
+ const int key, const struct timespec *timeout, const int flag) {
+
+ int rv;
+ shm_queue_status_t stRecord;
+ LockFreeQueue<shm_packet_t> *remoteQueue;
+ hashtable_t *hashtable = mm_get_hashtable();
+
+ if( sockt->queue != NULL)
+ goto LABEL_PUSH;
+
+ // if(hashtable_get_queue_count(hashtable) > QUEUE_COUNT_LIMIT) {
+ // return EBUS_EXCEED_LIMIT;
+ // }
+
+ {
+ if ((rv = pthread_mutex_lock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_sendto : pthread_mutex_lock");
+
+ if (sockt->queue == NULL) {
+ if (sockt->key == 0) {
+ sockt->key = hashtable_alloc_key(hashtable);
+ }
+ 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);
+ if ((rv = pthread_mutex_unlock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_sendto : pthread_mutex_unlock");
+ return EBUS_KEY_INUSED;
+ }
+
+ // 鏍囪key瀵瑰簲鐨勭姸鎬� 锛屼负opened
+ stRecord.status = SHM_QUEUE_ST_OPENED;
+ stRecord.createTime = time(NULL);
+ shmQueueStMap->insert({sockt->key, stRecord});
+
+ }
+
+ if ((rv = pthread_mutex_unlock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_sendto : pthread_mutex_unlock");
+
+ }
+
+
+ LABEL_PUSH:
+ if (sendpak->action != BUS_ACTION_STOP && key == sockt->key) {
+ logger->error( "can not send to your self!");
+ return EBUS_SENDTO_SELF;
+ }
+
+ // 妫�鏌ey鏍囪鐨勭姸鎬�
+ auto it = shmQueueStMap->find(key);
+ if(it != shmQueueStMap->end()) {
+ if(it->second.status == SHM_QUEUE_ST_CLOSED) {
+ // key瀵瑰簲鐨勭姸鎬佹槸鍏抽棴鐨�
+ goto ERR_CLOSED;
+ }
+ }
+
+ remoteQueue = shm_socket_attach_queue(key);
+
+ if (remoteQueue == NULL ) {
+ goto ERR_CLOSED;
+ } else if(remoteQueue->isClosed()) {
+ goto ERR_CLOSED;
+ }
+
+ sendpak->key = sockt->key;
+ rv = remoteQueue->push(*sendpak, timeout, flag);
+
+ if(rv != 0) {
+ mm_free(sendpak->buf);
+ }
+ if(rv == ETIMEDOUT) {
+ return EBUS_TIMEOUT;
+ }
+ return rv;
+
+ERR_CLOSED:
+ logger->error("sendto key %d failed, %s", key, bus_strerror(EBUS_CLOSED));
+ return EBUS_CLOSED;
+
+}
+
+// 鐭繛鎺ユ柟寮忔帴鍙�
+static int shm_recvpakfrom(shm_socket_t *sockt, shm_packet_t *_recvpak , const struct timespec *timeout, int flag) {
+ int rv;
+ shm_queue_status_t stRecord;
+ hashtable_t *hashtable = mm_get_hashtable();
+ shm_packet_t recvpak;
+
+ if( sockt->queue != NULL)
+ goto LABEL_POP;
+
+ // if(hashtable_get_queue_count(hashtable) > QUEUE_COUNT_LIMIT) {
+ // return EBUS_EXCEED_LIMIT;
+ // }
+
+ {
+ if ((rv = pthread_mutex_lock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_recvfrom : pthread_mutex_lock");
+
+
+ if (sockt->key == 0) {
+ sockt->key = hashtable_alloc_key(hashtable);
+ }
+ 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);
+ if ((rv = pthread_mutex_unlock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_recvfrom : pthread_mutex_unlock");
+ return EBUS_KEY_INUSED;
+ }
+
+ // 鏍囪key瀵瑰簲鐨勭姸鎬� 锛屼负opened
+ stRecord.status = SHM_QUEUE_ST_OPENED;
+ stRecord.createTime = time(NULL);
+ shmQueueStMap->insert({sockt->key, stRecord});
+
+ if ((rv = pthread_mutex_unlock(&(sockt->mutex))) != 0)
+ err_exit(rv, "shm_recvfrom : pthread_mutex_unlock");
+
+ }
+
+LABEL_POP:
+
+
+ rv = sockt->queue->pop(recvpak, timeout, flag);
+ if(rv != 0) {
+ if(rv == ETIMEDOUT) {
+ return EBUS_TIMEOUT;
+ }
+ return rv;
+ }
+
+
+ if(recvpak.action == BUS_ACTION_STOP) {
+ return EBUS_STOPED;
+ }
+ *_recvpak = recvpak;
+ return 0;
+}
+
--
Gitblit v1.8.0