blockworks-foundation
/
lite-rpc
mirror of https://github.com/blockworks-foundation/lite-rpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes to the batching timeout

This commit is contained in:
Godmode Galactus 2023-03-27 17:07:55 +02:00
parent e3016fe2a8
commit cea7d9d0d7
No known key found for this signature in database
GPG Key ID: A04142C71ABB0DEA
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/workers/tx_sender.rs
View File

@ -188,11 +188,6 @@ impl TxSender {
let tasks_counter = tasks_counter.clone(); let tasks_counter = tasks_counter.clone();
let mut timeout_interval = tx_send_interval.as_millis() as u64; let mut timeout_interval = tx_send_interval.as_millis() as u64;
let mut try_get_permit = || {
permit = semaphore.clone().try_acquire_owned().ok();
permit.is_some()
};
while txs.len() <= tx_batch_size { while txs.len() <= tx_batch_size {
let instance = tokio::time::Instant::now(); let instance = tokio::time::Instant::now();
match tokio::time::timeout(Duration::from_millis(timeout_interval), recv.recv()) match tokio::time::timeout(Duration::from_millis(timeout_interval), recv.recv())
@ -203,27 +198,24 @@ impl TxSender {
TXS_IN_CHANNEL.dec(); TXS_IN_CHANNEL.dec();
sigs_and_slots.push((sig, slot)); sigs_and_slots.push((sig, slot));
txs.push(tx); txs.push(tx);
// update the timeout inteval
timeout_interval = timeout_interval
.saturating_sub(instance.elapsed().as_millis() as u64).max(1);
} }
None => { None => {
bail!("Channel Disconnected"); bail!("Channel Disconnected");
} }
}, },
Err(_) => { Err(_) => {
if try_get_permit() { permit = semaphore.clone().try_acquire_owned().ok();
if permit.is_some() {
break; break;
} else {
// already timed out, but could not get a permit
timeout_interval = 1;
} }
} }
} }
timeout_interval =
timeout_interval.saturating_sub(instance.elapsed().as_millis() as u64);
if timeout_interval < 100 {
if try_get_permit() {
break;
} else {
// could not get a permit continue batching with a small timeout
timeout_interval = 100;
}
}
} }
assert_eq!(sigs_and_slots.len(), txs.len()); assert_eq!(sigs_and_slots.len(), txs.len());