From cf05ea3d9f43e4e84d621e1f9d54cbef552b6e2b Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期二, 18 五月 2021 16:53:28 +0800
Subject: [PATCH] fix center init mutex.
---
src/topic_node.h | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/topic_node.h b/src/topic_node.h
index b018807..1dfbf43 100644
--- a/src/topic_node.h
+++ b/src/topic_node.h
@@ -78,7 +78,7 @@
MQId ssn() { return SockNode().id(); }
bool ClientQueryRPCTopic(const Topic &topic, BHAddress &addr, const int timeout_ms);
typedef MsgQueryTopicReply::BHNodeAddress NodeAddress;
- int QueryRPCTopics(const Topic &topic, std::vector<NodeAddress> &addr, const int timeout_ms);
+ int QueryTopicServers(const Topic &topic, std::vector<NodeAddress> &addr, const int timeout_ms);
const std::string &proc_id() { return info_.proc_id(); }
typedef BHAddress Address;
@@ -86,7 +86,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 +98,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;
}
};
@@ -139,6 +146,7 @@
}
enum State {
+ eStateUninited,
eStateUnregistered,
eStateOnline,
eStateOffline // heartbeat fail.
@@ -146,9 +154,9 @@
void state(const State st) { state_.store(st); }
void state_cas(State expected, const State val) { state_.compare_exchange_strong(expected, val); }
State state() const { return state_.load(); }
- bool IsOnline() { return Init() && state() == eStateOnline; }
+ 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_;
--
Gitblit v1.8.0