From cf0a3209b51babf72469d962914db0dac2e5f52c Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 27 十二月 2022 14:13:30 +0800
Subject: [PATCH] add get msg timeout
---
message.cpp | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/message.cpp b/message.cpp
index 8766730..f7f42f3 100644
--- a/message.cpp
+++ b/message.cpp
@@ -13,7 +13,7 @@
#include "google/protobuf/dynamic_message.h"
#include "google/protobuf/compiler/importer.h"
-#include "3dparty/yyjson/yyjson.h"
+#include "3rdparty/yyjson/yyjson.h"
#include "bhome_msg_api.pb.h"
using namespace bhome_msg;
@@ -269,8 +269,7 @@
char* entry = NULL;
size_t entry_size = 0;
json2str(sv, &entry, &entry_size);
- arr[i] = ptrT<char>(entry_size+1);
- memcpy(arr[i], entry, entry_size);
+ arr[i] = entry;
}
return make_tuple(arr, count);
};
@@ -474,7 +473,11 @@
tie(msg->procid, msg->procidl) = copymemory(pid, pids);
MsgRequestTopic msgRT;
- if (!msgRT.ParseFromArray(data, size)) return NULL;
+ if (!msgRT.ParseFromArray(data, size)) {
+ free(msg->procid);
+ free(msg);
+ return NULL;
+ }
tie(msg->msg, msg->msgl) = copymemory(msgRT.data());
return msg;
@@ -488,7 +491,7 @@
msgRT.set_topic(topic, topicl);
msgRT.set_data(data, datal);
- auto pbstr = msgRT.SerializeAsString();
+ const auto& pbstr = msgRT.SerializeAsString();
tie(msg->msg, msg->msgl) = copymemory(pbstr);
return msg;
@@ -632,3 +635,10 @@
yyjson_mut_doc_free(doc);
return cstr_ref(json, jsonl);
}
+
+void free_query_procs(struct cqueryprocs* procs, const size_t count){
+ for(size_t i = 0; i < count; i++){
+ free(procs[i].id);
+ }
+ free(procs);
+}
--
Gitblit v1.8.0