From 124011574583b980c1794a1de4e61b39f73f1f11 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 14 一月 2021 16:44:49 +0800
Subject: [PATCH] Merge branch 'dev' into rdma
---
src/socket/shm_socket.h | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index cf6737f..164ce2d 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -11,13 +11,6 @@
SHM_MSG_NOWAIT = 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,
@@ -56,7 +49,7 @@
// 鏈湴key
int key;
bool force_bind;
- int mutex;
+ pthread_mutex_t mutex;
shm_connection_status_t status;
SHMQueue<shm_msg_t> *queue;
SHMQueue<shm_msg_t> *remoteQueue;
--
Gitblit v1.8.0