From 13ff4eb1fa77477d6e0e57d217cfeea0de6c72c4 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Sun, 21 Jul 2019 20:16:48 +0000 Subject: [PATCH] Switch the rest of the refcount(9) functions to bool return type. There are some explicit comparisions of refcount_release(9) result with 0/1, which are fine. Reviewed by: markj, mjg Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D21014 --- share/man/man9/refcount.9 | 10 +++++----- sys/sys/refcount.h | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/share/man/man9/refcount.9 b/share/man/man9/refcount.9 index b435bab30641..edb219f01723 100644 --- a/share/man/man9/refcount.9 +++ b/share/man/man9/refcount.9 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 20, 2009 +.Dd July 21, 2019 .Dt REFCOUNT 9 .Os .Sh NAME @@ -42,7 +42,7 @@ .Fn refcount_init "volatile u_int *count" "u_int value" .Ft void .Fn refcount_acquire "volatile u_int *count" -.Ft int +.Ft bool .Fn refcount_release "volatile u_int *count" .Sh DESCRIPTION The @@ -73,9 +73,9 @@ protection for acquiring a new reference. The .Fn refcount_release function is used to release an existing reference. -The function returns a non-zero value if the reference being released was +The function returns true if the reference being released was the last reference; -otherwise, it returns zero. +otherwise, it returns false. .Pp Note that these routines do not provide any inter-CPU synchronization, data protection, @@ -89,7 +89,7 @@ is released. .Sh RETURN VALUES The .Nm refcount_release -function returns non-zero when releasing the last reference and zero when +function returns true when releasing the last reference and false when releasing any other reference. .Sh HISTORY These functions were introduced in diff --git a/sys/sys/refcount.h b/sys/sys/refcount.h index ad8ffe7b5828..a705be4ec8e3 100644 --- a/sys/sys/refcount.h +++ b/sys/sys/refcount.h @@ -69,7 +69,7 @@ refcount_acquire_checked(volatile u_int *count) } } -static __inline int +static __inline bool refcount_release(volatile u_int *count) { u_int old; @@ -78,7 +78,7 @@ refcount_release(volatile u_int *count) old = atomic_fetchadd_int(count, -1); KASSERT(old > 0, ("refcount %p is zero", count)); if (old > 1) - return (0); + return (false); /* * Last reference. Signal the user to call the destructor. @@ -87,14 +87,14 @@ refcount_release(volatile u_int *count) * at the start of the function synchronized with this fence. */ atomic_thread_fence_acq(); - return (1); + return (true); } /* * This functions returns non-zero if the refcount was * incremented. Else zero is returned. */ -static __inline __result_use_check int +static __inline __result_use_check bool refcount_acquire_if_not_zero(volatile u_int *count) { u_int old; @@ -103,13 +103,13 @@ refcount_acquire_if_not_zero(volatile u_int *count) for (;;) { KASSERT(old < UINT_MAX, ("refcount %p overflowed", count)); if (old == 0) - return (0); + return (false); if (atomic_fcmpset_int(count, &old, old + 1)) - return (1); + return (true); } } -static __inline __result_use_check int +static __inline __result_use_check bool refcount_release_if_not_last(volatile u_int *count) { u_int old; @@ -118,9 +118,9 @@ refcount_release_if_not_last(volatile u_int *count) for (;;) { KASSERT(old > 0, ("refcount %p is zero", count)); if (old == 1) - return (0); + return (false); if (atomic_fcmpset_int(count, &old, old - 1)) - return (1); + return (true); } }