From d98aed57890f1f83db0a8bdd4467c67a657a7eeb Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Tue, 16 May 2023 17:32:35 -0700 Subject: [PATCH] fix ci --- .../src/runtime/scheduler/multi_thread/worker.rs | 16 ++++++++-------- tokio/src/runtime/task/atomic_cell.rs | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tokio/src/runtime/scheduler/multi_thread/worker.rs b/tokio/src/runtime/scheduler/multi_thread/worker.rs index 24ccd284e..bb82d8114 100644 --- a/tokio/src/runtime/scheduler/multi_thread/worker.rs +++ b/tokio/src/runtime/scheduler/multi_thread/worker.rs @@ -721,14 +721,14 @@ impl Core { if self.is_searching { self.is_searching = false; - if worker.handle.shared.idle.transition_worker_from_searching() { - if worker.handle.work_to_steal() { - // Transition *back* to searching - self.is_searching = true; - worker.handle.shared.idle.transition_worker_to_searching(); + if worker.handle.shared.idle.transition_worker_from_searching() + && worker.handle.work_to_steal() + { + // Transition *back* to searching + self.is_searching = true; + worker.handle.shared.idle.transition_worker_to_searching(); - return false; - } + return false; } } @@ -869,7 +869,7 @@ impl Handle { .push_back(task, &self.shared.inject, &mut core.metrics); } else { // Push to the LIFO slot - let prev = core.lifo_slot(&self).swap_local(task); + let prev = core.lifo_slot(self).swap_local(task); if let Some(prev) = prev { core.run_queue diff --git a/tokio/src/runtime/task/atomic_cell.rs b/tokio/src/runtime/task/atomic_cell.rs index 54b00d868..737aa302b 100644 --- a/tokio/src/runtime/task/atomic_cell.rs +++ b/tokio/src/runtime/task/atomic_cell.rs @@ -54,7 +54,7 @@ impl AtomicCell { if self .task - .compare_exchange(prev, next, Release, Acquire) + .compare_exchange(prev, next, AcqRel, Acquire) .is_ok() { // Safety: we already checked !null above @@ -85,6 +85,6 @@ impl AtomicCell { return Some(unsafe { Notified::from_raw(NonNull::new_unchecked(task)) }); } - return None; + None } }