diff options
| author | Jason Evans <jasone@FreeBSD.org> | 2001-01-22 05:56:55 +0000 |
|---|---|---|
| committer | Jason Evans <jasone@FreeBSD.org> | 2001-01-22 05:56:55 +0000 |
| commit | 56771ca74b5ca2534bb504c808cdc366949696be (patch) | |
| tree | 717a038f144c0f5b71cc026170adf4fac784bd78 /sys/kern/kern_mutex.c | |
| parent | 0c645db4c07d7c51478f23518c78355bc190d557 (diff) | |
| download | src-56771ca74b5ca2534bb504c808cdc366949696be.tar.gz src-56771ca74b5ca2534bb504c808cdc366949696be.zip | |
Print correct file name and line number in mtx_assert().
Noticed by: jake
Notes
Notes:
svn path=/head/; revision=71360
Diffstat (limited to 'sys/kern/kern_mutex.c')
| -rw-r--r-- | sys/kern/kern_mutex.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 1127a40418f7..ae7da619d53f 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -794,7 +794,7 @@ mtx_exit_hard(struct mtx *m, int type) #ifdef INVARIANTS void -mtx_assert(struct mtx *m, int what) +_mtx_assert(struct mtx *m, int what, const char *file, int line) { switch ((what)) { case MA_OWNED: @@ -802,23 +802,23 @@ mtx_assert(struct mtx *m, int what) case MA_OWNED | MA_NOTRECURSED: if (!mtx_owned((m))) panic("mutex %s not owned at %s:%d", - (m)->mtx_description, __FILE__, __LINE__); + (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__); + (m)->mtx_description, file, line); } else if (((what) & MA_RECURSED) != 0) { panic("mutex %s unrecursed at %s:%d", - (m)->mtx_description, __FILE__, __LINE__); + (m)->mtx_description, file, line); } break; case MA_NOTOWNED: if (mtx_owned((m))) panic("mutex %s owned at %s:%d", - (m)->mtx_description, __FILE__, __LINE__); + (m)->mtx_description, file, line); break; default: - panic("unknown mtx_assert at %s:%d", __FILE__, __LINE__); + panic("unknown mtx_assert at %s:%d", file, line); } } #endif |