[asterisk-commits] tilghman: trunk r285269 - in /trunk: ./ main/poll.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Sep  7 14:09:08 2010
New Revision: 285269

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=285269
Log:
Merged revisions 285268 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285268 | tilghman | 2010-09-07 14:08:09 -0500 (Tue, 07 Sep 2010) | 18 lines
  
  Merged revisions 285267 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r285267 | tilghman | 2010-09-07 14:07:17 -0500 (Tue, 07 Sep 2010) | 11 lines
    
    Merged revisions 285266 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r285266 | tilghman | 2010-09-07 14:04:50 -0500 (Tue, 07 Sep 2010) | 4 lines
      
      Use poll, if indicated to do so, in the ast_poll2 implementation.
      
      This fixes the unit tests on FreeBSD 8.0.
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/main/poll.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/poll.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/poll.c?view=diff&rev=285269&r1=285268&r2=285269
==============================================================================
--- trunk/main/poll.c (original)
+++ trunk/main/poll.c Tue Sep  7 14:09:08 2010
@@ -93,7 +93,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)
 {
@@ -267,10 +267,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));