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

- Add a new macro DROP_GIANT_NOSWITCH() that is similar to DROP_GIANT()

Browse Source 
except that it uses the MTX_NOSWITCH flag while it releases Giant via
  mtx_exit().
- Add a mtx_recursed() primitive.  This primitive should only be used on
  a mutex owned by the current process.  It will return non-zero if the
  mutex is recursively owned, or zero otherwise.
- Add two new flags MA_RECURSED and MA_NOTRECURSED that can be used in
  conjuction with MA_OWNED to control the assertion checked by mtx_assert().
- Fix some of the KTR tracepoint strings to use %p when displaying the lock
  field of a mutex, which is a uintptr_t.
This commit is contained in:
jhb 2000-11-15 22:12:33 +00:00
parent 3e6befb757
commit 57e4266549
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/sys/mutex.h
View File

@ -177,6 +177,16 @@ do { \
return; \
} while (0)
#define DROP_GIANT_NOSWITCH() \
do { \
int _giantcnt; \
WITNESS_SAVE_DECL(Giant); \
\
if (mtx_owned(&Giant)) \
WITNESS_SAVE(&Giant, Giant); \
for (_giantcnt = 0; mtx_owned(&Giant); _giantcnt++) \
mtx_exit(&Giant, MTX_DEF | MTX_NOSWITCH)
#define DROP_GIANT() \
do { \
int _giantcnt; \
@ -209,12 +219,23 @@ do { \
#ifdef INVARIANTS
#define MA_OWNED 1
#define MA_NOTOWNED 2
#define MA_RECURSED 4
#define MA_NOTRECURSED 8
#define mtx_assert(m, what) do { \
switch ((what)) { \
case MA_OWNED: \
case MA_OWNED | MA_RECURSED: \
case MA_OWNED | MA_NOTRECURSED: \
if (!mtx_owned((m))) \
panic("mutex %s not owned at %s:%d", \
(m)->mtx_description, __FILE__, __LINE__); \
if (mtx_recursed((m))) { \
if (((what) & MA_NOTRECURSED) != 0) \
panic("mutex %s recursed at %s:%d", \
(m)->mtx_description, __FILE__, __LINE__); \
} else if (((what) & MA_RECURSED) != 0) \
panic("mutex %s unrecursed at %s:%d", \
(m)->mtx_description, __FILE__, __LINE__); \
break; \
case MA_NOTOWNED: \
if (mtx_owned((m))) \
@ -416,6 +437,11 @@ void witness_restore(struct mtx *, const char *, int);
*/
#define mtx_owned(m) (((m)->mtx_lock & MTX_FLAGMASK) == (uintptr_t)CURTHD)
/*
* Return non-zero if a mutex has been recursively acquired.
*/
#define mtx_recursed(m) ((m)->mtx_recurse != 0)
/* Common strings */
#ifdef _KERN_MUTEX_C_
#ifdef KTR_EXTEND
@ -426,13 +452,13 @@ void witness_restore(struct mtx *, const char *, int);
* (from CTR5 to CTR3), but since they're just passed to snprintf as the last
* parameters, it doesn't do any harm to leave them.
*/
char STR_mtx_enter_fmt[] = "GOT %s [%x] r=%d";
char STR_mtx_exit_fmt[] = "REL %s [%x] r=%d";
char STR_mtx_try_enter_fmt[] = "TRY_ENTER %s [%x] result=%d";
char STR_mtx_enter_fmt[] = "GOT %s [%p] r=%d";
char STR_mtx_exit_fmt[] = "REL %s [%p] r=%d";
char STR_mtx_try_enter_fmt[] = "TRY_ENTER %s [%p] result=%d";
#else
char STR_mtx_enter_fmt[] = "GOT %s [%x] at %s:%d r=%d";
char STR_mtx_exit_fmt[] = "REL %s [%x] at %s:%d r=%d";
char STR_mtx_try_enter_fmt[] = "TRY_ENTER %s [%x] at %s:%d result=%d";
char STR_mtx_enter_fmt[] = "GOT %s [%p] at %s:%d r=%d";
char STR_mtx_exit_fmt[] = "REL %s [%p] at %s:%d r=%d";
char STR_mtx_try_enter_fmt[] = "TRY_ENTER %s [%p] at %s:%d result=%d";
#endif
char STR_mtx_bad_type[] = "((type) & (MTX_NORECURSE | MTX_NOSWITCH)) == 0";
char STR_mtx_owned[] = "mtx_owned(mpp)";