From 546bdaa58724ec6a19b56e800ad60963bd3bd1bc Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 04 二月 2021 11:42:24 +0800
Subject: [PATCH] modify callback function
---
src/socket/shm_socket.h | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/socket/shm_socket.h b/src/socket/shm_socket.h
index aa5fc90..6444913 100644
--- a/src/socket/shm_socket.h
+++ b/src/socket/shm_socket.h
@@ -41,8 +41,8 @@
} shm_socket_t;
-// typedef void (*recv_callback_fn)(void **sendbuf, int *sendsize);
-typedef std::function<void(void **sendbuf, int *sendsize, void *user_data)> recv_callback_fn;
+// typedef void (*recvandsend_callback_fn)(void **sendbuf, int *sendsize);
+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);
@@ -67,11 +67,15 @@
const struct timespec * timeout = NULL, int flags = 0);
/**
- * @callback void (*recv_callback_fn)(void **sendbuf, int *sendsize)
- * sendbuf 鍜� sendsize鏄痗allbak_fn鍥炶皟鍑芥暟鐨勮繑鍥炲��, 鍒嗗埆琛ㄧず鍙戦�佹暟鎹紝鍜屽彂閫佹暟鎹殑澶у皬銆�
+ * @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_recvandsend(shm_socket_t *sockt, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
+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