From 6600a375ac386a0d384c4e9f1af4f235b8d67262 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 04 二月 2021 12:00:46 +0800
Subject: [PATCH] update
---
src/socket/shm_socket.cpp | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/src/socket/shm_socket.cpp b/src/socket/shm_socket.cpp
index bee4622..9e3f583 100644
--- a/src/socket/shm_socket.cpp
+++ b/src/socket/shm_socket.cpp
@@ -153,7 +153,7 @@
int rv;
- shm_packet_t sendpak;
+ shm_packet_t sendpak = {0};
sendpak.key = sockt->key;
sendpak.size = size;
sendpak.buf = mm_malloc(size);
@@ -242,48 +242,38 @@
}
/**
- * @callback void (*recv_callback_fn)(void **sendbuf, int *sendsize)
+ * @callback void (*recvandsend_callback_fn)(void *recvbuf, int recvsize, int key, void **sendbuf, int *sendsize)
* sendbuf 鍜� sendsize鏄痗allbak_fn鍥炶皟鍑芥暟鐨勮繑鍥炲��, 鍒嗗埆琛ㄧず鍙戦�佹暟鎹紝鍜屽彂閫佹暟鎹殑澶у皬銆�
*
*/
-int shm_recvandsend(shm_socket_t *sockt, void **recvbuf, int *recvsize, int *key, recv_callback_fn callback,
- const struct timespec *timeout, int flag) {
+int shm_recvandsend(shm_socket_t *sockt, recvandsend_callback_fn callback,
+ const struct timespec *timeout, int flag, void *user_data) {
int rv;
void *sendbuf = NULL;
int sendsize = 0;
- shm_packet_t recvpak;
+ shm_packet_t recvpak = {0};
rv = shm_recvpakfrom(sockt , &recvpak, timeout, flag);
-
-
if (rv != 0) {
- if(rv == ETIMEDOUT)
+ if(rv == ETIMEDOUT){
+ logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(EBUS_TIMEOUT));
return EBUS_TIMEOUT;
+ }
- logger->debug("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
+ logger->error("%d shm_recvfrom failed %s", shm_socket_get_key(sockt), bus_strerror(rv));
return rv;
}
- if(recvbuf != NULL) {
- void *_buf = malloc(recvpak.size);
- memcpy(_buf, recvpak.buf, recvpak.size);
- *recvbuf = _buf;
- }
-
- if(recvsize != NULL)
- *recvsize = recvpak.size;
-
- if(key != NULL)
- *key = recvpak.key;
-
+
+ void *recvbuf = malloc(recvpak.size);
+ memcpy(recvbuf, recvpak.buf, recvpak.size);
mm_free(recvpak.buf);
+ callback(recvbuf, recvpak.size, recvpak.key, &sendbuf, &sendsize, user_data);
- callback(&sendbuf, &sendsize);
-
- shm_packet_t sendpak;
+ shm_packet_t sendpak = {0};
sendpak.key = sockt->key;
sendpak.size = sendsize;
memcpy(sendpak.uuid, recvpak.uuid, sizeof sendpak.uuid);
--
Gitblit v1.8.0