reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-08 21:27:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Partially implemented kernel/user times in GetThreadTimes (based on a

Browse Source 
patch by Ryan Cumming).
This commit is contained in:
Alexandre Julliard 2002-11-30 01:56:56 +00:00
parent 374a7abd65
commit 5926cea79f
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/kernel/tests/thread.c
View File

@ -481,13 +481,11 @@ VOID test_GetThreadTimes(DWORD version)
"creationTime was invalid");
ok(exitTime.dwLowDateTime!=99 || exitTime.dwHighDateTime!=99,
"exitTime was invalid");
todo_wine {
ok(kernelTime.dwLowDateTime!=99 || kernelTime.dwHighDateTime!=99,
"kernelTime was invalid");
ok(userTime.dwLowDateTime!=99 || userTime.dwHighDateTime!=99,
"userTime was invalid");
}
ok(CloseHandle(thread)!=0,"ClosewHandle failed");
ok(kernelTime.dwLowDateTime!=99 || kernelTime.dwHighDateTime!=99,
"kernelTime was invalid");
ok(userTime.dwLowDateTime!=99 || userTime.dwHighDateTime!=99,
"userTime was invalid");
ok(CloseHandle(thread)!=0,"CloseHandle failed");
}
/* Check the processor affinity functions */

34
scheduler/thread.c
View File

@ -27,6 +27,9 @@
#ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h>
#endif
#ifdef HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
@ -709,6 +712,37 @@ BOOL WINAPI GetThreadTimes(
}
SERVER_END_REQ;
}
if (ret && (kerneltime || usertime))
{
/* We call times(2) for kernel time or user time */
/* We can only (portably) do this for the current thread */
if (thread == GetCurrentThread())
{
ULONGLONG time;
struct tms time_buf;
long clocks_per_sec = sysconf(_SC_CLK_TCK);
times(&time_buf);
if (kerneltime)
{
time = (ULONGLONG)time_buf.tms_stime * 10000000 / clocks_per_sec;
kerneltime->dwHighDateTime = time >> 32;
kerneltime->dwLowDateTime = (DWORD)time;
}
if (usertime)
{
time = (ULONGLONG)time_buf.tms_utime * 10000000 / clocks_per_sec;
usertime->dwHighDateTime = time >> 32;
usertime->dwLowDateTime = (DWORD)time;
}
}
else
{
if (kerneltime) kerneltime->dwHighDateTime = kerneltime->dwLowDateTime = 0;
if (usertime) usertime->dwHighDateTime = usertime->dwLowDateTime = 0;
FIXME("Cannot get kerneltime or usertime of other threads\n");
}
}
return ret;
}