[asterisk-commits] file: trunk r51514 - in /trunk: ./ res/res_musiconhold.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jan 22 19:47:55 2007
New Revision: 51514

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51514
Log:
Merged revisions 51513 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r51513 | file | 2007-01-22 20:45:04 -0500 (Mon, 22 Jan 2007) | 10 lines

Merged revisions 51512 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r51512 | file | 2007-01-22 20:41:35 -0500 (Mon, 22 Jan 2007) | 2 lines

Yield before reading from zaptel timing source under Solaris so that other threads get a chance to do things. (issue #7875 reported by bob)

........

................

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

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

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=51514&r1=51513&r2=51514
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Mon Jan 22 19:47:55 2007
@@ -48,6 +48,9 @@
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#ifdef SOLARIS
+#include <thread.h>
+#endif
 
 #include "asterisk/zapata.h"
 
@@ -504,6 +507,9 @@
 			}
 		}
 		if (class->pseudofd > -1) {
+#ifdef SOLARIS
+			thr_yield();
+#endif
 			/* Pause some amount of time */
 			res = read(class->pseudofd, buf, sizeof(buf));
 			pthread_testcancel();