tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Delete events from callback before forgetting them in TQueue.

Browse Source
This commit is contained in:
levlam 2022-12-20 16:37:22 +03:00
parent 6cb9371061
commit f99fb4fc06
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tddb/td/db/TQueue.cpp
View File

@ -236,6 +236,26 @@ class TQueueImpl final : public TQueue {
for (size_t i = 0; i < keep_count; i++) {
--end_it;
}
if (callback_ != nullptr) {
vector<uint64> deleted_log_event_ids;
auto callback_end_it = end_it;
if (keep_count == 0) {
--callback_end_it;
}
for (auto it = q.events.begin(); it != callback_end_it; ++it) {
auto &event = it->second;
if (event.log_event_id != 0) {
deleted_log_event_ids.push_back(event.log_event_id);
event.log_event_id = 0;
}
}
for (auto log_event_id : deleted_log_event_ids) {
callback_->pop(log_event_id);
}
}
auto callback_clear_time = Time::now() - start_time;
for (auto it = q.events.begin(); it != end_it;) {
pop(q, queue_id, it, q.tail_id);
}
@ -243,7 +263,8 @@ class TQueueImpl final : public TQueue {
auto clear_time = Time::now() - start_time;
if (clear_time > 0.1) {
LOG(WARNING) << "Cleared " << (size - keep_count) << " TQueue events with total size "
<< (total_event_length - q.total_event_length) << " in " << clear_time << " seconds";
<< (total_event_length - q.total_event_length) << " in " << clear_time - callback_clear_time
<< " seconds and deleted them from callback in " << callback_clear_time << " seconds";
}
}

2
test/tqueue.cpp
View File

@ -234,7 +234,7 @@ TEST(TQueue, clear) {
td::int32 now = 0;
td::vector<td::TQueue::EventId> ids;
td::Random::Xorshift128plus rnd(123);
for (size_t i = 0; i < 1000000; i++) {
for (size_t i = 0; i < 100000; i++) {
tqueue->push(1, td::string(td::Random::fast(100, 500), 'a'), now + 600000, 0, {}).ensure();
}
auto tail_id = tqueue->get_tail(1);