From c64c54d8e75b9354dc49a7b6b2d326e7dd59eb37 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 15 四月 2021 19:32:16 +0800
Subject: [PATCH] add api; fix send, socknode mem leak.
---
src/topic_node.h | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index 0627930..8c3c48e 100644
--- a/src/topic_node.h
+++ b/src/topic_node.h
@@ -29,7 +29,7 @@
class TopicNode
{
SharedMemory &shm_;
- MsgRegister info_;
+ ProcInfo info_;
SharedMemory &shm() { return shm_; }
@@ -51,9 +51,9 @@
bool ServerSendReply(void *src_info, const MsgRequestTopicReply &reply);
// topic client
- typedef std::function<void(const std::string &proc_id, const MsgRequestTopicReply &reply)> RequestResultCB;
+ typedef std::function<void(const BHMsgHead &head, const MsgRequestTopicReply &reply)> RequestResultCB;
bool ClientStartWorker(RequestResultCB const &cb, const int nworker = 2);
- bool ClientAsyncRequest(const MsgRequestTopic &request, const RequestResultCB &rrcb = RequestResultCB());
+ bool ClientAsyncRequest(const MsgRequestTopic &request, std::string &msg_id, const RequestResultCB &rrcb = RequestResultCB());
bool ClientSyncRequest(const MsgRequestTopic &request, std::string &proc_id, MsgRequestTopicReply &reply, const int timeout_ms);
// publish
@@ -62,15 +62,15 @@
// subscribe
typedef std::function<void(const std::string &proc_id, const MsgPublish &data)> SubDataCB;
bool SubscribeStartWorker(const SubDataCB &tdcb, int nworker = 2);
- bool Subscribe(MsgTopicList &topics, const int timeout_ms);
+ bool Subscribe(MsgTopicList &topics, MsgCommonReply &reply_body, const int timeout_ms);
bool RecvSub(std::string &proc_id, MsgPublish &pub, const int timeout_ms);
- void Start(ServerCB const &server_cb, SubDataCB const &sub_cb);
+ void Start(ServerCB const &server_cb, SubDataCB const &sub_cb, RequestResultCB &client_cb, int nworker = 2);
void Stop();
private:
bool ClientQueryRPCTopic(const Topic &topic, bhome::msg::BHAddress &addr, const int timeout_ms);
- const std::string &proc_id() { return info_.proc().proc_id(); }
+ const std::string &proc_id() { return info_.proc_id(); }
typedef bhome_msg::BHAddress Address;
class TopicQueryCache
@@ -118,7 +118,9 @@
auto &SockClient() { return SockRequest(); }
auto &SockReply() { return sock_reply_; }
auto &SockServer() { return SockReply(); }
+ bool IsRegistered() const { return registered_.load(); }
+ std::atomic<bool> registered_;
ShmSocket sock_node_;
ShmSocket sock_request_;
ShmSocket sock_reply_;
--
Gitblit v1.8.0