From 1894a0a98b5b2102f83c00b7273ba7654334f469 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 20 Oct 2008 13:06:04 +0000 Subject: [PATCH] Consistently use KDEBUG. It is always defined and therefore must be checked with "#if". git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28247 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/debug.h | 15 +++++--- headers/private/kernel/lock.h | 16 ++++----- .../network/protocols/tcp/TCPEndpoint.cpp | 2 +- src/system/kernel/fs/vfs.cpp | 2 +- src/system/kernel/lock.cpp | 34 +++++++++---------- src/system/kernel/vm/vm.cpp | 2 +- 6 files changed, 38 insertions(+), 33 deletions(-) diff --git a/headers/private/kernel/debug.h b/headers/private/kernel/debug.h index e5e536f258..8e5580f956 100644 --- a/headers/private/kernel/debug.h +++ b/headers/private/kernel/debug.h @@ -14,12 +14,17 @@ #include -#if DEBUG -/* - * The kernel debug level. - * Level 1 is usual asserts, > 1 should be used for very expensive runtime checks +/* KDEBUG + The kernel debug level. + Level 1 is usual asserts, > 1 should be used for very expensive runtime + checks */ -# define KDEBUG 1 +#if !defined(KDEBUG) +# if DEBUG +# define KDEBUG 1 +# else +# define KDEBUG 0 +# endif #endif #define ASSERT_ALWAYS(x) \ diff --git a/headers/private/kernel/lock.h b/headers/private/kernel/lock.h index 0785d30151..0b0d6c758b 100644 --- a/headers/private/kernel/lock.h +++ b/headers/private/kernel/lock.h @@ -18,7 +18,7 @@ struct mutex_waiter; typedef struct mutex { const char* name; struct mutex_waiter* waiters; -#ifdef KDEBUG +#if KDEBUG thread_id holder; #else int32 count; @@ -31,7 +31,7 @@ typedef struct mutex { typedef struct recursive_lock { mutex lock; -#ifndef KDEBUG +#if !KDEBUG thread_id holder; #endif int recursion; @@ -77,7 +77,7 @@ typedef struct rw_lock { // static initializers -#ifdef KDEBUG +#if KDEBUG # define MUTEX_INITIALIZER(name) { name, NULL, -1, 0 } # define RECURSIVE_LOCK_INITIALIZER(name) { MUTEX_INITIALIZER(name), 0 } #else @@ -130,7 +130,7 @@ extern status_t _mutex_trylock(mutex* lock); static inline status_t mutex_lock(mutex* lock) { -#ifdef KDEBUG +#if KDEBUG return _mutex_lock(lock, false); #else if (atomic_add(&lock->count, -1) < 0) @@ -143,7 +143,7 @@ mutex_lock(mutex* lock) static inline status_t mutex_lock_threads_locked(mutex* lock) { -#ifdef KDEBUG +#if KDEBUG return _mutex_lock(lock, true); #else if (atomic_add(&lock->count, -1) < 0) @@ -156,7 +156,7 @@ mutex_lock_threads_locked(mutex* lock) static inline status_t mutex_trylock(mutex* lock) { -#ifdef KDEBUG +#if KDEBUG return _mutex_trylock(lock); #else if (atomic_test_and_set(&lock->count, -1, 0) != 0) @@ -169,7 +169,7 @@ mutex_trylock(mutex* lock) static inline void mutex_unlock(mutex* lock) { -#if !defined(KDEBUG) +#if !KDEBUG if (atomic_add(&lock->count, 1) < -1) #endif _mutex_unlock(lock, false); @@ -179,7 +179,7 @@ mutex_unlock(mutex* lock) static inline void mutex_transfer_lock(mutex* lock, thread_id thread) { -#ifdef KDEBUG +#if KDEBUG lock->holder = thread; #endif } diff --git a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp index a9a3a8a483..f28fc5448c 100644 --- a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp @@ -2239,7 +2239,7 @@ TCPEndpoint::Dump() const kprintf("TCP endpoint %p\n", this); kprintf(" state: %s\n", name_for_state(fState)); kprintf(" flags: 0x%lx\n", fFlags); -#ifdef KDEBUG +#if KDEBUG kprintf(" lock: { %p, holder: %ld }\n", &fLock, fLock.holder); #endif kprintf(" accept sem: %ld\n", fAcceptSemaphore); diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index 378ce44132..ab43eaafc7 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -71,7 +71,7 @@ #define HAS_FS_CALL(vnode, op) (vnode->ops->op != NULL) #define HAS_FS_MOUNT_CALL(mount, op) (mount->volume->ops->op != NULL) -#ifdef KDEBUG +#if KDEBUG # define FS_CALL(vnode, op, params...) \ ( HAS_FS_CALL(vnode, op) ? \ vnode->ops->op(vnode->mount->volume, vnode, params) \ diff --git a/src/system/kernel/lock.cpp b/src/system/kernel/lock.cpp index 8a3337c4d6..f9b2ae4b69 100644 --- a/src/system/kernel/lock.cpp +++ b/src/system/kernel/lock.cpp @@ -43,7 +43,7 @@ struct rw_lock_waiter { #define RW_LOCK_FLAG_OWNS_NAME RW_LOCK_FLAG_CLONE_NAME -#ifdef KDEBUG +#if KDEBUG # define RECURSIVE_LOCK_HOLDER(lock) ((lock)->lock.holder) #else # define RECURSIVE_LOCK_HOLDER(lock) ((lock)->holder) @@ -100,7 +100,7 @@ recursive_lock_lock(recursive_lock *lock) if (thread != RECURSIVE_LOCK_HOLDER(lock)) { mutex_lock(&lock->lock); -#ifndef KDEBUG +#if !KDEBUG lock->holder = thread; #endif } @@ -124,7 +124,7 @@ recursive_lock_trylock(recursive_lock *lock) if (status != B_OK) return status; -#ifndef KDEBUG +#if !KDEBUG lock->holder = thread; #endif } @@ -141,7 +141,7 @@ recursive_lock_unlock(recursive_lock *lock) panic("recursive_lock %p unlocked by non-holder thread!\n", lock); if (--lock->recursion == 0) { -#ifndef KDEBUG +#if !KDEBUG lock->holder = -1; #endif mutex_unlock(&lock->lock); @@ -253,7 +253,7 @@ rw_lock_destroy(rw_lock* lock) // unblock all waiters InterruptsSpinLocker locker(gThreadSpinlock); -#ifdef KDEBUG +#if KDEBUG if (lock->waiters != NULL && thread_get_current_thread_id() != lock->holder) { panic("rw_lock_destroy(): there are blocking threads, but the caller " @@ -429,7 +429,7 @@ mutex_init(mutex* lock, const char *name) { lock->name = name; lock->waiters = NULL; -#ifdef KDEBUG +#if KDEBUG lock->holder = -1; #else lock->count = 0; @@ -445,7 +445,7 @@ mutex_init_etc(mutex* lock, const char *name, uint32 flags) { lock->name = (flags & MUTEX_FLAG_CLONE_NAME) != 0 ? strdup(name) : name; lock->waiters = NULL; -#ifdef KDEBUG +#if KDEBUG lock->holder = -1; #else lock->count = 0; @@ -465,7 +465,7 @@ mutex_destroy(mutex* lock) // unblock all waiters InterruptsSpinLocker locker(gThreadSpinlock); -#ifdef KDEBUG +#if KDEBUG if (lock->waiters != NULL && thread_get_current_thread_id() != lock->holder) { panic("mutex_destroy(): there are blocking threads, but caller doesn't " @@ -496,7 +496,7 @@ mutex_switch_lock(mutex* from, mutex* to) { InterruptsSpinLocker locker(gThreadSpinlock); -#if !defined(KDEBUG) +#if !KDEBUG if (atomic_add(&from->count, 1) < -1) #endif _mutex_unlock(from, true); @@ -508,7 +508,7 @@ mutex_switch_lock(mutex* from, mutex* to) status_t _mutex_lock(mutex* lock, bool threadsLocked) { -#ifdef KDEBUG +#if KDEBUG if (!gKernelStartup && !threadsLocked && !are_interrupts_enabled()) { panic("_mutex_lock(): called with interrupts disabled for lock %p", lock); @@ -520,7 +520,7 @@ _mutex_lock(mutex* lock, bool threadsLocked) // Might have been released after we decremented the count, but before // we acquired the spinlock. -#ifdef KDEBUG +#if KDEBUG if (lock->holder < 0) { lock->holder = thread_get_current_thread_id(); return B_OK; @@ -552,7 +552,7 @@ _mutex_lock(mutex* lock, bool threadsLocked) thread_prepare_to_block(waiter.thread, 0, THREAD_BLOCK_TYPE_MUTEX, lock); status_t error = thread_block_locked(waiter.thread); -#ifdef KDEBUG +#if KDEBUG if (error == B_OK) lock->holder = waiter.thread->id; #endif @@ -567,7 +567,7 @@ _mutex_unlock(mutex* lock, bool threadsLocked) // lock only, if !threadsLocked InterruptsSpinLocker locker(gThreadSpinlock, false, !threadsLocked); -#ifdef KDEBUG +#if KDEBUG if (thread_get_current_thread_id() != lock->holder) { panic("_mutex_unlock() failure: thread %ld is trying to release " "mutex %p (current holder %ld)\n", thread_get_current_thread_id(), @@ -586,7 +586,7 @@ _mutex_unlock(mutex* lock, bool threadsLocked) // unblock thread thread_unblock_locked(waiter->thread, B_OK); -#ifdef KDEBUG +#if KDEBUG // Already set the holder to the unblocked thread. Besides that this // actually reflects the current situation, setting it to -1 would // cause a race condition, since another locker could think the lock @@ -596,7 +596,7 @@ _mutex_unlock(mutex* lock, bool threadsLocked) } else { // We've acquired the spinlock before the locker that is going to wait. // Just mark the lock as released. -#ifdef KDEBUG +#if KDEBUG lock->holder = -1; #else lock->flags |= MUTEX_FLAG_RELEASED; @@ -608,7 +608,7 @@ _mutex_unlock(mutex* lock, bool threadsLocked) status_t _mutex_trylock(mutex* lock) { -#ifdef KDEBUG +#if KDEBUG InterruptsSpinLocker _(gThreadSpinlock); if (lock->holder <= 0) { @@ -638,7 +638,7 @@ dump_mutex_info(int argc, char** argv) kprintf("mutex %p:\n", lock); kprintf(" name: %s\n", lock->name); kprintf(" flags: 0x%x\n", lock->flags); -#ifdef KDEBUG +#if KDEBUG kprintf(" holder: %ld\n", lock->holder); #else kprintf(" count: %ld\n", lock->count); diff --git a/src/system/kernel/vm/vm.cpp b/src/system/kernel/vm/vm.cpp index cd16d20d7f..93a145d4b3 100644 --- a/src/system/kernel/vm/vm.cpp +++ b/src/system/kernel/vm/vm.cpp @@ -3465,7 +3465,7 @@ dump_cache(int argc, char **argv) kprintf(" temporary: %ld\n", cache->temporary); kprintf(" scan_skip: %ld\n", cache->scan_skip); kprintf(" lock: %p\n", cache->GetLock()); -#ifdef KDEBUG +#if KDEBUG kprintf(" lock.holder: %ld\n", cache->GetLock()->holder); #endif kprintf(" areas:\n");