diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2000-03-23 09:59:58 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2000-03-23 09:59:58 +0000 |
| commit | e4ca293f2b7880e155199a51cd0ccc792fa720e0 (patch) | |
| tree | 6dc58c76d2eaaa482951d8cf4cf7855a14281d96 /sys/conf | |
| parent | d66e702367cad6ad4bdb3038f6f500811c97dc6e (diff) | |
New API for timeouts. Replaces the old timeout()/untimeout() API and
makes it the callers responsibility to allocate resources for the
timeouts.
This is a KISS implementation and does _not_ solve the problems of slow
handling of a large number of pending timeouts (this will be solved in
future work) (although hardclock is now guarateed to take constant time
for handling of timeouts).
Old timeout() and untimeout() are implemented as wrappers around the new
API and kept for compatibility. They will be removed as soon as all
subsystems are converted to use the new API.
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/files | 3 | ||||
| -rw-r--r-- | sys/conf/param.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/conf/files b/sys/conf/files index f9da9127d31..38973293fbd 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.154 2000/03/19 06:53:40 deraadt Exp $ +# $OpenBSD: files,v 1.155 2000/03/23 09:59:56 art Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -346,6 +346,7 @@ file kern/kern_subr.c file kern/kern_sysctl.c file kern/kern_synch.c file kern/kern_time.c +file kern/kern_timeout.c file kern/kern_xxx.c file kern/subr_autoconf.c file kern/subr_disk.c diff --git a/sys/conf/param.c b/sys/conf/param.c index db37665a492..2805b2ff517 100644 --- a/sys/conf/param.c +++ b/sys/conf/param.c @@ -1,4 +1,4 @@ -/* $OpenBSD: param.c,v 1.8 2000/03/21 14:55:52 deraadt Exp $ */ +/* $OpenBSD: param.c,v 1.9 2000/03/23 09:59:56 art Exp $ */ /* $NetBSD: param.c,v 1.16 1996/03/12 03:08:40 mrg Exp $ */ /* @@ -47,7 +47,7 @@ #include <sys/proc.h> #include <sys/vnode.h> #include <sys/file.h> -#include <sys/callout.h> +#include <sys/timeout.h> #ifdef REAL_CLISTS #include <sys/clist.h> #endif @@ -96,7 +96,7 @@ int vm_cache_max = NTEXT; /* XXX these probably needs some measurements */ #define NVNODE (NPROC * 2 + NTEXT + 100) int desiredvnodes = NVNODE; int maxfiles = 3 * (NPROC + MAXUSERS) + 80; -int ncallout = (16 + NPROC) * 2; +int ntimeout = (16 + NPROC) * 2; #ifdef REAL_CLISTS int nclist = 60 + 12 * MAXUSERS; #endif @@ -166,7 +166,7 @@ int nbuf, nswbuf; * them here forces loader errors if this file is omitted * (if they've been externed everywhere else; hah!). */ -struct callout *callout; +struct timeout *timeouts; struct cblock *cfree; struct buf *buf, *swbuf; char *buffers; |