From 5c912c70e9333298ff48f7ea15424f72ca977b99 Mon Sep 17 00:00:00 2001
From: Fu Juntang <StrongTiger_001@163.com>
Date: 星期五, 17 九月 2021 09:43:55 +0800
Subject: [PATCH] Add the heartbeat logic feature.
---
src/socket/shm_socket.cpp | 131 ++++++++++++++++++++++++++++++-------------
1 files changed, 92 insertions(+), 39 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 84bf77e..6705b96 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -23,11 +23,12 @@
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_recvpakfrom(shm_socket_t *sockt, shm_packet_t *recvpak , const struct timespec *timeout,
+ int flag, int reset = 0, int data_set = 0);
-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_sendpakto(shm_socket_t *sockt, shm_packet_t *sendpak, const int key, const struct timespec *timeout,
+ const int flag, int reset = 0, int data_set = 0);
static int _shm_sendandrecv_uuid(shm_socket_t *sockt, const void *send_buf,
@@ -45,7 +46,7 @@
void *tmp_ptr = hashtable_get(hashtable, key);
if (tmp_ptr == NULL || tmp_ptr == (void *)1 ) {
- queue = new LockFreeQueue<shm_packet_t>(32);
+ queue = new LockFreeQueue<shm_packet_t>(LOCK_FREE_Q_DEFAULT_SIZE);
hashtable_put(hashtable, key, (void *)queue);
return queue;
} else if(force) {
@@ -75,7 +76,6 @@
int s, type;
pthread_mutexattr_t mtxAttr;
- 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;
@@ -183,20 +183,24 @@
}
// 鐭繛鎺ユ柟寮忓彂閫�
-int shm_sendto(shm_socket_t *sockt, const void *buf, const int size,
- const int key, const struct timespec *timeout, const int flag) {
+int shm_sendto(shm_socket_t *sockt, const void *buf, const int size, const int key, const struct timespec *timeout,
+ const int flag, int reset, int data_set) {
int rv;
shm_packet_t sendpak = {0};
- sendpak.key = sockt->key;
+ if (reset == 0) {
+ sendpak.key = sockt->key;
+ } else {
+ sendpak.key = data_set;
+ }
sendpak.size = size;
if(buf != NULL) {
sendpak.buf = mm_malloc(size);
memcpy(sendpak.buf, buf, size);
}
- rv = shm_sendpakto(sockt, &sendpak, key, timeout, flag);
+ rv = shm_sendpakto(sockt, &sendpak, key, timeout, flag, reset, data_set);
return rv;
}
@@ -226,7 +230,7 @@
if (rv != 0) {
if(rv == ETIMEDOUT){
- logger->debug("%d shm_recvandsend failed %s", shm_socket_get_key(sockt), bus_strerror(EBUS_TIMEOUT));
+ logger->error("%d shm_recvandsend failed %s", shm_socket_get_key(sockt), bus_strerror(EBUS_TIMEOUT));
return EBUS_TIMEOUT;
}
@@ -262,15 +266,15 @@
}
// 鐭繛鎺ユ柟寮忔帴鍙�
-int shm_recvfrom(shm_socket_t *sockt, void **buf, int *size, int *key, const struct timespec *timeout, int flag) {
+int shm_recvfrom(shm_socket_t *sockt, void **buf, int *size, int *key, const struct timespec *timeout, int flag, int reset, int data_set) {
int rv;
shm_packet_t recvpak;
- rv = shm_recvpakfrom(sockt , &recvpak, timeout, flag);
+ rv = shm_recvpakfrom(sockt , &recvpak, timeout, flag, reset, data_set);
if (rv != 0) {
- logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ logger->error("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
return rv;
}
@@ -363,7 +367,6 @@
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;
@@ -377,11 +380,10 @@
return EBUS_TIMEOUT;
}
- logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ logger->error("%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) {
@@ -469,7 +471,7 @@
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));
+ logger->error("%d shm_recvfrom failed %s", shm_socket_get_key(tmp_socket), bus_strerror(rv));
return rv;
}
@@ -544,15 +546,24 @@
-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_sendpakto(shm_socket_t *sockt, shm_packet_t *sendpak, const int key, const struct timespec *timeout,
+ const int flag, int reset, int data_set) {
int rv;
shm_queue_status_t stRecord;
LockFreeQueue<shm_packet_t> *remoteQueue;
+ LockFreeQueue<shm_packet_t> *fixedQueue;
hashtable_t *hashtable = mm_get_hashtable();
- if( sockt->queue != NULL)
+ if ((reset != 0) && (data_set == 0)) {
+ return EBUS_KEY_INUSED;
+ }
+
+ if (reset != 0) {
+ fixedQueue = shm_socket_attach_queue(data_set);
+ }
+
+ if (((reset == 0) && (sockt->queue != NULL)) || ((reset != 0) && (fixedQueue != NULL)))
goto LABEL_PUSH;
// if(hashtable_get_queue_count(hashtable) > QUEUE_COUNT_LIMIT) {
@@ -563,7 +574,7 @@
if ((rv = pthread_mutex_lock(&(sockt->mutex))) != 0)
err_exit(rv, "shm_sendto : pthread_mutex_lock");
- if (sockt->queue == NULL) {
+ if ((sockt->queue == NULL) && (reset == 0)) {
if (sockt->key == 0) {
sockt->key = hashtable_alloc_key(hashtable);
}
@@ -580,6 +591,16 @@
// stRecord.createTime = time(NULL);
// shmQueueStMap->insert({sockt->key, stRecord});
+ }
+
+ if ((fixedQueue == NULL) && (reset != 0)) {
+ fixedQueue = shm_socket_bind_queue(data_set, false);
+ if (fixedQueue == 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;
+ }
}
if ((rv = pthread_mutex_unlock(&(sockt->mutex))) != 0)
@@ -611,7 +632,9 @@
goto ERR_CLOSED;
}
- sendpak->key = sockt->key;
+ if (reset == 0) {
+ sendpak->key = sockt->key;
+ }
rv = remoteQueue->push(*sendpak, timeout, flag);
if(rv != 0) {
@@ -629,13 +652,23 @@
}
// 鐭繛鎺ユ柟寮忔帴鍙�
-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 reset, int data_set) {
int rv;
shm_queue_status_t stRecord;
+ LockFreeQueue<shm_packet_t> *fixedQueue;
hashtable_t *hashtable = mm_get_hashtable();
shm_packet_t recvpak;
- if( sockt->queue != NULL)
+ if ((reset != 0) && (data_set == 0)) {
+ return EBUS_KEY_INUSED;
+ }
+
+ if (reset != 0) {
+ fixedQueue = shm_socket_attach_queue(data_set);
+ }
+
+ if (((sockt->queue != NULL) && (reset == 0)) || ((reset != 0) && (fixedQueue != NULL)))
goto LABEL_POP;
// if(hashtable_get_queue_count(hashtable) > QUEUE_COUNT_LIMIT) {
@@ -646,21 +679,33 @@
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;
+ if ((sockt->queue == NULL) && (reset == 0)) {
+ 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});
}
-
- // 鏍囪key瀵瑰簲鐨勭姸鎬� 锛屼负opened
- // stRecord.status = SHM_QUEUE_ST_OPENED;
- // stRecord.createTime = time(NULL);
- // shmQueueStMap->insert({sockt->key, stRecord});
+
+ if ((fixedQueue == NULL) && (reset != 0)) {
+ fixedQueue = shm_socket_bind_queue(data_set, false);
+ if (fixedQueue == 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;
+ }
+ }
if ((rv = pthread_mutex_unlock(&(sockt->mutex))) != 0)
err_exit(rv, "shm_recvfrom : pthread_mutex_unlock");
@@ -669,7 +714,11 @@
LABEL_POP:
- rv = sockt->queue->pop(recvpak, timeout, flag);
+ if (reset == 0) {
+ rv = sockt->queue->pop(recvpak, timeout, flag);
+ } else {
+ rv = fixedQueue->pop(recvpak, timeout, flag);
+ }
if(rv != 0) {
if(rv == ETIMEDOUT) {
return EBUS_TIMEOUT;
@@ -697,6 +746,10 @@
count += strlen(ptr->public_info) + 1;
memcpy(dst + count, ptr->private_info, strlen(ptr->private_info) + 1);
count += strlen(ptr->private_info) + 1;
+ memcpy(dst + count, ptr->int_info, strlen(ptr->int_info) + 1);
+ count += strlen(ptr->int_info) + 1;
+ memcpy(dst + count, ptr->svr_info, strlen(ptr->svr_info) + 1);
+ count += strlen(ptr->svr_info) + 1;
*counter = count;
}
--
Gitblit v1.8.0