From 5c912c70e9333298ff48f7ea15424f72ca977b99 Mon Sep 17 00:00:00 2001
From: Fu Juntang <StrongTiger_001@163.com>
Date: 星期五, 17 九月 2021 09:43:55 +0800
Subject: [PATCH] Add the heartbeat logic feature.
---
src/socket/shm_socket.h | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 516a343..2b50a11 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,15 +33,15 @@
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;
LockFreeQueue<shm_packet_t> *queue; //self queue
LockFreeQueue<shm_packet_t> *remoteQueue; // peer queue
- std::map<std::string, shm_packet_t> recvbuf;
-
+ std::map<std::string, shm_packet_t> recvbuf; // for uuid
+ std::map<int, shm_packet_t> recvbuf2; //for thread local
} shm_socket_t;
@@ -48,28 +50,32 @@
size_t shm_socket_remove_keys(int keys[], size_t length);
size_t shm_socket_remove_keys_exclude(int keys[], size_t length);
-shm_socket_t *shm_open_socket(shm_socket_type_t socket_type);
+shm_socket_t *shm_socket_open(shm_socket_type_t socket_type);
-int shm_close_socket(shm_socket_t * socket) ;
+int shm_socket_close(shm_socket_t * sockt) ;
-int shm_socket_stop(shm_socket_t *sockt);
+int shm_socket_stop(shm_socket_t * sockt);
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
*/
-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 +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