From c6964d5af25d4ec7ed9dbe7674dc4e3896b36ead Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期五, 16 四月 2021 16:10:02 +0800
Subject: [PATCH] node remove mq if never registered; refactor.
---
src/sendq.cpp | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/src/sendq.cpp b/src/sendq.cpp
index 4b1f947..ad293c3 100644
--- a/src/sendq.cpp
+++ b/src/sendq.cpp
@@ -19,44 +19,59 @@
#include "shm_queue.h"
#include <chrono>
-bool SendQ::TrySend(bhome_shm::ShmMsgQueue &mq)
-{
- if (out_.empty()) {
- std::unique_lock<std::mutex> lock(mutex_);
- out_.swap(in_);
- }
+//TODO change to save head, body, instead of MsgI.
+// as MsgI which is in shm, but head, body are in current process.
+// Then if node crashes, shm will not be affected by msgs in sendq.
+// but pulishing ref-counted msg need some work.
- auto FirstNotExpired = [](MsgList &l) {
+int SendQ::DoSend1Remote(bhome_shm::ShmMsgQueue &mq, const Remote &remote, Array &arr)
+{
+ auto FirstNotExpired = [](Array &l) {
auto Less = [](const TimedMsg &msg, const TimePoint &tp) { return msg.expire() < tp; };
return std::lower_bound(l.begin(), l.end(), Now(), Less);
};
- auto SendOneRemote = [&](const Remote &remote, MsgList &msg_list) {
- auto pos = FirstNotExpired(msg_list);
- for (auto it = msg_list.begin(); it != pos; ++it) {
- auto &info = it->data();
- if (info.on_expire_) {
- info.on_expire_(info.msg_);
- }
- info.msg_.Release(mq.shm());
+ auto pos = FirstNotExpired(arr);
+ for (auto it = arr.begin(); it != pos; ++it) {
+ auto &info = it->data();
+ if (info.on_expire_) {
+ info.on_expire_(info.msg_);
}
+ info.msg_.Release(mq.shm());
+ }
- int n = mq.TrySendAll(*(MQId *) remote.data(), MsgIter(pos), MsgIter(msg_list.end()));
- for (int i = 0; i < n; ++i) {
- auto &msg = pos->data().msg_;
- if (msg.IsCounted()) {
- msg.Release(mq.shm());
- }
- ++pos;
+ int n = mq.TrySendAll(*(MQId *) remote.data(), MsgIter(pos), MsgIter(arr.end()));
+ for (int i = 0; i < n; ++i) {
+ auto &msg = pos->data().msg_;
+ if (msg.IsCounted()) {
+ msg.Release(mq.shm());
}
+ ++pos;
+ }
- msg_list.erase(msg_list.begin(), pos);
+ arr.erase(arr.begin(), pos);
+ return n;
+}
+
+int SendQ::DoSend1Remote(bhome_shm::ShmMsgQueue &mq, const Remote &remote, ArrayList &al)
+{
+ int nsend = 0;
+ auto AllSent = [&](Array &arr) {
+ nsend += DoSend1Remote(mq, remote, arr);
+ return arr.empty();
};
+ for (auto it = al.begin(); it != al.end() && AllSent(*it); it = al.erase(it)) {}
+ return nsend;
+}
+bool SendQ::TrySend(bhome_shm::ShmMsgQueue &mq)
+{
+ std::unique_lock<std::mutex> lock(mutex_out_);
+ size_t nsend = 0;
if (!out_.empty()) {
auto rec = out_.begin();
do {
- SendOneRemote(rec->first, rec->second);
+ nsend += DoSend1Remote(mq, rec->first, rec->second);
if (rec->second.empty()) {
rec = out_.erase(rec);
} else {
@@ -64,5 +79,21 @@
}
} while (rec != out_.end());
}
+
+ auto Collect = [&]() {
+ std::unique_lock<std::mutex> lock(mutex_in_);
+ if (out_.empty()) {
+ out_.swap(in_);
+ } else if (nsend == 0) { // remote blocked
+ for (auto &kv : in_) {
+ auto &to = out_[kv.first];
+ to.splice(to.end(), kv.second);
+ }
+ in_.clear();
+ }
+ };
+
+ Collect();
+
return !out_.empty();
}
\ No newline at end of file
--
Gitblit v1.8.0