From bef24e7b4001c7c7cd7a03a22f8eaf7c8af3c4b7 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 20 一月 2022 14:08:35 +0800
Subject: [PATCH] performance
---
src/bn_api.cpp | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/bn_api.cpp b/src/bn_api.cpp
index 90e74ca..91ce3b0 100644
--- a/src/bn_api.cpp
+++ b/src/bn_api.cpp
@@ -198,9 +198,7 @@
return true;
}
-// 璁㈤槄
-int BHSubscribeTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
-{
+static int sub(const string& url, const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms){
if (!topics || topics_len <= 0) return false;
bhome_msg::MsgTopicList mtl;
@@ -218,17 +216,22 @@
// printf("BHSubscribeTopics %s\n", t.c_str());
subscribe_topic(t);
}
- return true;
- auto ret = simple_request(get_url(URLSubLocal), topics, topics_len, reply, reply_len, timeout_ms);
+
+ auto ret = simple_request(url, topics, topics_len, reply, reply_len, timeout_ms);
if (!ret){
printf("BHSubscribeTopics simple_request failed\n");
}
return ret;
}
+// 璁㈤槄
+int BHSubscribeTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
+{
+ return sub(get_url(URLSubLocal), topics, topics_len, reply, reply_len, timeout_ms);
+}
// 璁㈤槄缃戠粶,涓嶅疄鐜�
int BHSubscribeNetTopics(const void *topics, const int topics_len, void **reply, int *reply_len, const int timeout_ms)
{
- return BHSubscribeTopics(topics, topics_len, reply, reply_len, timeout_ms);
+ return sub(get_url(URLSubNet), topics, topics_len, reply, reply_len, timeout_ms);
}
// 璇诲彇璁㈤槄娑堟伅,proc_id鏆傛椂娌＄敤锛岃繑鍥瀎ake msg
@@ -319,26 +322,23 @@
{
if (!request || request_len <= 0) return false;
+ string url{};
// BHQueryTopicAddress鑾峰彇proc_id
string procid{};
- if (!get_proc_id_from_MsgRequestTopic(request, request_len, timeout_ms, &procid)){
- return false;
+ if (get_proc_id_from_MsgRequestTopic(request, request_len, timeout_ms, &procid)){
+ // PRNTVITAG("get_proc_id_from_MsgRequestTopic failed");
+ // return false;
+ url = "ipc:///tmp/" + procid;
}
-
- auto url("ipc:///tmp/" + procid);
-
if (remote && remote_len > 0){
BHAddress addr;
if (addr.ParseFromArray(remote, remote_len)){
if (!addr.ip().empty() && addr.port() > 0){
- // url = "tcp://" + addr.ip() + ":" + to_string(addr.port());
+ url = "tcp://" + addr.ip() + ":" + to_string(addr.port());
printf("======>> BHRequest use remote address %s\n", url.c_str());
}
}
}
- // 浣跨敤procid浣滀负ipc閫氫俊
- // printf("BHRequest procid %s\n", procid.c_str());
-
int rc = request2(url, request, request_len, reply, reply_len, timeout_ms);
if (rc < 0) return false;
@@ -360,11 +360,10 @@
if (ret != 0) return false;
string procid{};
- if (!get_proc_id_from_MsgRequestTopic(msg.data(), msg.size(), timeout_ms, &procid)){
- return false;
+ if (get_proc_id_from_MsgRequestTopic(msg.data(), msg.size(), timeout_ms, &procid)){
+ copy_memory(proc_id, proc_id_len, procid.data(), procid.size());
}
- copy_memory(proc_id, proc_id_len, procid.data(), procid.size());
copy_memory(request, request_len, msg.data(), msg.size());
return true;
--
Gitblit v1.8.0