From 1d6c040dcb9a01648edc66d8c0006c8c9294a705 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期四, 22 四月 2021 18:28:30 +0800
Subject: [PATCH] add mutex timeout limit; use atomic as refcount.
---
box/center.cpp | 78 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 38 deletions(-)
diff --git a/box/center.cpp b/box/center.cpp
index 0dd4ed4..3059e90 100644
--- a/box/center.cpp
+++ b/box/center.cpp
@@ -27,7 +27,6 @@
using namespace bhome_shm;
using namespace bhome_msg;
-using namespace bhome::msg;
typedef BHCenter::MsgHandler Handler;
namespace
@@ -39,7 +38,7 @@
public:
typedef std::string ProcId;
typedef std::string Address;
- typedef bhome::msg::ProcInfo ProcInfo;
+ typedef bhome_msg::ProcInfo ProcInfo;
typedef std::function<void(Address const &)> Cleaner;
private:
@@ -97,12 +96,9 @@
NodeCenter(const std::string &id, const Cleaner &cleaner, const steady_clock::duration offline_time, const steady_clock::duration kill_time) :
NodeCenter(id, cleaner, duration_cast<seconds>(offline_time).count(), duration_cast<seconds>(kill_time).count()) {}
- const std::string &id() const
- {
- return id_;
- } // no need to lock.
+ // center name, no relative to shm.
+ const std::string &id() const { return id_; }
- //TODO maybe just return serialized string.
MsgCommonReply Register(const BHMsgHead &head, MsgRegister &msg)
{
if (msg.proc().proc_id() != head.proc_id()) {
@@ -121,20 +117,18 @@
};
auto pos = nodes_.find(head.proc_id());
- if (pos == nodes_.end()) { // new client
- Node node(new NodeInfo);
- UpdateRegInfo(node);
- nodes_[node->proc_.proc_id()] = node;
- } else {
+ if (pos != nodes_.end()) { // new client
Node &node = pos->second;
if (node->addrs_.find(SrcAddr(head)) == node->addrs_.end()) {
// node restarted, release old mq.
- for (auto &addr : node->addrs_) {
- cleaner_(addr);
- }
- node->addrs_.clear();
+ RemoveNode(node);
+ node.reset(new NodeInfo);
}
UpdateRegInfo(node);
+ } else {
+ Node node(new NodeInfo);
+ UpdateRegInfo(node);
+ nodes_[node->proc_.proc_id()] = node;
}
return MakeReply(eSuccess);
} catch (...) {
@@ -334,11 +328,7 @@
auto &cli = *it->second;
cli.state_.UpdateState(now, offline_time_, kill_time_);
if (cli.state_.flag_ == kStateKillme) {
- if (cleaner_) {
- for (auto &addr : cli.addrs_) {
- cleaner_(addr);
- }
- }
+ RemoveNode(it->second);
it = nodes_.erase(it);
} else {
++it;
@@ -357,6 +347,30 @@
{
auto node = weak.lock();
return node && Valid(*node);
+ }
+ void RemoveNode(Node &node)
+ {
+ auto EraseMapRec = [&node](auto &rec_map, auto &node_rec) {
+ for (auto &addr_topics : node_rec) {
+ TopicDest dest{addr_topics.first, node};
+ for (auto &topic : addr_topics.second) {
+ auto pos = rec_map.find(topic);
+ if (pos != rec_map.end()) {
+ pos->second.erase(dest);
+ if (pos->second.empty()) {
+ rec_map.erase(pos);
+ }
+ }
+ }
+ }
+ };
+ EraseMapRec(service_map_, node->services_);
+ EraseMapRec(subscribe_map_, node->subscriptions_);
+
+ for (auto &addr : node->addrs_) {
+ cleaner_(addr);
+ }
+ node->addrs_.clear();
}
std::string id_; // center proc id;
@@ -381,7 +395,7 @@
Handler Combine(const Handler &h1, const Handler &h2)
{
- return [h1, h2](ShmSocket &socket, bhome_msg::MsgI &msg, bhome::msg::BHMsgHead &head) {
+ return [h1, h2](ShmSocket &socket, bhome_msg::MsgI &msg, bhome_msg::BHMsgHead &head) {
return h1(socket, msg, head) || h2(socket, msg, head);
};
}
@@ -399,15 +413,12 @@
bool AddCenter(const std::string &id, const NodeCenter::Cleaner &cleaner)
{
- auto center_ptr = std::make_shared<Synced<NodeCenter>>(id, cleaner, 5s, 10s);
+ auto center_ptr = std::make_shared<Synced<NodeCenter>>(id, cleaner, 60s, 60s * 2);
auto MakeReplyer = [](ShmSocket &socket, BHMsgHead &head, const std::string &proc_id) {
return [&](auto &&rep_body) {
auto reply_head(InitMsgHead(GetType(rep_body), proc_id, head.msg_id()));
- MsgI msg;
- if (msg.Make(socket.shm(), reply_head, rep_body)) {
- auto &remote = head.route(0).mq_id();
- bool r = socket.Send(remote.data(), msg);
- }
+ auto &remote = head.route(0).mq_id();
+ socket.Send(remote.data(), reply_head, rep_body);
};
};
@@ -479,12 +490,6 @@
} // namespace
-SharedMemory &BHomeShm()
-{
- static SharedMemory shm("bhome_default_shm_v0", 1024 * 1024 * 64);
- return shm;
-}
-
BHCenter::CenterRecords &BHCenter::Centers()
{
static CenterRecords rec;
@@ -508,16 +513,13 @@
printf("remove mq : %s\n", r ? "ok" : "failed");
};
- AddCenter("#center", gc);
+ AddCenter("#bhome_center", gc);
for (auto &kv : Centers()) {
auto &info = kv.second;
sockets_[info.name_] = std::make_shared<ShmSocket>(shm, *(MQId *) info.mqid_.data(), info.mq_len_);
}
}
-
-BHCenter::BHCenter() :
- BHCenter(BHomeShm()) {}
bool BHCenter::Start()
{
--
Gitblit v1.8.0