From dbf7fd6f620b86c382431ce10fd5fe3c5ddca955 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 24 十二月 2020 14:10:44 +0800
Subject: [PATCH] update
---
src/socket/bus_server_socket.c | 81 +++++++++++++++++++++++-----------------
1 files changed, 46 insertions(+), 35 deletions(-)
diff --git a/src/socket/bus_server_socket.c b/src/socket/bus_server_socket.c
index e1ddb89..9bd61b0 100644
--- a/src/socket/bus_server_socket.c
+++ b/src/socket/bus_server_socket.c
@@ -1,6 +1,7 @@
#include "bus_server_socket.h"
#include "shm_mod_socket.h"
+#include "bus_error.h"
static Logger *logger = LoggerFactory::getLogger();
@@ -60,38 +61,34 @@
BusServerSocket::BusServerSocket() {
+ logger->debug("BusServerSocket Init");
shm_socket = shm_open_socket(SHM_SOCKET_DGRAM);
topic_sub_map = NULL;
+
}
BusServerSocket::~BusServerSocket() {
-// printf("BusServerSocket destory 1\n");
SHMKeySet *subscripter_set;
SHMTopicSubMap::iterator map_iter;
+ logger->debug("BusServerSocket destory 1");
stop();
- sleep(2);
-// printf("BusServerSocket destory 2\n");
+ logger->debug("BusServerSocket destory 2");
+
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;
-// printf("BusServerSocket destory 2-1\n");
if(subscripter_set != NULL) {
-// printf("BusServerSocket destory 2-2\n");
subscripter_set->clear();
-// printf("BusServerSocket destory 2-3\n");
mm_free((void *)subscripter_set);
-// printf("BusServerSocket destory 2-4\n");
}
}
topic_sub_map->clear();
mem_pool_free_by_key(BUS_MAP_KEY);
}
-// printf("BusServerSocket destory 3\n");
- // printf("=============close socket\n");
shm_close_socket(shm_socket);
-// printf("BusServerSocket destory 4\n");
+ logger->debug("BusServerSocket destory 3");
}
@@ -107,6 +104,7 @@
int BusServerSocket::force_bind(int key) {
return shm_socket_force_bind(shm_socket, key);
}
+
/**
* 鍚姩bus
*
@@ -116,20 +114,34 @@
topic_sub_map = mem_pool_attach<SHMTopicSubMap>(BUS_MAP_KEY);
run_pubsub_proxy();
- // pthread_t tid;
- // pthread_create(&tid, NULL, run_accept_sub_request, _socket);
+ // 杩涚▼鍋滄鐨勬椂鍊欙紝棰勭暀3绉掕祫婧愬洖鏀剁殑鏃堕棿銆傚惁鍒欙紝浼氬彂鐢熻皟鐢╟lose鐨勬椂鍊欙紝鍏变韩鍐呭瓨鐨勮祫婧愯繕娌℃潵寰楀強鍥炴敹杩涚▼灏遍��鍑轰簡
return 0;
}
int BusServerSocket::stop(){
- char buf[128];
-
+ int ret;
+ logger->debug("====>stopping");
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);
+ // 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;
+ head.content_size = 0;
+
+ void *buf;
+ int size = ShmModSocket::get_bus_sendbuf(head, NULL, 0, NULL, 0, &buf);
+ if(size > 0) {
+ ret = shm_sendandrecv_unsafe(shm_socket, buf, size, shm_socket->key, NULL, NULL);
+ free(buf);
+ return ret;
+ } else {
+ return -1;
+ }
+
}
/*
@@ -201,7 +213,7 @@
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) == SHM_SOCKET_ECONNFAILED ) {
+ if (shm_sendto(shm_socket, buf, size, send_key, &timeout) == EBUS_CLOSED ) {
//瀵规柟宸插叧闂殑杩炴帴鏀惧埌寰呭垹闄ら槦鍒楅噷銆傚鏋滅洿鎺ュ垹闄や細璁﹊ter鎸囬拡鍑虹幇閿欎贡
subscripter_to_del.push_back(send_key);
} else {
@@ -239,8 +251,7 @@
head = ShmModSocket::decode_bus_head(buf);
topics = buf + BUS_HEAD_SIZE;
action = head.action;
- // if(parse_pubsub_topic(buf, size, &action, &topics, &head_len)) {
- printf("run_pubsub_proxy : %s, %s \n", action, topics);
+ // printf("run_pubsub_proxy : %s, %s \n", action, topics);
if(strcmp(action, "sub") == 0) {
// 璁㈤槄鏀寔澶氫富棰樿闃�
topic = strtok(topics, topic_delim);
@@ -250,7 +261,8 @@
topic = strtok(NULL, topic_delim);
}
- } else if(strcmp(action, "desub") == 0) {
+ }
+ else if(strcmp(action, "desub") == 0) {
// printf("desub topic=%s,%s,%d\n", topics, trim(topics, 0), strcmp(trim(topics, 0), ""));
if(strcmp(trim(topics, 0), "") == 0) {
// 鍙栨秷鎵�鏈夎闃�
@@ -264,34 +276,33 @@
}
}
- } else if(strcmp(action, "pub") == 0) {
+ }
+ else if(strcmp(action, "pub") == 0) {
content = topics + head.topic_size;
_proxy_pub(topics, content, head.content_size, key);
- } else if(strcmp(action, "stop") == 0) {
- logger->info( "Stopping Bus...");
- // snprintf(resp_buf, 128, "%sstop_finished%s%s%s%s", ACTION_LIDENTIFIER, ACTION_RIDENTIFIER, TOPIC_LIDENTIFIER, "", TOPIC_RIDENTIFIER);
- // shm_sendto(shm_socket, resp_buf, strlen(resp_buf), key);
- // free(action);
- // free(topics);
- free(buf);
- break;
+
+ }
+ else if(strcmp(action, "stop") == 0) {
+
+ free(buf);
+ break;
} else {
- logger->error( "BusServerSocket::run_pubsub_proxy : unrecognized action");
+ logger->error( "BusServerSocket::run_pubsub_proxy : unrecognized action %s", action);
}
- // free(action);
- // free(topics);
- // } else {
- // logger->error( "BusServerSocket::run_pubsub_proxy : incorrect format msg");
- // }
free(buf);
}
+
+ logger->info( "Stopping Bus...");
+ shm_sendto(shm_socket, "stop_finished", strlen( "stop_finished") +1, key);
+
return NULL;
}
/**
+ * deprecate
* @str "<**sub**>{缁忔祹}"
*/
--
Gitblit v1.8.0