diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2007-05-30 02:25:00 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2007-05-30 02:25:00 +0000 |
| commit | 42929eb7ad76e5b911a543cf5362303c42ca4d63 (patch) | |
| tree | 588a5b24cc5947579fdc40215546c1ded269117f | |
| parent | cc26359d8cc31fd2998b70da5c99dc6397db841f (diff) | |
openbsd has timeouts, not callouts so rename the variables. i applied an older
diff from brad. from brad.
| -rw-r--r-- | sys/kern/kern_event.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 3a72a3c59d7..39decd34450 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_event.c,v 1.30 2007/05/30 00:23:48 tedu Exp $ */ +/* $OpenBSD: kern_event.c,v 1.31 2007/05/30 02:24:59 tedu Exp $ */ /*- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org> @@ -91,10 +91,10 @@ int filt_procattach(struct knote *kn); void filt_procdetach(struct knote *kn); int filt_proc(struct knote *kn, long hint); int filt_fileattach(struct knote *kn); -void filt_timerexpire(void *knx); -int filt_timerattach(struct knote *kn); -void filt_timerdetach(struct knote *kn); -int filt_timer(struct knote *kn, long hint); +void filt_timerexpire(void *knx); +int filt_timerattach(struct knote *kn); +void filt_timerdetach(struct knote *kn); +int filt_timer(struct knote *kn, long hint); struct filterops kqread_filtops = { 1, NULL, filt_kqdetach, filt_kqueue }; @@ -107,8 +107,8 @@ struct filterops timer_filtops = struct pool knote_pool; struct pool kqueue_pool; -int kq_ncallouts = 0; -int kq_calloutmax = (4 * 1024); +int kq_ntimeouts = 0; +int kq_timeoutmax = (4 * 1024); #define KNOTE_ACTIVATE(kn) do { \ kn->kn_status |= KN_ACTIVE; \ @@ -323,9 +323,9 @@ filt_timerattach(struct knote *kn) struct timeval tv; int tticks; - if (kq_ncallouts > kq_calloutmax) + if (kq_ntimeouts > kq_timeoutmax) return (ENOMEM); - kq_ncallouts++; + kq_ntimeouts++; tv.tv_sec = kn->kn_sdata / 1000; tv.tv_usec = (kn->kn_sdata % 1000) * 1000; @@ -348,7 +348,7 @@ filt_timerdetach(struct knote *kn) to = (struct timeout *)kn->kn_hook; timeout_del(to); FREE(to, M_KEVENT); - kq_ncallouts--; + kq_ntimeouts--; } int |