Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always pick 'rusage' from p->p_stats->p_ru, p->p_ru is dead and gone.

Browse Source
This commit is contained in:
dsl 2007-05-01 17:22:32 +00:00
parent 982bad256f
commit 92ab0cdf99
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/compat/irix/irix_signal.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: irix_signal.c,v 1.39 2007/03/09 14:11:28 ad Exp $ */ /* $NetBSD: irix_signal.c,v 1.40 2007/05/01 17:22:32 dsl Exp $ */
/*- /*-
* Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc. * Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.39 2007/03/09 14:11:28 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: irix_signal.c,v 1.40 2007/05/01 17:22:32 dsl Exp $");
#include <sys/types.h> #include <sys/types.h>
#include <sys/signal.h> #include <sys/signal.h>
@ -109,11 +109,7 @@ irix_wait_siginfo(p, st, stat, s)
if (p) { if (p) {
i.isi_pid = p->p_pid; i.isi_pid = p->p_pid;
if (stat == SZOMB) { if (p->p_stats != NULL) {
i.isi_stime = p->p_ru->ru_stime.tv_sec;
i.isi_utime = p->p_ru->ru_utime.tv_sec;
}
else {
i.isi_stime = p->p_stats->p_ru.ru_stime.tv_sec; i.isi_stime = p->p_stats->p_ru.ru_stime.tv_sec;
i.isi_utime = p->p_stats->p_ru.ru_utime.tv_sec; i.isi_utime = p->p_stats->p_ru.ru_utime.tv_sec;
} }

10
sys/compat/svr4/svr4_misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_misc.c,v 1.127 2007/04/30 14:05:47 dsl Exp $ */ /* $NetBSD: svr4_misc.c,v 1.128 2007/05/01 17:22:32 dsl Exp $ */
/*- /*-
* Copyright (c) 1994 The NetBSD Foundation, Inc. * Copyright (c) 1994 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.127 2007/04/30 14:05:47 dsl Exp $"); __KERNEL_RCSID(0, "$NetBSD: svr4_misc.c,v 1.128 2007/05/01 17:22:32 dsl Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -1087,11 +1087,7 @@ svr4_setinfo(p, st, s)
if (p) { if (p) {
s->si_pid = p->p_pid; s->si_pid = p->p_pid;
if (p->p_stat == SZOMB) { if (p->p_stats != NULL) {
s->si_stime = p->p_ru->ru_stime.tv_sec;
s->si_utime = p->p_ru->ru_utime.tv_sec;
}
else {
s->si_stime = p->p_stats->p_ru.ru_stime.tv_sec; s->si_stime = p->p_stats->p_ru.ru_stime.tv_sec;
s->si_utime = p->p_stats->p_ru.ru_utime.tv_sec; s->si_utime = p->p_stats->p_ru.ru_utime.tv_sec;
} }

10
sys/compat/svr4_32/svr4_32_misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_32_misc.c,v 1.46 2007/04/30 14:05:48 dsl Exp $ */ /* $NetBSD: svr4_32_misc.c,v 1.47 2007/05/01 17:22:32 dsl Exp $ */
/*- /*-
* Copyright (c) 1994 The NetBSD Foundation, Inc. * Copyright (c) 1994 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.46 2007/04/30 14:05:48 dsl Exp $"); __KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.47 2007/05/01 17:22:32 dsl Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -1126,11 +1126,7 @@ svr4_32_setinfo(p, st, si)
if (p) { if (p) {
i.si_pid = p->p_pid; i.si_pid = p->p_pid;
if (p->p_stat == SZOMB) { if (p->p_stats != NULL) {
i.si_stime = p->p_ru->ru_stime.tv_sec;
i.si_utime = p->p_ru->ru_utime.tv_sec;
}
else {
i.si_stime = p->p_stats->p_ru.ru_stime.tv_sec; i.si_stime = p->p_stats->p_ru.ru_stime.tv_sec;
i.si_utime = p->p_stats->p_ru.ru_utime.tv_sec; i.si_utime = p->p_stats->p_ru.ru_utime.tv_sec;
} }