diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2000-11-23 00:38:45 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2000-11-23 00:38:45 +0000 |
| commit | f377b2b19e18b51d1cb56ae4563c6bd8892942bf (patch) | |
| tree | ef8fc97bf54620fd75aa63f2e65934753883a8a5 /sys/sys/mutex.h | |
| parent | bade6e5e6b0eb47c91fd01ee753821f9bb8bcf0c (diff) | |
| download | src-f377b2b19e18b51d1cb56ae4563c6bd8892942bf.tar.gz src-f377b2b19e18b51d1cb56ae4563c6bd8892942bf.zip | |
Fix the KTR tracepoints for mtx_enter/exit/try_enter to properly order the
parameters for the KTR_EXTEND case.
Notes
Notes:
svn path=/head/; revision=69068
Diffstat (limited to 'sys/sys/mutex.h')
| -rw-r--r-- | sys/sys/mutex.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h index 6cca748dc210..53bc87895276 100644 --- a/sys/sys/mutex.h +++ b/sys/sys/mutex.h @@ -456,9 +456,9 @@ 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 [%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"; +char STR_mtx_enter_fmt[] = "GOT %s [%p] r=%d at %s:%d"; +char STR_mtx_exit_fmt[] = "REL %s [%p] r=%d at %s:%d"; +char STR_mtx_try_enter_fmt[] = "TRY_ENTER %s [%p] result=%d at %s:%d"; #endif char STR_mtx_bad_type[] = "((type) & (MTX_NORECURSE | MTX_NOSWITCH)) == 0"; char STR_mtx_owned[] = "mtx_owned(mpp)"; @@ -534,8 +534,8 @@ _mtx_enter(struct mtx *mtxp, int type, const char *file, int line) done: WITNESS_ENTER(mpp, type, file, line); CTR5(KTR_LOCK, STR_mtx_enter_fmt, - mpp->mtx_description, mpp, file, line, - mpp->mtx_recurse); + mpp->mtx_description, mpp, mpp->mtx_recurse, file, line); + } /* @@ -557,7 +557,7 @@ _mtx_try_enter(struct mtx *mtxp, int type, const char *file, int line) } #endif CTR5(KTR_LOCK, STR_mtx_try_enter_fmt, - mpp->mtx_description, mpp, file, line, rval); + mpp->mtx_description, mpp, rval, file, line); return rval; } @@ -573,8 +573,7 @@ _mtx_exit(struct mtx *mtxp, int type, const char *file, int line) MPASS2(mtx_owned(mpp), STR_mtx_owned); WITNESS_EXIT(mpp, type, file, line); CTR5(KTR_LOCK, STR_mtx_exit_fmt, - mpp->mtx_description, mpp, file, line, - mpp->mtx_recurse); + mpp->mtx_description, mpp, mpp->mtx_recurse, file, line); if ((type) & MTX_SPIN) { if ((type) & MTX_NORECURSE) { int mtx_intr = mpp->mtx_saveintr; |