From 554529bb69cd610e83db2c9a80b4f36f5225d80f Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 27 七月 2020 17:56:34 +0800
Subject: [PATCH] restart bus
---
src/socket/dgram_mod_socket.c | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c
index 62ae7ac..937d8f0 100644
--- a/src/socket/dgram_mod_socket.c
+++ b/src/socket/dgram_mod_socket.c
@@ -16,11 +16,15 @@
static Logger logger = LoggerFactory::getLogger();
+//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;
+typedef std::map<SHMString, SHMKeySet *, std::less<SHMString>, SHM_STL_Allocator<std::pair<SHMString, SHMKeySet *> > > SHMTopicSubMap;
+
typedef struct dgram_mod_socket_t {
shm_socket_t *shm_socket;
// pthread_t recv_thread;
// <涓婚锛� 璁㈤槄鑰�>
- std::map<std::string, std::set<int> *> *topic_sub_map;
+ SHMTopicSubMap *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 );
@@ -36,9 +40,9 @@
int dgram_mod_close_socket(void * _socket) {
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
- 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;
+ SHMTopicSubMap *topic_sub_map = socket->topic_sub_map;
+ 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++) {
@@ -57,6 +61,12 @@
int dgram_mod_bind(void * _socket, int port){
dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
return shm_socket_bind(socket->shm_socket, port);
+}
+
+
+int dgram_mod_force_bind(void * _socket, int port) {
+ dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket;
+ return shm_socket_force_bind(socket->shm_socket, port);
}
int dgram_mod_sendto(void *_socket, const void *buf, const int size, const int port) {
@@ -96,7 +106,14 @@
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> *>;
+printf("mem_pool_malloc_by_key before\n");
+ // void *map_ptr = mem_pool_malloc_by_key(1, sizeof(SHMTopicSubMap));
+ socket->topic_sub_map = mem_pool_attach<SHMTopicSubMap>(1);
+printf("mem_pool_malloc_by_key after\n");
+
+ // socket->topic_sub_map = new(map_ptr) SHMTopicSubMap;
+
+ //socket->topic_sub_map = new SHMTopicSubMap;
run_pubsub_proxy(socket);
// pthread_t tid;
// pthread_create(&tid, NULL, run_accept_sub_request, _socket);
@@ -136,16 +153,17 @@
* 澶勭悊璁㈤槄
*/
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;
+ SHMTopicSubMap *topic_sub_map = socket->topic_sub_map;
+ SHMKeySet *subscripter_set;
- std::map<std::string, std::set<int> *>::iterator map_iter;
- std::set<int>::iterator set_iter;
+ SHMTopicSubMap::iterator map_iter;
+ SHMKeySet::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>;
+ void *set_ptr = mm_malloc(sizeof(SHMKeySet));
+ subscripter_set = new(set_ptr) SHMKeySet;
topic_sub_map->insert({topic, subscripter_set});
}
subscripter_set->insert(port);
@@ -155,11 +173,11 @@
* 澶勭悊鍙戝竷锛屼唬鐞嗚浆鍙�
*/
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;
+ SHMTopicSubMap *topic_sub_map = socket->topic_sub_map;
+ SHMKeySet *subscripter_set;
- std::map<std::string, std::set<int> *>::iterator map_iter;
- std::set<int>::iterator set_iter;
+ SHMTopicSubMap::iterator map_iter;
+ SHMKeySet::iterator set_iter;
std::vector<int> subscripter_to_del;
std::vector<int>::iterator vector_iter;
@@ -171,12 +189,14 @@
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);
+ printf("_proxy_pub 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);
+ } else {
+printf("_proxy_pub send after: %d \n", send_port);
}
-// printf("run_accept_sub_request send after: %d \n", send_port);
+
}
@@ -200,9 +220,9 @@
size_t head_len;
const char *topic_delim = ",";
-//printf("server receive before\n");
+printf("run_pubsub_proxy server receive before\n");
while(shm_recvfrom(socket->shm_socket, (void **)&buf, &size, &port) == 0) {
-//printf("server recv after: %s \n", buf);
+printf("run_pubsub_proxy server recv after: %s \n", buf);
if(parse_pubsub_topic(buf, size, &action, &topics, &head_len)) {
if(strcmp(action, "sub") == 0) {
// 璁㈤槄鏀寔澶氫富棰樿闃�
--
Gitblit v1.8.0