From 27d8bc7cad4a8f68c2da3efbb77f45ec70ae40e6 Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期三, 05 一月 2022 14:11:39 +0800
Subject: [PATCH] pb.go MsgQueryProcReply add subLocalTopics and subNetTopics
---
src/socket/shm_socket.h | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 97d9f2c..a900e4e 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -4,6 +4,7 @@
#include "usg_common.h"
#include "usg_typedef.h"
#include "shm_queue.h"
+#include "proc_def.h"
#include "lock_free_queue.h"
#include <functional>
@@ -18,10 +19,11 @@
#define BUS_ACTION_STOP 1
typedef struct shm_packet_t {
- int key;
+ int key;
+
size_t size;
void * buf;
- char uuid[64];
+ char uuid[1];
int action;
} shm_packet_t;
@@ -31,7 +33,6 @@
typedef struct shm_socket_t {
shm_socket_type_t socket_type;
- // 鏈湴key
int key;
bool force_bind;
pthread_mutex_t mutex;
@@ -59,17 +60,20 @@
int shm_socket_bind(shm_socket_t * socket, int key) ;
int shm_socket_force_bind(shm_socket_t * socket, int key) ;
-
+
/**
* @flags : BUS_NOWAIT_FLAG
*/
-int shm_sendto(shm_socket_t *socket, const void *buf, const int size, const int key, const struct timespec * timeout = NULL, const int flags=0);
+int shm_sendto(shm_socket_t *socket, const void *buf, const int size, const int key, const struct timespec * timeout = NULL, const int flags=0, int reset = 0, int data_set = 0);
-int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *key, const struct timespec * timeout = NULL, int flags=0);
+int shm_recvfrom(shm_socket_t *socket, void **buf, int *size, int *key, const struct timespec * timeout = NULL, int flags=0, int reset = 0, int data_set = 0);
int shm_sendandrecv(shm_socket_t *socket, const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size,
const struct timespec * timeout = NULL, int flags = 0);
+typedef std::set<int, std::less<int>, SHM_STL_Allocator<int> > SvrProc;
+typedef std::map<SHMString, SvrProc *, std::less<SHMString>, SHM_STL_Allocator<std::pair<const SHMString, SvrProc *> > > SvrTcs;
+typedef std::map<int, SHMString, std::less<int>, SHM_STL_Allocator<std::pair<int, const SHMString> > > ProcPartZone;
/**
* @callback void (*recvandsend_callback_fn)(void *recvbuf, int recvsize, int key, void **sendbuf, int *sendsize, void * user_data)
* @recvbuf 鏀跺埌鐨勬暟鎹�
@@ -83,7 +87,6 @@
const struct timespec *timeout = NULL, int flag = 0, void * user_data = NULL);
-
-
+void proc_copy(char *dst, void *src, int *count);
#endif
\ No newline at end of file
--
Gitblit v1.8.0