Skip to content

Weaken needlessly restrictive orderings on Arc::*_count #95183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2022
+6 −6
Merged

Weaken needlessly restrictive orderings on Arc::*_count #95183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions library/alloc/src/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ use core::ptr::{self, NonNull};
#[cfg(not(no_global_oom_handling))]
use core::slice::from_raw_parts_mut;
use core::sync::atomic;
use core::sync::atomic::Ordering::{Acquire, Relaxed, Release, SeqCst};
use core::sync::atomic::Ordering::{Acquire, Relaxed, Release};

#[cfg(not(no_global_oom_handling))]
use crate::alloc::handle_alloc_error;
Expand Down Expand Up @@ -970,7 +970,7 @@ impl<T: ?Sized> Arc<T> {
#[must_use]
#[stable(feature = "arc_counts", since = "1.15.0")]
pub fn weak_count(this: &Self) -> usize {
let cnt = this.inner().weak.load(SeqCst);
let cnt = this.inner().weak.load(Acquire);
// If the weak count is currently locked, the value of the
// count was 0 just before taking the lock.
if cnt == usize::MAX { 0 } else { cnt - 1 }
Expand Down Expand Up @@ -1000,7 +1000,7 @@ impl<T: ?Sized> Arc<T> {
#[must_use]
#[stable(feature = "arc_counts", since = "1.15.0")]
pub fn strong_count(this: &Self) -> usize {
this.inner().strong.load(SeqCst)
this.inner().strong.load(Acquire)
}

/// Increments the strong reference count on the `Arc<T>` associated with the
Expand Down Expand Up @@ -1961,7 +1961,7 @@ impl<T: ?Sized> Weak<T> {
#[must_use]
#[stable(feature = "weak_counts", since = "1.41.0")]
pub fn strong_count(&self) -> usize {
if let Some(inner) = self.inner() { inner.strong.load(SeqCst) } else { 0 }
if let Some(inner) = self.inner() { inner.strong.load(Acquire) } else { 0 }
}

/// Gets an approximation of the number of `Weak` pointers pointing to this
Expand All @@ -1980,8 +1980,8 @@ impl<T: ?Sized> Weak<T> {
pub fn weak_count(&self) -> usize {
self.inner()
.map(|inner| {
let weak = inner.weak.load(SeqCst);
let strong = inner.strong.load(SeqCst);
let weak = inner.weak.load(Acquire);
let strong = inner.strong.load(Acquire);
if strong == 0 {
0
} else {
Expand Down