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
---
test_socket/dgram_mod_bus.c | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index bddc7d5..3cb6d9f 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -1,13 +1,30 @@
#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);
+void sigint_handler(int sig) {
+ printf("sigint_handler\n");
+ hashtable_t *hashtable = mm_get_hashtable();
+ //hashtable_remove(hashtable, 8);
+ // dgram_mod_close_socket(server_socket);
+ //SHMQueue<ELEM_T>::remove_queues_include
+ exit(0);
+}
+
+
+void server(int port, bool restart) {
+ //signal(SIGINT, sigint_handler);
+ void * server_socket = dgram_mod_open_socket();
+
+ if(restart) {
+ dgram_mod_force_bind(server_socket, port);
+ } else {
+ dgram_mod_bind(server_socket, port);
+ }
+
- dgram_mod_start_bus(socket);
-
+ dgram_mod_start_bus(server_socket);
}
@@ -68,14 +85,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