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 | 570 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 342 insertions(+), 228 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index bddcec0..978eda9 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -5,46 +5,52 @@
#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_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 pthread_key_t _localthread_socket_key_;
-static void _destrory_socket_perthread(void *tmp_socket);
-static void _create_socket_key_perthread(void);
+static void _destrory_threadlocal_socket_(void *tmp_socket);
+static void _create_threadlocal_socket_key_(void);
static int shm_recvpakfrom(shm_socket_t *sockt, shm_packet_t *recvpak , const struct timespec *timeout, int flag);
-static int shm_sendpakto(shm_socket_t *sockt, const shm_packet_t *sendpak,
+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_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);
+
+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;
- hashtable_lock(hashtable);
void *tmp_ptr = hashtable_get(hashtable, key);
-
if (tmp_ptr == NULL || tmp_ptr == (void *)1 ) {
- queue = new LockFreeQueue<shm_packet_t>(16);
+ queue = new LockFreeQueue<shm_packet_t>(32);
hashtable_put(hashtable, key, (void *)queue);
- hashtable_unlock(hashtable);
return queue;
} else if(force) {
- hashtable_unlock(hashtable);
- return (LockFreeQueue<shm_packet_t> *) queue;
+ return (LockFreeQueue<shm_packet_t> *) tmp_ptr;
}
- hashtable_unlock(hashtable);
return NULL;
}
@@ -56,7 +62,6 @@
hashtable_t *hashtable = mm_get_hashtable();
void *tmp_ptr = hashtable_get(hashtable, key);
if (tmp_ptr == NULL || tmp_ptr == (void *)1) {
- //logger->error("shm_socket._remote_queue_attach锛歝onnet at key %d failed!", key);
return NULL;
}
@@ -65,26 +70,11 @@
return 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;
-}
-
-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;
@@ -107,28 +97,66 @@
if (s != 0)
err_exit(s, "pthread_mutexattr_destroy");
+
+ shmQueueStMap = shm_mm_attach<ShmQueueStMap>(SHM_QUEUE_ST_KEY);
+
return sockt;
}
-int shm_close_socket(shm_socket_t *sockt) {
+
+static int _shm_socket_close_(shm_socket_t *sockt) {
- int s;
-
- logger->debug("shm_close_socket\n");
+ int rv, i;
+ hashtable_t *hashtable = mm_get_hashtable();
+ logger->debug("shm_socket_close\n");
+
+
+ // 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);
+ // }
+ // }
+
+
+
if(sockt->queue != NULL) {
- delete sockt->queue;
- 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);
- s = pthread_mutex_destroy(&(sockt->mutex) );
- if(s != 0) {
- err_exit(s, "shm_close_socket");
+ 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;
@@ -145,152 +173,77 @@
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;
+ shm_packet_t sendpak = {0};
sendpak.key = sockt->key;
sendpak.size = size;
- sendpak.buf = mm_malloc(size);
- memcpy(sendpak.buf, buf, 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);
+}
- int rv, tryn = 3;
- shm_packet_t sendpak;
- shm_packet_t recvpak;
- std::map<std::string, shm_packet_t>::iterator recvbufIter;
- std::string uuid = sole::uuid4().str();
-
- sendpak.key = sockt->key;
- sendpak.size = send_size;
- 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(rv != 0) {
- return rv;
- }
-
- while(true) {
- 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);
- break;
- }
-
- 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 (strncmp(uuid.c_str(), recvpak.uuid, sizeof recvpak.uuid) == 0) {
- // 鍙戦�佷笌鎺ュ彈鐨刄UID鍖归厤鎴愬姛
- break;
- } else {
- // 绛旈潪鎵�闂紝鏀惧埌缂撳瓨閲�
- sockt->recvbuf.insert({recvpak.uuid, recvpak});
- continue;
- }
-
- if(tryn == 0) {
- // 灏濊瘯浜唗ryn娆￠兘娌℃湁鎴愬姛
- 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;
- }
-
- if(recv_size != NULL)
- *recv_size = recvpak.size;
-
- mm_free(recvpak.buf);
-
- return 0;
-
-}
/**
- * @callback void (*recv_callback_fn)(void **sendbuf, int *sendsize)
+ * @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, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
- const struct timespec *timeout, int flag) {
+int shm_recvandsend(shm_socket_t *sockt, recvandsend_callback_fn callback,
+ const struct timespec *timeout, int flag, void *user_data) {
int rv;
- void *sendbuf = NULL;
+ void *sendbuf, *recvbuf = NULL;
int sendsize = 0;
- shm_packet_t recvpak;
+ shm_packet_t recvpak = {0};
rv = shm_recvpakfrom(sockt , &recvpak, timeout, flag);
-
-
if (rv != 0) {
- if(rv == ETIMEDOUT)
+ if(rv == ETIMEDOUT){
+ logger->debug("%d shm_recvandsend failed %s", shm_socket_get_key(sockt), bus_strerror(EBUS_TIMEOUT));
return EBUS_TIMEOUT;
- else {
- logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
- return rv;
}
+
+ logger->error("%d shm_recvandsend failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ return rv;
}
- if(recvbuf != NULL) {
- void *_buf = malloc(recvpak.size);
- memcpy(_buf, recvpak.buf, recvpak.size);
- *recvbuf = _buf;
+ if(recvpak.buf != NULL) {
+ recvbuf = malloc(recvpak.size);
+ memcpy(recvbuf, recvpak.buf, recvpak.size);
+ mm_free(recvpak.buf);
}
- if(recvsize != NULL)
- *recvsize = recvpak.size;
+ callback(recvbuf, recvpak.size, recvpak.key, &sendbuf, &sendsize, user_data);
- if(key != NULL)
- *key = recvpak.key;
-
- mm_free(recvpak.buf);
-
- callback(&sendbuf, &sendsize);
-
- shm_packet_t sendpak;
+ shm_packet_t sendpak = {0};
sendpak.key = sockt->key;
sendpak.size = sendsize;
- memcpy(sendpak.uuid, recvpak.uuid, sizeof sendpak.uuid);
+ 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);
@@ -308,20 +261,19 @@
if (rv != 0) {
- if(rv == ETIMEDOUT)
- return EBUS_TIMEOUT;
- else {
- logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
- return rv;
- }
+ logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ return rv;
}
-
- if(buf != NULL) {
- void *_buf = malloc(recvpak.size);
- memcpy(_buf, recvpak.buf, recvpak.size);
- *buf = _buf;
+ 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)
@@ -330,6 +282,9 @@
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;
}
@@ -338,15 +293,17 @@
// =================================================================================================
/* Free thread-specific data buffer */
-static void _destrory_socket_perthread(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(_perthread_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);
@@ -354,14 +311,14 @@
}
/* One-time key creation function */
-static void _create_socket_key_perthread(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(&_perthread_socket_key_, _destrory_socket_perthread);
- //s = pthread_key_create(&_perthread_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");
exit(1);
@@ -369,68 +326,176 @@
}
-// use thread local
-int _shm_sendandrecv_thread_local(shm_socket_t *sockt, const void *send_buf,
- const int send_size, const int send_key, void **recv_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) {
- int recv_key;
- int rv;
- int tryn = 0;
- // 鐢╰hread local 淇濊瘉姣忎釜绾跨▼鐢ㄤ竴涓嫭鍗犵殑socket鎺ュ彈瀵规柟杩斿洖鐨勪俊鎭�
- shm_socket_t *tmp_socket;
+ int rv, tryn = 16;
+ shm_packet_t sendpak;
+ shm_packet_t recvpak;
+ std::map<std::string, shm_packet_t>::iterator recvbufIter;
+
+ 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(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;
- /* 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);
+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;
+}
+
+// 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(_perthread_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("%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);
+ rv = pthread_setspecific(_localthread_socket_key_, tmp_socket);
if ( rv != 0) {
logger->error(rv, "shm_sendandrecv : pthread_setspecific");
exit(1);
}
}
+
+ 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 = shm_sendto(tmp_socket, send_buf, send_size, send_key, timeout, flags)) == 0) {
+ if(rv != 0) {
+ return rv;
+ }
- 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;
+ 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;
}
-
- return EBUS_RECVFROM_WRONG_END;
- }
- return rv;
+ 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;
+ }
+
+ 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;
}
-int _shm_sendandrecv_alloc_new(shm_socket_t *sockt, const void *send_buf,
+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;
@@ -440,7 +505,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);
@@ -449,7 +514,7 @@
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));
+ logger->error("_shm_sendandrecv_alloc_new : %s\n", bus_strerror(rv));
return rv;
}
@@ -466,26 +531,32 @@
return EBUS_RECVFROM_WRONG_END;
}
- shm_close_socket(tmp_socket);
+ _shm_socket_close_(tmp_socket);
return rv;
}
-static int shm_sendpakto(shm_socket_t *sockt, const shm_packet_t *sendpak,
+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);
@@ -493,8 +564,16 @@
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)
@@ -504,33 +583,58 @@
LABEL_PUSH:
- if (key == sockt->key) {
+ if (sendpak->action != BUS_ACTION_STOP && key == sockt->key) {
logger->error( "can not send to your self!");
return EBUS_SENDTO_SELF;
}
- 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;
+ // 妫�鏌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) {
+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)
@@ -543,9 +647,15 @@
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");
@@ -555,15 +665,19 @@
LABEL_POP:
-
- rv = sockt->queue->pop(*recvpak, timeout, flag);
+ rv = sockt->queue->pop(recvpak, timeout, flag);
+ if(rv != 0) {
+ if(rv == ETIMEDOUT) {
+ return EBUS_TIMEOUT;
+ }
+ return rv;
+ }
- return rv;
+
+ if(recvpak.action == BUS_ACTION_STOP) {
+ return EBUS_STOPED;
+ }
+ *_recvpak = recvpak;
+ return 0;
}
-// int shm_sendandrecv(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) {
-
-// struct timespec tm = {10, 0};
-// return _shm_sendandrecv_thread_local(sockt, send_buf, send_size, send_key,recv_buf, recv_size, &tm, flags);
-// }
+
--
Gitblit v1.8.0