hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for ifdef rather than if in SPINLOCK_PROFILE

Browse Source
This commit is contained in:
Mark Riddoch
2014-09-15 09:19:15 +01:00
parent f9aece5113
commit 2bfa8abd2a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/spinlock.c
View File

@ -40,7 +40,7 @@ void
spinlock_init(SPINLOCK *lock) spinlock_init(SPINLOCK *lock)
{ {
lock->lock = 0; lock->lock = 0;
#ifdef SPINLOCK_PROFILE #if SPINLOCK_PROFILE
lock->spins = 0; lock->spins = 0;
lock->acquired = 0; lock->acquired = 0;
lock->waiting = 0; lock->waiting = 0;
@ -57,7 +57,7 @@ spinlock_init(SPINLOCK *lock)
void void
spinlock_acquire(SPINLOCK *lock) spinlock_acquire(SPINLOCK *lock)
{ {
#ifdef SPINLOCK_PROFILE #if SPINLOCK_PROFILE
int spins = 0; int spins = 0;
atomic_add(&(lock->waiting), 1); atomic_add(&(lock->waiting), 1);
@ -65,12 +65,12 @@ int spins = 0;
while (atomic_add(&(lock->lock), 1) != 0) while (atomic_add(&(lock->lock), 1) != 0)
{ {
atomic_add(&(lock->lock), -1); atomic_add(&(lock->lock), -1);
#ifdef SPINLOCK_PROFILE #if SPINLOCK_PROFILE
atomic_add(&(lock->spins), 1); atomic_add(&(lock->spins), 1);
spins++; spins++;
#endif #endif
} }
#ifdef SPINLOCK_PROFILE #if SPINLOCK_PROFILE
if (spins) if (spins)
{ {
lock->contended++; lock->contended++;
@ -97,7 +97,7 @@ spinlock_acquire_nowait(SPINLOCK *lock)
atomic_add(&(lock->lock), -1); atomic_add(&(lock->lock), -1);
return FALSE; return FALSE;
} }
#ifdef SPINLOCK_PROFILE #if SPINLOCK_PROFILE
lock->acquired++; lock->acquired++;
lock->owner = THREAD_SHELF(); lock->owner = THREAD_SHELF();
#endif #endif
@ -112,7 +112,7 @@ spinlock_acquire_nowait(SPINLOCK *lock)
void void
spinlock_release(SPINLOCK *lock) spinlock_release(SPINLOCK *lock)
{ {
#ifdef SPINLOCK_PROFILE #if SPINLOCK_PROFILE
if (lock->waiting > lock->max_waiting) if (lock->waiting > lock->max_waiting)
lock->max_waiting = lock->waiting; lock->max_waiting = lock->waiting;
#endif #endif
@ -135,7 +135,7 @@ spinlock_release(SPINLOCK *lock)
void void
spinlock_stats(SPINLOCK *lock, void (*reporter)(void *, char *, int), void *hdl) spinlock_stats(SPINLOCK *lock, void (*reporter)(void *, char *, int), void *hdl)
{ {
#ifdef SPINLOCK_PROFILE #if SPINLOCK_PROFILE
reporter(hdl, "Spinlock acquired", lock->acquired); reporter(hdl, "Spinlock acquired", lock->acquired);
if (lock->acquired) if (lock->acquired)
{ {