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

Make it possible to compile kernel with KTR but without DDB.

Browse Source
This commit is contained in:
sobomax 2008-10-30 21:48:28 +00:00
parent ae5a12cdf1
commit dafc63cd43
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/conf/files
View File

@ -1691,7 +1691,7 @@ kern/subr_sbuf.c standard
kern/subr_scanf.c standard kern/subr_scanf.c standard
kern/subr_sleepqueue.c standard kern/subr_sleepqueue.c standard
kern/subr_smp.c standard kern/subr_smp.c standard
kern/subr_stack.c optional ddb | stack kern/subr_stack.c optional ddb | stack | ktr
kern/subr_taskqueue.c standard kern/subr_taskqueue.c standard
kern/subr_trap.c standard kern/subr_trap.c standard
kern/subr_turnstile.c standard kern/subr_turnstile.c standard

6
sys/kern/subr_stack.c
View File

@ -155,15 +155,18 @@ stack_sbuf_print_ddb(struct sbuf *sb, struct stack *st)
name, offset); name, offset);
} }
} }
#endif
#ifdef KTR #ifdef KTR
void void
stack_ktr(u_int mask, const char *file, int line, struct stack *st, u_int depth, stack_ktr(u_int mask, const char *file, int line, struct stack *st, u_int depth,
int cheap) int cheap)
{ {
#ifdef DDB
const char *name; const char *name;
long offset; long offset;
int i; int i;
#endif
KASSERT(st->depth <= STACK_MAX, ("bogus stack")); KASSERT(st->depth <= STACK_MAX, ("bogus stack"));
if (cheap) { if (cheap) {
@ -180,6 +183,7 @@ stack_ktr(u_int mask, const char *file, int line, struct stack *st, u_int depth,
ktr_tracepoint(mask, file, line, "#2 %p %p %p %p %p %p", 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[12], st->pcs[13], st->pcs[14], st->pcs[15],
st->pcs[16], st->pcs[17]); st->pcs[16], st->pcs[17]);
#ifdef DDB
} else { } else {
if (depth == 0 || st->depth < depth) if (depth == 0 || st->depth < depth)
depth = st->depth; depth = st->depth;
@ -188,10 +192,10 @@ stack_ktr(u_int mask, const char *file, int line, struct stack *st, u_int depth,
ktr_tracepoint(mask, file, line, "#%d %p at %s+%#lx", ktr_tracepoint(mask, file, line, "#%d %p at %s+%#lx",
i, st->pcs[i], (u_long)name, offset, 0, 0); i, st->pcs[i], (u_long)name, offset, 0, 0);
} }
#endif
} }
} }
#endif #endif
#endif
/* /*
* Two variants of stack symbol lookup -- one that uses the DDB interfaces * Two variants of stack symbol lookup -- one that uses the DDB interfaces