diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-01-23 01:47:55 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-01-23 01:47:55 +0000 |
| commit | fa6d3941dfa9d4911aa4237e202b3a1080250705 (patch) | |
| tree | 82b46b93b5605263b5a42e156f05f3d3b132f104 /res | |
| parent | b86d65958fc0283c192db208beadefb17c45b6db (diff) | |
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)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51514 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index e8410d95b..6b97445cf 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -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(); |