From owner-svn-src-stable@FreeBSD.ORG  Mon Apr 12 21:13:03 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 68C2A106566C;
	Mon, 12 Apr 2010 21:13:03 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 577E78FC1C;
	Mon, 12 Apr 2010 21:13:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3CLD31W042075;
	Mon, 12 Apr 2010 21:13:03 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3CLD3ht042072;
	Mon, 12 Apr 2010 21:13:03 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201004122113.o3CLD3ht042072@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Mon, 12 Apr 2010 21:13:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206509 - stable/7/lib/libc/db/hash
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Apr 2010 21:13:03 -0000

Author: avg
Date: Mon Apr 12 21:13:03 2010
New Revision: 206509
URL: http://svn.freebsd.org/changeset/base/206509

Log:
  MFC r206178: ibc/db/hash: cap auto-tuned block size

Modified:
  stable/7/lib/libc/db/hash/hash.c
  stable/7/lib/libc/db/hash/hash.h
Directory Properties:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdtime/   (props changed)

Modified: stable/7/lib/libc/db/hash/hash.c
==============================================================================
--- stable/7/lib/libc/db/hash/hash.c	Mon Apr 12 21:12:03 2010	(r206508)
+++ stable/7/lib/libc/db/hash/hash.c	Mon Apr 12 21:13:03 2010	(r206509)
@@ -309,6 +309,8 @@ init_hash(hashp, file, info)
 		if (stat(file, &statbuf))
 			return (NULL);
 		hashp->BSIZE = statbuf.st_blksize;
+		if (hashp->BSIZE > MAX_BSIZE)
+			hashp->BSIZE = MAX_BSIZE;
 		hashp->BSHIFT = __log2(hashp->BSIZE);
 	}
 

Modified: stable/7/lib/libc/db/hash/hash.h
==============================================================================
--- stable/7/lib/libc/db/hash/hash.h	Mon Apr 12 21:12:03 2010	(r206508)
+++ stable/7/lib/libc/db/hash/hash.h	Mon Apr 12 21:13:03 2010	(r206509)
@@ -118,7 +118,7 @@ typedef struct htab	 {		/* Memory reside
 /*
  * Constants
  */
-#define	MAX_BSIZE		65536		/* 2^16 */
+#define	MAX_BSIZE		32768		/* 2^15 but should be 65536 */
 #define MIN_BUFFERS		6
 #define MINHDRSIZE		512
 #define DEF_BUFSIZE		65536		/* 64 K */