From b861de29176891657cc96631ddbfb4ea9e114a42 Mon Sep 17 00:00:00 2001
From: Fu Juntang <StrongTiger_001@163.com>
Date: 星期一, 30 八月 2021 17:52:23 +0800
Subject: [PATCH] re-structure the communication work flow.
---
src/socket/shm_socket.h | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 97d9f2c..8e874d1 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,7 +19,8 @@
#define BUS_ACTION_STOP 1
typedef struct shm_packet_t {
- int key;
+ int key;
+
size_t size;
void * buf;
char uuid[64];
@@ -31,8 +33,8 @@
typedef struct shm_socket_t {
shm_socket_type_t socket_type;
- // 鏈湴key
int key;
+ char proc_id[MAX_STR_LEN];
bool force_bind;
pthread_mutex_t mutex;
@@ -59,7 +61,8 @@
int shm_socket_bind(shm_socket_t * socket, int key) ;
int shm_socket_force_bind(shm_socket_t * socket, int key) ;
-
+
+int shm_socket_bind_proc_id(shm_socket_t *sockt, const char *buf, int len);
/**
* @flags : BUS_NOWAIT_FLAG
*/
@@ -70,6 +73,9 @@
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 +89,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