From 0fd19aa1c8a2bf543099d6b1077ff19078f9074e Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 24 十二月 2020 11:35:12 +0800
Subject: [PATCH] Merge branch 'dev'
---
demo/dgram_mod_bus.c | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/demo/dgram_mod_bus.c b/demo/dgram_mod_bus.c
index bddc7d5..3d53898 100644
--- a/demo/dgram_mod_bus.c
+++ b/demo/dgram_mod_bus.c
@@ -1,13 +1,21 @@
#include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
#include "usg_common.h"
+#include "mm.h"
-void server(int port) {
- void *socket = dgram_mod_open_socket();
- dgram_mod_bind(socket, port);
+
+
+void server(int port, bool restart) {
+ 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);
}
@@ -65,17 +73,23 @@
int main(int argc, char *argv[]) {
- shm_init(512);
+ shm_mm_wrapper_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