From 803d392aeb11665a3e34f7be83f972a1fc7d39c0 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 04 二月 2021 15:47:39 +0800
Subject: [PATCH] update

---
 src/net/net_mod_socket.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/net/net_mod_socket.h b/src/net/net_mod_socket.h
index 5b2e930..11e0ebe 100644
--- a/src/net/net_mod_socket.h
+++ b/src/net/net_mod_socket.h
@@ -62,10 +62,8 @@
 private:
    
   ShmModSocket shmModSocket;
-  // pool req_resp_pool;
-  NetConnPool *gpool;
 
-  pthread_mutex_t sendMutex;
+  // pthread_mutex_t sendMutex;
 
   // request header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭
   static void * encode_request_head(net_mod_request_head_t & request);
@@ -193,11 +191,13 @@
   int sendandrecv_nowait( const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size) ;
 
 
-  int recvandsend(void **recvbuf, int *recvsize, int *key, recv_callback_fn callback) ;
+  
 
-  int recvandsend_timeout(void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
-                                        const struct timespec *timeout );
-  int recvandsend_nowait(void **recvbuf, int *recvsize, int *key, recv_callback_fn callback);
+  /**
+   * recvandsend
+   */
+  int recvandsend( recvandsend_callback_fn callback,
+                                        const struct timespec *timeout = NULL , int flag = 0, void * user_data = NULL );
 
   /**
    * 鍚憂ode_arr 涓殑鎵�鏈夌綉缁滆妭鐐瑰彂甯冩秷鎭�

--
Gitblit v1.8.0