From ff4991e1f942a3f1281330e21bf437b4b8558094 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期四, 06 八月 2020 15:22:55 +0800 Subject: [PATCH] add remove_keys --- src/socket/include/dmod_socket.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/socket/include/dmod_socket.h b/src/socket/include/dmod_socket.h index 8eb0fbf..e34e4cc 100644 --- a/src/socket/include/dmod_socket.h +++ b/src/socket/include/dmod_socket.h @@ -46,14 +46,14 @@ void _proxy_pub( char *topic, size_t head_len, void *buf, size_t size, int port); void *run_pubsub_proxy(); int parse_pubsub_topic(char *str, size_t size, char **_action, char **_topic, size_t *head_len ); - int _sub_( void *topic, int size, int port, struct timespec *timeout, int flags); - int _pub_( void *topic, int topic_size, void *content, int content_size, int port, struct timespec *timeout, int flags); + int _sub_( char *topic, int size, int port, struct timespec *timeout, int flags); + int _pub_( char *topic, int topic_size, void *content, int content_size, int port, struct timespec *timeout, int flags); void _proxy_desub( char *topic, int port); void _proxy_desub_all(int port); - int _desub_( void *topic, int size, int port, struct timespec *timeout, int flags); + int _desub_( char *topic, int size, int port, struct timespec *timeout, int flags); - static void foreach_subscripters(std::function<void(SHMKeySet *, SHMKeySet::iterator)> cb); + static void foreach_subscripters(std::function<void(SHMKeySet *, int)> cb); static bool include_in_keys(int key, int keys[], size_t length); static size_t remove_subscripters(int keys[], size_t length) ; public: @@ -119,10 +119,10 @@ * @size 涓婚闀垮害 * @port 鎬荤嚎绔彛 */ - int sub(void *topic, int size, int port); + int sub(char *topic, int size, int port); // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int sub_timeout(void *topic, int size, int port, struct timespec *timeout); - int sub_nowait(void *topic, int size, int port); + int sub_timeout(char *topic, int size, int port, struct timespec *timeout); + int sub_nowait(char *topic, int size, int port); /** @@ -131,10 +131,10 @@ * @size 涓婚闀垮害 * @port 鎬荤嚎绔彛 */ - int desub( void *topic, int size, int port); + int desub( char *topic, int size, int port); // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int desub_timeout(void *topic, int size, int port, struct timespec *timeout); - int desub_nowait(void *topic, int size, int port) ; + int desub_timeout(char *topic, int size, int port, struct timespec *timeout); + int desub_nowait(char *topic, int size, int port) ; /** * 鍙戝竷涓婚 @@ -142,10 +142,10 @@ * @content 涓婚鍐呭 * @port 鎬荤嚎绔彛 */ - int pub(void *topic, int topic_size, void *content, int content_size, int port); + int pub(char *topic, int topic_size, void *content, int content_size, int port); // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇 - int pub_timeout(void *topic, int topic_size, void *content, int content_size, int port, struct timespec *timeout); - int pub_nowait(void *topic, int topic_size, void *content, int content_size, int port); + int pub_timeout(char *topic, int topic_size, void *content, int content_size, int port, struct timespec *timeout); + int pub_nowait(char *topic, int topic_size, void *content, int content_size, int port); /** -- Gitblit v1.8.0