Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Convert a KASSERT to a KASSERTMSG



details:   https://anonhg.NetBSD.org/src/rev/d3927996d381
branches:  trunk
changeset: 787670:d3927996d381
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jun 28 01:21:45 2013 +0000

description:
Convert a KASSERT to a KASSERTMSG

diffstat:

 sys/kern/kern_timeout.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 3f7af50ac660 -r d3927996d381 sys/kern/kern_timeout.c
--- a/sys/kern/kern_timeout.c   Fri Jun 28 01:21:06 2013 +0000
+++ b/sys/kern/kern_timeout.c   Fri Jun 28 01:21:45 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_timeout.c,v 1.45 2010/12/18 01:36:19 rmind Exp $  */
+/*     $NetBSD: kern_timeout.c,v 1.46 2013/06/28 01:21:45 matt Exp $   */
 
 /*-
  * Copyright (c) 2003, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.45 2010/12/18 01:36:19 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_timeout.c,v 1.46 2013/06/28 01:21:45 matt Exp $");
 
 /*
  * Timeouts are kept in a hierarchical timing wheel.  The c_time is the
@@ -311,7 +311,9 @@
         */
        KASSERT((c->c_flags & CALLOUT_PENDING) == 0);
        KASSERT(c->c_cpu->cc_lwp == curlwp || c->c_cpu->cc_active != c);
-       KASSERT(c->c_magic == CALLOUT_MAGIC);
+       KASSERTMSG(c->c_magic == CALLOUT_MAGIC,
+           "callout %p: c_magic (%#x) != CALLOUT_MAGIC (%#x)",
+           c, c->c_magic, CALLOUT_MAGIC);
        c->c_magic = 0;
 }
 



Home | Main Index | Thread Index | Old Index