diff options
| author | davide <davide@FreeBSD.org> | 2013-03-04 16:25:12 +0000 |
|---|---|---|
| committer | davide <davide@FreeBSD.org> | 2013-03-04 16:25:12 +0000 |
| commit | 0aca596713f4cc3791a44511f7f609d1bedeb766 (patch) | |
| tree | c9b2ef5f765ed05ea9379eb2b670bbd5b1bbe607 /sys/kern/kern_resource.c | |
| parent | 9157a1f8c61715b7054d9997e6deebdb0ae97836 (diff) | |
| download | FreeBSD-src-0aca596713f4cc3791a44511f7f609d1bedeb766.zip FreeBSD-src-0aca596713f4cc3791a44511f7f609d1bedeb766.tar.gz | |
MFcalloutng (r244251 with minor changes):
Specify that precision of 0.5s is enough for resource limitation.
Sponsored by: Google Summer of Code 2012, iXsystems inc.
Tested by: flo, marius, ian, markj, Fabian Keil
Diffstat (limited to 'sys/kern/kern_resource.c')
| -rw-r--r-- | sys/kern/kern_resource.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c index 590cfcb..d36de50 100644 --- a/sys/kern/kern_resource.c +++ b/sys/kern/kern_resource.c @@ -645,7 +645,8 @@ lim_cb(void *arg) } } if ((p->p_flag & P_WEXIT) == 0) - callout_reset(&p->p_limco, hz, lim_cb, p); + callout_reset_sbt(&p->p_limco, SBT_1S, 0, + lim_cb, p, C_PREL(1)); } int @@ -697,7 +698,8 @@ kern_proc_setrlimit(struct thread *td, struct proc *p, u_int which, case RLIMIT_CPU: if (limp->rlim_cur != RLIM_INFINITY && p->p_cpulimit == RLIM_INFINITY) - callout_reset(&p->p_limco, hz, lim_cb, p); + callout_reset_sbt(&p->p_limco, SBT_1S, 0, + lim_cb, p, C_PREL(1)); p->p_cpulimit = limp->rlim_cur; break; case RLIMIT_DATA: @@ -1137,7 +1139,8 @@ lim_fork(struct proc *p1, struct proc *p2) p2->p_limit = lim_hold(p1->p_limit); callout_init_mtx(&p2->p_limco, &p2->p_mtx, 0); if (p1->p_cpulimit != RLIM_INFINITY) - callout_reset(&p2->p_limco, hz, lim_cb, p2); + callout_reset_sbt(&p2->p_limco, SBT_1S, 0, + lim_cb, p2, C_PREL(1)); } void |
