[asterisk-commits] file: branch 1.4 r51513 - in /branches/1.4: ./ res/res_musiconhold.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Jan 22 19:45:04 2007
New Revision: 51513

URL: http://svn.digium.com/view/asterisk?view=rev&rev=51513
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/res/res_musiconhold.c

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

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