From 803d392aeb11665a3e34f7be83f972a1fc7d39c0 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 04 二月 2021 15:47:39 +0800
Subject: [PATCH] update

---
 src/socket/shm_mod_socket.cpp |   34 ++++++++++++++++++++++++----------
 1 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/socket/shm_mod_socket.cpp b/src/socket/shm_mod_socket.cpp
index a012e80..f5bd0b7 100644
--- a/src/socket/shm_mod_socket.cpp
+++ b/src/socket/shm_mod_socket.cpp
@@ -79,14 +79,28 @@
 */
 int ShmModSocket::sendandrecv(const void *send_buf, const int send_size, const int send_key, 
 	void **recv_buf, int *recv_size, const struct timespec *timeout, int flag){
-	return shm_sendandrecv(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, timeout, flag);
+	int rv = shm_sendandrecv(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, timeout, flag);
+
+	if(rv == 0) {
+	  logger->debug("ShmModSocket::sendandrecv:  sendandrecv to %d success.\n", send_key);
+	  return 0;
+  }
+
+  logger->debug("ShmModSocket::sendandrecv : sendandrecv to %d failed %s",  send_key, bus_strerror(rv));
+	return rv;
+}
+
+
+int ShmModSocket::recvandsend( recvandsend_callback_fn callback,
+                    const struct timespec *timeout , int flag, void * user_data ) {
+  return shm_recvandsend(shm_socket, callback, timeout, flag, user_data);
 }
  
-// 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
-int ShmModSocket::sendandrecv_unsafe(const void *send_buf, const int send_size, const int send_key, 
-	void **recv_buf, int *recv_size, const struct timespec *timeout, int flag){
-	return shm_sendandrecv_unsafe(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, timeout, flag);
-}
+// // 瓒呮椂杩斿洖銆� @sec 绉� 锛� @nsec 绾崇
+// int ShmModSocket::sendandrecv_unsafe(const void *send_buf, const int send_size, const int send_key, 
+// 	void **recv_buf, int *recv_size, const struct timespec *timeout, int flag){
+// 	return shm_sendandrecv_unsafe(shm_socket, send_buf, send_size, send_key, recv_buf, recv_size, timeout, flag);
+// }
  
 /**
  * 璁㈤槄鎸囧畾涓婚
@@ -94,7 +108,7 @@
  * @size 涓婚闀垮害
  * @key 鎬荤嚎绔彛
  */
-int  ShmModSocket::sub(char *topic, int topic_size, int key,  
+int  ShmModSocket::sub(const char *topic, int topic_size, int key,  
 	const struct timespec *timeout, int flags) {
 	int ret;
 	bus_head_t head = {};
@@ -125,7 +139,7 @@
  * @size 涓婚闀垮害
  * @key 鎬荤嚎绔彛
  */
-int  ShmModSocket::desub(char *topic, int topic_size, int key, const struct timespec *timeout, int flags) {
+int  ShmModSocket::desub(const char *topic, int topic_size, int key, const struct timespec *timeout, int flags) {
 	// char buf[8192];
 	int ret;
 	if(topic == NULL) {
@@ -163,7 +177,7 @@
  * @content 涓婚鍐呭
  * @key 鎬荤嚎绔彛
  */
-int  ShmModSocket::pub(char *topic, int topic_size, void *content, int content_size, int key, const struct timespec *timeout, int flags) {
+int  ShmModSocket::pub(const char *topic, int topic_size, const void *content, int content_size, int key, const struct timespec *timeout, int flags) {
 	int ret;
 	bus_head_t head = {};
 	memcpy(head.action, "pub", sizeof(head.action));
@@ -196,7 +210,7 @@
 // =============================================================================
 
 int ShmModSocket::get_bus_sendbuf(bus_head_t &request_head, 
-  void *topic_buf, int topic_size, void *content_buf, int content_size, void **retbuf) {
+ const void *topic_buf, int topic_size, const void *content_buf, int content_size, void **retbuf) {
  
   int buf_size;
   char *buf;

--
Gitblit v1.8.0