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 | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 deletions(-)
diff --git a/src/sendq.cpp b/src/sendq.cpp
index 3f988ca..f1e5918 100644
--- a/src/sendq.cpp
+++ b/src/sendq.cpp
@@ -16,27 +16,31 @@
* =====================================================================================
*/
#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)
-{
- static size_t total = 0;
- static size_t count = 0;
- static size_t max_len = 0;
- static time_t last = 0;
- ++count;
- total += arr.size();
- if (arr.size() > max_len) {
- max_len = arr.size();
- }
- time_t now;
- time(&now);
- if (now > last && count > 0) {
- last = now;
- printf("avg size : %ld, max size: %ld\n", total / count, max_len);
- }
+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; };
return std::lower_bound(l.begin(), l.end(), Now(), Less);
@@ -46,25 +50,20 @@
for (auto it = arr.begin(); it != pos; ++it) {
auto &info = it->data();
if (info.on_expire_) {
- info.on_expire_(info.msg_);
+ info.on_expire_(info.data_);
}
- info.msg_.Release(mq.shm());
}
- 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());
- }
+ while (pos != arr.end() && mq.TrySend(pos->data().mq_, pos->data().data_)) {
++pos;
}
+ int nprocessed = std::distance(arr.begin(), pos);
arr.erase(arr.begin(), pos);
- return n;
+ 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) {
@@ -75,8 +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();
@@ -91,7 +93,7 @@
}
auto Collect = [&]() {
- std::unique_lock<std::mutex> lock(mutex_);
+ std::unique_lock<std::mutex> lock(mutex_in_);
if (out_.empty()) {
out_.swap(in_);
} else if (nsend == 0) { // remote blocked
@@ -106,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