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 | 70 +++++++----------------------------
1 files changed, 14 insertions(+), 56 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index cf6737f..198d4da 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -4,25 +4,7 @@
#include "usg_common.h"
#include "usg_typedef.h"
#include "shm_queue.h"
-
-enum shm_socket_flag_t
-{
- SHM_MSG_TIMEOUT = 1,
- 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,
- SHM_CONN_ESTABLISHED=3
-};
+#include "lock_free_queue.h"
enum shm_socket_type_t
{
@@ -30,23 +12,14 @@
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;
@@ -56,14 +29,11 @@
// 鏈湴key
int key;
bool force_bind;
- int mutex;
- shm_connection_status_t status;
- SHMQueue<shm_msg_t> *queue;
- SHMQueue<shm_msg_t> *remoteQueue;
- 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;
+ pthread_mutex_t mutex;
+
+ LockFreeQueue<shm_packet_t> *queue; //self queue
+ LockFreeQueue<shm_packet_t> *remoteQueue; // peer queue
+
} shm_socket_t;
@@ -80,34 +50,22 @@
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 : 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);
-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