From owner-p4-projects@FreeBSD.ORG  Tue Mar 11 22:04:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B44201065675; Tue, 11 Mar 2008 22:04:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 73F0D106566C
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 22:04:27 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6300B8FC19
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 22:04:27 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2BM4RF3041279
	for <perforce@freebsd.org>; Tue, 11 Mar 2008 22:04:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2BM4RDt041277
	for perforce@freebsd.org; Tue, 11 Mar 2008 22:04:27 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 11 Mar 2008 22:04:27 GMT
Message-Id: <200803112204.m2BM4RDt041277@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 137444 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Mar 2008 22:04:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=137444

Change 137444 by rwatson@rwatson_cinnamon on 2008/03/11 22:03:31

	Read the default buffer size from bpf device so that zero-copy
	tracks net.bpf.bpfsize as a default.  Round up to page size.

Affected files ...

.. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#22 edit

Differences ...

==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#22 (text+ko) ====

@@ -810,7 +810,12 @@
 			    pcap_strerror(errno));
 			goto bad;
 		}
-		p->zbufsize = 32768;
+		if ((ioctl(fd, BIOCGBLEN, (caddr_t)&v) < 0) || v < 32768)
+			v = 32768;
+#ifndef roundup
+#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
+#endif
+		p->zbufsize = roundup(v, getpagesize());
 		if (p->zbufsize > zbufmax)
 			p->zbufsize = zbufmax;
 		p->zbuf1 = mmap(NULL, p->zbufsize, PROT_READ | PROT_WRITE,