From b674aecae951c1f83e07f80956160fadf331d026 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 03 六月 2021 18:12:33 +0800
Subject: [PATCH] remove useless code, compile warning.
---
src/topic_node.h | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index be82cf6..1425844 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,25 +34,30 @@
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(SharedMemory &shm, MQId ssn_id = 0);
~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 DoRegister(false, proc, reply_body, timeout_ms); }
+ bool DoRegister(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;
typedef std::function<void(void *src_info, std::string &client_proc_id, MsgRequestTopic &request)> ServerAsyncCB;
bool ServerStart(ServerSyncCB const &cb, const int nworker = 2);
bool ServerStart(ServerAsyncCB const &cb, const int nworker = 2);
- bool ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply, const int timeout_ms);
+ bool ServerRegisterRPC(MsgTopicList &topics, MsgCommonReply &reply, const int timeout_ms) { return DoServerRegisterRPC(false, topics, reply, timeout_ms); }
+ bool DoServerRegisterRPC(const bool internal, MsgTopicList &topics, MsgCommonReply &reply, 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);
@@ -86,7 +91,11 @@
{
class Impl
{
- typedef std::unordered_map<Topic, Address> Records;
+ struct TimedRec {
+ Address addr_;
+ int64_t timestamp_;
+ };
+ typedef std::unordered_map<Topic, TimedRec> Records;
Records records_;
public:
@@ -94,15 +103,18 @@
{
auto pos = records_.find(topic);
if (pos != records_.end()) {
- addr = pos->second;
- return true;
- } else {
- return false;
+ if (NowSec() - pos->second.timestamp_ < NodeTimeoutSec() / 2) {
+ addr = pos->second.addr_;
+ return true;
+ } else {
+ LOG_TRACE() << "topic dest cache timeout.";
+ }
}
+ return false;
}
bool Store(const Topic &topic, const Address &addr)
{
- records_[topic] = addr;
+ records_[topic] = {addr, NowSec()};
return true;
}
};
@@ -149,13 +161,39 @@
State state() const { return state_.load(); }
bool IsOnline() { return state() == eStateOnline; }
bool Init();
- bool Valid() const { return !sockets_.empty(); }
+ bool Valid() const { return state() != eStateUninited; }
std::mutex mutex_;
- MQId ssn_id_ = 0;
std::atomic<State> state_;
+ MQId ssn_id_ = 0;
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