From 5e463316508fbb0bd79c8b4b68cd461b302a4da1 Mon Sep 17 00:00:00 2001 From: wangzhengquan <wangzhengquan85@126.com> Date: 星期一, 01 二月 2021 14:16:36 +0800 Subject: [PATCH] update --- src/socket/shm_socket.h | 37 +++++++++---------------------------- 1 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h index 00e9035..15df610 100644 --- a/src/socket/shm_socket.h +++ b/src/socket/shm_socket.h @@ -6,14 +6,6 @@ #include "shm_queue.h" #include "lock_free_queue.h" - - -enum shm_connection_status_t { - SHM_CONN_CLOSED=1, - SHM_CONN_LISTEN=2, - SHM_CONN_ESTABLISHED=3 -}; - enum shm_socket_type_t { SHM_SOCKET_STREAM = 1, @@ -47,13 +39,14 @@ int key; bool force_bind; 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; - pthread_t dispatch_thread; + + LockFreeQueue<shm_msg_t> *queue; //self queue + LockFreeQueue<shm_msg_t> *remoteQueue; // peer queue + // shm_connection_status_t status; + // 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; } shm_socket_t; @@ -70,19 +63,7 @@ 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 */ -- Gitblit v1.8.0