archive-gh-me/ish
1
0
Fork 0
mirror of https://github.com/ish-app/ish.git synced 2026-02-01 14:32:26 +00:00
Code Issues Projects Releases Wiki Activity

Use the shared rusage_get_current() implementation for consistency

Browse Source 
Oops.
This commit is contained in:
woachk 2018-11-11 22:06:27 +01:00 committed by Theodore Dubois
parent 223e8ef5b6
commit 80831550a7
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/time.c
View File

@ -112,19 +112,9 @@ dword_t sys_times( addr_t tbuf) {
STRACE("times(0x%x)", tbuf);
if (tbuf) {
struct tms tmp;
#if __linux__
struct rusage usage;
int err = getrusage(RUSAGE_THREAD, &usage);
assert(err == 0);
tmp.tms_utime = usage.ru_utime.tv_usec * (CLOCKS_PER_SEC/1000);
tmp.tms_stime = usage.ru_stime.tv_usec * (CLOCKS_PER_SEC/1000);
#elif __APPLE__
thread_basic_info_data_t info;
mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
int err = thread_info(mach_thread_self(), THREAD_BASIC_INFO, (thread_info_t) &info, &count);
tmp.tms_utime = info.user_time.microseconds * (CLOCKS_PER_SEC/1000);
tmp.tms_stime = info.system_time.microseconds * (CLOCKS_PER_SEC/1000);
#endif
struct rusage_ rusage = rusage_get_current();
tmp.tms_utime = rusage.utime.usec * (CLOCKS_PER_SEC/1000);
tmp.tms_stime = rusage.stime.usec * (CLOCKS_PER_SEC/1000);
if (user_put(tbuf, tmp))
return _EFAULT;
}