diff options
author | Conrad Meyer <cem@FreeBSD.org> | 2019-03-15 22:39:55 +0000 |
---|---|---|
committer | Conrad Meyer <cem@FreeBSD.org> | 2019-03-15 22:39:55 +0000 |
commit | 54533f66c953ea1784423b8c1abc3c9342dbf750 (patch) | |
tree | 83f033ec8432a8015f9d9f859ea8e7ad7be067e5 | |
parent | a530b610636be65c4948ba01a65da56627d7ffe2 (diff) | |
download | src-54533f66c953ea1784423b8c1abc3c9342dbf750.tar.gz src-54533f66c953ea1784423b8c1abc3c9342dbf750.zip |
stack(9): Drop unused API mode and comment that referenced it
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D19601
Notes
Notes:
svn path=/head/; revision=345206
-rw-r--r-- | sys/geom/geom_io.c | 10 | ||||
-rw-r--r-- | sys/kern/subr_stack.c | 32 | ||||
-rw-r--r-- | sys/sys/_stack.h | 2 | ||||
-rw-r--r-- | sys/sys/stack.h | 8 |
4 files changed, 18 insertions, 34 deletions
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 9797884252ef..58bf324e0e3e 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -155,7 +155,7 @@ g_new_bio(void) CTR1(KTR_GEOM, "g_new_bio(): %p", bp); stack_save(&st); - CTRSTACK(KTR_GEOM, &st, 3, 0); + CTRSTACK(KTR_GEOM, &st, 3); } #endif return (bp); @@ -173,7 +173,7 @@ g_alloc_bio(void) CTR1(KTR_GEOM, "g_alloc_bio(): %p", bp); stack_save(&st); - CTRSTACK(KTR_GEOM, &st, 3, 0); + CTRSTACK(KTR_GEOM, &st, 3); } #endif return (bp); @@ -188,7 +188,7 @@ g_destroy_bio(struct bio *bp) CTR1(KTR_GEOM, "g_destroy_bio(): %p", bp); stack_save(&st); - CTRSTACK(KTR_GEOM, &st, 3, 0); + CTRSTACK(KTR_GEOM, &st, 3); } #endif uma_zfree(biozone, bp); @@ -236,7 +236,7 @@ g_clone_bio(struct bio *bp) CTR2(KTR_GEOM, "g_clone_bio(%p): %p", bp, bp2); stack_save(&st); - CTRSTACK(KTR_GEOM, &st, 3, 0); + CTRSTACK(KTR_GEOM, &st, 3); } #endif return(bp2); @@ -265,7 +265,7 @@ g_duplicate_bio(struct bio *bp) CTR2(KTR_GEOM, "g_duplicate_bio(%p): %p", bp, bp2); stack_save(&st); - CTRSTACK(KTR_GEOM, &st, 3, 0); + CTRSTACK(KTR_GEOM, &st, 3); } #endif return(bp2); diff --git a/sys/kern/subr_stack.c b/sys/kern/subr_stack.c index 168b4508e8eb..0429a5fb2434 100644 --- a/sys/kern/subr_stack.c +++ b/sys/kern/subr_stack.c @@ -215,7 +215,7 @@ stack_sbuf_print_ddb(struct sbuf *sb, const struct stack *st) #ifdef KTR void stack_ktr(u_int mask, const char *file, int line, const struct stack *st, - u_int depth, int cheap) + u_int depth) { #ifdef DDB const char *name; @@ -224,31 +224,15 @@ stack_ktr(u_int mask, const char *file, int line, const struct stack *st, #endif KASSERT(st->depth <= STACK_MAX, ("bogus stack")); - if (cheap) { - ktr_tracepoint(mask, file, line, "#0 %p %p %p %p %p %p", - st->pcs[0], st->pcs[1], st->pcs[2], st->pcs[3], - st->pcs[4], st->pcs[5]); - if (st->depth <= 6) - return; - ktr_tracepoint(mask, file, line, "#1 %p %p %p %p %p %p", - st->pcs[6], st->pcs[7], st->pcs[8], st->pcs[9], - st->pcs[10], st->pcs[11]); - if (st->depth <= 12) - return; - ktr_tracepoint(mask, file, line, "#2 %p %p %p %p %p %p", - st->pcs[12], st->pcs[13], st->pcs[14], st->pcs[15], - st->pcs[16], st->pcs[17]); #ifdef DDB - } else { - if (depth == 0 || st->depth < depth) - depth = st->depth; - for (i = 0; i < depth; i++) { - (void)stack_symbol_ddb(st->pcs[i], &name, &offset); - ktr_tracepoint(mask, file, line, "#%d %p at %s+%#lx", - i, st->pcs[i], (u_long)name, offset, 0, 0); - } -#endif + if (depth == 0 || st->depth < depth) + depth = st->depth; + for (i = 0; i < depth; i++) { + (void)stack_symbol_ddb(st->pcs[i], &name, &offset); + ktr_tracepoint(mask, file, line, "#%d %p at %s+%#lx", + i, st->pcs[i], (u_long)name, offset, 0, 0); } +#endif } #endif diff --git a/sys/sys/_stack.h b/sys/sys/_stack.h index a7d440440b45..bab8dabd2080 100644 --- a/sys/sys/_stack.h +++ b/sys/sys/_stack.h @@ -31,7 +31,7 @@ #ifndef _SYS__STACK_H_ #define _SYS__STACK_H_ -#define STACK_MAX 18 /* Don't change, stack_ktr relies on this. */ +#define STACK_MAX 18 struct stack { int depth; diff --git a/sys/sys/stack.h b/sys/sys/stack.h index ee804917f08d..3b4eff8ab117 100644 --- a/sys/sys/stack.h +++ b/sys/sys/stack.h @@ -51,13 +51,13 @@ int stack_sbuf_print_flags(struct sbuf *, const struct stack *, int); #ifdef KTR void stack_ktr(u_int, const char *, int, const struct stack *, - u_int, int); -#define CTRSTACK(m, st, depth, cheap) do { \ + u_int); +#define CTRSTACK(m, st, depth) do { \ if (KTR_COMPILE & (m)) \ - stack_ktr((m), __FILE__, __LINE__, st, depth, cheap); \ + stack_ktr((m), __FILE__, __LINE__, st, depth); \ } while(0) #else -#define CTRSTACK(m, st, depth, cheap) +#define CTRSTACK(m, st, depth) #endif /* MD Routines. */ |