From owner-svn-ports-head@freebsd.org Sat Jul 15 10:04:14 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4A56DBEE1B; Sat, 15 Jul 2017 10:04:14 +0000 (UTC) (envelope-from rezny@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8F4016B99F; Sat, 15 Jul 2017 10:04:14 +0000 (UTC) (envelope-from rezny@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6FA4DHH083361; Sat, 15 Jul 2017 10:04:13 GMT (envelope-from rezny@FreeBSD.org) Received: (from rezny@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6FA4DYR083359; Sat, 15 Jul 2017 10:04:13 GMT (envelope-from rezny@FreeBSD.org) Message-Id: <201707151004.v6FA4DYR083359@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rezny set sender to rezny@FreeBSD.org using -f From: Matthew Rezny Date: Sat, 15 Jul 2017 10:04:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445865 - in head/sysutils/ksysguardd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rezny X-SVN-Commit-Paths: in head/sysutils/ksysguardd: . files X-SVN-Commit-Revision: 445865 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Jul 2017 10:04:14 -0000 Author: rezny Date: Sat Jul 15 10:04:13 2017 New Revision: 445865 URL: https://svnweb.freebsd.org/changeset/ports/445865 Log: Account for "laundry" memory as part of "inactive" memory Reviewed by: tcberner, groot@kde Differential Revision: https://reviews.freebsd.org/D11557 Added: head/sysutils/ksysguardd/files/patch-FreeBSD_Memory.c (contents, props changed) Modified: head/sysutils/ksysguardd/Makefile Modified: head/sysutils/ksysguardd/Makefile ============================================================================== --- head/sysutils/ksysguardd/Makefile Sat Jul 15 09:51:09 2017 (r445864) +++ head/sysutils/ksysguardd/Makefile Sat Jul 15 10:04:13 2017 (r445865) @@ -2,6 +2,7 @@ PORTNAME= ksysguardd PORTVERSION= ${KDE4_WORKSPACE_VERSION} +PORTREVISION= 1 CATEGORIES= sysutils kde kde-applications DISTNAME= kde-workspace-${PORTVERSION} Added: head/sysutils/ksysguardd/files/patch-FreeBSD_Memory.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/ksysguardd/files/patch-FreeBSD_Memory.c Sat Jul 15 10:04:13 2017 (r445865) @@ -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)