zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DragonFlyBSD update 

- drop unused kinfo includes and link argument
- detect kvm library necessity at configure step
- fix variable typo
This commit is contained in:
Christian Göttsche 2020-12-20 18:21:25 +01:00
parent 4a73e80338
commit 8db8b9edac
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -192,9 +192,10 @@ dragonflybsd_platform_headers = \
dragonflybsd/ProcessField.h dragonflybsd/ProcessField.h
if HTOP_DRAGONFLYBSD if HTOP_DRAGONFLYBSD
AM_LDFLAGS += -lkvm -lkinfo myhtopplatsources = \
myhtopplatsources = dragonflybsd/Platform.c dragonflybsd/DragonFlyBSDProcessList.c \ dragonflybsd/Platform.c \
dragonflybsd/DragonFlyBSDProcess.c dragonflybsd/DragonFlyBSDProcessList.c \
dragonflybsd/DragonFlyBSDProcess.c
myhtopplatheaders = $(dragonflybsd_platform_headers) myhtopplatheaders = $(dragonflybsd_platform_headers)
endif endif

4
configure.ac
View File

@ -247,6 +247,10 @@ if test "$my_htop_platform" = "darwin"; then
AC_CHECK_FUNCS([mach_timebase_info]) AC_CHECK_FUNCS([mach_timebase_info])
fi fi
if test "$my_htop_platform" = "dragonflybsd"; then
AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
fi
if test "$my_htop_platform" = "freebsd"; then if test "$my_htop_platform" = "freebsd"; then
AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"]) AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
fi fi

2
dragonflybsd/DragonFlyBSDProcessList.c
View File

@ -431,7 +431,7 @@ void ProcessList_goThroughEntries(ProcessList* super, bool pauseProcessUpdate) {
} }
proc->m_virt = kproc->kp_vm_map_size / ONE_K; proc->m_virt = kproc->kp_vm_map_size / ONE_K;
proc->m_resident = kproc->kp_vm_rssize * pageSizeKB; proc->m_resident = kproc->kp_vm_rssize * pageSizeKb;
proc->nlwp = kproc->kp_nthreads; // number of lwp thread proc->nlwp = kproc->kp_nthreads; // number of lwp thread
proc->time = (kproc->kp_swtime + 5000) / 10000; proc->time = (kproc->kp_swtime + 5000) / 10000;

2
dragonflybsd/DragonFlyBSDProcessList.h
View File

@ -11,8 +11,6 @@ in the source distribution for its full text.
#include <kvm.h> #include <kvm.h>
#include <sys/param.h> #include <sys/param.h>
#include <osreldate.h> #include <osreldate.h>
#include <sys/kinfo.h>
#include <kinfo.h>
#include <sys/jail.h> #include <sys/jail.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/resource.h> #include <sys/resource.h>