Adjust EventListener::new and listen calls

smol-rs · Nov 21, 2023 · 1a4bcd8 · 1a4bcd8
1 parent eb1d978
commit 1a4bcd8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 24 deletions.
diff --git a/src/barrier.rs b/src/barrier.rs
@@ -82,7 +82,7 @@ impl Barrier {
         BarrierWait::_new(BarrierWaitInner {
             barrier: self,
             lock: Some(self.state.lock()),
-            evl: EventListener::new(&self.event),
+            evl: EventListener::new(),
             state: WaitState::Initial,
         })
     }
@@ -200,7 +200,7 @@ impl EventListenerFuture for BarrierWaitInner<'_> {
 
                     if state.count < this.barrier.n {
                         // We need to wait for the event.
-                        this.evl.as_mut().listen();
+                        this.evl.as_mut().listen(&this.barrier.event);
                         *this.state = WaitState::Waiting { local_gen };
                     } else {
                         // We are the last one.
@@ -233,7 +233,7 @@ impl EventListenerFuture for BarrierWaitInner<'_> {
 
                     if *local_gen == state.generation_id && state.count < this.barrier.n {
                         // We need to wait for the event again.
-                        this.evl.as_mut().listen();
+                        this.evl.as_mut().listen(&this.barrier.event);
                         *this.state = WaitState::Waiting {
                             local_gen: *local_gen,
                         };

diff --git a/src/mutex.rs b/src/mutex.rs
@@ -479,8 +479,7 @@ impl<T: ?Sized, B: Borrow<Mutex<T>>> AcquireSlow<B, T> {
     fn new(mutex: B) -> Self {
         // Create a new instance of the listener.
         let listener = {
-            let mutex = Borrow::<Mutex<T>>::borrow(&mutex);
-            EventListener::new(&mutex.lock_ops)
+            EventListener::new()
         };
 
         AcquireSlow {
@@ -532,7 +531,7 @@ impl<T: ?Sized, B: Unpin + Borrow<Mutex<T>>> EventListenerFuture for AcquireSlow
             loop {
                 // Start listening for events.
                 if !this.listener.is_listening() {
-                    this.listener.as_mut().listen();
+                    this.listener.as_mut().listen(&mutex.lock_ops);
 
                     // Try locking if nobody is being starved.
                     match mutex
@@ -596,7 +595,7 @@ impl<T: ?Sized, B: Unpin + Borrow<Mutex<T>>> EventListenerFuture for AcquireSlow
         loop {
             if !this.listener.is_listening() {
                 // Start listening for events.
-                this.listener.as_mut().listen();
+                this.listener.as_mut().listen(&mutex.lock_ops);
 
                 // Try locking if nobody else is being starved.
                 match mutex

diff --git a/src/once_cell.rs b/src/once_cell.rs
@@ -274,9 +274,9 @@ impl<T> OnceCell<T> {
         }
 
         // Slow path: wait for the value to be initialized.
-        let listener = EventListener::new(&self.passive_waiters);
+        let listener = EventListener::new();
         pin!(listener);
-        listener.as_mut().listen();
+        listener.as_mut().listen(&self.passive_waiters);
 
         // Try again.
         if let Some(value) = self.get() {
@@ -329,9 +329,9 @@ impl<T> OnceCell<T> {
         }
 
         // Slow path: wait for the value to be initialized.
-        let listener = EventListener::new(&self.passive_waiters);
+        let listener = EventListener::new();
         pin!(listener);
-        listener.as_mut().listen();
+        listener.as_mut().listen(&self.passive_waiters);
 
         // Try again.
         if let Some(value) = self.get() {
@@ -591,7 +591,7 @@ impl<T> OnceCell<T> {
         strategy: &mut impl for<'a> Strategy<'a>,
     ) -> Result<(), E> {
         // The event listener we're currently waiting on.
-        let event_listener = EventListener::new(&self.active_initializers);
+        let event_listener = EventListener::new();
         pin!(event_listener);
 
         let mut closure = Some(closure);
@@ -614,7 +614,7 @@ impl<T> OnceCell<T> {
                     if event_listener.is_listening() {
                         strategy.wait(event_listener.as_mut()).await;
                     } else {
-                        event_listener.as_mut().listen();
+                        event_listener.as_mut().listen(&self.active_initializers);
                     }
                 }
                 State::Uninitialized => {

diff --git a/src/rwlock/raw.rs b/src/rwlock/raw.rs
@@ -86,7 +86,7 @@ impl RawRwLock {
         RawRead {
             lock: self,
             state: self.state.load(Ordering::Acquire),
-            listener: EventListener::new(&self.no_writer),
+            listener: EventListener::new(),
         }
     }
 
@@ -161,7 +161,7 @@ impl RawRwLock {
     pub(super) fn write(&self) -> RawWrite<'_> {
         RawWrite {
             lock: self,
-            no_readers: EventListener::new(&self.no_readers),
+            no_readers: EventListener::new(),
             state: WriteState::Acquiring {
                 lock: self.mutex.lock(),
             },
@@ -193,7 +193,7 @@ impl RawRwLock {
 
         RawUpgrade {
             lock: Some(self),
-            listener: EventListener::new(&self.no_readers),
+            listener: EventListener::new(),
         }
     }
 
@@ -328,7 +328,7 @@ impl<'a> EventListenerFuture for RawRead<'a> {
             } else {
                 // Start listening for "no writer" events.
                 let load_ordering = if !this.listener.is_listening() {
-                    this.listener.as_mut().listen();
+                    this.listener.as_mut().listen(&this.lock.no_writer);
 
                     // Make sure there really is no writer.
                     Ordering::SeqCst
@@ -473,7 +473,7 @@ impl<'a> EventListenerFuture for RawWrite<'a> {
                     }
 
                     // Start waiting for the readers to finish.
-                    this.no_readers.as_mut().listen();
+                    this.no_readers.as_mut().listen(&this.lock.no_readers);
                     this.state.as_mut().set(WriteState::WaitingReaders);
                 }
 
@@ -494,7 +494,7 @@ impl<'a> EventListenerFuture for RawWrite<'a> {
                     // Wait for the readers to finish.
                     if !this.no_readers.is_listening() {
                         // Register a listener.
-                        this.no_readers.as_mut().listen();
+                        this.no_readers.as_mut().listen(&this.lock.no_readers);
                     } else {
                         // Wait for the readers to finish.
                         ready!(strategy.poll(this.no_readers.as_mut(), cx));
@@ -559,7 +559,7 @@ impl<'a> EventListenerFuture for RawUpgrade<'a> {
             // If there are readers, wait for them to finish.
             if !this.listener.is_listening() {
                 // Start listening for "no readers" events.
-                this.listener.as_mut().listen();
+                this.listener.as_mut().listen(&lock.no_readers);
             } else {
                 // Wait for the readers to finish.
                 ready!(strategy.poll(this.listener.as_mut(), cx));

diff --git a/src/semaphore.rs b/src/semaphore.rs
@@ -88,7 +88,7 @@ impl Semaphore {
     pub fn acquire(&self) -> Acquire<'_> {
         Acquire::_new(AcquireInner {
             semaphore: self,
-            listener: EventListener::new(&self.event),
+            listener: EventListener::new(),
         })
     }
 
@@ -176,7 +176,7 @@ impl Semaphore {
     pub fn acquire_arc(self: &Arc<Self>) -> AcquireArc {
         AcquireArc {
             semaphore: self.clone(),
-            listener: EventListener::new(&self.event),
+            listener: EventListener::new(),
         }
     }
 
@@ -245,7 +245,7 @@ impl<'a> EventListenerFuture for AcquireInner<'a> {
                 None => {
                     // Wait on the listener.
                     if !this.listener.is_listening() {
-                        this.listener.as_mut().listen();
+                        this.listener.as_mut().listen(&this.semaphore.event);
                     } else {
                         ready!(strategy.poll(this.listener.as_mut(), cx));
                     }
@@ -285,7 +285,7 @@ impl Future for AcquireArc {
                 None => {
                     // Wait on the listener.
                     if !this.listener.is_listening() {
-                        this.listener.as_mut().listen();
+                        this.listener.as_mut().listen(&this.semaphore.event);
                     } else {
                         ready!(this.listener.as_mut().poll(cx));
                     }