From e924ba2fc0f4e57aae032fade3a566c2019f4630 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 29 一月 2021 09:52:30 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.h | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 65fb899..00e9035 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -4,22 +4,14 @@
#include "usg_common.h"
#include "usg_typedef.h"
#include "shm_queue.h"
+#include "lock_free_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 +21,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 +46,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,18 +83,21 @@
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, 浣嗘槸涓嶆槸绾跨▼瀹夊叏鐨�
*/
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);
+ const struct timespec * timeout = NULL, int flags=0);
--
Gitblit v1.8.0