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'

---
 test_socket/dgram_mod_bus.c |   77 +++++++++++++++++++++++++-------------
 1 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/test_socket/dgram_mod_bus.c b/test_socket/dgram_mod_bus.c
index 70f09c4..042b2fd 100644
--- a/test_socket/dgram_mod_bus.c
+++ b/test_socket/dgram_mod_bus.c
@@ -1,5 +1,5 @@
 #include "dgram_mod_socket.h"
-#include "shm_mm.h"
+#include "shm_mm_wraper.h"
 #include "usg_common.h"
 #include "mm.h"
 
@@ -9,15 +9,14 @@
    exit(0);
 }
 
-void server(int port, bool restart) {
-  signal(SIGINT,  sigint_handler);
+void server(int key, bool restart) {
   server_socket = dgram_mod_open_socket();
 
 
   if(restart) {
-    dgram_mod_force_bind(server_socket, port);
+    dgram_mod_force_bind(server_socket, key);
   } else {
-     dgram_mod_bind(server_socket, port);
+     dgram_mod_bind(server_socket, key);
   }
  
    
@@ -29,16 +28,17 @@
   pthread_detach(pthread_self());
   void *recvbuf;
   int size;
-  int port;
-  while (dgram_mod_recvfrom( socket, &recvbuf, &size, &port) == 0) {
+  int key;
+  while (dgram_mod_recvfrom( socket, &recvbuf, &size, &key) == 0) {
     printf("鏀跺埌璁㈤槄娑堟伅:%s\n", recvbuf);
     free(recvbuf);
   }
   
 }
 
-void client(int port) {
+void client(int key) {
   void *socket = dgram_mod_open_socket();
+  
   pthread_t tid;
   pthread_create(&tid, NULL, run_recv, socket);
   int size;
@@ -49,57 +49,82 @@
   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);
-      dgram_mod_sub(socket, topic, strlen(topic),  port);
-      printf("Sub success!\n");
-    }
-    else if(strcmp(action, "pub") == 0) {
+      if (dgram_mod_sub(socket, topic, strlen(topic),  key) == 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),  key) == 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);
-      dgram_mod_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,  key) == 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);
+ 
 }
 
  
 
 int main(int argc, char *argv[]) {
-  shm_init(512);
-  int port;
+  shm_mm_wrapper_init(512);
+  int key;
   if (argc < 3) {
-    fprintf(stderr, "Usage: %s %s|%s <PORT> ...\n", argv[0], "server", "client");
+    fprintf(stderr, "Usage: %s %s|%s|rmkey <key> ...\n", argv[0], "server", "client");
     return 1;
   }
 
-  port = atoi(argv[2]);
+  key = atoi(argv[2]);
 
   if (strcmp("server", argv[1]) == 0) {
     if(argc >= 4 && strcmp("restart", argv[3]) == 0) {
-      server(port, true);
+      server(key, true);
     }
     else{
-      server(port, false);
+      server(key, false);
     }
     
+  } else if (strcmp("client", argv[1]) == 0) {
+    client(key);
+  } else if(strcmp("rmkey", argv[1]) == 0) {
+    for(int i = 2; i < argc; i++) {
+      key = atoi(argv[i]);
+      dgram_mod_remove_key(key);
+      // printf("%d\n", key);
+    }
   }
 
-  if (strcmp("client", argv[1]) == 0)
-    client(port);
 
   
   return 0;

--
Gitblit v1.8.0