From owner-svn-ports-head@freebsd.org Sat Mar 3 11:47:22 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47F89F340F9; Sat, 3 Mar 2018 11:47:22 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EDD807D221; Sat, 3 Mar 2018 11:47:21 +0000 (UTC) (envelope-from danfe@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E420025D8B; Sat, 3 Mar 2018 11:47:21 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w23BlL2n066427; Sat, 3 Mar 2018 11:47:21 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w23BlLmC066426; Sat, 3 Mar 2018 11:47:21 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201803031147.w23BlLmC066426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sat, 3 Mar 2018 11:47:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463480 - head/benchmarks/apib/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/benchmarks/apib/files X-SVN-Commit-Revision: 463480 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.25 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, 03 Mar 2018 11:47:22 -0000 Author: danfe Date: Sat Mar 3 11:47:21 2018 New Revision: 463480 URL: https://svnweb.freebsd.org/changeset/ports/463480 Log: Adjust code comments and add one missing linefeed. Modified: head/benchmarks/apib/files/patch-src_apib__cpu.c Modified: head/benchmarks/apib/files/patch-src_apib__cpu.c ============================================================================== --- head/benchmarks/apib/files/patch-src_apib__cpu.c Sat Mar 3 11:24:57 2018 (r463479) +++ head/benchmarks/apib/files/patch-src_apib__cpu.c Sat Mar 3 11:47:21 2018 (r463480) @@ -22,7 +22,7 @@ apr_status_t s; apr_file_t* f; char buf[PROC_BUF_LEN]; -@@ -66,10 +74,19 @@ int cpu_Count(apr_pool_t* pool) +@@ -66,10 +74,20 @@ int cpu_Count(apr_pool_t* pool) count = 1; } return count; @@ -33,6 +33,7 @@ { +#ifdef __FreeBSD__ + struct tms ticks; ++ + cpu->idle = times(&ticks); + if (cpu->idle == -1) + return 0; @@ -42,7 +43,7 @@ apr_status_t s; apr_file_t* proc; char buf[PROC_BUF_LEN]; -@@ -118,10 +135,12 @@ static int getTicks(CPUUsage* cpu, apr_pool_t* pool) +@@ -118,10 +136,12 @@ static int getTicks(CPUUsage* cpu, apr_pool_t* pool) } return 0; @@ -55,7 +56,7 @@ apr_status_t s; apr_file_t* proc; char buf[PROC_BUF_LEN]; -@@ -138,12 +157,36 @@ double cpu_GetMemoryUsage(apr_pool_t* pool) +@@ -138,12 +158,36 @@ double cpu_GetMemoryUsage(apr_pool_t* pool) if (s != APR_SUCCESS) { return 0.0; } @@ -67,7 +68,7 @@ long cache = 0; +#ifdef __FreeBSD__ -+ /* Let's work with kilobytes. */ ++ /* We work with kilobytes to match Linux' /proc/meminfo. */ + long pagesize = sysconf(_SC_PAGESIZE) / 1024; + totalMem = sysconf(_SC_PHYS_PAGES) * pagesize; + @@ -83,7 +84,7 @@ + sysctlbyname("vfs.bufspace", &buffers, &len, NULL, 0); + buffers /= 1024; + -+ /* `cache' is number of inactive pages since r309017. */ ++ /* `cache' is based on number of inactive pages since r309017. */ + unsigned inact; + len = sizeof(inact); + sysctlbyname("vm.stats.vm.v_inactive_count", &inact, &len, NULL, 0); @@ -92,7 +93,7 @@ while (linep_NextLine(&line)) { char* n = linep_NextToken(&line, " "); char* v = linep_NextToken(&line, " "); -@@ -158,6 +201,7 @@ double cpu_GetMemoryUsage(apr_pool_t* pool) +@@ -158,6 +202,7 @@ double cpu_GetMemoryUsage(apr_pool_t* pool) cache = atol(v); } }