Module Name: src
Committed By: rmind
Date: Sun Aug 7 14:03:17 UTC 2011
Modified Files:
src/share/man/man9: kthread.9
src/sys/dev: fss.c
src/sys/dev/flash: flash_io.c
src/sys/kern: kern_kthread.c
src/sys/rump/librump/rumpkern: threads.c
src/sys/rump/net/lib/libshmif: if_shmem.c
src/sys/rump/net/lib/libvirtif: if_virt.c
src/sys/sys: kthread.h lwp.h
src/tests/rump/kernspace: busypage.c thread.c tsleep.c
Log Message:
Rename slightly misleading KTHREAD_JOINABLE to KTHREAD_MUSTJOIN.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/share/man/man9/kthread.9
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/fss.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/flash/flash_io.c
cvs rdiff -u -r1.35 -r1.36 src/sys/kern/kern_kthread.c
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpkern/threads.c
cvs rdiff -u -r1.39 -r1.40 src/sys/rump/net/lib/libshmif/if_shmem.c
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/net/lib/libvirtif/if_virt.c
cvs rdiff -u -r1.10 -r1.11 src/sys/sys/kthread.h
cvs rdiff -u -r1.153 -r1.154 src/sys/sys/lwp.h
cvs rdiff -u -r1.4 -r1.5 src/tests/rump/kernspace/busypage.c
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/kernspace/thread.c \
src/tests/rump/kernspace/tsleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/kthread.9
diff -u src/share/man/man9/kthread.9:1.26 src/share/man/man9/kthread.9:1.27
--- src/share/man/man9/kthread.9:1.26 Thu May 19 08:55:01 2011
+++ src/share/man/man9/kthread.9 Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: kthread.9,v 1.26 2011/05/19 08:55:01 wiz Exp $
+.\" $NetBSD: kthread.9,v 1.27 2011/08/07 14:03:16 rmind Exp $
.\"
.\" Copyright (c) 2000, 2007, 2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd May 19, 2011
+.Dd August 7, 2011
.Dt KTHREAD 9
.Os
.Sh NAME
@@ -93,7 +93,7 @@
May be
.Dv NULL ,
unless
-.Dv KTHREAD_JOINABLE
+.Dv KTHREAD_MUSTJOIN
is specified in
.Fa flags .
.It Fa fmt
@@ -106,7 +106,7 @@
The following
.Va flags
are defined.
-.Bl -tag -width KTHREAD_JOINABLE
+.Bl -tag -width KTHREAD_MUSTJOIN
.It Dv KTHREAD_IDLE
Causes the thread to be created in the
.Dv LSIDL
@@ -138,8 +138,8 @@
.Dv SCHED_RR
class do not have their priority dynamically
adjusted by the scheduler.
-.It Dv KTHREAD_JOINABLE
-Requests creation of joinable kthread.
+.It Dv KTHREAD_MUSTJOIN
+Indicates that created kthread must be joined.
In such case
.Fn kthread_exit
will wait until
@@ -160,7 +160,7 @@
.Xr pthread_join 3 ,
however it must be called only once for kernel thread which was
created using the
-.Dv KTHREAD_JOIN
+.Dv KTHREAD_MUSTJOIN
flag and would wait on
.Fa kthread_exit .
.El
Index: src/sys/dev/fss.c
diff -u src/sys/dev/fss.c:1.77 src/sys/dev/fss.c:1.78
--- src/sys/dev/fss.c:1.77 Tue Jun 21 13:59:41 2011
+++ src/sys/dev/fss.c Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.77 2011/06/21 13:59:41 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.78 2011/08/07 14:03:16 rmind Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.77 2011/06/21 13:59:41 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.78 2011/08/07 14:03:16 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -455,7 +455,7 @@
}
sc->sc_flags |= FSS_BS_THREAD;
- if ((error = kthread_create(PRI_BIO, KTHREAD_JOINABLE, NULL,
+ if ((error = kthread_create(PRI_BIO, KTHREAD_MUSTJOIN, NULL,
fss_bs_thread, sc, &sc->sc_bs_lwp,
"%s", device_xname(sc->sc_dev))) != 0) {
sc->sc_flags &= ~FSS_BS_THREAD;
Index: src/sys/dev/flash/flash_io.c
diff -u src/sys/dev/flash/flash_io.c:1.3 src/sys/dev/flash/flash_io.c:1.4
--- src/sys/dev/flash/flash_io.c:1.3 Fri Jul 15 19:19:57 2011
+++ src/sys/dev/flash/flash_io.c Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_io.c,v 1.3 2011/07/15 19:19:57 cliff Exp $ */
+/* $NetBSD: flash_io.c,v 1.4 2011/08/07 14:03:16 rmind Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: flash_io.c,v 1.3 2011/07/15 19:19:57 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_io.c,v 1.4 2011/08/07 14:03:16 rmind Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -119,7 +119,7 @@
fio->fio_write_pending = false;
/* arrange to allocate the kthread */
- error = kthread_create(PRI_NONE, KTHREAD_JOINABLE | KTHREAD_MPSAFE,
+ error = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN | KTHREAD_MPSAFE,
NULL, flash_sync_thread, fio, &fio->fio_thread, "flashio");
if (!error)
Index: src/sys/kern/kern_kthread.c
diff -u src/sys/kern/kern_kthread.c:1.35 src/sys/kern/kern_kthread.c:1.36
--- src/sys/kern/kern_kthread.c:1.35 Sun Jul 17 20:54:52 2011
+++ src/sys/kern/kern_kthread.c Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_kthread.c,v 1.35 2011/07/17 20:54:52 joerg Exp $ */
+/* $NetBSD: kern_kthread.c,v 1.36 2011/08/07 14:03:16 rmind Exp $ */
/*-
* Copyright (c) 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_kthread.c,v 1.35 2011/07/17 20:54:52 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_kthread.c,v 1.36 2011/08/07 14:03:16 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,9 +121,9 @@
l->l_cpu = ci;
}
- if ((flag & KTHREAD_JOINABLE) != 0) {
+ if ((flag & KTHREAD_MUSTJOIN) != 0) {
KASSERT(lp != NULL);
- l->l_pflag |= LP_JOINABLE;
+ l->l_pflag |= LP_MUSTJOIN;
}
if ((flag & KTHREAD_INTR) != 0) {
l->l_pflag |= LP_INTR;
@@ -170,7 +170,7 @@
}
/* Barrier for joining. */
- if (l->l_pflag & LP_JOINABLE) {
+ if (l->l_pflag & LP_MUSTJOIN) {
mutex_enter(&kthread_lock);
while (kthread_jtarget != l) {
cv_wait(&kthread_cv, &kthread_lock);
Index: src/sys/rump/librump/rumpkern/threads.c
diff -u src/sys/rump/librump/rumpkern/threads.c:1.14 src/sys/rump/librump/rumpkern/threads.c:1.15
--- src/sys/rump/librump/rumpkern/threads.c:1.14 Sun Jul 17 20:54:54 2011
+++ src/sys/rump/librump/rumpkern/threads.c Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: threads.c,v 1.14 2011/07/17 20:54:54 joerg Exp $ */
+/* $NetBSD: threads.c,v 1.15 2011/08/07 14:03:16 rmind Exp $ */
/*
* Copyright (c) 2007-2009 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: threads.c,v 1.14 2011/07/17 20:54:54 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: threads.c,v 1.15 2011/08/07 14:03:16 rmind Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -153,14 +153,14 @@
}
rv = rumpuser_thread_create(threadbouncer, k, thrname,
- (flags & KTHREAD_JOINABLE) == KTHREAD_JOINABLE, &l->l_ctxlink);
+ (flags & KTHREAD_MUSTJOIN) == KTHREAD_MUSTJOIN, &l->l_ctxlink);
if (rv)
return rv;
if (newlp) {
*newlp = l;
} else {
- KASSERT((flags & KTHREAD_JOINABLE) == 0);
+ KASSERT((flags & KTHREAD_MUSTJOIN) == 0);
}
return 0;
Index: src/sys/rump/net/lib/libshmif/if_shmem.c
diff -u src/sys/rump/net/lib/libshmif/if_shmem.c:1.39 src/sys/rump/net/lib/libshmif/if_shmem.c:1.40
--- src/sys/rump/net/lib/libshmif/if_shmem.c:1.39 Mon Mar 21 16:41:09 2011
+++ src/sys/rump/net/lib/libshmif/if_shmem.c Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_shmem.c,v 1.39 2011/03/21 16:41:09 pooka Exp $ */
+/* $NetBSD: if_shmem.c,v 1.40 2011/08/07 14:03:16 rmind Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.39 2011/03/21 16:41:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_shmem.c,v 1.40 2011/08/07 14:03:16 rmind Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -186,7 +186,7 @@
error = 0;
if (rump_threads) {
error = kthread_create(PRI_NONE,
- KTHREAD_MPSAFE | KTHREAD_JOINABLE, NULL,
+ KTHREAD_MPSAFE | KTHREAD_MUSTJOIN, NULL,
shmif_rcv, ifp, &sc->sc_rcvl, "shmif");
} else {
printf("WARNING: threads not enabled, shmif NOT working\n");
Index: src/sys/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.23 src/sys/rump/net/lib/libvirtif/if_virt.c:1.24
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.23 Wed Jun 22 04:01:08 2011
+++ src/sys/rump/net/lib/libvirtif/if_virt.c Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_virt.c,v 1.23 2011/06/22 04:01:08 mrg Exp $ */
+/* $NetBSD: if_virt.c,v 1.24 2011/08/07 14:03:16 rmind Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.23 2011/06/22 04:01:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_virt.c,v 1.24 2011/08/07 14:03:16 rmind Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -116,12 +116,12 @@
ifp->if_softc = sc;
if (rump_threads) {
- if ((error = kthread_create(PRI_NONE, KTHREAD_JOINABLE, NULL,
+ if ((error = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN, NULL,
virtif_receiver, ifp, &sc->sc_l_rcv, "virtifr")) != 0)
goto out;
if ((error = kthread_create(PRI_NONE,
- KTHREAD_JOINABLE | KTHREAD_MPSAFE, NULL,
+ KTHREAD_MUSTJOIN | KTHREAD_MPSAFE, NULL,
virtif_sender, ifp, &sc->sc_l_snd, "virtifs")) != 0)
goto out;
} else {
Index: src/sys/sys/kthread.h
diff -u src/sys/sys/kthread.h:1.10 src/sys/sys/kthread.h:1.11
--- src/sys/sys/kthread.h:1.10 Thu May 19 03:07:29 2011
+++ src/sys/sys/kthread.h Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kthread.h,v 1.10 2011/05/19 03:07:29 rmind Exp $ */
+/* $NetBSD: kthread.h,v 1.11 2011/08/07 14:03:16 rmind Exp $ */
/*-
* Copyright (c) 1998, 2007, 2009 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
#define KTHREAD_MPSAFE 0x02 /* Do not acquire kernel_lock */
#define KTHREAD_INTR 0x04 /* Software interrupt handler */
#define KTHREAD_TS 0x08 /* Time-sharing priority range */
-#define KTHREAD_JOINABLE 0x10 /* Joinable */
+#define KTHREAD_MUSTJOIN 0x10 /* Must join on exit */
void kthread_sysinit(void);
Index: src/sys/sys/lwp.h
diff -u src/sys/sys/lwp.h:1.153 src/sys/sys/lwp.h:1.154
--- src/sys/sys/lwp.h:1.153 Sun Aug 7 13:33:02 2011
+++ src/sys/sys/lwp.h Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lwp.h,v 1.153 2011/08/07 13:33:02 rmind Exp $ */
+/* $NetBSD: lwp.h,v 1.154 2011/08/07 14:03:16 rmind Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2010
@@ -248,7 +248,7 @@
#define LP_MPSAFE 0x00000020 /* Starts life without kernel_lock */
#define LP_INTR 0x00000040 /* Soft interrupt handler */
#define LP_SYSCTLWRITE 0x00000080 /* sysctl write lock held */
-#define LP_JOINABLE 0x00000100 /* Joinable kthread */
+#define LP_MUSTJOIN 0x00000100 /* Must join kthread on exit */
#define LP_SA_PAGEFAULT 0x00000200 /* SA LWP in pagefault handler */
#define LP_SA_NOBLOCK 0x00000400 /* SA don't upcall on block */
#define LP_TIMEINTR 0x00010000 /* Time this soft interrupt */
Index: src/tests/rump/kernspace/busypage.c
diff -u src/tests/rump/kernspace/busypage.c:1.4 src/tests/rump/kernspace/busypage.c:1.5
--- src/tests/rump/kernspace/busypage.c:1.4 Sun Jun 12 06:38:14 2011
+++ src/tests/rump/kernspace/busypage.c Sun Aug 7 14:03:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: busypage.c,v 1.4 2011/06/12 06:38:14 mrg Exp $ */
+/* $NetBSD: busypage.c,v 1.5 2011/08/07 14:03:15 rmind Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: busypage.c,v 1.4 2011/06/12 06:38:14 mrg Exp $");
+__RCSID("$NetBSD: busypage.c,v 1.5 2011/08/07 14:03:15 rmind Exp $");
#endif /* !lint */
#include <sys/param.h>
@@ -75,7 +75,7 @@
if (testpg == NULL)
panic("couldn't create vm page");
- rv = kthread_create(PRI_NONE, KTHREAD_JOINABLE | KTHREAD_MPSAFE, NULL,
+ rv = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN | KTHREAD_MPSAFE, NULL,
thread, NULL, &newl, "jointest");
if (rv)
panic("thread creation failed: %d", rv);
Index: src/tests/rump/kernspace/thread.c
diff -u src/tests/rump/kernspace/thread.c:1.1 src/tests/rump/kernspace/thread.c:1.2
--- src/tests/rump/kernspace/thread.c:1.1 Mon May 31 23:32:51 2010
+++ src/tests/rump/kernspace/thread.c Sun Aug 7 14:03:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: thread.c,v 1.1 2010/05/31 23:32:51 pooka Exp $ */
+/* $NetBSD: thread.c,v 1.2 2011/08/07 14:03:15 rmind Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: thread.c,v 1.1 2010/05/31 23:32:51 pooka Exp $");
+__RCSID("$NetBSD: thread.c,v 1.2 2011/08/07 14:03:15 rmind Exp $");
#endif /* !lint */
#include <sys/param.h>
@@ -57,7 +57,7 @@
struct lwp *newl;
int rv;
- rv = kthread_create(PRI_NONE, KTHREAD_JOINABLE | KTHREAD_MPSAFE, NULL,
+ rv = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN | KTHREAD_MPSAFE, NULL,
jointhread, NULL, &newl, "jointest");
if (rv)
panic("thread creation failed: %d", rv);
Index: src/tests/rump/kernspace/tsleep.c
diff -u src/tests/rump/kernspace/tsleep.c:1.1 src/tests/rump/kernspace/tsleep.c:1.2
--- src/tests/rump/kernspace/tsleep.c:1.1 Mon May 31 23:32:51 2010
+++ src/tests/rump/kernspace/tsleep.c Sun Aug 7 14:03:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tsleep.c,v 1.1 2010/05/31 23:32:51 pooka Exp $ */
+/* $NetBSD: tsleep.c,v 1.2 2011/08/07 14:03:16 rmind Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: tsleep.c,v 1.1 2010/05/31 23:32:51 pooka Exp $");
+__RCSID("$NetBSD: tsleep.c,v 1.2 2011/08/07 14:03:16 rmind Exp $");
#endif /* !lint */
#include <sys/param.h>
@@ -117,7 +117,7 @@
int rv, i;
for (i = 0; i < NTHREADS; i++) {
- rv = kthread_create(PRI_NONE, KTHREAD_JOINABLE,
+ rv = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN,
NULL, bigthread, (void *)(uintptr_t)i, &bigl[i], "b");
if (rv)
panic("thread create failed: %d", rv);
@@ -126,7 +126,7 @@
mutex_init(&mymtx, MUTEX_DEFAULT, IPL_NONE);
for (i = 0; i < NTHREADS; i++) {
- rv = kthread_create(PRI_NONE, KTHREAD_JOINABLE | KTHREAD_MPSAFE,
+ rv = kthread_create(PRI_NONE, KTHREAD_MUSTJOIN| KTHREAD_MPSAFE,
NULL, tinythread, (void *)(uintptr_t)i, ¬bigl[i], "nb");
if (rv)
panic("thread create failed: %d", rv);
