kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 51513 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2007-01-23 01:47:55 +00:00
parent b86d65958f
commit fa6d3941df
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_musiconhold.c
View 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();