diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-17 11:58:05 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-17 11:58:05 +0000 |
| commit | 61aba42d5c9e2784e4c83c44f817426b3b9bf48a (patch) | |
| tree | 5ed874f4d73fcdaf318f53e2d73e19424f8fe8a4 | |
| parent | 1e34c02e3ea774c1818fa17d75095b6efcdc8a02 (diff) | |
| download | upstream-61aba42d5c9e2784e4c83c44f817426b3b9bf48a.tar.gz upstream-61aba42d5c9e2784e4c83c44f817426b3b9bf48a.tar.bz2 upstream-61aba42d5c9e2784e4c83c44f817426b3b9bf48a.zip | |
mountd: correctly handle poll() timeout case, solves possible 100% CPU load when idle (#7293)
SVN-Revision: 27635
| -rw-r--r-- | package/mountd/Makefile | 4 | ||||
| -rw-r--r-- | package/mountd/patches/020-handle_timeout.patch | 32 |
2 files changed, 34 insertions, 2 deletions
diff --git a/package/mountd/Makefile b/package/mountd/Makefile index f7a68242ac..4b739220f0 100644 --- a/package/mountd/Makefile +++ b/package/mountd/Makefile @@ -1,11 +1,11 @@ -# Copyright (C) 2009-2010 OpenWrt.org +# Copyright (C) 2009-2011 OpenWrt.org # All rights reserved. include $(TOPDIR)/rules.mk PKG_NAME:=mountd PKG_VERSION:=0.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources diff --git a/package/mountd/patches/020-handle_timeout.patch b/package/mountd/patches/020-handle_timeout.patch new file mode 100644 index 0000000000..badf40fe4d --- /dev/null +++ b/package/mountd/patches/020-handle_timeout.patch @@ -0,0 +1,32 @@ +--- a/lib/autofs.c ++++ b/lib/autofs.c +@@ -140,6 +140,7 @@ static int fullread(void *ptr, size_t le + + static int autofs_in(union autofs_v5_packet_union *pkt) + { ++ int res; + struct pollfd fds[1]; + + fds[0].fd = fdout; +@@ -147,15 +148,19 @@ static int autofs_in(union autofs_v5_pac + + while(1) + { +- if(poll(fds, 2, 1000) == -1) ++ res = poll(fds, 1, -1); ++ ++ if (res == -1) + { + if (errno == EINTR) + continue; + log_printf("failed while trying to read packet from kernel\n"); + return -1; + } +- if(fds[0].revents & POLLIN) ++ else if ((res > 0) && (fds[0].revents & POLLIN)) ++ { + return fullread(pkt, sizeof(*pkt)); ++ } + } + } + |