From ff4991e1f942a3f1281330e21bf437b4b8558094 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 06 八月 2020 15:22:55 +0800
Subject: [PATCH] add remove_keys
---
test_socket/dgram_mod_bus.c | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index 5a549bc..f800f10 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -10,7 +10,6 @@
}
void server(int port, bool restart) {
- signal(SIGINT, sigint_handler);
server_socket = dgram_mod_open_socket();
@@ -39,6 +38,8 @@
void client(int port) {
void *socket = dgram_mod_open_socket();
+
+
pthread_t tid;
pthread_create(&tid, NULL, run_recv, socket);
int size;
@@ -56,7 +57,7 @@
printf("Please input topic!\n");
scanf("%s", topic);
if (dgram_mod_sub(socket, topic, strlen(topic), port) == 0) {
- printf("Sub success!\n");
+ printf("%d Sub success!\n", dgram_mod_get_port(socket));
} else {
printf("Sub failture!\n");
exit(0);
@@ -66,24 +67,25 @@
printf("Please input topic!\n");
scanf("%s", topic);
if (dgram_mod_desub(socket, topic, strlen(topic), port) == 0) {
- printf("Desub success!\n");
+ printf("%d Desub success!\n", dgram_mod_get_port(socket));
} else {
printf("Desub failture!\n");
exit(0);
}
- }
- else if(strcmp(action, "pub") == 0) {
+ } else if(strcmp(action, "pub") == 0) {
// printf("%s %s %s\n", action, topic, content);
printf("Please input topic and content\n");
scanf("%s %s", topic, content);
if(dgram_mod_pub(socket, topic, strlen(topic)+1, content, strlen(content)+1, port) == 0){
- printf("Pub success!\n");
+ printf("%d Pub success!\n", dgram_mod_get_port(socket));
} else {
printf("Pub failture!\n");
}
} else if(strcmp(action, "quit") == 0) {
+ printf("(%d) quit\n", dgram_mod_get_port(socket));
+ dgram_mod_close_socket(socket);
break;
} else {
printf("error input argument\n");
@@ -91,8 +93,7 @@
}
}
- printf("(%d) quit\n", dgram_mod_get_port(socket));
- dgram_mod_close_socket(socket);
+
}
@@ -101,7 +102,7 @@
shm_init(512);
int port;
if (argc < 3) {
- fprintf(stderr, "Usage: %s %s|%s <PORT> ...\n", argv[0], "server", "client");
+ fprintf(stderr, "Usage: %s %s|%s|rmkey <PORT> ...\n", argv[0], "server", "client");
return 1;
}
@@ -115,10 +116,16 @@
server(port, false);
}
+ } else if (strcmp("client", argv[1]) == 0) {
+ client(port);
+ } else if(strcmp("rmkey", argv[1]) == 0) {
+ for(int i = 2; i < argc; i++) {
+ port = atoi(argv[i]);
+ dgram_mod_remove_key(port);
+ // printf("%d\n", port);
+ }
}
- if (strcmp("client", argv[1]) == 0)
- client(port);
return 0;
--
Gitblit v1.8.0