From b984dac55bdd0a5b694837fb8fb2ceb07ce9808f Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@smartai.com>
Date: 星期二, 07 九月 2021 11:25:57 +0800
Subject: [PATCH] resize the buf allocation to dynamic buf.

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

diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index fb389a3..da02fab 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -3,15 +3,16 @@
 #include "usg_common.h"
 #include "shm_socket.h"
 #include "shm_allocator.h"
-#include "mem_pool.h"
+#include "shm_mm.h"
 #include "hashtable.h"
+#include "proc_def.h"
 #include "sem_util.h"
 #include "logger_factory.h"
 #include "key_def.h"
 #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 +37,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 +49,7 @@
 	ShmModSocket();
 	~ShmModSocket();
 	 
+	int stop();
 	/**
 	 * 缁戝畾绔彛鍒皊ocket, 濡傛灉涓嶇粦瀹氬垯绯荤粺鑷姩鍒嗛厤涓�涓�
 	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
@@ -58,6 +61,9 @@
 	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 	*/
 	int force_bind(int key);
+
+  int bind_proc_id(char *buf, int len);
+  int reg(void *pData, int len, void **buf, int *size, const int timeout_ms, int flag);
 	/**
 	 * 鍙戦�佷俊鎭�
 	 * @key 鍙戦�佺粰璋�
@@ -73,9 +79,7 @@
 	 * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭�
 	 * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜
 	*/
- 
 	int recvfrom(void **buf, int *size, int *key,  const struct timespec *timeout = NULL, int flag = 0);
-
 	/**
 	 * 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟
 	 * @key 鍙戦�佺粰璋�
@@ -126,7 +130,14 @@
 	 */
 	int get_key() ;
 
+  int get_procid(char *buf, int len);
+
 
 };
 
+
+typedef std::map<int, ProcInfo, std::less<int>, SHM_STL_Allocator<std::pair<int, ProcInfo> > > ProcZone;
+typedef std::set<SHMString,  std::less<SHMString>, SHM_STL_Allocator<SHMString> > TcsZone;
+typedef std::map<int, TcsZone *, std::less<int>, SHM_STL_Allocator<std::pair<const int, TcsZone *> > > ProcTcsMap;
+
 #endif

--
Gitblit v1.8.0