Module Name: src Committed By: rmind Date: Mon Feb 20 01:12:43 UTC 2012
Modified Files: src/sys/kern: kern_time.c Log Message: itimerfire: fix a regression, check if timer is already queued. To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/kern/kern_time.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/kern_time.c diff -u src/sys/kern/kern_time.c:1.172 src/sys/kern/kern_time.c:1.173 --- src/sys/kern/kern_time.c:1.172 Sun Feb 19 21:06:55 2012 +++ src/sys/kern/kern_time.c Mon Feb 20 01:12:42 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_time.c,v 1.172 2012/02/19 21:06:55 rmind Exp $ */ +/* $NetBSD: kern_time.c,v 1.173 2012/02/20 01:12:42 rmind Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.172 2012/02/19 21:06:55 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.173 2012/02/20 01:12:42 rmind Exp $"); #include <sys/param.h> #include <sys/resourcevar.h> @@ -1335,7 +1335,7 @@ itimerfire(struct ptimer *pt) * XXX Can overrun, but we don't do signal queueing yet, anyway. * XXX Relying on the clock interrupt is stupid. */ - if (pt->pt_ev.sigev_notify != SIGEV_SIGNAL) { + if (pt->pt_ev.sigev_notify != SIGEV_SIGNAL || pt->pt_queued) { return; } TAILQ_INSERT_TAIL(&timer_queue, pt, pt_chain);