itsscb/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2025-09-28 12:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync: broadcast, revert "Keep lock until sender notified" (#2348)

Browse Source 
This reverts commit 826fc21abfd04779cde92e4cc33de2adb42cf327.

The code was intentional. Holding the lock while notifying is
unnecessary. Also change the code to use `drop` so clippy doesn't
confuse people against their will.
This commit is contained in:
kalcutter 2020-03-27 22:22:16 +01:00 committed by GitHub
parent 8020b02bd0
commit 5c71268bb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tokio/src/sync/broadcast.rs
View File

@ -114,6 +114,7 @@ use crate::loom::sync::atomic::{spin_loop_hint, AtomicBool, AtomicPtr, AtomicUsi
use crate::loom::sync::{Arc, Condvar, Mutex}; use crate::loom::sync::{Arc, Condvar, Mutex};
use std::fmt; use std::fmt;
use std::mem;
use std::ptr; use std::ptr;
use std::sync::atomic::Ordering::SeqCst; use std::sync::atomic::Ordering::SeqCst;
use std::task::{Context, Poll, Waker}; use std::task::{Context, Poll, Waker};
@ -980,7 +981,7 @@ impl<T> Slot<T> {
if 1 == self.lock.fetch_sub(2, SeqCst) - 2 { if 1 == self.lock.fetch_sub(2, SeqCst) - 2 {
// First acquire the lock to make sure our sender is waiting on the // First acquire the lock to make sure our sender is waiting on the
// condition variable, otherwise the notification could be lost. // condition variable, otherwise the notification could be lost.
let _lock = tail.lock().unwrap(); mem::drop(tail.lock().unwrap());
// Wake up senders // Wake up senders
condvar.notify_all(); condvar.notify_all();
} }
@ -1000,8 +1001,6 @@ impl<'a, T> RecvGuard<'a, T> {
} }
fn drop_no_rem_dec(self) { fn drop_no_rem_dec(self) {
use std::mem;
self.slot.rx_unlock(self.tail, self.condvar, false); self.slot.rx_unlock(self.tail, self.condvar, false);
mem::forget(self); mem::forget(self);