From 71c847e99c0ce99fae955b08c0aafecb0fb9bdd6 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 18 一月 2021 11:55:33 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/socket/shm_socket.h | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 65fb899..0917d00 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -5,21 +5,16 @@
#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
+};
+
+enum shm_connection_status_t {
+ SHM_CONN_CLOSED=1,
+ SHM_CONN_LISTEN=2,
+ SHM_CONN_ESTABLISHED=3
};
enum shm_socket_type_t
@@ -29,15 +24,13 @@
};
-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
+enum shm_msg_type_t
+{
+ SHM_SOCKET_OPEN = 1,
+ SHM_SOCKET_OPEN_REPLY = 2,
+ SHM_SOCKET_CLOSE = 3,
+ SHM_COMMON_MSG = 4
+
};
typedef struct shm_msg_t {
@@ -56,10 +49,10 @@
// 鏈湴key
int key;
bool force_bind;
- int mutex;
- shm_connection_status_t status;
- SHMQueue<shm_msg_t> *queue;
- SHMQueue<shm_msg_t> *remoteQueue;
+ pthread_mutex_t mutex;
+ shm_connection_status_t status;
+ SHMQueue<shm_msg_t> *queue; //self queue
+ SHMQueue<shm_msg_t> *remoteQueue; // peer queue
LockFreeQueue<shm_msg_t, DM_Allocator> *messageQueue;
LockFreeQueue<shm_msg_t, DM_Allocator> *acceptQueue;
std::map<int, shm_socket_t* > *clientSocketMap;
@@ -93,6 +86,9 @@
int shm_recv(shm_socket_t * socket, void **buf, int *size) ;
+/**
+ * @flags : SHM_MSG_NOWAIT
+ */
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);
--
Gitblit v1.8.0