From f12c014371ec9dc9b0c62db3e45df90cc97e9b31 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期二, 28 七月 2020 11:02:00 +0800 Subject: [PATCH] commit --- test_socket/dgram_mod_bus.c | 13 +++++++------ src/socket/dgram_mod_socket.c | 8 +------- demo/Makefile | 2 +- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/demo/Makefile b/demo/Makefile index e339a50..a8b38ff 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -14,7 +14,7 @@ include $(ROOT)/Make.defines.$(PLATFORM) -PROGS = dgram_mod_req_rep dgram_mod_survey +PROGS = dgram_mod_req_rep dgram_mod_survey dgram_mod_bus build: $(PROGS) diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c index c9566af..f58e4bb 100644 --- a/src/socket/dgram_mod_socket.c +++ b/src/socket/dgram_mod_socket.c @@ -121,14 +121,8 @@ int dgram_mod_start_bus(void * _socket) { dgram_mod_socket_t * socket = (dgram_mod_socket_t *) _socket; socket->mod = BUS; -printf("mem_pool_malloc_by_key before\n"); - // void *map_ptr = mem_pool_malloc_by_key(1, sizeof(SHMTopicSubMap)); +// printf("mem_pool_malloc_by_key before\n"); socket->topic_sub_map = mem_pool_attach<SHMTopicSubMap>(BUS_MAP_KEY); -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); diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c index b016cbc..01a5ac6 100644 --- a/test_socket/dgram_mod_bus.c +++ b/test_socket/dgram_mod_bus.c @@ -12,12 +12,13 @@ void server(int port, bool restart) { // signal(SIGINT, sigint_handler); server_socket = dgram_mod_open_socket(); - - if(restart) { - dgram_mod_force_bind(server_socket, port); - } else { - dgram_mod_bind(server_socket, port); - } + dgram_mod_force_bind(server_socket, port); + + // if(restart) { + + // } else { + // // dgram_mod_bind(server_socket, port); + // } dgram_mod_start_bus(server_socket); -- Gitblit v1.8.0