[gentoo-commits] gentoo-x86 commit in net-libs/libpcap/files: libpcap-1.0.1_pre20090812-poll-cpu-usage.patch

[Robin H. Johnson (robbat2)]

robbat2     09/08/29 21:06:50

  Added:                libpcap-1.0.1_pre20090812-poll-cpu-usage.patch
  Log:
  Bump to newer snapshot, and include poll() CPU usage fix from Ubuntu. Massively drops CPU usage for live captures again.
  (Portage version: 2.2_rc40/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-libs/libpcap/files/libpcap-1.0.1_pre20090812-poll-cpu-usage.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libpcap/files/libpcap-1.0.1_pre20090812-poll-cpu-usage.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libpcap/files/libpcap-1.0.1_pre20090812-poll-cpu-usage.patch?rev=1.1&content-type=text/plain

Index: libpcap-1.0.1_pre20090812-poll-cpu-usage.patch
===================================================================
https://bugs.launchpad.net/ubuntu/+source/tcpdump/+bug/369288

Rediffed to apply.

diff -Nuar --exclude '*.orig' --exclude '*.rej' libpcap-1.0.1-20090708.orig/pcap-linux.c libpcap-1.0.1-20090708/pcap-linux.c
--- libpcap-1.0.1-20090708.orig/pcap-linux.c	2009-07-08 11:52:08.000000000 +0000
+++ libpcap-1.0.1-20090708/pcap-linux.c	2009-08-29 20:47:44.951806355 +0000
@@ -2785,6 +2785,19 @@
 					handle->fd, errno, pcap_strerror(errno));
 				return -1;
 			}
+
+			/* poll() sometimes returns > 0 even in error cases
+			 * and sets error-bits like POLLERR, POLLHUP, ..
+			 * Are also "good" bits are possible, like POLLPRI.
+			 * TODO: what's with POLLRDHUP since kernel 2.6.17?
+			 */
+			if (ret > 0 && pollinfo.revents & (POLLERR | POLLHUP | POLLNVAL)) {
+				snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
+						"critical revent in poll on packet socket fd %d: 0x%4.4x", 
+						handle->fd, pollinfo.revents);
+				return -1;
+			}
+
 			/* check for break loop condition on interrupted syscall*/
 			if (handle->break_loop) {
 				handle->break_loop = 0;