d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

To avoid excessive code duplication move struct rusage translation

Browse Source 
to a separate function.

MFC after:	1 Month.
This commit is contained in:
Dmitry Chagin 2011-01-28 18:28:06 +00:00
parent 9ca9fc5380
commit 53c74fc607
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=218028
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/amd64/linux32/linux32_machdep.c
View File

@ -106,6 +106,28 @@ bsd_to_linux_sigaltstack(int bsa)
return (lsa); return (lsa);
} }
static void bsd_to_linux_rusage(struct rusage *ru, struct l_rusage *lru)
{
lru->ru_utime.tv_sec = ru->ru_utime.tv_sec;
lru->ru_utime.tv_usec = ru->ru_utime.tv_usec;
lru->ru_stime.tv_sec = ru->ru_stime.tv_sec;
lru->ru_stime.tv_usec = ru->ru_stime.tv_usec;
lru->ru_maxrss = ru->ru_maxrss;
lru->ru_ixrss = ru->ru_ixrss;
lru->ru_idrss = ru->ru_idrss;
lru->ru_isrss = ru->ru_isrss;
lru->ru_minflt = ru->ru_minflt;
lru->ru_majflt = ru->ru_majflt;
lru->ru_nswap = ru->ru_nswap;
lru->ru_inblock = ru->ru_inblock;
lru->ru_oublock = ru->ru_oublock;
lru->ru_msgsnd = ru->ru_msgsnd;
lru->ru_msgrcv = ru->ru_msgrcv;
lru->ru_nsignals = ru->ru_nsignals;
lru->ru_nvcsw = ru->ru_nvcsw;
lru->ru_nivcsw = ru->ru_nivcsw;
}
int int
linux_execve(struct thread *td, struct linux_execve_args *args) linux_execve(struct thread *td, struct linux_execve_args *args)
{ {
@ -1126,24 +1148,7 @@ linux_getrusage(struct thread *td, struct linux_getrusage_args *uap)
if (error != 0) if (error != 0)
return (error); return (error);
if (uap->rusage != NULL) { if (uap->rusage != NULL) {
s32.ru_utime.tv_sec = s.ru_utime.tv_sec; bsd_to_linux_rusage(&s, &s32);
s32.ru_utime.tv_usec = s.ru_utime.tv_usec;
s32.ru_stime.tv_sec = s.ru_stime.tv_sec;
s32.ru_stime.tv_usec = s.ru_stime.tv_usec;
s32.ru_maxrss = s.ru_maxrss;
s32.ru_ixrss = s.ru_ixrss;
s32.ru_idrss = s.ru_idrss;
s32.ru_isrss = s.ru_isrss;
s32.ru_minflt = s.ru_minflt;
s32.ru_majflt = s.ru_majflt;
s32.ru_nswap = s.ru_nswap;
s32.ru_inblock = s.ru_inblock;
s32.ru_oublock = s.ru_oublock;
s32.ru_msgsnd = s.ru_msgsnd;
s32.ru_msgrcv = s.ru_msgrcv;
s32.ru_nsignals = s.ru_nsignals;
s32.ru_nvcsw = s.ru_nvcsw;
s32.ru_nivcsw = s.ru_nivcsw;
error = copyout(&s32, uap->rusage, sizeof(s32)); error = copyout(&s32, uap->rusage, sizeof(s32));
} }
return (error); return (error);