From 5add39f46c8323875fb56bc764a8ff627ad82f18 Mon Sep 17 00:00:00 2001 From: Fu Juntang <StrongTiger_001@163.com> Date: 星期五, 08 十月 2021 11:12:06 +0800 Subject: [PATCH] Adjust the free action independent of the return value from the function return. --- src/socket/shm_mod_socket.h | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h index 9890aef..c361300 100644 --- a/src/socket/shm_mod_socket.h +++ b/src/socket/shm_mod_socket.h @@ -5,6 +5,7 @@ #include "shm_allocator.h" #include "shm_mm.h" #include "hashtable.h" +#include "proc_def.h" #include "sem_util.h" #include "logger_factory.h" #include "key_def.h" @@ -60,23 +61,12 @@ * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 */ int force_bind(int key); - /** - * 鍙戦�佷俊鎭� - * @key 鍙戦�佺粰璋� - * @flag BUS_TIMEOUT_FLAG BUS_NOWAIT_FLAG - * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 - */ - - int sendto(const void *buf, const int size, const int key, const struct timespec *timeout = NULL, int flag = 0); - - /** - * 鎺ユ敹淇℃伅 - * @key 浠庤皝鍝噷鏀跺埌鐨勪俊鎭� - * @return 0 鎴愬姛锛� 鍏朵粬鍊� 澶辫触鐨勯敊璇爜 - */ - - int recvfrom(void **buf, int *size, int *key, const struct timespec *timeout = NULL, int flag = 0); + int reg(void *pData, int len, void **buf, int *size, const int timeout_ms, int flag); + + int sendto(const void *buf, const int size, const int key, const struct timespec *timeout = NULL, int flag = 0, int reset = 0, int data_set = 0); + + int recvfrom(void **buf, int *size, int *key, const struct timespec *timeout = NULL, int flag = 0, int reset = 0, int data_set = 0); /** * 鍙戦�佽姹備俊鎭苟绛夊緟鎺ユ敹搴旂瓟 @@ -128,7 +118,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