pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 07:37:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace Condvars with blocking channel (#5815)

Browse Source 
* remove condvars

* return false on lost sender

* fix

* Update primitives/io/src/batch_verifier.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Nikolay Volf
2020-04-28 18:54:52 +03:00
committed by GitHub
parent 1be634da85
commit 986246a102
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/primitives/io/src/batch_verifier.rs
+7 -13
View File
@@ -114,8 +114,6 @@ impl BatchVerifier {
/// aggregated result.
#[must_use]
pub fn verify_and_clear(&mut self) -> bool {
use std::sync::{Mutex, Condvar};
let pending = std::mem::replace(&mut self.pending_tasks, vec![]);
let started = std::time::Instant::now();
@@ -139,14 +137,12 @@ impl BatchVerifier {
self.sr25519_items.clear();
if pending.len() > 0 {
let pair = Arc::new((Mutex::new(false), Condvar::new()));
let pair_clone = pair.clone();
let (sender, receiver) = std::sync::mpsc::channel();
if self.scheduler.spawn_obj(FutureObj::new(async move {
futures::future::join_all(pending).await;
let mut finished = pair_clone.0.lock().expect("Locking can only fail when the mutex is poisoned; qed");
*finished = true;
pair_clone.1.notify_all();
sender.send(())
.expect("Channel never panics if receiver is live. \
Receiver is always live until received this data; qed. ");
}.boxed())).is_err() {
log::debug!(
target: "runtime",
@@ -155,11 +151,9 @@ impl BatchVerifier {
return false;
}
let (finished, cond_var) = &*pair;
let mut finished = finished.lock().expect("Locking can only fail when the mutex is poisoned; qed");
while !*finished {
finished = cond_var.wait(finished).expect("Waiting can only fail when the mutex waited on is poisoned; qed");
if receiver.recv().is_err() {
log::warn!(target: "runtime", "Haven't received async result from verification task. Returning false.");
return false;
}
}