BIND 10 master, updated. 766e74511e7c99d3d224e15b5f8a8afb5d154ea5 bug #1639: Change comment in configure.ac

[BIND 10 source code commits]

The branch, master has been updated
       via  766e74511e7c99d3d224e15b5f8a8afb5d154ea5 (commit)
       via  228fe4a17c5da83de7ea31735d2f283d0638d928 (commit)
       via  d576a1526ed1a9bc3275fa966768ce465692386a (commit)
       via  6ea0b1d62e7b8b6596209291aa6c8b34b8e73191 (commit)
      from  4de96e9a3231ed79cb9d5549c00079df4dd7ceba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 766e74511e7c99d3d224e15b5f8a8afb5d154ea5
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Mar 21 10:05:33 2012 +0530

    bug #1639: Change comment in configure.ac

commit 228fe4a17c5da83de7ea31735d2f283d0638d928
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Mar 20 11:02:23 2012 -0700

    [1639] some minor editorial fixes: () for return, indentation consistency

commit d576a1526ed1a9bc3275fa966768ce465692386a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Mar 20 00:28:40 2012 +0530

    bug #1639: Add comment to endif

commit 6ea0b1d62e7b8b6596209291aa6c8b34b8e73191
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Mar 20 00:17:20 2012 +0530

    bug #1639: Implement a pselect() wrapper around select() for OpenBSD

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                    |    3 +++
 tests/tools/perfdhcp/perfdhcp.c |   29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 5ce897d..2f64dd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -930,6 +930,9 @@ EV_SET(&kevent, 0, 0, 0, 0, 0, udata);],
 	])
 fi
 
+# Check for functions that are not available on all platforms
+AC_CHECK_FUNCS([pselect])
+
 # perfdhcp: If the clock_gettime() function does not exist on the system,
 # use an alternative supplied in the code based on gettimeofday().
 CLOCK_GETTIME_LDFLAGS=
diff --git a/tests/tools/perfdhcp/perfdhcp.c b/tests/tools/perfdhcp/perfdhcp.c
index 6e02b7e..ba115cc 100644
--- a/tests/tools/perfdhcp/perfdhcp.c
+++ b/tests/tools/perfdhcp/perfdhcp.c
@@ -66,6 +66,35 @@ main(const int argc, char* const argv[])
 #include <time.h>
 #include <unistd.h>
 
+#ifndef HAVE_PSELECT
+
+#include <assert.h>
+
+/* Platforms such as OpenBSD don't provide a pselect(), so we use our
+   own implementation for this testcase, which wraps around select() and
+   hence doesn't implement the high precision timer. This implementation
+   is fine for our purpose. */
+
+static int
+pselect (int nfds, fd_set *readfds, fd_set *writefds,
+         fd_set *exceptfds, const struct timespec *timeout,
+         const sigset_t *sigmask)
+{
+	struct timeval my_timeout;
+
+	/* Our particular usage of pselect() doesn't use these fields. */
+	assert(writefds == NULL);
+	assert(exceptfds == NULL);
+	assert(sigmask == NULL);
+
+	my_timeout.tv_sec = timeout->tv_sec;
+	my_timeout.tv_usec = timeout->tv_nsec / 1000;
+
+	return (select(nfds, readfds, writefds, exceptfds, &my_timeout));
+}
+
+#endif /* HAVE_PSELECT */
+
 /* DHCPv4 defines (to be moved/shared) */
 
 #define DHCP_OFF_OPCODE		0