Module Name: src
Committed By: pooka
Date: Sat Dec 5 22:38:19 UTC 2009
Modified Files:
src/sys/kern: kern_condvar.c kern_synch.c
src/sys/sys: condvar.h
Log Message:
tsleep() on lbolt is now illegal. Convert cv_wakeup(&lbolt) to
cv_broadcast(&lbolt) and get rid of the prior.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/kern/kern_condvar.c
cvs rdiff -u -r1.272 -r1.273 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.11 -r1.12 src/sys/sys/condvar.h
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_condvar.c
diff -u src/sys/kern/kern_condvar.c:1.27 src/sys/kern/kern_condvar.c:1.28
--- src/sys/kern/kern_condvar.c:1.27 Wed Oct 21 21:12:06 2009
+++ src/sys/kern/kern_condvar.c Sat Dec 5 22:38:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_condvar.c,v 1.27 2009/10/21 21:12:06 rmind Exp $ */
+/* $NetBSD: kern_condvar.c,v 1.28 2009/12/05 22:38:19 pooka Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.27 2009/10/21 21:12:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.28 2009/12/05 22:38:19 pooka Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -365,21 +365,6 @@
}
/*
- * cv_wakeup:
- *
- * Wake all LWPs waiting on a condition variable. For cases
- * where the address may be waited on by mtsleep()/tsleep().
- * Not a documented call.
- */
-void
-cv_wakeup(kcondvar_t *cv)
-{
-
- cv_wakeup_all(cv);
- wakeup(cv);
-}
-
-/*
* cv_has_waiters:
*
* For diagnostic assertions: return non-zero if a condition
Index: src/sys/kern/kern_synch.c
diff -u src/sys/kern/kern_synch.c:1.272 src/sys/kern/kern_synch.c:1.273
--- src/sys/kern/kern_synch.c:1.272 Sat Dec 5 22:34:43 2009
+++ src/sys/kern/kern_synch.c Sat Dec 5 22:38:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_synch.c,v 1.272 2009/12/05 22:34:43 pooka Exp $ */
+/* $NetBSD: kern_synch.c,v 1.273 2009/12/05 22:38:19 pooka Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.272 2009/12/05 22:34:43 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.273 2009/12/05 22:38:19 pooka Exp $");
#include "opt_kstack.h"
#include "opt_perfctrs.h"
@@ -1211,6 +1211,6 @@
}
mutex_exit(proc_lock);
uvm_meter();
- cv_wakeup(&lbolt);
+ cv_broadcast(&lbolt);
callout_schedule(&sched_pstats_ch, hz);
}
Index: src/sys/sys/condvar.h
diff -u src/sys/sys/condvar.h:1.11 src/sys/sys/condvar.h:1.12
--- src/sys/sys/condvar.h:1.11 Fri Dec 19 07:57:28 2008
+++ src/sys/sys/condvar.h Sat Dec 5 22:38:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: condvar.h,v 1.11 2008/12/19 07:57:28 thorpej Exp $ */
+/* $NetBSD: condvar.h,v 1.12 2009/12/05 22:38:19 pooka Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -51,8 +51,6 @@
void cv_signal(kcondvar_t *);
void cv_broadcast(kcondvar_t *);
-void cv_wakeup(kcondvar_t *);
-
bool cv_has_waiters(kcondvar_t *);
bool cv_is_valid(kcondvar_t *);
