From 14c345b38d57fd814f217eb8465963a08ca79f7e Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 05 二月 2021 17:41:09 +0800
Subject: [PATCH] update
---
src/socket/shm_mod_socket.cpp | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/socket/shm_mod_socket.cpp b/src/socket/shm_mod_socket.cpp
index 32ff061..4898c81 100644
--- a/src/socket/shm_mod_socket.cpp
+++ b/src/socket/shm_mod_socket.cpp
@@ -8,6 +8,11 @@
return shm_socket_remove_keys(keys, length);
}
+size_t ShmModSocket::remove_keys_exclude(int keys[], size_t length) {
+ BusServerSocket::remove_subscripters(keys, length);
+ return shm_socket_remove_keys_exclude(keys, length);
+}
+
ShmModSocket::ShmModSocket() {
shm_socket = shm_open_socket(SHM_SOCKET_DGRAM);
bus_set = new std::set<int>;
@@ -25,6 +30,11 @@
shm_close_socket(shm_socket);
}
+
+int ShmModSocket::stop() {
+ return shm_socket_stop(shm_socket);
+}
+
int ShmModSocket::bind(int key) {
return shm_socket_bind(shm_socket, key);
@@ -91,16 +101,9 @@
}
-int ShmModSocket::recvandsend(void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
+int ShmModSocket::recvandsend( recvandsend_callback_fn callback,
const struct timespec *timeout , int flag, void * user_data ) {
- int rv = shm_recvandsend(shm_socket, recvbuf, recvsize, key, callback, timeout, flag, user_data);
- if(rv == 0) {
- logger->debug("ShmModSocket::shm_recvandsend: success. key = %d\n", *key);
- return 0;
- }
-
- logger->debug("ShmModSocket::shm_recvandsend : failed. %s", bus_strerror(rv));
- return rv;
+ return shm_recvandsend(shm_socket, callback, timeout, flag, user_data);
}
// // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
--
Gitblit v1.8.0