From 91ea20d03ebb5a8d20150d3ecc28a13c51ce93f1 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 22 一月 2021 19:17:06 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.cpp | 76 ++++++++++++++++---------------------
1 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index 672a9a7..e370c72 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -30,8 +30,8 @@
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);
+ bus_errno = EBUS_KEY_INUSED;
+ logger->error("%s. key = %d ", bus_strerror(EBUS_KEY_INUSED), socket->key);
return 0;
}
return 1;
@@ -133,8 +133,8 @@
} else {
if(!_shm_socket_check_key(socket)) {
- bus_errno = ESHM_BUS_KEY_INUSED;
- return ESHM_BUS_KEY_INUSED;
+ bus_errno = EBUS_KEY_INUSED;
+ return EBUS_KEY_INUSED;
}
}
@@ -224,8 +224,8 @@
socket->key = hashtable_alloc_key(hashtable);
} else {
if(!_shm_socket_check_key(socket)) {
- bus_errno = ESHM_BUS_KEY_INUSED;
- return ESHM_BUS_KEY_INUSED;
+ bus_errno = EBUS_KEY_INUSED;
+ return EBUS_KEY_INUSED;
}
}
@@ -318,7 +318,7 @@
const int key, const struct timespec *timeout, const int flags) {
int s;
- bool rv;
+ int 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 "
@@ -338,8 +338,8 @@
} else {
if(!_shm_socket_check_key(socket)) {
- bus_errno = ESHM_BUS_KEY_INUSED;
- return ESHM_BUS_KEY_INUSED;
+ bus_errno = EBUS_KEY_INUSED;
+ return EBUS_KEY_INUSED;
}
}
@@ -349,6 +349,9 @@
if ((s = pthread_mutex_unlock(&(socket->mutex))) != 0)
err_exit(s, "shm_sendto : pthread_mutex_unlock");
+
+ // There is some case where a socket need to send to himeself, for example when bus server need to stop, he need to send himself
+ // a top message.
// if (key == socket->key) {
// logger->error( "can not send to your self!");
@@ -370,9 +373,9 @@
memcpy(dest.buf, buf, size);
- if(flags & SHM_MSG_NOWAIT != 0) {
+ if( (flags & BUS_NOWAIT_FLAG) == BUS_NOWAIT_FLAG) {
rv = remoteQueue->push_nowait(dest);
- } else if(timeout != NULL) {
+ } else if((flags & BUS_TIMEOUT_FLAG) == BUS_TIMEOUT_FLAG && timeout != NULL) {
rv = remoteQueue->push_timeout(dest, timeout);
} else {
rv = remoteQueue->push(dest);
@@ -380,28 +383,23 @@
if (rv == 0) {
// printf("shm_sendto push after\n");
- delete remoteQueue;
return 0;
} else {
- delete remoteQueue;
mm_free(dest.buf);
- if(rv == EBUS_TIMEOUT) {
+ if(rv > EBUS_BASE) {
// bus_errno = EBUS_TIMEOUT;
- // logger->error("sendto key %d failed, %s", key, bus_strerror(EBUS_TIMEOUT));
- return EBUS_TIMEOUT;
+ logger->debug("sendto key %d failed %s", key, bus_strerror(rv));
} else {
- //logger->error(errno, "sendto key %d failed!", key);
- return rv;
+ logger->error(rv, "sendto key %d failed", key);
}
-
-
+ return rv;
}
}
// 鐭繛鎺ユ柟寮忔帴鍙�
int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *key, struct timespec *timeout, int flags) {
int s;
- bool rv;
+ int 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 "
@@ -420,8 +418,8 @@
} else {
if(!_shm_socket_check_key(socket)) {
- bus_errno = ESHM_BUS_KEY_INUSED;
- return ESHM_BUS_KEY_INUSED;
+ bus_errno = EBUS_KEY_INUSED;
+ return EBUS_KEY_INUSED;
}
}
@@ -433,10 +431,11 @@
shm_msg_t src;
- if(flags & SHM_MSG_NOWAIT != 0) {
+ if((flags & BUS_NOWAIT_FLAG) == BUS_NOWAIT_FLAG) {
rv = socket->queue->pop_nowait(src);
- } else if(timeout != NULL) {
+ } else if((flags & BUS_TIMEOUT_FLAG) == BUS_TIMEOUT_FLAG && timeout != NULL) {
rv = socket->queue->pop_timeout(src, timeout);
+// printf("0 shm_recvfrom====%d\n", rv);
} else {
rv = socket->queue->pop(src);
}
@@ -457,14 +456,12 @@
mm_free(src.buf);
return 0;
} else {
-
- if(rv == EBUS_TIMEOUT) {
- // logger->error("shm_recvfrom failed, %s", bus_strerror(EBUS_TIMEOUT));
- return EBUS_TIMEOUT;
+ if(rv > EBUS_BASE) {
+ logger->debug("shm_recvfrom failed %s", bus_strerror(rv));
} else {
- // logger->error(rv, "shm_recvfrom failed!");
- return rv;
+ logger->error(rv, "shm_recvfrom failed");
}
+ return rv;
}
}
@@ -531,7 +528,7 @@
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() );
+ logger->debug("%ld create tmp socket\n", (long)pthread_self() );
tmp_socket = shm_open_socket(SHM_SOCKET_DGRAM);
rv = pthread_setspecific(_tmp_recv_socket_key_, tmp_socket);
@@ -543,13 +540,10 @@
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_alloc_new(shm_socket_t *socket, const void *send_buf,
@@ -653,7 +647,7 @@
switch (src.type) {
case SHM_SOCKET_OPEN:
- socket->acceptQueue->push_timeout(src, &timeout);
+ socket->acceptQueue->push(src, &timeout, BUS_TIMEOUT_FLAG);
break;
case SHM_SOCKET_CLOSE:
_server_close_conn_to_client(socket, src.key);
@@ -664,7 +658,7 @@
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);
+ client_socket->messageQueue->push(src, &timeout, BUS_TIMEOUT_FLAG);
// print_msg("_server_run_msg_rev push after", src);
}
@@ -699,7 +693,7 @@
_client_close_conn_to_server(socket);
break;
case SHM_COMMON_MSG:
- socket->messageQueue->push_timeout(src, &timeout);
+ socket->messageQueue->push(src, &timeout, BUS_TIMEOUT_FLAG);
break;
default:
logger->error( "shm_socket._client_run_msg_rev: undefined message type.");
@@ -727,10 +721,7 @@
socket->queue = NULL;
}
- if (socket->remoteQueue != NULL) {
- delete socket->remoteQueue;
- socket->remoteQueue = NULL;
- }
+
if (socket->messageQueue != NULL) {
delete socket->messageQueue;
@@ -749,7 +740,6 @@
client_socket = iter->second;
client_socket->remoteQueue->push_timeout(close_msg, &timeout);
- delete client_socket->remoteQueue;
client_socket->remoteQueue = NULL;
delete client_socket->messageQueue;
--
Gitblit v1.8.0