OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2025-03-24 15:49:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

[throttle] clear hchats_s instead of creating&dropping every iteration

Browse source
This commit is contained in:
Waffle 2020-09-30 21:39:45 +03:00
parent 5f5e42054d
commit 6714a9c503
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/bot/limits.rs
View file

@ -58,13 +58,17 @@ async fn worker(
// FIXME: remove unnecessary ChatId clones // FIXME: remove unnecessary ChatId clones
// FIXME: struct with fast random remove and append-to-the-end // FIXME: Make an research about data structures for this queue.
// Currently this is O(n) removing (n = number of elements stayed),
// amortized O(1) push (vec+vecrem).
let mut queue: Vec<(ChatId, Sender<()>)> = Vec::new(); // FIXME: with_cap let mut queue: Vec<(ChatId, Sender<()>)> = Vec::new(); // FIXME: with_cap
let mut history: VecDeque<(ChatId, Instant)> = VecDeque::new(); let mut history: VecDeque<(ChatId, Instant)> = VecDeque::new();
// hchats[chat] = history.iter().filter(|(c, _)| c == chat).count() // hchats[chat] = history.iter().filter(|(c, _)| c == chat).count()
let mut hchats: HashMap<ChatId, u32> = HashMap::new(); let mut hchats: HashMap<ChatId, u32> = HashMap::new();
let mut hchats_s = HashMap::new();
loop { loop {
// If there are no pending requests we are just waiting // If there are no pending requests we are just waiting
if queue.is_empty() { if queue.is_empty() {
@ -99,11 +103,11 @@ async fn worker(
let mut allowed = limits.overall_s.saturating_sub(history.iter().take_while(|(_, time)| time > &sec_back).count() as u32); let mut allowed = limits.overall_s.saturating_sub(history.iter().take_while(|(_, time)| time > &sec_back).count() as u32);
if allowed == 0 { if allowed == 0 {
hchats_s.clear();
delay_for(DELAY).await; delay_for(DELAY).await;
continue; continue;
} }
let mut hchats_s = HashMap::new();
for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) { for (chat, _) in history.iter().take_while(|(_, time)| time > &sec_back) {
*hchats_s *hchats_s
.entry(chat.clone()) .entry(chat.clone())
@ -142,6 +146,7 @@ async fn worker(
} }
drop(queue_rem); drop(queue_rem);
hchats_s.clear();
delay_for(DELAY).await; delay_for(DELAY).await;
} }
} }