[svn-commits] tilghman: branch 1.4 r285266 - /branches/1.4/main/poll.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Sep  7 14:04:50 2010
New Revision: 285266

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285266
Log:
Use poll, if indicated to do so, in the ast_poll2 implementation.

This fixes the unit tests on FreeBSD 8.0.

Modified:
    branches/1.4/main/poll.c

Modified: branches/1.4/main/poll.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/poll.c?view=diff&rev=285266&r1=285265&r2=285266
==============================================================================
--- branches/1.4/main/poll.c (original)
+++ branches/1.4/main/poll.c Tue Sep  7 14:04:50 2010
@@ -94,7 +94,7 @@
 				 Private Functions
 \*---------------------------------------------------------------------------*/
 
-#if defined(AST_POLL_COMPAT) || !defined(HAVE_PPOLL)
+#if defined(AST_POLL_COMPAT)
 static int map_poll_spec(struct pollfd *pArray, unsigned long n_fds,
 		ast_fdset *pReadSet, ast_fdset *pWriteSet, ast_fdset *pExceptSet)
 {
@@ -268,10 +268,14 @@
 
 int ast_poll2(struct pollfd *pArray, unsigned long n_fds, struct timeval *tv)
 {
-#ifdef HAVE_PPOLL
+#if !defined(AST_POLL_COMPAT)
 	struct timeval start = ast_tvnow();
+#if defined(HAVE_PPOLL)
 	struct timespec ts = { tv ? tv->tv_sec : 0, tv ? tv->tv_usec * 1000 : 0 };
 	int res = ppoll(pArray, n_fds, tv ? &ts : NULL, NULL);
+#else
+	int res = poll(pArray, n_fds, tv ? tv->tv_sec * 1000 + tv->tv_usec / 1000 : -1);
+#endif
 	struct timeval after = ast_tvnow();
 	if (res > 0 && tv && ast_tvdiff_ms(ast_tvadd(*tv, start), after) > 0) {
 		*tv = ast_tvsub(*tv, ast_tvsub(after, start));