Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kill tsleep/wakeup and use cv

This commit is contained in:
ozaki-r 2017-02-01 08:16:42 +00:00
parent bbe8ead203
commit 23e72bfbc4
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/net/bpf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bpf.c,v 1.210 2017/02/01 08:15:15 ozaki-r Exp $ */
/* $NetBSD: bpf.c,v 1.211 2017/02/01 08:16:42 ozaki-r Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.210 2017/02/01 08:15:15 ozaki-r Exp $");
__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.211 2017/02/01 08:16:42 ozaki-r Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@ -523,6 +523,8 @@ bpfopen(dev_t dev, int flag, int mode, struct lwp *l)
d->bd_jitcode = NULL;
BPF_DLIST_ENTRY_INIT(d);
BPFIF_DLIST_ENTRY_INIT(d);
d->bd_mtx = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NET);
cv_init(&d->bd_cv, "bpf");
mutex_enter(&bpf_mtx);
BPF_DLIST_WRITER_INSEART_HEAD(d);
@ -577,6 +579,9 @@ bpf_close(struct file *fp)
callout_destroy(&d->bd_callout);
seldestroy(&d->bd_sel);
softint_disestablish(d->bd_sih);
mutex_obj_free(d->bd_mtx);
cv_destroy(&d->bd_cv);
kmem_free(d, sizeof(*d));
return (0);
@ -644,8 +649,11 @@ bpf_read(struct file *fp, off_t *offp, struct uio *uio,
ROTATE_BUFFERS(d);
break;
}
error = tsleep(d, PRINET|PCATCH, "bpf",
d->bd_rtout);
mutex_enter(d->bd_mtx);
error = cv_timedwait_sig(&d->bd_cv, d->bd_mtx, d->bd_rtout);
mutex_exit(d->bd_mtx);
if (error == EINTR || error == ERESTART) {
splx(s);
KERNEL_UNLOCK_ONE(NULL);
@ -705,7 +713,11 @@ done:
static inline void
bpf_wakeup(struct bpf_d *d)
{
wakeup(d);
mutex_enter(d->bd_mtx);
cv_broadcast(&d->bd_cv);
mutex_exit(d->bd_mtx);
if (d->bd_async)
softint_schedule(d->bd_sih);
selnotify(&d->bd_sel, 0, 0);

6
sys/net/bpfdesc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bpfdesc.h,v 1.42 2017/02/01 08:13:45 ozaki-r Exp $ */
/* $NetBSD: bpfdesc.h,v 1.43 2017/02/01 08:16:42 ozaki-r Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@ -47,6 +47,8 @@
#include <net/bpfjit.h> /* for bpfjit_function_t */
#ifdef _KERNEL
#include <sys/pslist.h>
#include <sys/mutex.h>
#include <sys/condvar.h>
#endif
/*
@ -111,6 +113,8 @@ struct bpf_d {
#ifdef _KERNEL
struct pslist_entry bd_bif_dlist_entry; /* For bpf_if */
struct pslist_entry bd_bpf_dlist_entry; /* For the global list */
kmutex_t *bd_mtx;
kcondvar_t bd_cv;
#endif
};