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 | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index 0c58bb4..01a5ac6 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -1,13 +1,27 @@
#include "dgram_mod_socket.h"
#include "shm_mm.h"
#include "usg_common.h"
+#include "mm.h"
-void server(int port) {
- void *socket = dgram_mod_open_socket();
- dgram_mod_bind(socket, port);
-
- start_bus(socket);
+void * server_socket;
+void sigint_handler(int sig) {
+ dgram_mod_close_socket(server_socket);
+ exit(0);
+}
+
+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);
+ // }
+
+
+ dgram_mod_start_bus(server_socket);
}
@@ -41,14 +55,14 @@
if(strcmp(action, "sub") == 0) {
printf("Please input topic!\n");
scanf("%s", topic);
- sub(socket, topic, strlen(topic), port);
+ dgram_mod_sub(socket, topic, strlen(topic), port);
printf("Sub success!\n");
}
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);
- pub(socket, topic, strlen(topic)+1, content, strlen(content)+1, port);
+ dgram_mod_pub(socket, topic, strlen(topic)+1, content, strlen(content)+1, port);
printf("Pub success!\n");
} else if(strcmp(action, "quit") == 0) {
break;
@@ -58,7 +72,7 @@
}
}
- printf("(%d) quit\n", dgram_mod_get_socket_port(socket));
+ printf("(%d) quit\n", dgram_mod_get_port(socket));
dgram_mod_close_socket(socket);
}
@@ -68,14 +82,20 @@
shm_init(512);
int port;
if (argc < 3) {
- fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
+ fprintf(stderr, "Usage: %s %s|%s <PORT> ...\n", argv[0], "server", "client");
return 1;
}
port = atoi(argv[2]);
if (strcmp("server", argv[1]) == 0) {
- server(port);
+ if(argc >= 4 && strcmp("restart", argv[3]) == 0) {
+ server(port, true);
+ }
+ else{
+ server(port, false);
+ }
+
}
if (strcmp("client", argv[1]) == 0)
--
Gitblit v1.8.0