From 758438289fc45829a8f6cef1b42afed0a1a8cb60 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 03 二月 2021 15:59:58 +0800
Subject: [PATCH] uuid msg
---
src/socket/shm_socket.h | 85 +++++++++++++-----------------------------
1 files changed, 27 insertions(+), 58 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 65fb899..377ba4e 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -4,23 +4,8 @@
#include "usg_common.h"
#include "usg_typedef.h"
#include "shm_queue.h"
-
-
-
-enum shm_msg_type_t
-{
- SHM_SOCKET_OPEN = 1,
- SHM_SOCKET_OPEN_REPLY = 2,
- SHM_SOCKET_CLOSE = 3,
- SHM_COMMON_MSG = 4
-
-};
-
-enum shm_socket_flag_t
-{
- SHM_MSG_TIMEOUT = 1,
- SHM_MSG_NOWAIT = 2
-};
+#include "lock_free_queue.h"
+#include <functional>
enum shm_socket_type_t
{
@@ -28,25 +13,16 @@
SHM_SOCKET_DGRAM = 2
};
+
+
-enum shm_socket_error_type_t {
- SHM_SOCKET_ECONNFAILED = 1,
- SHM_SOCKET_ETIMEOUT = 2
-};
-
-enum shm_connection_status_t {
- SHM_CONN_CLOSED=1,
- SHM_CONN_LISTEN=2,
- SHM_CONN_ESTABLISHED=3
-};
-
-typedef struct shm_msg_t {
+typedef struct shm_packet_t {
int key;
- shm_msg_type_t type;
size_t size;
void * buf;
+ char uuid[64];
-} shm_msg_t;
+} shm_packet_t;
@@ -56,18 +32,17 @@
// 鏈湴key
int key;
bool force_bind;
- int mutex;
- shm_connection_status_t status;
- SHMQueue<shm_msg_t> *queue;
- SHMQueue<shm_msg_t> *remoteQueue;
- LockFreeQueue<shm_msg_t, DM_Allocator> *messageQueue;
- LockFreeQueue<shm_msg_t, DM_Allocator> *acceptQueue;
- std::map<int, shm_socket_t* > *clientSocketMap;
- pthread_t dispatch_thread;
+ 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;
+
} shm_socket_t;
-
+// typedef void (*recv_callback_fn)(void **sendbuf, int *sendsize);
+typedef std::function<void(void **sendbuf, int *sendsize)> recv_callback_fn;
size_t shm_socket_remove_keys(int keys[], size_t length);
@@ -80,31 +55,25 @@
int shm_socket_bind(shm_socket_t * socket, int key) ;
int shm_socket_force_bind(shm_socket_t * socket, int key) ;
-
-
-int shm_listen(shm_socket_t * socket) ;
-
-shm_socket_t* shm_accept(shm_socket_t* socket);
-
-int shm_connect(shm_socket_t * socket, int key);
-
-int shm_send(shm_socket_t * socket, const void *buf, const int size) ;
-
-
-int shm_recv(shm_socket_t * socket, void **buf, int *size) ;
-
+
+/**
+ * @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_recvfrom(shm_socket_t *socket, void **buf, int *size, int *key, 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 shm_sendandrecv(shm_socket_t *socket, const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size,
- struct timespec * timeout = NULL, int flags=0);
+ const struct timespec * timeout = NULL, int flags = 0);
/**
- * 鍔熻兘鍚宻hm_sendandrecv, 浣嗘槸涓嶆槸绾跨▼瀹夊叏鐨�
+ * @callback void (*recv_callback_fn)(void **sendbuf, int *sendsize)
+ * sendbuf 鍜� sendsize鏄痗allbak_fn鍥炶皟鍑芥暟鐨勮繑鍥炲��, 鍒嗗埆琛ㄧず鍙戦�佹暟鎹紝鍜屽彂閫佹暟鎹殑澶у皬銆�
+ *
*/
-int shm_sendandrecv_unsafe(shm_socket_t *socket, const void *send_buf, const int send_size, const int send_key, void **recv_buf, int *recv_size,
- struct timespec * timeout = NULL, int flags=0);
+int shm_recvandsend(shm_socket_t *sockt, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
+ const struct timespec *timeout = NULL, int flag = 0);
+
--
Gitblit v1.8.0