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

Add file and line arguments to WITNESS_ENTER() and WITNESS_EXIT, since

Browse Source 
__FILE__ and __LINE__ don't get expanded usefully in inline functions.

Add const to all witness*() arguments that are filenames.
This commit is contained in:
Jason Evans 2000-09-09 22:43:22 +00:00
parent 9360d3ebdd
commit 46bf3fe5a6
7 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/alpha/include/mutex.h
View File

@ -243,12 +243,12 @@ extern char STR_IDIS[];
#ifndef SMP_DEBUG
#error WITNESS requires SMP_DEBUG
#endif /* SMP_DEBUG */
#define WITNESS_ENTER(m, f) \
#define WITNESS_ENTER(m, t, f, l) \
if ((m)->mtx_witness != NULL) \
witness_enter((m), (f), __FILE__, __LINE__)
#define WITNESS_EXIT(m, f) \
witness_enter((m), (t), (f), (l))
#define WITNESS_EXIT(m, t, f, l) \
if ((m)->mtx_witness != NULL) \
witness_exit((m), (f), __FILE__, __LINE__)
witness_exit((m), (t), (f), (l))
#define WITNESS_SLEEP(check, m) witness_sleep(check, (m), __FILE__, __LINE__)
#define WITNESS_SAVE_DECL(n) \
@ -269,17 +269,17 @@ do { \
void witness_init(mtx_t *, int flag);
void witness_destroy(mtx_t *);
void witness_enter(mtx_t *, int, char *, int);
void witness_try_enter(mtx_t *, int, char *, int);
void witness_exit(mtx_t *, int, char *, int);
void witness_enter(mtx_t *, int, const char *, int);
void witness_try_enter(mtx_t *, int, const char *, int);
void witness_exit(mtx_t *, int, const char *, int);
void witness_display(void(*)(const char *fmt, ...));
void witness_list(struct proc *);
int witness_sleep(int, mtx_t *, char *, int);
int witness_sleep(int, mtx_t *, const char *, int);
void witness_save(mtx_t *, const char **, int *);
void witness_restore(mtx_t *, const char *, int);
#else /* WITNESS */
#define WITNESS_ENTER(m, flag)
#define WITNESS_EXIT(m, flag)
#define WITNESS_ENTER(m, t, f, l)
#define WITNESS_EXIT(m, t, f, l)
#define WITNESS_SLEEP(check, m)
#define WITNESS_SAVE_DECL(n)
#define WITNESS_SAVE(m, n)
@ -291,9 +291,9 @@ void witness_restore(mtx_t *, const char *, int);
*/
#define witness_init(m, flag) flag++
#define witness_destroy(m)
#define witness_enter(m, flag, f, l)
#define witness_try_enter(m, flag, f, l )
#define witness_exit(m, flag, f, l)
#define witness_enter(m, t, f, l)
#define witness_try_enter(m, t, f, l)
#define witness_exit(m, t, f, l)
#endif /* WITNESS */
/*
@ -474,7 +474,7 @@ _mtx_enter(mtx_t *mtxp, int type, const char *file, int line)
}
}
} while (0);
WITNESS_ENTER(mpp, type);
WITNESS_ENTER(mpp, type, file, line);
CTR5(KTR_LOCK, STR_mtx_enter_fmt,
mpp->mtx_description, mpp, file, line,
mpp->mtx_recurse);
@ -495,7 +495,7 @@ _mtx_try_enter(mtx_t *mtxp, int type, const char *file, int line)
#ifdef SMP_DEBUG
if (rval && mpp->mtx_witness != NULL) {
ASS(mpp->mtx_recurse == 0);
witness_try_enter(mpp, type, file, line);
witness_try_enter(mpp, type, file, line);
}
#endif
CTR5(KTR_LOCK, STR_mtx_try_enter_fmt,
@ -515,7 +515,7 @@ _mtx_exit(mtx_t *mtxp, int type, const char *file, int line)
mtx_t *const mpp = mtxp;
MPASS2(mtx_owned(mpp), STR_mtx_owned);
WITNESS_EXIT(mpp, type);
WITNESS_EXIT(mpp, type, file, line);
CTR5(KTR_LOCK, STR_mtx_exit_fmt,
mpp->mtx_description, mpp, file, line,
mpp->mtx_recurse);

28
sys/amd64/include/mutex.h
View File

@ -240,12 +240,12 @@ extern char STR_IDIS[];
#ifndef SMP_DEBUG
#error WITNESS requires SMP_DEBUG
#endif /* SMP_DEBUG */
#define WITNESS_ENTER(m, f) \
#define WITNESS_ENTER(m, t, f, l) \
if ((m)->mtx_witness != NULL) \
witness_enter((m), (f), __FILE__, __LINE__)
#define WITNESS_EXIT(m, f) \
witness_enter((m), (t), (f), (l))
#define WITNESS_EXIT(m, t, f, l) \
if ((m)->mtx_witness != NULL) \
witness_exit((m), (f), __FILE__, __LINE__)
witness_exit((m), (t), (f), (l))
#define WITNESS_SLEEP(check, m) witness_sleep(check, (m), __FILE__, __LINE__)
#define WITNESS_SAVE_DECL(n) \
@ -266,17 +266,17 @@ do { \
void witness_init(mtx_t *, int flag);
void witness_destroy(mtx_t *);
void witness_enter(mtx_t *, int, char *, int);
void witness_enter(mtx_t *, int, const char *, int);
void witness_try_enter(mtx_t *, int, const char *, int);
void witness_exit(mtx_t *, int, char *, int);
void witness_exit(mtx_t *, int, const char *, int);
void witness_display(void(*)(const char *fmt, ...));
void witness_list(struct proc *);
int witness_sleep(int, mtx_t *, char *, int);
int witness_sleep(int, mtx_t *, const char *, int);
void witness_save(mtx_t *, const char **, int *);
void witness_restore(mtx_t *, const char *, int);
#else /* WITNESS */
#define WITNESS_ENTER(m, flag)
#define WITNESS_EXIT(m, flag)
#define WITNESS_ENTER(m, t, f, l)
#define WITNESS_EXIT(m, t, f, l)
#define WITNESS_SLEEP(check, m)
#define WITNESS_SAVE_DECL(n)
#define WITNESS_SAVE(m, n)
@ -288,9 +288,9 @@ void witness_restore(mtx_t *, const char *, int);
*/
#define witness_init(m, flag) flag++
#define witness_destroy(m)
#define witness_enter(m, flag, f, l)
#define witness_try_enter(m, flag, f, l )
#define witness_exit(m, flag, f, l)
#define witness_enter(m, t, f, l)
#define witness_try_enter(m, t, f, l)
#define witness_exit(m, t, f, l)
#endif /* WITNESS */
/*
@ -659,7 +659,7 @@ _mtx_enter(mtx_t *mtxp, int type, const char *file, int line)
(type) & MTX_HARDOPTS);
}
} while (0);
WITNESS_ENTER(mpp, type);
WITNESS_ENTER(mpp, type, file, line);
CTR5(KTR_LOCK, STR_mtx_enter_fmt,
mpp->mtx_description, mpp, file, line,
mpp->mtx_recurse);
@ -700,7 +700,7 @@ _mtx_exit(mtx_t *mtxp, int type, const char *file, int line)
mtx_t *const mpp = mtxp;
MPASS2(mtx_owned(mpp), STR_mtx_owned);
WITNESS_EXIT(mpp, type);
WITNESS_EXIT(mpp, type, file, line);
CTR5(KTR_LOCK, STR_mtx_exit_fmt,
mpp->mtx_description, mpp, file, line,
mpp->mtx_recurse);

28
sys/i386/include/mutex.h
View File

@ -240,12 +240,12 @@ extern char STR_IDIS[];
#ifndef SMP_DEBUG
#error WITNESS requires SMP_DEBUG
#endif /* SMP_DEBUG */
#define WITNESS_ENTER(m, f) \
#define WITNESS_ENTER(m, t, f, l) \
if ((m)->mtx_witness != NULL) \
witness_enter((m), (f), __FILE__, __LINE__)
#define WITNESS_EXIT(m, f) \
witness_enter((m), (t), (f), (l))
#define WITNESS_EXIT(m, t, f, l) \
if ((m)->mtx_witness != NULL) \
witness_exit((m), (f), __FILE__, __LINE__)
witness_exit((m), (t), (f), (l))
#define WITNESS_SLEEP(check, m) witness_sleep(check, (m), __FILE__, __LINE__)
#define WITNESS_SAVE_DECL(n) \
@ -266,17 +266,17 @@ do { \
void witness_init(mtx_t *, int flag);
void witness_destroy(mtx_t *);
void witness_enter(mtx_t *, int, char *, int);
void witness_enter(mtx_t *, int, const char *, int);
void witness_try_enter(mtx_t *, int, const char *, int);
void witness_exit(mtx_t *, int, char *, int);
void witness_exit(mtx_t *, int, const char *, int);
void witness_display(void(*)(const char *fmt, ...));
void witness_list(struct proc *);
int witness_sleep(int, mtx_t *, char *, int);
int witness_sleep(int, mtx_t *, const char *, int);
void witness_save(mtx_t *, const char **, int *);
void witness_restore(mtx_t *, const char *, int);
#else /* WITNESS */
#define WITNESS_ENTER(m, flag)
#define WITNESS_EXIT(m, flag)
#define WITNESS_ENTER(m, t, f, l)
#define WITNESS_EXIT(m, t, f, l)
#define WITNESS_SLEEP(check, m)
#define WITNESS_SAVE_DECL(n)
#define WITNESS_SAVE(m, n)
@ -288,9 +288,9 @@ void witness_restore(mtx_t *, const char *, int);
*/
#define witness_init(m, flag) flag++
#define witness_destroy(m)
#define witness_enter(m, flag, f, l)
#define witness_try_enter(m, flag, f, l )
#define witness_exit(m, flag, f, l)
#define witness_enter(m, t, f, l)
#define witness_try_enter(m, t, f, l)
#define witness_exit(m, t, f, l)
#endif /* WITNESS */
/*
@ -659,7 +659,7 @@ _mtx_enter(mtx_t *mtxp, int type, const char *file, int line)
(type) & MTX_HARDOPTS);
}
} while (0);
WITNESS_ENTER(mpp, type);
WITNESS_ENTER(mpp, type, file, line);
CTR5(KTR_LOCK, STR_mtx_enter_fmt,
mpp->mtx_description, mpp, file, line,
mpp->mtx_recurse);
@ -700,7 +700,7 @@ _mtx_exit(mtx_t *mtxp, int type, const char *file, int line)
mtx_t *const mpp = mtxp;
MPASS2(mtx_owned(mpp), STR_mtx_owned);
WITNESS_EXIT(mpp, type);
WITNESS_EXIT(mpp, type, file, line);
CTR5(KTR_LOCK, STR_mtx_exit_fmt,
mpp->mtx_description, mpp, file, line,
mpp->mtx_recurse);

6
sys/kern/kern_mutex.c
View File

@ -226,7 +226,7 @@ witness_destroy(mtx_t *m)
}
void
witness_enter(mtx_t *m, int flags, char *file, int line)
witness_enter(mtx_t *m, int flags, const char *file, int line)
{
witness_t *w, *w1;
mtx_t *m1;
@ -361,7 +361,7 @@ witness_enter(mtx_t *m, int flags, char *file, int line)
}
void
witness_exit(mtx_t *m, int flags, char *file, int line)
witness_exit(mtx_t *m, int flags, const char *file, int line)
{
witness_t *w;
@ -458,7 +458,7 @@ witness_display(void(*prnt)(const char *fmt, ...))
}
int
witness_sleep(int check_only, mtx_t *mtx, char *file, int line)
witness_sleep(int check_only, mtx_t *mtx, const char *file, int line)
{
mtx_t *m;
struct proc *p;

6
sys/kern/subr_turnstile.c
View File

@ -226,7 +226,7 @@ witness_destroy(mtx_t *m)
}
void
witness_enter(mtx_t *m, int flags, char *file, int line)
witness_enter(mtx_t *m, int flags, const char *file, int line)
{
witness_t *w, *w1;
mtx_t *m1;
@ -361,7 +361,7 @@ witness_enter(mtx_t *m, int flags, char *file, int line)
}
void
witness_exit(mtx_t *m, int flags, char *file, int line)
witness_exit(mtx_t *m, int flags, const char *file, int line)
{
witness_t *w;
@ -458,7 +458,7 @@ witness_display(void(*prnt)(const char *fmt, ...))
}
int
witness_sleep(int check_only, mtx_t *mtx, char *file, int line)
witness_sleep(int check_only, mtx_t *mtx, const char *file, int line)
{
mtx_t *m;
struct proc *p;

6
sys/kern/subr_witness.c
View File

@ -226,7 +226,7 @@ witness_destroy(mtx_t *m)
}
void
witness_enter(mtx_t *m, int flags, char *file, int line)
witness_enter(mtx_t *m, int flags, const char *file, int line)
{
witness_t *w, *w1;
mtx_t *m1;
@ -361,7 +361,7 @@ witness_enter(mtx_t *m, int flags, char *file, int line)
}
void
witness_exit(mtx_t *m, int flags, char *file, int line)
witness_exit(mtx_t *m, int flags, const char *file, int line)
{
witness_t *w;
@ -458,7 +458,7 @@ witness_display(void(*prnt)(const char *fmt, ...))
}
int
witness_sleep(int check_only, mtx_t *mtx, char *file, int line)
witness_sleep(int check_only, mtx_t *mtx, const char *file, int line)
{
mtx_t *m;
struct proc *p;

32
sys/powerpc/include/mutex.h
View File

@ -243,12 +243,12 @@ extern char STR_IDIS[];
#ifndef SMP_DEBUG
#error WITNESS requires SMP_DEBUG
#endif /* SMP_DEBUG */
#define WITNESS_ENTER(m, f) \
#define WITNESS_ENTER(m, t, f, l) \
if ((m)->mtx_witness != NULL) \
witness_enter((m), (f), __FILE__, __LINE__)
#define WITNESS_EXIT(m, f) \
witness_enter((m), (t), (f), (l))
#define WITNESS_EXIT(m, t, f, l) \
if ((m)->mtx_witness != NULL) \
witness_exit((m), (f), __FILE__, __LINE__)
witness_exit((m), (t), (f), (l))
#define WITNESS_SLEEP(check, m) witness_sleep(check, (m), __FILE__, __LINE__)
#define WITNESS_SAVE_DECL(n) \
@ -269,17 +269,17 @@ do { \
void witness_init(mtx_t *, int flag);
void witness_destroy(mtx_t *);
void witness_enter(mtx_t *, int, char *, int);
void witness_try_enter(mtx_t *, int, char *, int);
void witness_exit(mtx_t *, int, char *, int);
void witness_enter(mtx_t *, int, const char *, int);
void witness_try_enter(mtx_t *, int, const char *, int);
void witness_exit(mtx_t *, int, const char *, int);
void witness_display(void(*)(const char *fmt, ...));
void witness_list(struct proc *);
int witness_sleep(int, mtx_t *, char *, int);
int witness_sleep(int, mtx_t *, const char *, int);
void witness_save(mtx_t *, const char **, int *);
void witness_restore(mtx_t *, const char *, int);
#else /* WITNESS */
#define WITNESS_ENTER(m, flag)
#define WITNESS_EXIT(m, flag)
#define WITNESS_ENTER(m, t, f, l)
#define WITNESS_EXIT(m, t, f, l)
#define WITNESS_SLEEP(check, m)
#define WITNESS_SAVE_DECL(n)
#define WITNESS_SAVE(m, n)
@ -291,9 +291,9 @@ void witness_restore(mtx_t *, const char *, int);
*/
#define witness_init(m, flag) flag++
#define witness_destroy(m)
#define witness_enter(m, flag, f, l)
#define witness_try_enter(m, flag, f, l )
#define witness_exit(m, flag, f, l)
#define witness_enter(m, t, f, l)
#define witness_try_enter(m, t, f, l)
#define witness_exit(m, t, f, l)
#endif /* WITNESS */
/*
@ -474,7 +474,7 @@ _mtx_enter(mtx_t *mtxp, int type, const char *file, int line)
}
}
} while (0);
WITNESS_ENTER(mpp, type);
WITNESS_ENTER(mpp, type, file, line);
CTR5(KTR_LOCK, STR_mtx_enter_fmt,
mpp->mtx_description, mpp, file, line,
mpp->mtx_recurse);
@ -495,7 +495,7 @@ _mtx_try_enter(mtx_t *mtxp, int type, const char *file, int line)
#ifdef SMP_DEBUG
if (rval && mpp->mtx_witness != NULL) {
ASS(mpp->mtx_recurse == 0);
witness_try_enter(mpp, type, file, line);
witness_try_enter(mpp, type, file, line);
}
#endif
CTR5(KTR_LOCK, STR_mtx_try_enter_fmt,
@ -515,7 +515,7 @@ _mtx_exit(mtx_t *mtxp, int type, const char *file, int line)
mtx_t *const mpp = mtxp;
MPASS2(mtx_owned(mpp), STR_mtx_owned);
WITNESS_EXIT(mpp, type);
WITNESS_EXIT(mpp, type, file, line);
CTR5(KTR_LOCK, STR_mtx_exit_fmt,
mpp->mtx_description, mpp, file, line,
mpp->mtx_recurse);