diff options
author | andre <andre@FreeBSD.org> | 2013-03-08 10:14:58 +0000 |
---|---|---|
committer | andre <andre@FreeBSD.org> | 2013-03-08 10:14:58 +0000 |
commit | 7f0cc3ba06376c70d7259b9d2b80a8ad5d4583be (patch) | |
tree | 3b153971c209175c11aa60030eb1581e42e42d1e /sys/kern/subr_param.c | |
parent | ac59206acfdd9f611aea30d00816ffca9f8011b2 (diff) | |
download | FreeBSD-src-7f0cc3ba06376c70d7259b9d2b80a8ad5d4583be.zip FreeBSD-src-7f0cc3ba06376c70d7259b9d2b80a8ad5d4583be.tar.gz |
Move the auto-sizing of the callout array from init_param2() to
kern_timeout_callwheel_alloc() where it is actually used.
This is a mechanical move and no tuning parameters are changed.
The pre-allocated callout array is only used for legacy timeout(9)
calls and is only allocated and active on cpu0. Eventually all
remaining users of timeout(9) should switch to the callout_* API.
Reviewed by: davide
Diffstat (limited to 'sys/kern/subr_param.c')
-rw-r--r-- | sys/kern/subr_param.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index 0a3580b..825a3a0 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -91,7 +91,6 @@ int maxprocperuid; /* max # of procs per user */ int maxfiles; /* sys. wide open files limit */ int maxfilesperproc; /* per-proc open files limit */ int msgbufsize; /* size of kernel message buffer */ -int ncallout; /* maximum # of timer events */ int nbuf; int ngroups_max; /* max # groups per process */ int nswbuf; @@ -109,8 +108,6 @@ u_long sgrowsiz; /* amount to grow stack */ SYSCTL_INT(_kern, OID_AUTO, hz, CTLFLAG_RDTUN, &hz, 0, "Number of clock ticks per second"); -SYSCTL_INT(_kern, OID_AUTO, ncallout, CTLFLAG_RDTUN, &ncallout, 0, - "Number of pre-allocated timer events"); SYSCTL_INT(_kern, OID_AUTO, nbuf, CTLFLAG_RDTUN, &nbuf, 0, "Number of buffers in the buffer cache"); SYSCTL_INT(_kern, OID_AUTO, nswbuf, CTLFLAG_RDTUN, &nswbuf, 0, @@ -327,15 +324,6 @@ init_param2(long physpages) TUNABLE_INT_FETCH("kern.nbuf", &nbuf); /* - * XXX: Does the callout wheel have to be so big? - * - * Clip callout to result of previous function of maxusers maximum - * 384. This is still huge, but acceptable. - */ - ncallout = imin(16 + maxproc + maxfiles, 18508); - TUNABLE_INT_FETCH("kern.ncallout", &ncallout); - - /* * The default for maxpipekva is min(1/64 of the kernel address space, * max(1/64 of main memory, 512KB)). See sys_pipe.c for more details. */ |