From c9c89f7b85c82d5b7d2c094e2aa1488d865d85de Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 09:42:56 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.h | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 164ce2d..b1665a0 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -4,12 +4,9 @@
#include "usg_common.h"
#include "usg_typedef.h"
#include "shm_queue.h"
+#include "lock_free_queue.h"
-enum shm_socket_flag_t
-{
- SHM_MSG_TIMEOUT = 1,
- SHM_MSG_NOWAIT = 2
-};
+
enum shm_connection_status_t {
SHM_CONN_CLOSED=1,
@@ -50,9 +47,9 @@
int key;
bool force_bind;
pthread_mutex_t mutex;
- shm_connection_status_t status;
- SHMQueue<shm_msg_t> *queue;
- SHMQueue<shm_msg_t> *remoteQueue;
+ 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;
@@ -87,7 +84,7 @@
int shm_recv(shm_socket_t * socket, void **buf, int *size) ;
/**
- * @flags : SHM_MSG_NOWAIT
+ * @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);
--
Gitblit v1.8.0