From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jun 17 08:20:10 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B9DF106566C for ; Sun, 17 Jun 2012 08:20:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 43AE58FC12 for ; Sun, 17 Jun 2012 08:20:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5H8KAIe043917 for ; Sun, 17 Jun 2012 08:20:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5H8KAeR043915; Sun, 17 Jun 2012 08:20:10 GMT (envelope-from gnats) Resent-Date: Sun, 17 Jun 2012 08:20:10 GMT Resent-Message-Id: <201206170820.q5H8KAeR043915@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DEE21065672 for ; Sun, 17 Jun 2012 08:10:15 +0000 (UTC) (envelope-from jason@jw.lds.net.ua) Received: from jw.lds.net.ua (jw.lds.net.ua [193.192.37.74]) by mx1.freebsd.org (Postfix) with ESMTP id A730D8FC08 for ; Sun, 17 Jun 2012 08:10:14 +0000 (UTC) Received: from jw.lds.net.ua (localhost [127.0.0.1]) by jw.lds.net.ua (8.14.5/8.14.5) with ESMTP id q5H847aQ092752 for ; Sun, 17 Jun 2012 11:04:07 +0300 (EEST) (envelope-from jason@jw.lds.net.ua) Received: (from root@localhost) by jw.lds.net.ua (8.14.5/8.14.5/Submit) id q5H842xr092750; Sun, 17 Jun 2012 11:04:02 +0300 (EEST) (envelope-from jason) Message-Id: <201206170804.q5H842xr092750@jw.lds.net.ua> Date: Sun, 17 Jun 2012 11:04:02 +0300 (EEST) From: To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/169174: [patch] sysutils/htop: fix swap size calculation on i386 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: vsjcfm@gmail.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jun 2012 08:20:10 -0000 >Number: 169174 >Category: ports >Synopsis: [patch] sysutils/htop: fix swap size calculation on i386 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Jun 17 08:20:09 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Sayetsky Anton >Release: FreeBSD 8.3-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD jw.local 8.3-RELEASE-p1 FreeBSD 8.3-RELEASE-p1 #0 r235504: Wed May 16 14:33:18 EEST 2012 root@jw.local:/tmp/obj/mnt/garbage/build/src/sys/JASONW i386 >Description: There is an error in my previous htop patch. Swap values can overflow on i386. >How-To-Repeat: Install htop 1.0.1_1 and create swap >2GiB, you will see a value of -2097152MiB >Fix: Patch for previous patch attached. --- patch-Makefile begins here --- --- /usr/ports/sysutils/htop/Makefile 2012-05-30 00:22:56.000000000 +0300 +++ Makefile 2012-06-17 10:53:16.000000000 +0300 @@ -7,7 +7,7 @@ PORTNAME= htop PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= SF --- patch-Makefile ends here --- --- patch-patch-ProcessList.c begins here --- --- /usr/ports/sysutils/htop/files/patch-ProcessList.c 2012-05-30 00:22:56.000000000 +0300 +++ patch-ProcessList.c 2012-06-17 10:53:54.000000000 +0300 @@ -51,8 +51,8 @@ + kd = kvm_open(NULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL); + assert(kd != NULL); + kvm_getswapinfo(kd, kvmswapinfo, 1, 0); -+ this->totalSwap = kvmswapinfo[0].ksw_total * PAGE_SIZE / KB; -+ this->usedSwap = kvmswapinfo[0].ksw_used * PAGE_SIZE / KB; ++ this->totalSwap = kvmswapinfo[0].ksw_total * (PAGE_SIZE / KB); ++ this->usedSwap = kvmswapinfo[0].ksw_used * (PAGE_SIZE / KB); + kvm_close(kd); + len = sizeof(this->totalMem); + SYSCTLBYNAME("vm.stats.vm.v_page_count", this->totalMem, len); --- patch-patch-ProcessList.c ends here --- >Release-Note: >Audit-Trail: >Unformatted: