From d94bfb19c54d4b980c1b4d63b42f3dfa0bc202a6 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 27 七月 2020 11:42:34 +0800
Subject: [PATCH] update
---
src/socket/dgram_mod_socket.c | 129 +++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 46 deletions(-)
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index c5e5a28..62ae7ac 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -13,17 +13,18 @@
#define TOPIC_LIDENTIFIER "{"
#define TOPIC_RIDENTIFIER "}"
-static int parse_pubsub_topic(char *str, size_t size, char **_action, char **_topic, size_t *head_len );
-void * run_accept_pubsub_request(void * _socket) ;
+
+static Logger logger = LoggerFactory::getLogger();
typedef struct dgram_mod_socket_t {
- socket_mod_t mod;
shm_socket_t *shm_socket;
// pthread_t recv_thread;
// <涓婚锛� 璁㈤槄鑰�>
std::map<std::string, std::set<int> *> *topic_sub_map;
} dgram_mod_socket_t;
+static int parse_pubsub_topic(char *str, size_t size, char **_action, char **_topic, size_t *head_len );
+void * run_pubsub_proxy(dgram_mod_socket_t * socket) ;
void *dgram_mod_open_socket() {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *)calloc(1, sizeof(dgram_mod_socket_t));
@@ -83,7 +84,7 @@
-int dgram_mod_get_socket_port(void * _socket) {
+int dgram_mod_get_port(void * _socket) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
return socket->shm_socket->port;
}
@@ -93,10 +94,10 @@
free(buf);
}
-int start_bus(void * _socket) {
+int dgram_mod_start_bus(void * _socket) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
socket->topic_sub_map = new std::map<std::string, std::set<int> *>;
- run_accept_pubsub_request(_socket);
+ run_pubsub_proxy(socket);
// pthread_t tid;
// pthread_create(&tid, NULL, run_accept_sub_request, _socket);
return 0;
@@ -106,7 +107,7 @@
/**
* @port 鎬荤嚎绔彛
*/
-int sub(void * _socket, void *topic, int size, int port) {
+int dgram_mod_sub(void * _socket, void *topic, int size, int port) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
char buf[8192];
snprintf(buf, 8192, "%ssub%s%s%s%s", ACTION_LIDENTIFIER, ACTION_RIDENTIFIER, TOPIC_LIDENTIFIER, (char *)topic, TOPIC_RIDENTIFIER);
@@ -116,7 +117,7 @@
/**
* @port 鎬荤嚎绔彛
*/
-int pub(void * _socket, void *topic, int topic_size, void *content, int content_size, int port) {
+int dgram_mod_pub(void * _socket, void *topic, int topic_size, void *content, int content_size, int port) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
int head_len;
@@ -131,60 +132,96 @@
//==========================================================================================================================
-
-void * run_accept_pubsub_request(void * _socket) {
- // pthread_detach(pthread_self());
- dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
- int size;
- int port;
- char * action, *topic, *buf;
-
- size_t head_len;
- // void * send_buf;
- int send_port;
- struct timespec timeout = {1,0};
+/*
+ * 澶勭悊璁㈤槄
+*/
+void _proxy_sub(dgram_mod_socket_t *socket, char *topic, int port) {
std::map<std::string, std::set<int> *> *topic_sub_map = socket->topic_sub_map;
std::set<int> *subscripter_set;
std::map<std::string, std::set<int> *>::iterator map_iter;
std::set<int>::iterator set_iter;
+
+ if( (map_iter = topic_sub_map->find(topic) ) != topic_sub_map->end()) {
+ subscripter_set = map_iter->second;
+ } else {
+ subscripter_set = new std::set<int>;
+ topic_sub_map->insert({topic, subscripter_set});
+ }
+ subscripter_set->insert(port);
+}
+
+/*
+ * 澶勭悊鍙戝竷锛屼唬鐞嗚浆鍙�
+*/
+void _proxy_pub(dgram_mod_socket_t * socket, char *topic, size_t head_len, void *buf, size_t size, int port) {
+ std::map<std::string, std::set<int> *> *topic_sub_map = socket->topic_sub_map;
+ std::set<int> *subscripter_set;
+
+ std::map<std::string, std::set<int> *>::iterator map_iter;
+ std::set<int>::iterator set_iter;
+
+ std::vector<int> subscripter_to_del;
+ std::vector<int>::iterator vector_iter;
+
+ int send_port;
+ struct timespec timeout = {1,0};
+
+ if( (map_iter = topic_sub_map->find(topic) ) != topic_sub_map->end()) {
+ subscripter_set = map_iter->second;
+ for(set_iter = subscripter_set->begin(); set_iter != subscripter_set->end(); set_iter++) {
+ send_port = *set_iter;
+// printf("run_accept_sub_request send before %d \n", send_port);
+ if (shm_sendto(socket->shm_socket, buf+head_len, size-head_len, send_port, &timeout) !=0 ) {
+ //瀵规柟宸插叧闂殑杩炴帴鏀惧埌寰呭垹闄ら槦鍒楅噷銆傚鏋滅洿鎺ュ垹闄や細璁﹊ter鎸囬拡鍑虹幇閿欎贡
+ subscripter_to_del.push_back(send_port);
+ }
+// printf("run_accept_sub_request send after: %d \n", send_port);
+
+ }
+
+ // 鍒犻櫎宸插叧闂殑绔�
+ 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_port);
+ }
+ }
+ subscripter_to_del.clear();
+
+ }
+}
+
+void * run_pubsub_proxy(dgram_mod_socket_t * socket) {
+ // pthread_detach(pthread_self());
+ int size;
+ int port;
+ char * action, *topic, *topics, *buf;
+ size_t head_len;
+
+ const char *topic_delim = ",";
//printf("server receive before\n");
while(shm_recvfrom(socket->shm_socket, (void **)&buf, &size, &port) == 0) {
//printf("server recv after: %s \n", buf);
- if(parse_pubsub_topic(buf, size, &action, &topic, &head_len)) {
+ if(parse_pubsub_topic(buf, size, &action, &topics, &head_len)) {
if(strcmp(action, "sub") == 0) {
- if( (map_iter = topic_sub_map->find(topic) ) != topic_sub_map->end()) {
- subscripter_set = map_iter->second;
- } else {
- subscripter_set = new std::set<int>;
- topic_sub_map->insert({topic, subscripter_set});
- }
- subscripter_set->insert(port);
+ // 璁㈤槄鏀寔澶氫富棰樿闃�
+ topic = trim(strtok(topics, topic_delim), NULL);
+ while(topic) {
+ _proxy_sub(socket, topic, port);
+ topic = trim(strtok(NULL, topic_delim), NULL);
+ }
} else if(strcmp(action, "pub") == 0) {
- if( (map_iter = topic_sub_map->find(topic) ) != topic_sub_map->end()) {
- subscripter_set = map_iter->second;
- for(set_iter = subscripter_set->begin(); set_iter != subscripter_set->end(); set_iter++) {
- send_port = *set_iter;
- // send_buf = malloc(size-head_len);
- // memcpy(send_buf, buf+head_len, );
-printf("run_accept_sub_request send before %d \n", send_port);
- if (shm_sendto(socket->shm_socket, buf+head_len, size-head_len, send_port, &timeout) !=0 ) {
-printf("erase %d \n", send_port);
- subscripter_set->erase(set_iter);
- set_iter++;
- }
-printf("run_accept_sub_request send after: %d \n", send_port);
-
- }
- }
+ _proxy_pub(socket, topics, head_len, buf, size, port);
}
- free(buf);
+
free(action);
- free(topic);
+ free(topics);
} else {
err_msg(0, "incorrect format msg");
}
+ free(buf);
}
return NULL;
}
--
Gitblit v1.8.0