From 330f78f3334bcdcdb4cc2ab2dbf66604e0224d71 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 21 五月 2021 16:21:45 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/valib/bhshmq
---
src/topic_node.h | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index 1dfbf43..c421048 100644
--- a/src/topic_node.h
+++ b/src/topic_node.h
@@ -19,7 +19,7 @@
#define TOPIC_NODE_YVKWA6TF
#include "msg.h"
-#include "socket.h"
+#include "shm_socket.h"
#include <atomic>
#include <memory>
#include <mutex>
@@ -34,18 +34,22 @@
SharedMemory &shm_;
ProcInfo info_;
- SharedMemory &shm() { return shm_; }
+ SharedMemory &shm() const { return shm_; }
+ const MQInfo &CenterAddr() const { return BHTopicCenterAddress(shm()); }
+ const MQInfo &BusAddr() const { return BHTopicBusAddress(shm()); }
public:
TopicNode(SharedMemory &shm);
~TopicNode();
// topic node
- bool Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms);
+ bool Register(ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms) { return UniRegister(false, proc, reply_body, timeout_ms); }
+ bool UniRegister(const bool internal, ProcInfo &proc, MsgCommonReply &reply_body, const int timeout_ms);
bool Unregister(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);
bool QueryTopicAddress(BHAddress &dest, MsgQueryTopic &query, MsgQueryTopicReply &reply_body, const int timeout_ms);
+ bool QueryProcs(BHAddress &dest, MsgQueryProc &query, MsgQueryProcReply &reply_body, const int timeout_ms);
// topic rpc server
typedef std::function<bool(const std::string &client_proc_id, const MsgRequestTopic &request, MsgRequestTopicReply &reply)> ServerSyncCB;
@@ -163,6 +167,32 @@
int proc_index_ = -1;
TopicQueryCache topic_query_cache_;
+
+ class RecvQ
+ {
+ public:
+ void Write(BHMsgHead &&head, std::string &&body) { q_.push_back({std::move(head), std::move(body)}); }
+ bool Read(BHMsgHead &head, std::string &body)
+ {
+ if (q_.empty()) {
+ return false;
+ } else {
+ head = std::move(q_.front().head);
+ body = std::move(q_.front().body);
+ q_.pop_front();
+ return true;
+ }
+ }
+
+ private:
+ struct MsgData {
+ BHMsgHead head;
+ std::string body;
+ };
+ std::deque<MsgData> q_;
+ };
+ Synced<RecvQ> server_buffer_;
+ Synced<RecvQ> sub_buffer_;
};
#endif // end of include guard: TOPIC_NODE_YVKWA6TF
--
Gitblit v1.8.0