From b7228c8620a6a0b593f1d8b82af5aac7ba456a85 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期二, 28 七月 2020 17:12:17 +0800 Subject: [PATCH] fix conflict --- demo/dgram_mod_req_rep | 0 test/test_set | 0 test/test_vector | 0 src/libshm_queue.a | 0 Makefile | 1 + src/socket/dgram_mod_socket.c | 2 +- test/strtok | 0 test_socket/dgram_mod_bus | 0 test/test | 0 demo/Makefile | 1 + test_socket/dgram_mod_survey | 0 test/Makefile | 1 + test_socket/dgram_mod_bus.c | 14 +++++++------- src/queue/hashtable.c | 3 +-- test/protocle_parse | 0 test/test.c | 14 +++----------- test_socket/dgram_mod_req_rep | 0 demo/dgram_mod_survey | 0 18 files changed, 15 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index b4fa973..e2c95d6 100755 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ DIRS = src test_socket demo test TAR_NAME = shm_queue.tar.gz + all: for i in $(DIRS); do \ (cd $$i && echo "making $$i" && $(MAKE) ) || exit 1; \ diff --git a/demo/Makefile b/demo/Makefile index a8b38ff..8fbd78f 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -15,6 +15,7 @@ PROGS = dgram_mod_req_rep dgram_mod_survey dgram_mod_bus + build: $(PROGS) diff --git a/demo/dgram_mod_req_rep b/demo/dgram_mod_req_rep new file mode 100755 index 0000000..74d29d9 --- /dev/null +++ b/demo/dgram_mod_req_rep Binary files differ diff --git a/demo/dgram_mod_survey b/demo/dgram_mod_survey new file mode 100755 index 0000000..d064466 --- /dev/null +++ b/demo/dgram_mod_survey Binary files differ diff --git a/src/libshm_queue.a b/src/libshm_queue.a new file mode 100644 index 0000000..da6d5e8 --- /dev/null +++ b/src/libshm_queue.a Binary files differ diff --git a/src/queue/hashtable.c b/src/queue/hashtable.c index eaa3ca6..86001ef 100755 --- a/src/queue/hashtable.c +++ b/src/queue/hashtable.c @@ -276,6 +276,7 @@ + std::set<int> * hashtable_keyset(hashtable_t *hashtable) { std::set<int> *keyset = new std::set<int>; tailq_entry_t *item; @@ -306,5 +307,3 @@ SemUtil::inc(hashtable->wlock); return key; } - - diff --git a/src/socket/dgram_mod_socket.c b/src/socket/dgram_mod_socket.c index f58e4bb..7e21fd2 100644 --- a/src/socket/dgram_mod_socket.c +++ b/src/socket/dgram_mod_socket.c @@ -121,8 +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"); socket->topic_sub_map = mem_pool_attach<SHMTopicSubMap>(BUS_MAP_KEY); + run_pubsub_proxy(socket); // pthread_t tid; // pthread_create(&tid, NULL, run_accept_sub_request, _socket); diff --git a/test/Makefile b/test/Makefile index ffc7b16..7298905 100755 --- a/test/Makefile +++ b/test/Makefile @@ -15,6 +15,7 @@ PROGS = protocle_parse strtok test_set test_vector lambda test + build: $(PROGS) diff --git a/test/protocle_parse b/test/protocle_parse new file mode 100755 index 0000000..e18682e --- /dev/null +++ b/test/protocle_parse Binary files differ diff --git a/test/strtok b/test/strtok new file mode 100755 index 0000000..df7f33e --- /dev/null +++ b/test/strtok Binary files differ diff --git a/test/test b/test/test new file mode 100755 index 0000000..1c5c801 --- /dev/null +++ b/test/test Binary files differ diff --git a/test/test.c b/test/test.c index 0aaa68e..d1193a6 100644 --- a/test/test.c +++ b/test/test.c @@ -1,15 +1,7 @@ #include "usg_common.h" #include "usg_typedef.h" -int test(char *src, int size) { - int i = strlen(src); - char dest[size]; - strncpy(dest, src, size); - puts(dest); - return i; -} + int main() { - char *str = "hello"; - int r = test(str, strlen(str)); - printf("%d\n", r); -} \ No newline at end of file +} + \ No newline at end of file diff --git a/test/test_set b/test/test_set new file mode 100755 index 0000000..c8b6db0 --- /dev/null +++ b/test/test_set Binary files differ diff --git a/test/test_vector b/test/test_vector new file mode 100755 index 0000000..c308410 --- /dev/null +++ b/test/test_vector Binary files differ diff --git a/test_socket/dgram_mod_bus b/test_socket/dgram_mod_bus new file mode 100755 index 0000000..c1cb03d --- /dev/null +++ b/test_socket/dgram_mod_bus Binary files differ diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c index 01a5ac6..63ea0cd 100644 --- a/test_socket/dgram_mod_bus.c +++ b/test_socket/dgram_mod_bus.c @@ -12,13 +12,13 @@ void server(int port, bool restart) { // signal(SIGINT, sigint_handler); server_socket = dgram_mod_open_socket(); - dgram_mod_force_bind(server_socket, port); - - // if(restart) { - - // } else { - // // dgram_mod_bind(server_socket, port); - // } + + + if(restart) { + dgram_mod_force_bind(server_socket, port); + } else { + dgram_mod_bind(server_socket, port); + } dgram_mod_start_bus(server_socket); diff --git a/test_socket/dgram_mod_req_rep b/test_socket/dgram_mod_req_rep new file mode 100755 index 0000000..e75553d --- /dev/null +++ b/test_socket/dgram_mod_req_rep Binary files differ diff --git a/test_socket/dgram_mod_survey b/test_socket/dgram_mod_survey new file mode 100755 index 0000000..496c8b0 --- /dev/null +++ b/test_socket/dgram_mod_survey Binary files differ -- Gitblit v1.8.0