d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtld: style the rest of rtld_lock.c

Browse Source 
Reviewed by:	markj
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Differential revision:	https://reviews.freebsd.org/D36396
This commit is contained in:
Konstantin Belousov 2022-08-30 15:49:15 +03:00
parent a687683b99
commit 7444f54bd3
1 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libexec/rtld-elf/rtld_lock.c
View File

@ -102,24 +102,24 @@ def_lock_create(void)
* line from it. * line from it.
*/ */
base = xmalloc(CACHE_LINE_SIZE); base = xmalloc(CACHE_LINE_SIZE);
p = (char *)base; p = base;
if ((uintptr_t)p % CACHE_LINE_SIZE != 0) { if ((uintptr_t)p % CACHE_LINE_SIZE != 0) {
free(base); free(base);
base = xmalloc(2 * CACHE_LINE_SIZE); base = xmalloc(2 * CACHE_LINE_SIZE);
p = (char *)base; p = base;
if ((r = (uintptr_t)p % CACHE_LINE_SIZE) != 0) if ((r = (uintptr_t)p % CACHE_LINE_SIZE) != 0)
p += CACHE_LINE_SIZE - r; p += CACHE_LINE_SIZE - r;
} }
l = (Lock *)p; l = (Lock *)p;
l->base = base; l->base = base;
l->lock = 0; l->lock = 0;
return l; return (l);
} }
static void static void
def_lock_destroy(void *lock) def_lock_destroy(void *lock)
{ {
Lock *l = (Lock *)lock; Lock *l = lock;
free(l->base); free(l->base);
} }
@ -189,9 +189,8 @@ def_wlock_acquire(void *lock)
static void static void
def_lock_release(void *lock) def_lock_release(void *lock)
{ {
Lock *l; Lock *l = lock;
l = (Lock *)lock;
atomic_add_rel_int(&l->lock, -((l->lock & WAFLAG) == 0 ? atomic_add_rel_int(&l->lock, -((l->lock & WAFLAG) == 0 ?
RC_INCR : WAFLAG)); RC_INCR : WAFLAG));
if (ld_fast_sigblock) if (ld_fast_sigblock)
@ -204,6 +203,7 @@ static int
def_thread_set_flag(int mask) def_thread_set_flag(int mask)
{ {
int old_val = thread_flag; int old_val = thread_flag;
thread_flag |= mask; thread_flag |= mask;
return (old_val); return (old_val);
} }
@ -212,6 +212,7 @@ static int
def_thread_clr_flag(int mask) def_thread_clr_flag(int mask)
{ {
int old_val = thread_flag; int old_val = thread_flag;
thread_flag &= ~mask; thread_flag &= ~mask;
return (old_val); return (old_val);
} }
@ -225,7 +226,7 @@ static struct RtldLockInfo deflockinfo;
static __inline int static __inline int
thread_mask_set(int mask) thread_mask_set(int mask)
{ {
return lockinfo.thread_set_flag(mask); return (lockinfo.thread_set_flag(mask));
} }
static __inline void static __inline void