From 68d23225a38a35f1325eb39fa4ed5a005d5de473 Mon Sep 17 00:00:00 2001
From: fujuntang <fujuntang@aiot.com>
Date: 星期三, 11 八月 2021 09:50:20 +0800
Subject: [PATCH] fix from 3.1 first commit
---
src/socket/shm_socket.h | 76 +++++++++++++++-----------------------
1 files changed, 30 insertions(+), 46 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index 00e9035..97d9f2c 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -5,14 +5,7 @@
#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
-};
+#include <functional>
enum shm_socket_type_t
{
@@ -20,23 +13,18 @@
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
-
-};
+#define BUS_ACTION_STOP 1
-typedef struct shm_msg_t {
+typedef struct shm_packet_t {
int key;
- shm_msg_type_t type;
size_t size;
void * buf;
+ char uuid[64];
+ int action;
-} shm_msg_t;
+} shm_packet_t;
@@ -47,42 +35,31 @@
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
+ std::map<std::string, shm_packet_t> recvbuf; // for uuid
+ std::map<int, shm_packet_t> recvbuf2; //for thread local
} shm_socket_t;
-
+typedef std::function<void(void *recvbuf, int recvsize, int key, void **sendbuf, int *sendsize, void *user_data)> recvandsend_callback_fn;
size_t shm_socket_remove_keys(int keys[], size_t length);
+size_t shm_socket_remove_keys_exclude(int keys[], size_t length);
-shm_socket_t *shm_open_socket(shm_socket_type_t socket_type);
+shm_socket_t *shm_socket_open(shm_socket_type_t socket_type);
-int shm_close_socket(shm_socket_t * socket) ;
+int shm_socket_close(shm_socket_t * sockt) ;
+
+int shm_socket_stop(shm_socket_t * sockt);
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
*/
@@ -91,13 +68,20 @@
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,
- const struct timespec * timeout = NULL, int flags=0);
+ const struct timespec * timeout = NULL, int flags = 0);
/**
- * 鍔熻兘鍚宻hm_sendandrecv, 浣嗘槸涓嶆槸绾跨▼瀹夊叏鐨�
+ * @callback void (*recvandsend_callback_fn)(void *recvbuf, int recvsize, int key, void **sendbuf, int *sendsize, void * user_data)
+ * @recvbuf 鏀跺埌鐨勬暟鎹�
+ * @recvsize 鏀跺埌鐨勬暟鎹殑澶у皬
+ * @key 鎺ュ彈鏁版嵁骞跺苟鍙戦�佹暟鎹殑瀵硅薄
+ * @sendbuf 瀛樺偍杩斿洖鍊肩殑鍦板潃锛岃〃绀鸿繑鍥炵殑鏁版嵁
+ * @sendsize 瀛樺偍杩斿洖鍊肩殑鍦板潃锛� 杩斿洖鏁版嵁鐨勯暱搴�
+ *
*/
-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);
+int shm_recvandsend(shm_socket_t *sockt, recvandsend_callback_fn callback,
+ const struct timespec *timeout = NULL, int flag = 0, void * user_data = NULL);
+
--
Gitblit v1.8.0