From owner-svn-src-projects@FreeBSD.ORG Mon Apr 8 08:35:25 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 78747B93; Mon, 8 Apr 2013 08:35:25 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6C5ABA9B; Mon, 8 Apr 2013 08:35:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r388ZPWr096931; Mon, 8 Apr 2013 08:35:25 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r388ZPgN096930; Mon, 8 Apr 2013 08:35:25 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201304080835.r388ZPgN096930@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 8 Apr 2013 08:35:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r249248 - projects/counters/sys/vm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2013 08:35:25 -0000 Author: glebius Date: Mon Apr 8 08:35:24 2013 New Revision: 249248 URL: http://svnweb.freebsd.org/changeset/base/249248 Log: Simplify uk_ppera calculation using howmany() macro. Suggested by: antoine Modified: projects/counters/sys/vm/uma_core.c Modified: projects/counters/sys/vm/uma_core.c ============================================================================== --- projects/counters/sys/vm/uma_core.c Mon Apr 8 08:33:31 2013 (r249247) +++ projects/counters/sys/vm/uma_core.c Mon Apr 8 08:35:24 2013 (r249248) @@ -1140,10 +1140,8 @@ keg_small_init(uma_keg_t keg) if (keg->uk_flags & UMA_ZONE_PCPU) { keg->uk_slabsize = sizeof(struct pcpu); - keg->uk_ppera = mp_ncpus/(PAGE_SIZE/sizeof(struct pcpu)); - /* Account for remainder. */ - if (mp_ncpus * sizeof(struct pcpu) > PAGE_SIZE * keg->uk_ppera) - keg->uk_ppera++; + keg->uk_ppera = howmany(mp_ncpus * sizeof(struct pcpu), + PAGE_SIZE); } else { keg->uk_slabsize = UMA_SLAB_SIZE; keg->uk_ppera = 1; @@ -1226,7 +1224,6 @@ keg_small_init(uma_keg_t keg) static void keg_large_init(uma_keg_t keg) { - int pages; KASSERT(keg != NULL, ("Keg is null in keg_large_init")); KASSERT((keg->uk_flags & UMA_ZFLAG_CACHEONLY) == 0, @@ -1234,14 +1231,8 @@ keg_large_init(uma_keg_t keg) KASSERT((keg->uk_flags & UMA_ZONE_PCPU) == 0, ("%s: Cannot large-init a UMA_ZONE_PCPU keg", __func__)); - pages = keg->uk_size / PAGE_SIZE; - - /* Account for remainder */ - if ((pages * PAGE_SIZE) < keg->uk_size) - pages++; - - keg->uk_ppera = pages; - keg->uk_slabsize = pages * PAGE_SIZE; + keg->uk_ppera = howmany(keg->uk_size, PAGE_SIZE); + keg->uk_slabsize = keg->uk_ppera * PAGE_SIZE; keg->uk_ipers = 1; keg->uk_rsize = keg->uk_size;