Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Inline {acquire,release}_spinlock(), when spinlock debugging is disabled. 

* Use atomic_{and,or}() instead of atomic_set(), as there are no built-ins
  for the latter.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35021 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2010-01-11 22:13:11 +00:00
parent 9c6720c064
commit 3fb2a94dfb
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
headers/private/kernel/smp.h
View File

@ -62,8 +62,37 @@ int32 smp_get_current_cpu(void);
int smp_intercpu_int_handler(int32 cpu);
void _acquire_spinlock(spinlock* lock);
#ifdef __cplusplus
}
#endif
// Unless spinlock debug features are enabled, try to inline
// {acquire,release}_spinlock().
#if !DEBUG_SPINLOCKS && !B_DEBUG_SPINLOCK_CONTENTION
static inline void
acquire_spinlock_inline(spinlock* lock)
{
if (atomic_or((int32*)lock, 1) == 0)
return;
_acquire_spinlock(lock);
}
static inline void
release_spinlock_inline(spinlock* lock)
{
atomic_and((int32*)lock, 0);
}
#define acquire_spinlock(lock) acquire_spinlock_inline(lock)
#define release_spinlock(lock) release_spinlock_inline(lock)
#endif // !DEBUG_SPINLOCKS && !B_DEBUG_SPINLOCK_CONTENTION
#endif /* KERNEL_SMP_H */

26
src/system/kernel/smp.cpp
View File

@ -40,6 +40,10 @@
#endif
#undef acquire_spinlock
#undef release_spinlock
#define MSG_POOL_SIZE (SMP_MAX_CPUS * 4)
// These macros define the number of unsuccessful iterations in
@ -282,7 +286,7 @@ process_all_pending_ici(int32 currentCPU)
void
acquire_spinlock(spinlock *lock)
_acquire_spinlock(spinlock *lock)
{
#if DEBUG_SPINLOCKS
if (are_interrupts_enabled()) {
@ -309,7 +313,7 @@ acquire_spinlock(spinlock *lock)
process_all_pending_ici(currentCPU);
PAUSE();
}
if (atomic_set((int32 *)lock, 1) == 0)
if (atomic_or((int32 *)lock, 1) == 0)
break;
}
@ -320,7 +324,7 @@ acquire_spinlock(spinlock *lock)
} else {
#if DEBUG_SPINLOCKS
int32 oldValue;
oldValue = atomic_set((int32 *)lock, 1);
oldValue = atomic_or((int32 *)lock, 1);
if (oldValue != 0) {
panic("acquire_spinlock: attempt to acquire lock %p twice on "
"non-SMP system (last caller: %p, value %ld)", lock,
@ -363,13 +367,13 @@ acquire_spinlock_nocheck(spinlock *lock)
PAUSE();
}
if (atomic_set((int32 *)lock, 1) == 0)
if (atomic_or((int32 *)lock, 1) == 0)
break;
}
#endif
} else {
#if DEBUG_SPINLOCKS
if (atomic_set((int32 *)lock, 1) != 0) {
if (atomic_or((int32 *)lock, 1) != 0) {
panic("acquire_spinlock_nocheck: attempt to acquire lock %p twice "
"on non-SMP system\n", lock);
}
@ -406,7 +410,7 @@ acquire_spinlock_cpu(int32 currentCPU, spinlock *lock)
process_all_pending_ici(currentCPU);
PAUSE();
}
if (atomic_set((int32 *)lock, 1) == 0)
if (atomic_or((int32 *)lock, 1) == 0)
break;
}
@ -417,7 +421,7 @@ acquire_spinlock_cpu(int32 currentCPU, spinlock *lock)
} else {
#if DEBUG_SPINLOCKS
int32 oldValue;
oldValue = atomic_set((int32 *)lock, 1);
oldValue = atomic_or((int32 *)lock, 1);
if (oldValue != 0) {
panic("acquire_spinlock_cpu(): attempt to acquire lock %p twice on "
"non-SMP system (last caller: %p, value %ld)", lock,
@ -442,7 +446,7 @@ release_spinlock(spinlock *lock)
panic("release_spinlock: attempt to release lock %p with interrupts enabled\n", lock);
#if B_DEBUG_SPINLOCK_CONTENTION
{
int32 count = atomic_set(&lock->lock, 0) - 1;
int32 count = atomic_and(&lock->lock, 0) - 1;
if (count < 0) {
panic("release_spinlock: lock %p was already released\n", lock);
} else {
@ -454,14 +458,14 @@ release_spinlock(spinlock *lock)
}
}
#else
if (atomic_set((int32 *)lock, 0) != 1)
if (atomic_and((int32 *)lock, 0) != 1)
panic("release_spinlock: lock %p was already released\n", lock);
#endif
} else {
#if DEBUG_SPINLOCKS
if (are_interrupts_enabled())
panic("release_spinlock: attempt to release lock %p with interrupts enabled\n", lock);
if (atomic_set((int32 *)lock, 0) != 1)
if (atomic_and((int32 *)lock, 0) != 1)
panic("release_spinlock: lock %p was already released\n", lock);
#endif
#if DEBUG_SPINLOCK_LATENCIES
@ -1220,3 +1224,5 @@ memory_write_barrier(void)
arch_cpu_memory_write_barrier();
}
#pragma weak acquire_spinlock=_acquire_spinlock