From 0da7d09982d61ea6864cec53e2341b51b30cf208 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 13 十月 2020 18:19:22 +0800
Subject: [PATCH] update

---
 test_socket/dgram_mod_bus.c |   84 ++++++++++++++++++++++++++++++++---------
 1 files changed, 65 insertions(+), 19 deletions(-)

diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index d51caf0..f800f10 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -1,13 +1,26 @@
 #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 * server_socket;
+void sigint_handler(int sig) {
+   dgram_mod_close_socket(server_socket);
+   exit(0);
+}
+
+void server(int port, bool restart) {
+  server_socket = dgram_mod_open_socket();
+
+
+  if(restart) {
+    dgram_mod_force_bind(server_socket, port);
+  } else {
+     dgram_mod_bind(server_socket, port);
+  }
+ 
    
-  start_bus(socket);
-  
+  dgram_mod_start_bus(server_socket);
 }
 
 
@@ -25,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;
@@ -35,31 +50,50 @@
   long i = 0;
   while (true) {
     //printf("Usage: pub <topic> [content] or sub <topic>\n");
-    printf("Can I help you? sub, pub or quit\n");
+    printf("Can I help you? sub, pub, desub or quit\n");
     scanf("%s",action);
     
     if(strcmp(action, "sub") == 0) {
       printf("Please input topic!\n");
       scanf("%s", topic);
-      sub(socket, topic, strlen(topic),  port);
-      printf("Sub success!\n");
-    }
-    else if(strcmp(action, "pub") == 0) {
+      if (dgram_mod_sub(socket, topic, strlen(topic),  port) == 0) {
+         printf("%d Sub success!\n", dgram_mod_get_port(socket));
+      } else {
+        printf("Sub failture!\n");
+        exit(0);
+      }
+     
+    } else if(strcmp(action, "desub") == 0) {
+      printf("Please input topic!\n");
+      scanf("%s", topic);
+      if (dgram_mod_desub(socket, topic, strlen(topic),  port) == 0) {
+         printf("%d Desub success!\n", dgram_mod_get_port(socket));
+      } else {
+        printf("Desub failture!\n");
+        exit(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);
-      pub(socket, topic, strlen(topic)+1, content, strlen(content)+1,  port);
-      printf("Pub success!\n");
+      if(dgram_mod_pub(socket, topic, strlen(topic)+1, content, strlen(content)+1,  port) == 0){
+        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\n");
+      printf("error input argument\n");
       continue;
     }
    
   }
-  printf("(%d) quit\n", dgram_mod_get_port(socket));
-  dgram_mod_close_socket(socket);
+ 
 }
 
  
@@ -68,18 +102,30 @@
   shm_init(512);
   int port;
   if (argc < 3) {
-    fprintf(stderr, "Usage: reqrep %s|%s <PORT> ...\n", "server", "client");
+    fprintf(stderr, "Usage: %s %s|%s|rmkey <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);
+    }
+    
+  } 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