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/sendq.cpp |   98 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 71 insertions(+), 27 deletions(-)

diff --git a/src/sendq.cpp b/src/sendq.cpp
index 4b1f947..2a772b0 100644
--- a/src/sendq.cpp
+++ b/src/sendq.cpp
@@ -16,47 +16,74 @@
  * =====================================================================================
  */
 #include "sendq.h"
-#include "shm_queue.h"
+#include "shm_msg_queue.h"
 #include <chrono>
 
-bool SendQ::TrySend(bhome_shm::ShmMsgQueue &mq)
-{
-	if (out_.empty()) {
-		std::unique_lock<std::mutex> lock(mutex_);
-		out_.swap(in_);
-	}
+using namespace bhome_shm;
 
-	auto FirstNotExpired = [](MsgList &l) {
+void SendQ::AppendData(const MQInfo &mq, const Data data, const TimePoint &expire, OnMsgEvent onExpire)
+{
+	TimedMsg tmp(expire, MsgInfo{mq, data, std::move(onExpire)});
+	std::unique_lock<std::mutex> lock(mutex_in_);
+
+	try {
+		auto &al = in_[mq.id_];
+		if (!al.empty()) {
+			al.front().emplace_back(std::move(tmp));
+		} else {
+			al.insert(al.begin(), Array())->emplace_back(std::move(tmp));
+		}
+		count_in_.Count1();
+	} catch (std::exception &e) {
+		LOG_ERROR() << "sendq error: " << e.what();
+		throw e;
+	}
+}
+
+int SendQ::DoSend1Remote(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.data_);
 		}
+	}
+	auto TrySend1 = [this](MsgInfo const &info) { return ShmMsgQueue::TrySend(shm_, info.mq_, info.data_); };
+	while (pos != arr.end() && TrySend1(pos->data())) {
+		++pos;
+	}
 
-		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 nprocessed = std::distance(arr.begin(), pos);
+	arr.erase(arr.begin(), pos);
+	return nprocessed;
+}
 
-		msg_list.erase(msg_list.begin(), pos);
+int SendQ::DoSend1Remote(const Remote remote, ArrayList &al)
+{
+	int nsend = 0;
+	auto AllSent = [&](Array &arr) {
+		nsend += DoSend1Remote(remote, arr);
+		return arr.empty();
 	};
+	for (auto it = al.begin(); it != al.end() && AllSent(*it); it = al.erase(it)) {}
+	return nsend;
+}
 
+bool SendQ::TrySend()
+{
+	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(rec->first, rec->second);
 			if (rec->second.empty()) {
 				rec = out_.erase(rec);
 			} else {
@@ -64,5 +91,22 @@
 			}
 		} while (rec != out_.end());
 	}
+	count_out_.Count(nsend);
+
+	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