Author: glebius
Date: Thu Oct 27 09:43:25 2011
New Revision: 226829
URL: http://svn.freebsd.org/changeset/base/226829

Log:
  - If KDB & NETGRAPH_DEBUG are on, print traces on discovered failed
    invariants.
  - Reduce tautology in NETGRAPH_DEBUG output.

Modified:
  head/sys/netgraph/netgraph.h
  head/sys/netgraph/ng_base.c

Modified: head/sys/netgraph/netgraph.h
==============================================================================
--- head/sys/netgraph/netgraph.h        Thu Oct 27 08:44:07 2011        
(r226828)
+++ head/sys/netgraph/netgraph.h        Thu Oct 27 09:43:25 2011        
(r226829)
@@ -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;

Modified: head/sys/netgraph/ng_base.c
==============================================================================
--- head/sys/netgraph/ng_base.c Thu Oct 27 08:44:07 2011        (r226828)
+++ head/sys/netgraph/ng_base.c Thu Oct 27 09:43:25 2011        (r226829)
@@ -3167,6 +3167,9 @@ dumphook (hook_p hook, char *file, int l
                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 li
                node->lastfile, node->lastline);
        if (line) {
                printf(" problem discovered at file %s, line %d\n", file, line);
+#ifdef KDB
+               kdb_backtrace();
+#endif
        }
 }
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to