From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit

---
 src/socket/shm_mod_socket.h |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index b866f0c..9890aef 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -3,7 +3,7 @@
 #include "usg_common.h"
 #include "shm_socket.h"
 #include "shm_allocator.h"
-#include "mem_pool.h"
+#include "shm_mm.h"
 #include "hashtable.h"
 #include "sem_util.h"
 #include "logger_factory.h"
@@ -11,7 +11,7 @@
 #include <set>
 #include "socket_def.h"
 
-#define BUS_HEAD_SIZE (64 + 2 * sizeof(uint32_t))
+#define BUS_HEAD_SIZE sizeof(bus_head_t)
 class BusServerSocket;
 
 struct bus_head_t
@@ -36,7 +36,8 @@
 	static int get_bus_sendbuf(bus_head_t &request_head, const void *topic_buf, int topic_size, const void *content_buf, int content_size, void **retbuf);
 
 public:
-	static size_t remove_keys(int keys[], size_t length);
+	// static size_t remove_keys(int keys[], size_t length);
+	// static size_t remove_keys_exclude(int keys[], size_t length);
 
   // bus header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭
   static void * encode_bus_head(bus_head_t & bushead);
@@ -47,6 +48,7 @@
 	ShmModSocket();
 	~ShmModSocket();
 	 
+	int stop();
 	/**
 	 * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
 	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
@@ -87,8 +89,10 @@
 	 const struct timespec *timeout = NULL, int flag = 0);
 
 
-  int recvandsend(void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
-                      const struct timespec *timeout = NULL , int flag = 0);
+	/**
+	 * 
+	 */
+  int recvandsend( recvandsend_callback_fn callback, const struct timespec *timeout = NULL , int flag = 0, void * user_data = NULL);
 
 	/**
 	 * 璁㈤槄鎸囧畾涓婚

--
Gitblit v1.8.0