From cb85aa8a8d02a3d6dc16e3f32e78da9e70f9c7f5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期二, 02 二月 2021 17:49:21 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.h | 48 ++++++++----------------------------------------
1 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 00e9035..198d4da 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -6,37 +6,20 @@
#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,
SHM_SOCKET_DGRAM = 2
};
+
-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 {
+typedef struct shm_packet_t {
int key;
- shm_msg_type_t type;
size_t size;
void * buf;
-} shm_msg_t;
+} shm_packet_t;
@@ -47,13 +30,10 @@
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_packet_t> *queue; //self queue
+ LockFreeQueue<shm_packet_t> *remoteQueue; // peer queue
+
} shm_socket_t;
@@ -70,19 +50,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