Damjan Jovanovic : ntdll: Implement get_thread_times() on FreeBSD.
Alexandre Julliard
julliard at winehq.org
Mon Nov 9 15:11:51 CST 2020
Module: wine
Branch: master
Commit: a563f584f544cd75b86738c1aa061dd47851684f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a563f584f544cd75b86738c1aa061dd47851684f
Author: Damjan Jovanovic <damjan.jov at gmail.com>
Date: Sat Nov 7 09:21:20 2020 +0200
ntdll: Implement get_thread_times() on FreeBSD.
Signed-off-by: Damjan Jovanovic <damjan.jov at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/Makefile.in | 2 +-
dlls/ntdll/unix/thread.c | 54 +++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 50 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index f39ffb42c6f..02eb5f1d871 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -3,7 +3,7 @@ MODULE = ntdll.dll
IMPORTLIB = ntdll
IMPORTS = winecrt0
EXTRAINCL = $(UNWIND_CFLAGS)
-EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS)
+EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS)
EXTRADLLFLAGS = -mno-cygwin -nodefaultlibs -Wl,--image-base,0x7bc00000
C_SRCS = \
diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index a161c5d1c90..8c91f49690b 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -43,6 +43,21 @@
#ifdef HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif
+#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_QUEUE_H
+#include <sys/queue.h>
+#endif
+#ifdef HAVE_SYS_USER_H
+#include <sys/user.h>
+#endif
+#ifdef HAVE_LIBPROCSTAT_H
+#include <libprocstat.h>
+#endif
#define NONAMELESSUNION
#include "ntstatus.h"
@@ -790,9 +805,9 @@ static void wow64_context_to_server( context_t *to, const WOW64_CONTEXT *from )
#endif /* __x86_64__ */
-#ifdef linux
BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time)
{
+#ifdef linux
unsigned long clocks_per_sec = sysconf( _SC_CLK_TCK );
unsigned long usr, sys;
const char *pos;
@@ -837,15 +852,44 @@ BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LA
ERR("Failed to parse %s\n", debugstr_a(buf));
return FALSE;
-}
+#elif defined(HAVE_LIBPROCSTAT)
+ struct procstat *pstat;
+ struct kinfo_proc *kip;
+ unsigned int proc_count;
+ BOOL ret = FALSE;
+
+ pstat = procstat_open_sysctl();
+ if (!pstat)
+ return FALSE;
+ if (unix_tid == -1)
+ kip = procstat_getprocs(pstat, KERN_PROC_PID, unix_pid, &proc_count);
+ else
+ kip = procstat_getprocs(pstat, KERN_PROC_PID | KERN_PROC_INC_THREAD, unix_pid, &proc_count);
+ if (kip)
+ {
+ unsigned int i;
+ for (i = 0; i < proc_count; i++)
+ {
+ if (unix_tid == -1 || kip[i].ki_tid == unix_tid)
+ {
+ kernel_time->QuadPart = 10000000 * (ULONGLONG)kip[i].ki_rusage.ru_stime.tv_sec +
+ 10 * (ULONGLONG)kip[i].ki_rusage.ru_stime.tv_usec;
+ user_time->QuadPart = 10000000 * (ULONGLONG)kip[i].ki_rusage.ru_utime.tv_sec +
+ 10 * (ULONGLONG)kip[i].ki_rusage.ru_utime.tv_usec;
+ ret = TRUE;
+ break;
+ }
+ }
+ procstat_freeprocs(pstat, kip);
+ }
+ procstat_close(pstat);
+ return ret;
#else
-BOOL get_thread_times(int unix_pid, int unix_tid, LARGE_INTEGER *kernel_time, LARGE_INTEGER *user_time)
-{
static int once;
if (!once++) FIXME("not implemented on this platform\n");
return FALSE;
-}
#endif
+}
/******************************************************************************
* NtQueryInformationThread (NTDLL.@)
More information about the wine-cvs
mailing list