From 73f8c1969fba5d84c113453e480f9b1d095a4a0a Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 27 Oct 2011 09:43:25 +0000 Subject: - If KDB & NETGRAPH_DEBUG are on, print traces on discovered failed invariants. - Reduce tautology in NETGRAPH_DEBUG output. --- sys/netgraph/netgraph.h | 5 +++-- sys/netgraph/ng_base.c | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'sys/netgraph') diff --git a/sys/netgraph/netgraph.h b/sys/netgraph/netgraph.h index 7b67c94e..09ee09e 100644 --- a/sys/netgraph/netgraph.h +++ b/sys/netgraph/netgraph.h @@ -57,6 +57,7 @@ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_netgraph.h" +#include "opt_kdb.h" #endif /* debugging options */ @@ -190,7 +191,7 @@ static __inline void _chkhook(hook_p hook, char *file, int line) { if (hook->hk_magic != HK_MAGIC) { - printf("Accessing freed hook "); + printf("Accessing freed "); dumphook(hook, file, line); } hook->lastline = line; @@ -458,7 +459,7 @@ static __inline void _chknode(node_p node, char *file, int line) { if (node->nd_magic != ND_MAGIC) { - printf("Accessing freed node "); + printf("Accessing freed "); dumpnode(node, file, line); } node->lastline = line; diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index 0918193..3c84dbf 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -3167,6 +3167,9 @@ dumphook (hook_p hook, char *file, int line) hook->lastfile, hook->lastline); if (line) { printf(" problem discovered at file %s, line %d\n", file, line); +#ifdef KDB + kdb_backtrace(); +#endif } } @@ -3181,6 +3184,9 @@ dumpnode(node_p node, char *file, int line) node->lastfile, node->lastline); if (line) { printf(" problem discovered at file %s, line %d\n", file, line); +#ifdef KDB + kdb_backtrace(); +#endif } } -- cgit v1.1