Merged revisions 51513 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 23 Jan 2007 01:47:55 +0000 (01:47 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 23 Jan 2007 01:47:55 +0000 (01:47 +0000)
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)

........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51514 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_musiconhold.c

index e8410d9..6b97445 100644 (file)
@@ -48,6 +48,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
+#ifdef SOLARIS
+#include <thread.h>
+#endif
 
 #include "asterisk/zapata.h"
 
@@ -504,6 +507,9 @@ static void *monmp3thread(void *data)
                        }
                }
                if (class->pseudofd > -1) {
+#ifdef SOLARIS
+                       thr_yield();
+#endif
                        /* Pause some amount of time */
                        res = read(class->pseudofd, buf, sizeof(buf));
                        pthread_testcancel();