From 607ac3ae8bfc017e10a7907e69dcbc3ab2a0fb63 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 05 二月 2021 13:54:56 +0800
Subject: [PATCH] add stop method

---
 test_net_socket/test_net_mod_socket.cpp |   67 +++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/test_net_socket/test_net_mod_socket.cpp b/test_net_socket/test_net_mod_socket.cpp
index 8711bca..49b6251 100644
--- a/test_net_socket/test_net_mod_socket.cpp
+++ b/test_net_socket/test_net_mod_socket.cpp
@@ -10,6 +10,8 @@
 
 #define  SCALE  100000
 
+static Logger *logger = LoggerFactory::getLogger();
+
 typedef struct Targ {
   net_node_t *node;
 	char *nodelist;
@@ -131,26 +133,59 @@
   }
 }
 
+void *serverSockt;
+
+
+static void _recvandsend_callback_(void *recvbuf, int recvsize, int key, void **sendbuf_ptr, int *sendsize_ptr, void * user_data) {
+  char sendbuf[512];
+  printf( "server: RECEIVED REQUEST FROM  %d : %s\n", key, (char *)recvbuf);
+  sprintf(sendbuf, "%d RECEIVED %s", net_mod_socket_get_key(serverSockt), (char *)recvbuf);
+  // buf 鍜� size鏄繑鍥炲��
+  *sendbuf_ptr = sendbuf;
+  *sendsize_ptr = strlen(sendbuf) + 1;
+  //recvbuf鏄垎閰嶅埌鍫嗛噷鐨勶紝浣跨敤瀹屽悗涓嶈蹇樿閲婃斁鎺�
+  free(recvbuf);
+  return;
+} 
+
+bool stop = false;
+
+static void stop_replyserver_handler(int sig) {
+  printf("stop_handler\n");
  
+  int rv = net_mod_socket_stop(serverSockt);
+  if(rv ==0) {
+    logger->debug("send stop suc");
+    return;
+  } else {
+    logger->debug("send stop fail.%s\n", bus_strerror(rv));
+  }
+}
 
 void start_reply(int mkey) {
-  printf("start reply\n");
-  void *ser = net_mod_socket_open();
-  net_mod_socket_bind(ser, mkey);
-  char sendbuf[512];
-  int rv;
-  while(true) {
-    rv = net_mod_socket_recvandsend_timeout(ser, [&]( void *recvbuf, int recvsize, int key, void ** sendbuf_ptr, int *sendsize_ptr, void * user_data){
-    printf( "server: RECEIVED REQUEST FROM  %d : %s\n", key, (char *)recvbuf);
-    sprintf(sendbuf, "%d RECEIVED %s", net_mod_socket_get_key(ser), (char *)recvbuf);
-    // buf 鍜� size鏄繑鍥炲��
-    *sendbuf_ptr = sendbuf;
-    *sendsize_ptr = strlen(sendbuf) + 1;
-    //recvbuf鏄垎閰嶅埌鍫嗛噷鐨勶紝浣跨敤瀹屽悗涓嶈蹇樿閲婃斁鎺�
-    free(recvbuf);
-    return;
-    }, 0, 2000000, NULL );
+  logger->debug("start reply\n");
+  signal(SIGINT,  stop_replyserver_handler);
+  signal(SIGTERM,  stop_replyserver_handler);
+
+  serverSockt = net_mod_socket_open();
+  net_mod_socket_bind(serverSockt, mkey);
+ 
+  int rv = 0 ;
+  while(  true) {
+    rv = net_mod_socket_recvandsend(serverSockt, _recvandsend_callback_ , NULL );
+    if (rv == 0)
+      continue;
+    if(rv == EBUS_STOPED) {
+      logger->debug("Stopping\n");
+      break;
+    }
+    logger->debug("net_mod_socket_recvandsend error.%s\n", bus_strerror(rv));
+
   }
+  
+    //rv = net_mod_socket_recvandsend_timeout(serverSockt, _recvandsend_callback_ , 0, 2000000, NULL );
+  net_mod_socket_close(serverSockt);
+  logger->debug("stopted\n");
   // while ( (rv = net_mod_socket_recvfrom(ser, &recvbuf, &size, &key) ) == 0) {
   //  // printf( "server: RECEIVED REQUEST FROM  %d NAME %s\n", key, recvbuf);
   //   sprintf(sendbuf, "%d RECEIVED %s", net_mod_socket_get_key(ser), (char *)recvbuf);

--
Gitblit v1.8.0