[asterisk-commits] lmadsen: tag 1.6.2.10 r278613 - /tags/1.6.2.10/res/res_timing_pthread.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Thu Jul 22 08:24:32 2010
New Revision: 278613

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=278613
Log:
Merge revision 278479 into 1.6.2.10 to fix res_timing_pthread.

Modified:
    tags/1.6.2.10/res/res_timing_pthread.c

Modified: tags/1.6.2.10/res/res_timing_pthread.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.10/res/res_timing_pthread.c?view=diff&rev=278613&r1=278612&r2=278613
==============================================================================
--- tags/1.6.2.10/res/res_timing_pthread.c (original)
+++ tags/1.6.2.10/res/res_timing_pthread.c Thu Jul 22 08:24:32 2010
@@ -36,6 +36,7 @@
 #include "asterisk/astobj2.h"
 #include "asterisk/time.h"
 #include "asterisk/lock.h"
+#include "asterisk/poll-compat.h"
 
 static void *timing_funcs_handle;
 
@@ -376,16 +377,12 @@
 	do {
 		unsigned char buf[1024];
 		ssize_t res;
-		fd_set rfds;
-		struct timeval timeout = {
-			.tv_sec = 0,
+		struct pollfd pfd = {
+			.fd = rd_fd,
+			.events = POLLIN,
 		};
 
-		/* Make sure there is data to read */
-		FD_ZERO(&rfds);
-		FD_SET(rd_fd, &rfds);
-
-		if (select(rd_fd + 1, &rfds, NULL, NULL, &timeout) != 1) {
+		if (ast_poll(&pfd, 1, 0) != 1) {
 			ast_debug(1, "Reading not available on timing pipe, "
 					"quantity: %u\n", quantity);
 			break;