From 153375e3b152768cbffce715d049499945834c29 Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期二, 13 四月 2021 15:11:14 +0800 Subject: [PATCH] add api code, use proto msg as data. --- src/topic_node.h | 36 +++++++++++++++--------------------- 1 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/topic_node.h b/src/topic_node.h index d2cdcf9..d671026 100644 --- a/src/topic_node.h +++ b/src/topic_node.h @@ -34,45 +34,39 @@ SharedMemory &shm() { return shm_; } public: + typedef std::function<void(std::string &proc_id, const void *data, const int len)> DataCB; TopicNode(SharedMemory &shm); ~TopicNode(); - void Start(); - void Stop(); // topic node bool Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms); bool Heartbeat(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms); bool Heartbeat(const int timeout_ms); // topic rpc server - typedef std::function<bool(const std::string &topic, const std::string &data, std::string &reply)> OnRequest; - bool ServerStart(OnRequest const &cb, const int nworker = 2); + typedef std::function<bool(const std::string &client_proc_id, const MsgRequestTopic &request, MsgRequestTopicReply &reply)> ServerCB; + bool ServerStart(ServerCB const &cb, const int nworker = 2); bool ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply, const int timeout_ms); - bool ServerRecvRequest(void *&src_info, std::string &topic, std::string &data, const int timeout_ms); - bool ServerSendReply(void *src_info, const std::string &data, const int timeout_ms); + bool ServerRecvRequest(void *&src_info, std::string &proc_id, MsgRequestTopic &request, const int timeout_ms); + bool ServerSendReply(void *src_info, const MsgRequestTopicReply &reply, const int timeout_ms); // topic client - typedef std::function<void(const std::string &data)> RequestResultCB; + typedef std::function<void(const std::string &proc_id, const MsgRequestTopicReply &reply)> RequestResultCB; bool ClientStartWorker(RequestResultCB const &cb, const int nworker = 2); - bool ClientAsyncRequest(const Topic &topic, const void *data, const size_t size, const int timeout_ms, const RequestResultCB &rrcb = RequestResultCB()); - bool ClientAsyncRequest(const Topic &topic, const std::string &data, const int timeout_ms, const RequestResultCB &rrcb = RequestResultCB()) - { - return ClientAsyncRequest(topic, data.data(), data.size(), timeout_ms, rrcb); - } - bool ClientSyncRequest(const Topic &topic, const void *data, const size_t size, std::string &out, const int timeout_ms); - bool ClientSyncRequest(const Topic &topic, const std::string &data, std::string &out, const int timeout_ms) - { - return ClientSyncRequest(topic, data.data(), data.size(), out, timeout_ms); - } + bool ClientAsyncRequest(const MsgRequestTopic &request, const int timeout_ms, const RequestResultCB &rrcb = RequestResultCB()); + bool ClientSyncRequest(const MsgRequestTopic &request, std::string &proc_id, MsgRequestTopicReply &reply, const int timeout_ms); // publish - bool Publish(const Topic &topic, const void *data, const size_t size, const int timeout_ms); + bool Publish(const MsgPublish &pub, const int timeout_ms); // subscribe - typedef std::function<void(const std::string &proc_id, const Topic &topic, const std::string &data)> TopicDataCB; - bool SubscribeStartWorker(const TopicDataCB &tdcb, int nworker = 2); + 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 RecvSub(std::string &proc_id, Topic &topic, std::string &data, 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 Stop(); private: bool ClientQueryRPCTopic(const Topic &topic, bhome::msg::BHAddress &addr, const int timeout_ms); -- Gitblit v1.8.0