From e852d6bc48ee32f3d7df323ab08f811a6fc34c54 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Tue, 14 Jan 2014 22:05:33 +0000 Subject: libc/resolv: Use poll() instead of kqueue(). The resolver in libc creates a kqueue for watching a single file descriptor. This can be done using poll() which should be lighter on the kernel and reduce possible problems with rlimits (file descriptors, kqueues). Reviewed by: jhb --- lib/libc/include/port_before.h | 2 +- lib/libc/resolv/res_send.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h index 304dd66df03fc..9e7525b59b542 100644 --- a/lib/libc/include/port_before.h +++ b/lib/libc/include/port_before.h @@ -5,7 +5,7 @@ #define _LIBC 1 #define DO_PTHREADS 1 -#define USE_KQUEUE 1 +#define USE_POLL 1 #define ISC_SOCKLEN_T socklen_t #define ISC_FORMAT_PRINTF(fmt, args) \ diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c index 4896fe8cb36da..f7c38c51a31f5 100644 --- a/lib/libc/resolv/res_send.c +++ b/lib/libc/resolv/res_send.c @@ -77,7 +77,7 @@ __FBSDID("$FreeBSD$"); */ #include "port_before.h" -#ifndef USE_KQUEUE +#if !defined(USE_KQUEUE) && !defined(USE_POLL) #include "fd_setsize.h" #endif @@ -963,7 +963,7 @@ send_dg(res_state statp, timeout.tv_nsec/1000000; pollfd.fd = s; pollfd.events = POLLRDNORM; - n = poll(&pollfd, 1, polltimeout); + n = _poll(&pollfd, 1, polltimeout); #endif /* USE_POLL */ if (n == 0) { -- cgit v1.2.3