Attachment 50537 Details for Bug 76972 – kern_resource.c.patch.txt

kern_resource.c.patch.txt

kern_resource.c.patch.txt (text/plain; charset=UTF-8), 1.41 KB, created by Andrey Zonov on 2012-08-02 14:42:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Zonov

Created: 2012-08-02 14:42:21 UTC

Size: 1.41 KB

patch

obsolete

>commit 97dcdfe872b83ece41e61c434937f924ea3ef2f5
>Author: Andrey Zonov <andrey@zonov.org>
>Date:   Thu Jun 14 00:29:33 2012 +0400
>
>    - Prevent overflow for usertime/systime in caclru1().
>
>diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
>index b09e031..cb3d854 100644
>--- a/sys/kern/kern_resource.c
>+++ b/sys/kern/kern_resource.c
>@@ -880,6 +880,8 @@ rufetchtd(struct thread *td, struct rusage *ru)
> 	calcru1(p, &td->td_rux, &ru->ru_utime, &ru->ru_stime);
> }
> 
>+#define	mul_div(a, b, c)	(a/c)*b + (a%c)*(b/c) + (a%c)*(b%c)/c
>+
> static void
> calcru1(struct proc *p, struct rusage_ext *ruxp, struct timeval *up,
>     struct timeval *sp)
>@@ -909,10 +911,10 @@ calcru1(struct proc *p, struct rusage_ext *ruxp, struct timeval *up,
> 		 * The normal case, time increased.
> 		 * Enforce monotonicity of bucketed numbers.
> 		 */
>-		uu = (tu * ut) / tt;
>+		uu = mul_div(tu, ut, tt);
> 		if (uu < ruxp->rux_uu)
> 			uu = ruxp->rux_uu;
>-		su = (tu * st) / tt;
>+		su = mul_div(tu, st, tt);
> 		if (su < ruxp->rux_su)
> 			su = ruxp->rux_su;
> 	} else if (tu + 3 > ruxp->rux_tu || 101 * tu > 100 * ruxp->rux_tu) {
>@@ -941,8 +943,8 @@ calcru1(struct proc *p, struct rusage_ext *ruxp, struct timeval *up,
> 		    "to %ju usec for pid %d (%s)\n",
> 		    (uintmax_t)ruxp->rux_tu, (uintmax_t)tu,
> 		    p->p_pid, p->p_comm);
>-		uu = (tu * ut) / tt;
>-		su = (tu * st) / tt;
>+		uu = mul_div(tu, ut, tt);
>+		su = mul_div(tu, st, tt);
> 	}
> 
> 	ruxp->rux_uu = uu;

Actions: View

Attachments on bug 76972: 50537