From 0cc00936da93b7003b882c58af01c1345f9cac38 Mon Sep 17 00:00:00 2001
From: Fu Juntang <StrongTiger_001@163.com>
Date: 星期一, 13 九月 2021 13:39:28 +0800
Subject: [PATCH] Remove the mutex lock.
---
src/socket/shm_socket.cpp | 181 ++++++++++++++++++++++++++++++++------------
1 files changed, 130 insertions(+), 51 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 918aef6..dc6d752 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -1,4 +1,5 @@
#include "shm_socket.h"
+#include "socket_def.h"
#include "hashtable.h"
#include "logger_factory.h"
#include <map>
@@ -22,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,
@@ -108,8 +110,6 @@
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);
@@ -118,8 +118,6 @@
// it->second.closeTime = time(NULL);
// }
// }
-
-
if(sockt->queue != NULL) {
sockt->queue->close();
@@ -169,25 +167,41 @@
return 0;
}
+int shm_socket_bind_proc_id(shm_socket_t *sockt, const char *buf, int len) {
+ strncpy(sockt->proc_id, buf, len > MAX_STR_LEN ? MAX_STR_LEN : len);
+
+ return 0;
+}
+
int shm_socket_get_key(shm_socket_t *sockt){
return sockt->key;
}
+int shm_socket_get_procid(shm_socket_t *sockt, char *buf, int len) {
+ strncpy(buf, sockt->proc_id, len);
+
+ return 0;
+}
+
// 鐭繛鎺ユ柟寮忓彂閫�
-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;
}
@@ -253,11 +267,11 @@
}
// 鐭繛鎺ユ柟寮忔帴鍙�
-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) {
@@ -296,8 +310,6 @@
static void _destrory_threadlocal_socket_(void *tmp_socket)
{
int rv;
-
- logger->debug("%lu destroy threadlocal socket\n", pthread_self());
if(tmp_socket == NULL)
return;
@@ -411,8 +423,6 @@
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;
@@ -430,12 +440,13 @@
{
/* If first call from this thread, allocate buffer for thread, and save its location */
tmp_socket = shm_socket_open(SHM_SOCKET_DGRAM);
-
- rv = pthread_setspecific(_localthread_socket_key_, tmp_socket);
- if ( rv != 0) {
- logger->error(rv, "shm_sendandrecv : pthread_setspecific");
- exit(1);
- }
+
+ }
+
+ 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;
@@ -473,6 +484,7 @@
} else {
// 绛旈潪鎵�闂紝鏀惧埌缂撳瓨閲�
tmp_socket->recvbuf2.insert({recvpak.key, recvpak});
+ exit(0);
continue;
}
}
@@ -481,7 +493,6 @@
return EBUS_RECVFROM_WRONG_END;
LABLE_SUC:
- sockt->key = tmp_socket->key;
if(recv_buf != NULL) {
void *_buf = malloc(recvpak.size);
memcpy(_buf, recvpak.buf, recvpak.size);
@@ -520,8 +531,8 @@
// 瓒呮椂瀵艰嚧鎺ュ彂閫佸璞★紝涓庤繑鍥炲璞′笉瀵瑰簲鐨勬儏鍐�
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);
+
+ 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;
}
@@ -538,15 +549,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) {
@@ -557,7 +577,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);
}
@@ -574,6 +594,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)
@@ -605,7 +635,9 @@
goto ERR_CLOSED;
}
- sendpak->key = sockt->key;
+ if (reset == 0) {
+ sendpak->key = sockt->key;
+ }
rv = remoteQueue->push(*sendpak, timeout, flag);
if(rv != 0) {
@@ -623,13 +655,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) {
@@ -640,22 +682,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");
@@ -664,8 +717,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;
@@ -680,4 +736,27 @@
*_recvpak = recvpak;
return 0;
}
-
+
+void proc_copy(char *dst, void *src, int *counter) {
+ int count = 0;
+ ProcInfo *ptr = static_cast<ProcInfo *>(src);
+
+ memcpy(dst, ptr->proc_id, strlen(ptr->proc_id) + 1);
+ count = strlen(ptr->proc_id) + 1;
+ memcpy(dst + count, ptr->name, strlen(ptr->name) + 1);
+ count += strlen(ptr->name) + 1;
+ memcpy(dst + count, ptr->public_info, strlen(ptr->public_info) + 1);
+ 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