From 2d44fab94cdf6cf8a58e20e5dd68043340cbdb63 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 27 十一月 2020 16:04:51 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket_wrapper.h | 16 ++++++++--------
src/socket/shm_mod_socket.h | 1 -
src/socket/shm_mod_socket.c | 12 ++++++------
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/socket/net_mod_socket_wrapper.h b/src/socket/net_mod_socket_wrapper.h
index 099e0a0..ff5915d 100644
--- a/src/socket/net_mod_socket_wrapper.h
+++ b/src/socket/net_mod_socket_wrapper.h
@@ -35,6 +35,7 @@
* @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
*/
int net_mod_socket_force_bind(void * _socket, int port);
+
/**
* 鍙戦�佷俊鎭�
* @port 鍙戦�佺粰璋�
@@ -84,6 +85,13 @@
net_mod_recv_msg_t ** recv_arr, int *recv_arr_size) ;
+/**
+ * 鍚姩bus
+ *
+ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
+*/
+int net_mod_socket_start_bus(void * _socket);
+
/**
* 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�
@@ -95,12 +103,6 @@
int net_mod_socket_pub(void *_sockt, net_node_t *node_arr, int node_arr_len, char *topic, int topic_size, void *content, int content_size);
-/**
- * 鍚姩bus
- *
- * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
-*/
-int net_mod_socket_start_bus(void * _socket);
/**
* 璁㈤槄鎸囧畾涓婚
@@ -126,12 +128,10 @@
int net_mod_socket_desub_nowait(void * _socket, void *topic, int size, int port);
-
/**
* 鑾峰彇soket绔彛鍙�
*/
int net_mod_socket_get_key(void * _socket) ;
-
/**
diff --git a/src/socket/shm_mod_socket.c b/src/socket/shm_mod_socket.c
index 9781a8a..9563e6b 100644
--- a/src/socket/shm_mod_socket.c
+++ b/src/socket/shm_mod_socket.c
@@ -1,5 +1,7 @@
#include "shm_mod_socket.h"
+static Logger *logger = LoggerFactory::getLogger();
+
void ShmModSocket::foreach_subscripters(std::function<void(SHMKeySet *, int)> cb) {
SHMTopicSubMap *topic_sub_map = mem_pool_attach<SHMTopicSubMap>(BUS_MAP_KEY);
@@ -139,7 +141,8 @@
inline int ShmModSocket::_recvfrom_(void **buf, int *size, int *key, struct timespec *timeout, int flags) {
if(mod == BUS) {
- err_exit(0, "Can not use method recvfrom in a 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);
@@ -350,7 +353,6 @@
subscripter_set = map_iter->second;
subscripter_set->erase(key);
-printf("============ desub %d\n", key);
}
}
@@ -365,7 +367,6 @@
for (auto map_iter = topic_sub_map->begin(); map_iter != topic_sub_map->end(); map_iter++) {
subscripter_set = map_iter->second;
subscripter_set->erase(key);
-printf("============ desub %d\n", key);
}
}
@@ -403,7 +404,7 @@
for(vector_iter = subscripter_to_del.begin(); vector_iter != subscripter_to_del.end(); vector_iter++) {
if((set_iter = subscripter_set->find(*vector_iter)) != subscripter_set->end()) {
subscripter_set->erase(set_iter);
- printf("remove closed subscripter %d \n", send_key);
+ logger->debug("remove closed subscripter %d \n", send_key);
}
}
subscripter_to_del.clear();
@@ -437,7 +438,6 @@
// printf("desub topic=%s,%s,%d\n", topics, trim(topics, 0), strcmp(trim(topics, 0), ""));
if(strcmp(trim(topics, 0), "") == 0) {
// 鍙栨秷鎵�鏈夎闃�
- printf("====鍙栨秷鎵�鏈夎闃匼n");
_proxy_desub_all(key);
} else {
@@ -457,7 +457,7 @@
free(action);
free(topics);
} else {
- err_msg(0, "incorrect format msg");
+ logger->error( "ShmModSocket::run_pubsub_proxy : incorrect format msg");
}
free(buf);
}
diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index e515011..aced91d 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -14,7 +14,6 @@
#define TOPIC_LIDENTIFIER "{"
#define TOPIC_RIDENTIFIER "}"
-static Logger *logger = LoggerFactory::getLogger();
#define BUS_MAP_KEY 1
//typedef std::basic_string<char, std::char_traits<char>, SHM_STL_Allocator<char> > SHMString;
typedef std::set<int, std::less<int>, SHM_STL_Allocator<int> > SHMKeySet;
--
Gitblit v1.8.0