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

Bah, fix fat finger in last. Invert the ~ on MTX_FLAGMASK as it's

Browse Source 
non-intuitive for the ~ to be built into the mask.  All the users now
explicitly ~ the mask.  In addition, add MTX_UNOWNED to the mask even
though it technically isn't a flag.  This should unbreak mtx_owner().

Quickly spotted by:	kris
This commit is contained in:
John Baldwin 2006-06-03 21:11:33 +00:00
parent f99cc4ad59
commit 49b94bfc54
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/kern/kern_mutex.c
View File

@ -85,7 +85,7 @@ __FBSDID("$FreeBSD$");
*/ */
#define mtx_unowned(m) ((m)->mtx_lock == MTX_UNOWNED) #define mtx_unowned(m) ((m)->mtx_lock == MTX_UNOWNED)
#define mtx_owner(m) ((struct thread *)((m)->mtx_lock & (MTX_FLAGMASK|MTX_UNOWNED))) #define mtx_owner(m) ((struct thread *)((m)->mtx_lock & ~MTX_FLAGMASK))
#ifdef DDB #ifdef DDB
static void db_show_mtx(struct lock_object *lock); static void db_show_mtx(struct lock_object *lock);
@ -527,7 +527,7 @@ _mtx_lock_sleep(struct mtx *m, uintptr_t tid, int opts, const char *file,
* If the current owner of the lock is executing on another * If the current owner of the lock is executing on another
* CPU, spin instead of blocking. * CPU, spin instead of blocking.
*/ */
owner = (struct thread *)(v & MTX_FLAGMASK); owner = (struct thread *)(v & ~MTX_FLAGMASK);
#ifdef ADAPTIVE_GIANT #ifdef ADAPTIVE_GIANT
if (TD_IS_RUNNING(owner)) { if (TD_IS_RUNNING(owner)) {
#else #else

4
sys/sys/mutex.h
View File

@ -71,7 +71,7 @@
#define MTX_RECURSED 0x00000001 /* lock recursed (for MTX_DEF only) */ #define MTX_RECURSED 0x00000001 /* lock recursed (for MTX_DEF only) */
#define MTX_CONTESTED 0x00000002 /* lock contested (for MTX_DEF only) */ #define MTX_CONTESTED 0x00000002 /* lock contested (for MTX_DEF only) */
#define MTX_UNOWNED 0x00000004 /* Cookie for free mutex */ #define MTX_UNOWNED 0x00000004 /* Cookie for free mutex */
#define MTX_FLAGMASK ~(MTX_RECURSED | MTX_CONTESTED) #define MTX_FLAGMASK (MTX_RECURSED | MTX_CONTESTED | MTX_UNOWNED)
#endif /* _KERNEL */ #endif /* _KERNEL */
@ -322,7 +322,7 @@ extern struct mtx_pool *mtxpool_sleep;
#define mtx_initialized(m) lock_initalized(&(m)->mtx_object) #define mtx_initialized(m) lock_initalized(&(m)->mtx_object)
#define mtx_owned(m) (((m)->mtx_lock & MTX_FLAGMASK) == (uintptr_t)curthread) #define mtx_owned(m) (((m)->mtx_lock & ~MTX_FLAGMASK) == (uintptr_t)curthread)
#define mtx_recursed(m) ((m)->mtx_recurse != 0) #define mtx_recursed(m) ((m)->mtx_recurse != 0)