From c46be6db32872bfd7c4010b43526b5e6bc0fa6a5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 25 一月 2021 14:04:59 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.h | 73 ++++++++++++++++--------------------
1 files changed, 33 insertions(+), 40 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 4f1efc2..00e9035 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -4,8 +4,22 @@
#include "usg_common.h"
#include "usg_typedef.h"
#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
{
@@ -16,32 +30,8 @@
};
-enum shm_socket_flag_t
-{
- SHM_MSG_TIMEOUT = 1,
- SHM_MSG_NOWAIT = 2
-};
-
-enum shm_socket_type_t
-{
- SHM_SOCKET_STREAM = 1,
- SHM_SOCKET_DGRAM = 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
-};
-
typedef struct shm_msg_t {
- int port;
+ int key;
shm_msg_type_t type;
size_t size;
void * buf;
@@ -53,13 +43,13 @@
typedef struct shm_socket_t {
shm_socket_type_t socket_type;
- // 鏈湴port
- int port;
+ // 鏈湴key
+ int key;
bool force_bind;
- int mutex;
- shm_connection_status_t status;
- SHMQueue<shm_msg_t> *queue;
- SHMQueue<shm_msg_t> *remoteQueue;
+ 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;
@@ -77,34 +67,37 @@
int shm_close_socket(shm_socket_t * socket) ;
-int shm_socket_bind(shm_socket_t * socket, int port) ;
+int shm_socket_bind(shm_socket_t * socket, int key) ;
-int shm_socket_force_bind(shm_socket_t * socket, int port) ;
+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 port);
+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) ;
-int shm_sendto(shm_socket_t *socket, const void *buf, const int size, const int port, const struct timespec * timeout = NULL, const int flags=0);
+/**
+ * @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 *port, 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_port, void **recv_buf, int *recv_size,
- 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,
+ 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_port, void **recv_buf, int *recv_size,
- struct timespec * timeout = NULL, int flags=0);
+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,
+ const struct timespec * timeout = NULL, int flags=0);
--
Gitblit v1.8.0