From e1bea2c6430ddadd589fd3377b69ca06226bb872 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 08 二月 2021 11:52:53 +0800
Subject: [PATCH] update
---
src/socket/bus_server_socket.cpp | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/socket/bus_server_socket.cpp b/src/socket/bus_server_socket.cpp
index fc684c1..6aa6a95 100644
--- a/src/socket/bus_server_socket.cpp
+++ b/src/socket/bus_server_socket.cpp
@@ -52,31 +52,13 @@
BusServerSocket::BusServerSocket() {
logger->debug("BusServerSocket Init");
- shm_socket = shm_open_socket(SHM_SOCKET_DGRAM);
+ shm_socket = shm_socket_open(SHM_SOCKET_DGRAM);
topic_sub_map = NULL;
}
BusServerSocket::~BusServerSocket() {
- SHMKeySet *subscripter_set;
- SHMTopicSubMap::iterator map_iter;
-
- stop();
-
- if(topic_sub_map != NULL) {
- for (map_iter = topic_sub_map->begin(); map_iter != topic_sub_map->end(); map_iter++) {
- subscripter_set = map_iter->second;
- if(subscripter_set != NULL) {
- subscripter_set->clear();
- mm_free((void *)subscripter_set);
- }
-
- }
- topic_sub_map->clear();
- mem_pool_free_by_key(SHM_BUS_MAP_KEY);
- }
- shm_close_socket(shm_socket);
- logger->debug("BusServerSocket destory 3");
+ destroy();
}
@@ -101,7 +83,7 @@
int BusServerSocket::start(){
topic_sub_map = mem_pool_attach<SHMTopicSubMap>(SHM_BUS_MAP_KEY);
- run_pubsub_proxy();
+ _run_proxy_();
return 0;
}
@@ -111,8 +93,6 @@
if( shm_socket->key <= 0) {
return -1;
}
- // snprintf(buf, 128, "%sstop%s%s%s%s", ACTION_LIDENTIFIER, ACTION_RIDENTIFIER, TOPIC_LIDENTIFIER, "", TOPIC_RIDENTIFIER);
- // return shm_sendto(shm_socket, buf, strlen(buf), shm_socket->key, NULL, 0);
bus_head_t head = {};
memcpy(head.action, "stop", sizeof(head.action));
head.topic_size = 0;
@@ -122,13 +102,33 @@
void *buf;
int size = ShmModSocket::get_bus_sendbuf(head, NULL, 0, NULL, 0, &buf);
if(size > 0) {
- ret = client.sendandrecv_unsafe( buf, size, shm_socket->key, NULL, NULL);
+ ret = client.sendto( buf, size, shm_socket->key);
free(buf);
return ret;
} else {
return -1;
}
+}
+
+int BusServerSocket::destroy() {
+ SHMKeySet *subscripter_set;
+ SHMTopicSubMap::iterator map_iter;
+ if(topic_sub_map != NULL) {
+ for (map_iter = topic_sub_map->begin(); map_iter != topic_sub_map->end(); map_iter++) {
+ subscripter_set = map_iter->second;
+ if(subscripter_set != NULL) {
+ subscripter_set->clear();
+ mm_free((void *)subscripter_set);
+ }
+
+ }
+ topic_sub_map->clear();
+ mem_pool_free_by_key(SHM_BUS_MAP_KEY);
+ }
+ shm_socket_close(shm_socket);
+ logger->debug("BusServerSocket destory 3");
+ return 0;
}
/*
@@ -193,21 +193,21 @@
std::vector<int>::iterator vector_iter;
int send_key;
+ int rv;
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_key = *set_iter;
- // printf("_proxy_pub send before %d \n", send_key);
- if (shm_sendto(shm_socket, buf, size, send_key, &timeout) == EBUS_CLOSED ) {
- //瀵规柟宸插叧闂殑杩炴帴鏀惧埌寰呭垹闄ら槦鍒楅噷銆傚鏋滅洿鎺ュ垹闄や細璁﹊ter鎸囬拡鍑虹幇閿欎贡
- subscripter_to_del.push_back(send_key);
- } else {
-// printf("_proxy_pub send after: %d \n", send_key);
+// logger->debug("_proxy_pub send before %d \n", send_key);
+ rv = shm_sendto(shm_socket, buf, size, send_key, &timeout, BUS_TIMEOUT_FLAG);
+ if(rv == 0) {
+ continue;
}
-
-
+ //瀵规柟宸插叧闂殑鎴栬�呭搴旂殑杩涚▼琚玨ill鎺夌殑杩炴帴鏀惧埌寰呭垹闄ら槦鍒楅噷銆傚鏋滅洿鎺ュ垹闄や細璁﹊ter鎸囬拡鍑虹幇閿欎贡
+ subscripter_to_del.push_back(send_key);
}
// 鍒犻櫎宸插叧闂殑绔�
@@ -222,7 +222,9 @@
}
}
-void * BusServerSocket::run_pubsub_proxy() {
+
+// 杩愯浠ｇ悊
+void * BusServerSocket::_run_proxy_() {
int size;
int key;
char * action, *topic, *topics, *buf, *content;
@@ -231,17 +233,17 @@
bus_head_t head;
const char *topic_delim = ",";
-// printf("run_pubsub_proxy server receive before\n");
+// logger.debug("_run_proxy_ server receive before\n");
while(shm_recvfrom(shm_socket, (void **)&buf, &size, &key) == 0) {
-// printf("run_pubsub_proxy server recvfrom %d after: %s \n", key, buf);
+// logger.debug("_run_proxy_ server recvfrom %d after: %s \n", key, buf);
head = ShmModSocket::decode_bus_head(buf);
topics = buf + BUS_HEAD_SIZE;
action = head.action;
- // printf("run_pubsub_proxy : %s\n", action);
+// logger.debug("_run_proxy_ : %s\n", action);
if(strcmp(action, "sub") == 0) {
// 璁㈤槄鏀寔澶氫富棰樿闃�
topic = strtok(topics, topic_delim);
-// printf("run_pubsub_proxy topic = %s\n", topic);
+// logger.debug("_run_proxy_ topic = %s\n", topic);
while(topic) {
_proxy_sub(trim(topic, 0), key);
topic = strtok(NULL, topic_delim);
@@ -249,7 +251,7 @@
}
else if(strcmp(action, "desub") == 0) {
-// printf("desub topic=%s,%s,%d\n", topics, trim(topics, 0), strcmp(trim(topics, 0), ""));
+// logger.debug("desub topic=%s,%s,%d\n", topics, trim(topics, 0), strcmp(trim(topics, 0), ""));
if(strcmp(trim(topics, 0), "") == 0) {
// 鍙栨秷鎵�鏈夎闃�
_proxy_desub_all(key);
@@ -273,13 +275,11 @@
free(buf);
break;
} else {
- logger->error( "BusServerSocket::run_pubsub_proxy : unrecognized action %s", action);
+ logger->error( "BusServerSocket::_run_proxy_ : unrecognized action %s", action);
}
free(buf);
}
-
- shm_sendto(shm_socket, "stop_finished", strlen( "stop_finished") +1, key);
return NULL;
}
--
Gitblit v1.8.0