From 34cd75f77d0ca94dbdba4e6cc9451fe4d33e78b3 Mon Sep 17 00:00:00 2001
From: lichao <lichao@aiotlink.com>
Date: 星期三, 19 五月 2021 19:14:13 +0800
Subject: [PATCH] add api BHQueryProcs.
---
src/sendq.cpp | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/src/sendq.cpp b/src/sendq.cpp
index 54de419..f1e5918 100644
--- a/src/sendq.cpp
+++ b/src/sendq.cpp
@@ -16,10 +16,30 @@
* =====================================================================================
*/
#include "sendq.h"
-#include "shm_queue.h"
+#include "shm_msg_queue.h"
#include <chrono>
-int SendQ::DoSend1Remote(bhome_shm::ShmMsgQueue &mq, const Remote &remote, Array &arr)
+using namespace bhome_shm;
+
+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));
+ }
+ } catch (std::exception &e) {
+ LOG_ERROR() << "sendq error: " << e.what();
+ throw e;
+ }
+}
+
+int SendQ::DoSend1Remote(ShmMsgQueue &mq, const Remote remote, Array &arr)
{
auto FirstNotExpired = [](Array &l) {
auto Less = [](const TimedMsg &msg, const TimePoint &tp) { return msg.expire() < tp; };
@@ -32,31 +52,9 @@
if (info.on_expire_) {
info.on_expire_(info.data_);
}
- if (info.data_.index() == 0) {
- boost::variant2::get<0>(info.data_).Release();
- }
}
- auto SendData = [&](Data &d) {
- bool r = false;
- if (d.index() == 0) {
- auto &msg = boost::variant2::get<0>(pos->data().data_);
- r = mq.TrySend(*(MQId *) remote.data(), msg);
- if (r) {
- msg.Release();
- }
- } else {
- auto &content = boost::variant2::get<1>(pos->data().data_);
- MsgI msg;
- if (msg.Make(content)) {
- DEFER1(msg.Release(););
- r = mq.TrySend(*(MQId *) remote.data(), msg);
- }
- }
- return r;
- };
-
- while (pos != arr.end() && SendData(pos->data().data_)) {
+ while (pos != arr.end() && mq.TrySend(pos->data().mq_, pos->data().data_)) {
++pos;
}
@@ -65,7 +63,7 @@
return nprocessed;
}
-int SendQ::DoSend1Remote(bhome_shm::ShmMsgQueue &mq, const Remote &remote, ArrayList &al)
+int SendQ::DoSend1Remote(ShmMsgQueue &mq, const Remote remote, ArrayList &al)
{
int nsend = 0;
auto AllSent = [&](Array &arr) {
@@ -76,9 +74,11 @@
return nsend;
}
-bool SendQ::TrySend(bhome_shm::ShmMsgQueue &mq)
+bool SendQ::TrySend(ShmMsgQueue &mq)
{
std::unique_lock<std::mutex> lock(mutex_out_);
+ // if (TooFast()) { return false; }
+
size_t nsend = 0;
if (!out_.empty()) {
auto rec = out_.begin();
@@ -108,4 +108,15 @@
Collect();
return !out_.empty();
-}
\ No newline at end of file
+}
+
+bool SendQ::TooFast()
+{
+ auto cur = NowSec();
+ if (cur > last_time_) {
+ last_time_ = cur;
+ count_ = 0;
+ }
+
+ return ++count_ > 1000 * 100;
+} // not accurate in multi-thread.
\ No newline at end of file
--
Gitblit v1.8.0