Skip to content

Commit

Permalink
Account for "laundry" memory as part of "inactive" memory
Browse files Browse the repository at this point in the history
Reviewed by:	tcberner, groot@kde
Differential Revision:	https://reviews.freebsd.org/D11557
  • Loading branch information
rezny authored and rezny committed Jul 15, 2017
1 parent 074f6d7 commit 991d73a
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
1 change: 1 addition & 0 deletions sysutils/ksysguardd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

PORTNAME= ksysguardd
PORTVERSION= ${KDE4_WORKSPACE_VERSION}
PORTREVISION= 1
CATEGORIES= sysutils kde kde-applications
DISTNAME= kde-workspace-${PORTVERSION}

Expand Down
49 changes: 49 additions & 0 deletions sysutils/ksysguardd/files/patch-FreeBSD_Memory.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--- FreeBSD/Memory.c.orig 2015-08-12 07:03:15 UTC
+++ FreeBSD/Memory.c
@@ -37,13 +37,14 @@

#define MEM_ACTIVE 0
#define MEM_INACTIVE 1
-#define MEM_WIRED 2
-#define MEM_CACHED 3
-#define MEM_BUFFERED 4
-#define MEM_FREE 5
-#define MEM_TOTAL 6
+#define MEM_LAUNDRY 2
+#define MEM_WIRED 3
+#define MEM_CACHED 4
+#define MEM_BUFFERED 5
+#define MEM_FREE 6
+#define MEM_TOTAL 7

-static size_t memory_stats[7];
+static size_t memory_stats[8];

#define SWAP_IN 0
#define SWAP_OUT 1
@@ -133,6 +134,7 @@ int updateMemory(void)
*/
GETPAGESYSCTL("vm.stats.vm.v_active_count", memory_stats[MEM_ACTIVE])
GETPAGESYSCTL("vm.stats.vm.v_inactive_count", memory_stats[MEM_INACTIVE])
+ GETPAGESYSCTL("vm.stats.vm.v_laundry_count", memory_stats[MEM_LAUNDRY])
GETPAGESYSCTL("vm.stats.vm.v_wire_count", memory_stats[MEM_WIRED])
GETPAGESYSCTL("vm.stats.vm.v_cache_count", memory_stats[MEM_CACHED])
GETPAGESYSCTL("vm.stats.vm.v_free_count", memory_stats[MEM_FREE])
@@ -184,7 +186,7 @@ void printMActiveInfo(const char* cmd)

void printMInactive(const char* cmd)
{
- fprintf(CurrentClient, "%lu\n", memory_stats[MEM_INACTIVE]);
+ fprintf(CurrentClient, "%lu\n", memory_stats[MEM_INACTIVE] + memory_stats[MEM_LAUNDRY]);
}

void printMInactiveInfo(const char* cmd)
@@ -194,7 +196,7 @@ void printMInactiveInfo(const char* cmd)

void printMApplication(const char* cmd)
{
- fprintf(CurrentClient, "%lu\n", memory_stats[MEM_ACTIVE] + memory_stats[MEM_INACTIVE]);
+ fprintf(CurrentClient, "%lu\n", memory_stats[MEM_ACTIVE] + memory_stats[MEM_INACTIVE] + memory_stats[MEM_LAUNDRY]);
}

void printMApplicationInfo(const char* cmd)

0 comments on commit 991d73a

Please sign in to comment.