From 251bbc8b0ebd9a91d34f81186d9284f6e669b4db Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 27 一月 2021 10:13:48 +0800
Subject: [PATCH] update
---
src/socket/shm_mod_socket.cpp | 87 ++++++++++++++++++-------------------------
1 files changed, 36 insertions(+), 51 deletions(-)
diff --git a/src/socket/shm_mod_socket.cpp b/src/socket/shm_mod_socket.cpp
index 8a9133d..058c081 100644
--- a/src/socket/shm_mod_socket.cpp
+++ b/src/socket/shm_mod_socket.cpp
@@ -9,7 +9,6 @@
}
ShmModSocket::ShmModSocket() {
- mod = (socket_mod_t)0;
shm_socket = shm_open_socket(SHM_SOCKET_DGRAM);
bus_set = new std::set<int>;
}
@@ -48,26 +47,13 @@
}
// 鍙戦�佷俊鎭秴鏃惰繑鍥炪�� @sec 绉� 锛� @nsec 绾崇
int ShmModSocket::sendto_timeout(const void *buf, const int size, const int key, const struct timespec *timeout) {
- return shm_sendto(shm_socket, buf, size, key, timeout, 0);
+ return shm_sendto(shm_socket, buf, size, key, timeout, BUS_TIMEOUT_FLAG);
}
// 鍙戦�佷俊鎭珛鍒昏繑鍥炪��
int ShmModSocket::sendto_nowait( const void *buf, const int size, const int key){
- return shm_sendto(shm_socket, buf, size, key, NULL, (int)SHM_MSG_NOWAIT);
+ return shm_sendto(shm_socket, buf, size, key, NULL, BUS_NOWAIT_FLAG);
}
-
-
-inline int ShmModSocket::_recvfrom_(void **buf, int *size, int *key, struct timespec *timeout, int flags) {
-
- if(mod == BUS) {
- logger->error("Can not use method recvfrom in a Bus");
- exit(1);
- }
-// printf("dgram_mod_recvfrom before\n");
- int rv = shm_recvfrom(shm_socket, buf, size, key, timeout, flags);
-// printf("dgram_mod_recvfrom after\n");
-
- return rv;
-}
+
/**
* 鎺ユ敹淇℃伅
@@ -75,20 +61,20 @@
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
int ShmModSocket::recvfrom(void **buf, int *size, int *key) {
- int rv = _recvfrom_( buf, size, key, NULL, 0);
- // logger->error(rv, "ShmModSocket::recvfrom failed!");
+ int rv = shm_recvfrom(shm_socket, buf, size, key, NULL, 0);
+
return rv;
}
-// 鎺ュ彈淇℃伅瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int ShmModSocket::recvfrom_timeout( void **buf, int *size, int *key, struct timespec *timeout) {
- int rv = _recvfrom_(buf, size, key, timeout, 0);
+int ShmModSocket::recvfrom_timeout( void **buf, int *size, int *key, const struct timespec *timeout) {
+ int rv = shm_recvfrom(shm_socket, buf, size, key, timeout, BUS_TIMEOUT_FLAG);
+
return rv;
}
int ShmModSocket::recvfrom_nowait( void **buf, int *size, int *key){
- int rv = _recvfrom_(buf, size, key, NULL, (int)SHM_MSG_NOWAIT);
+ int rv = shm_recvfrom(shm_socket, buf, size, key, NULL, BUS_NOWAIT_FLAG);
// logger->error(rv, "ShmModSocket::recvfrom_nowait failed!");
return rv;
}
@@ -102,22 +88,25 @@
return shm_sendandrecv(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, NULL, 0);
}
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int ShmModSocket::sendandrecv_timeout(const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size, struct timespec *timeout){
- return shm_sendandrecv(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, timeout, 0);
+int ShmModSocket::sendandrecv_timeout(const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size, const struct timespec *timeout){
+ return shm_sendandrecv(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, timeout, BUS_TIMEOUT_FLAG);
}
int ShmModSocket::sendandrecv_nowait(const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size){
- return shm_sendandrecv(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, 0, (int)SHM_MSG_NOWAIT);
+ return shm_sendandrecv(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, 0, BUS_NOWAIT_FLAG);
}
+
+
+
int ShmModSocket::sendandrecv_unsafe( const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size){
return shm_sendandrecv_unsafe(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, NULL, 0);
}
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int ShmModSocket::sendandrecv_unsafe_timeout(const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size, struct timespec *timeout){
- return shm_sendandrecv_unsafe(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, timeout, 0);
+int ShmModSocket::sendandrecv_unsafe_timeout(const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size, const struct timespec *timeout){
+ return shm_sendandrecv_unsafe(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, timeout, BUS_TIMEOUT_FLAG);
}
int ShmModSocket::sendandrecv_unsafe_nowait(const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size){
- return shm_sendandrecv_unsafe(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, 0, (int)SHM_MSG_NOWAIT);
+ return shm_sendandrecv_unsafe(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, 0, BUS_NOWAIT_FLAG);
}
@@ -133,11 +122,11 @@
return _sub_( topic, size, key, NULL, 0);
}
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int ShmModSocket::sub_timeout(char *topic, int size, int key, struct timespec *timeout){
- return _sub_(topic, size, key, timeout, 0);
+int ShmModSocket::sub_timeout(char *topic, int size, int key, const struct timespec *timeout){
+ return _sub_(topic, size, key, timeout, BUS_TIMEOUT_FLAG);
}
int ShmModSocket::sub_nowait(char *topic, int size, int key) {
- return _sub_(topic, size, key, NULL, (int)SHM_MSG_NOWAIT);
+ return _sub_(topic, size, key, NULL, BUS_NOWAIT_FLAG);
}
@@ -152,11 +141,11 @@
return _desub_( topic, size, key, NULL, 0);
}
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int ShmModSocket::desub_timeout(char *topic, int size, int key, struct timespec *timeout){
- return _desub_(topic, size, key, timeout, 0);
+int ShmModSocket::desub_timeout(char *topic, int size, int key, const struct timespec *timeout){
+ return _desub_(topic, size, key, timeout, BUS_TIMEOUT_FLAG);
}
int ShmModSocket::desub_nowait(char *topic, int size, int key) {
- return _desub_(topic, size, key, NULL, (int)SHM_MSG_NOWAIT);
+ return _desub_(topic, size, key, NULL, BUS_NOWAIT_FLAG);
}
@@ -171,11 +160,11 @@
return _pub_(topic, topic_size, content, content_size, key, NULL, 0);
}
// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int ShmModSocket::pub_timeout(char *topic, int topic_size, void *content, int content_size, int key, struct timespec * timeout){
- return _pub_( topic, topic_size, content, content_size, key, timeout, 0);
+int ShmModSocket::pub_timeout(char *topic, int topic_size, void *content, int content_size, int key, const struct timespec * timeout){
+ return _pub_( topic, topic_size, content, content_size, key, timeout, BUS_TIMEOUT_FLAG);
}
int ShmModSocket::pub_nowait(char *topic, int topic_size, void *content, int content_size, int key){
- return _pub_(topic, topic_size, content, content_size, key, NULL, (int)SHM_MSG_NOWAIT);
+ return _pub_(topic, topic_size, content, content_size, key, NULL, BUS_NOWAIT_FLAG);
}
@@ -193,7 +182,7 @@
* @key 鎬荤嚎绔彛
*/
int ShmModSocket::_sub_(char *topic, int topic_size, int key,
- struct timespec *timeout, int flags) {
+ const struct timespec *timeout, int flags) {
int ret;
@@ -220,8 +209,7 @@
/**
* @key 鎬荤嚎绔彛
*/
-int ShmModSocket::_desub_(char *topic, int topic_size, int key,
- struct timespec *timeout, int flags) {
+int ShmModSocket::_desub_(char *topic, int topic_size, int key, const struct timespec *timeout, int flags) {
// char buf[8192];
int ret;
if(topic == NULL) {
@@ -239,14 +227,12 @@
if(size > 0) {
ret = shm_sendto(shm_socket, buf, size, key, timeout, flags);
free(buf);
- if(ret == EBUS_TIMEOUT) {
- logger->error(ret, "ShmModSocket::_desub_ key %d failed, %s", key, bus_strerror(EBUS_TIMEOUT));
- return EBUS_TIMEOUT;
- } else {
- logger->error(ret, "ShmModSocket::_desub_ key %d failed!", key);
- return ret;
- }
-
+ if(ret == 0) {
+ return 0;
+ } else {
+ logger->error("ShmModSocket::_desub_ key %d failed, %s", key, bus_strerror(ret));
+ return ret;
+ }
} else {
return -1;
}
@@ -258,8 +244,7 @@
* @str "<**pub**>{缁忔祹}"
*/
-int ShmModSocket::_pub_(char *topic, int topic_size, void *content, int content_size, int key,
- struct timespec *timeout, int flags) {
+int ShmModSocket::_pub_(char *topic, int topic_size, void *content, int content_size, int key, const struct timespec *timeout, int flags) {
// int head_len;
// char buf[8192+content_size];
// snprintf(buf, 8192, "%spub%s%s%s%s", ACTION_LIDENTIFIER, ACTION_RIDENTIFIER, TOPIC_LIDENTIFIER, topic, TOPIC_RIDENTIFIER);
--
Gitblit v1.8.0