From 6b08856cc8c5ee7ac9c300c1706fa0c45bf3bcba Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期五, 13 一月 2023 10:31:09 +0800
Subject: [PATCH] 删除冗余代码 释放处理增加内存释放
---
util.cpp | 88 ++++++++++++++++++++++++-------------------
1 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/util.cpp b/util.cpp
index af742e0..9eedab4 100644
--- a/util.cpp
+++ b/util.cpp
@@ -15,6 +15,7 @@
#include "3rdparty/bus_client/cbhomeclient.h"
#include "3rdparty/bus_client/message.h"
#include "proto/x86_64/sysset.pb.h"
+#include <vector>
using namespace protomsg;
using namespace std;
@@ -51,7 +52,7 @@
return json;
}
-extern "C" int bus_dbapi_get_json_data(const char * json, char ** pptr_data)
+extern "C" int bus_dbapi_get_json_data(const char * json, char ** pptr_data, yyjson_type *ptr_type)
{
/*{
"success": true,
@@ -86,13 +87,9 @@
}*/
int ret = -1;
size_t data_len = 0;
- size_t success_len = 0;
- size_t total_len = 0;
- const char * ptr_data = NULL;
const char * ptr_value = NULL;
const char * success_name = "success";
const char * msg_name = "msg";
- const char * data_quote_name = "\"data\"";
if(NULL == *pptr_data)
{
@@ -109,7 +106,6 @@
int success_val = yyjson_get_bool(success);
printf("success: %d\n", success_val);
- printf("success_len:%lu\n",yyjson_get_len(success));
if(!success_val)
{
yyjson_doc_free(doc);
@@ -121,13 +117,15 @@
yyjson_val *msg = yyjson_obj_get(root, "msg");
printf("msg: %s\n", yyjson_get_str(msg));
- total_len = strlen(json);
- ptr_data = strstr(json, data_quote_name);
- ptr_value = strchr(ptr_data, ':');
- ptr_value++;
-
- //鍘婚櫎鏈�鍚庝竴涓�"}""
- data_len = total_len - (ptr_value - json) - 1;
+ // Get root["data"]
+ //yyjson_val *msg = yyjson_obj_get(root, "data");
+ yyjson_val *data = yyjson_obj_get(root, "data");
+
+ *ptr_type = yyjson_get_type(data);
+ ptr_value = yyjson_val_write(data, YYJSON_WRITE_NOFLAG, &data_len);
+ printf("data: %s\n", ptr_value);
+ printf("len: %lu\n", data_len);
+
memcpy(*pptr_data, ptr_value, data_len);
ret = 0;
@@ -138,42 +136,54 @@
return ret;
}
+bool bus_dbapi_get_topic_data(void *handle, const char* topic, crepmsg **pptr_repmsg, size_t len)
+{
+ const auto topicl = strlen(topic);
+ auto reqData = make_get_request(topic);
+ auto reqmsg = make_req_msg(topic, topicl, reqData, strlen(reqData));
+
+ if (bus_client_request(handle, reqmsg, pptr_repmsg)) {
+ printf("======>> bus_client_reqest [%s] get [%s]\n", topic, (*pptr_repmsg)->data);
+ } else {
+ return false;
+ }
+
+ len = strlen((*pptr_repmsg)->data) + 1;
+
+ free(reqData);
+}
+
+
bool bus_dbapi_get(void *handle, const char* topic, google::protobuf::Message& message) {
- const auto topicl = strlen(topic);
-
- auto reqData = make_get_request(topic);
-
- auto reqmsg = make_req_msg(topic, topicl, reqData, strlen(reqData));
-
- crepmsg *repmsg = NULL;
- if (bus_client_request(handle, reqmsg, &repmsg)) {
- printf("======>> bus_client_reqest [%s] get [%s]\n", topic, repmsg->data);
- } else {
- return false;
- }
+ yyjson_type type = YYJSON_TYPE_OBJ;
+ crepmsg *repmsg = NULL;
+ size_t len = 0;
+
+ bus_dbapi_get_topic_data(handle, topic, &repmsg, len);
int msglen = strlen(repmsg->data);
char* msgdata = (char *)malloc(msglen);
memset(msgdata, 0 , msglen);
- if(0 == bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata))
+ if(0 == bus_dbapi_get_json_data((const char *)repmsg->data, &msgdata, &type))
{
- printf("======>> protomsg: %s\n", msgdata);
- std::string jsonString = msgdata;
- if (json_to_proto(jsonString, message))
- {
- printf("======>> json_to_proto done\n");
- }
- else
- {
- printf("======>> json_to_proto fail\n");
- return false;
- }
+ printf("======>> protomsg: %s\n", msgdata);
}
+ std::string jsonString = msgdata;
+ if (json_to_proto(jsonString, message))
+ {
+ printf("======>> json_to_proto done\n");
+ }
+ else
+ {
+ printf("======>> json_to_proto fail\n");
+ return false;
+ }
+
free(msgdata);
- free_reqmsg(reqmsg);
- free(reqData);
+ free_reply_msg(repmsg);
return true;
}
+
--
Gitblit v1.8.0