Page MenuHomeFreeBSD
Files F157188540

D16747.id46782.diff
No OneTemporary
Actions

D16747.id46782.diff
View Options

Index: sysutils/xosview/files/patch-bsd_kernel.cc
===================================================================
--- sysutils/xosview/files/patch-bsd_kernel.cc
+++ sysutils/xosview/files/patch-bsd_kernel.cc
@@ -1,4 +1,4 @@
---- bsd/kernel.cc.orig 2017-11-04 15:05:59 UTC
+--- bsd/kernel.cc.orig 2018-08-16 13:49:43 UTC
+++ bsd/kernel.cc
@@ -93,6 +93,9 @@ static int mib_uvm[2] = { CTL_VM, VM_UVM
static int mib_uvm[2] = { CTL_VM, VM_UVMEXP };
@@ -10,7 +10,27 @@
#include <sys/vmmeter.h>
#endif
-@@ -328,7 +331,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6
+@@ -320,7 +323,18 @@ BSDGetPageStats(uint64_t *meminfo, uint6
+ pageinfo[1] = (uint64_t)uvm.pgswapout;
+ }
+ #else /* HAVE_UVM */
+- struct vmmeter vm;
++ struct vmmeter_fbsd {
++ u_int v_active_count;
++ u_int v_inactive_count;
++ u_int v_wire_count;
++ u_int v_cache_count;
++ u_int v_free_count;
++ u_int v_page_size;
++ u_int v_vnodepgsin;
++ u_int v_vnodepgsout;
++ u_int v_swappgsin;
++ u_int v_swappgsout;
++ } vm;
+ #if defined(XOSVIEW_FREEBSD)
+ size_t size = sizeof(unsigned int);
+ #define GET_VM_STATS(name) \
+@@ -328,7 +342,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6
GET_VM_STATS(v_active_count);
GET_VM_STATS(v_inactive_count);
GET_VM_STATS(v_wire_count);
@@ -20,7 +40,7 @@
GET_VM_STATS(v_free_count);
GET_VM_STATS(v_page_size);
GET_VM_STATS(v_vnodepgsin);
-@@ -350,7 +355,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6
+@@ -350,7 +366,9 @@ BSDGetPageStats(uint64_t *meminfo, uint6
meminfo[0] = (uint64_t)vm.v_active_count * vm.v_page_size;
meminfo[1] = (uint64_t)vm.v_inactive_count * vm.v_page_size;
meminfo[2] = (uint64_t)vm.v_wire_count * vm.v_page_size;
@@ -30,7 +50,7 @@
meminfo[4] = (uint64_t)vm.v_free_count * vm.v_page_size;
#else /* XOSVIEW_DFBSD */
meminfo[0] = (uint64_t)vms.v_active_count * vms.v_page_size;
-@@ -654,7 +661,7 @@ DevStat_Init(void) {
+@@ -654,7 +672,7 @@ DevStat_Init(void) {
uint64_t
DevStat_Get(uint64_t *read_bytes, uint64_t *write_bytes) {

File Metadata

Mime Type
text/plain
Expires
Wed, May 20, 3:39 AM (11 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33336531
Default Alt Text
D16747.id46782.diff (1 KB)

Event Timeline