From b4bda4a8e6aa1acf5e161a95642e944e08c72646 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 17 一月 2022 18:02:39 +0800
Subject: [PATCH] performance
---
src/bn_api.cpp | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/src/bn_api.cpp b/src/bn_api.cpp
index ca3f3fc..07773df 100644
--- a/src/bn_api.cpp
+++ b/src/bn_api.cpp
@@ -42,6 +42,7 @@
unsigned short port = *(unsigned short*)(out);
copy_memory(reply, reply_len, (char*)out + port_size, out_len - port_size);
BHFree(out, out_len);
+ printf("======>> recv port %d\n", port);
/////////////////////////////////////////////////////////////////////////
const auto& url_pub_proxy = get_url(URLPubProxy);
@@ -52,7 +53,7 @@
const auto& url_hb = get_url(URLHeartBeat);
respond_survey(url_hb, string{(const char*)proc_info, (const size_t)proc_info_len});
- start_reply(pi.proc_id(), 0);
+ start_reply(pi.proc_id(), port);
}
return ret;
}
@@ -130,15 +131,15 @@
auto url(get_url(URLQueryTopic));
- 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());
- printf("======>> BHQueryTopicAddress use remote address %s\n", url.c_str());
- }
- }
- }
+ // 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());
+ // printf("======>> BHQueryTopicAddress use remote address %s\n", url.c_str());
+ // }
+ // }
+ // }
return simple_request(url, topic, topic_len, reply, reply_len, timeout_ms);
}
@@ -156,15 +157,15 @@
auto url(get_url(URLQueryProcs));
- 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());
- printf("======>> BHQueryProcs use remote address %s\n", url.c_str());
- }
- }
- }
+ // 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());
+ // printf("======>> BHQueryProcs use remote address %s\n", url.c_str());
+ // }
+ // }
+ // }
return simple_request(url, query, query_len, reply, reply_len, timeout_ms);
}
@@ -318,26 +319,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;
@@ -359,11 +357,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