PERFORCE change 137444 for review
Robert Watson
rwatson at FreeBSD.org
Tue Mar 11 22:04:28 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=137444
Change 137444 by rwatson at 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,
More information about the p4-projects
mailing list