RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

cache: Use sigaction() instead of signal() 

Signal() has an unavoidable race-condition on "broken by
backwards-compatibility" systems like Solaris. (Upon receiving a
signal, the handler is reset to SIG_DFL, thus a second signal will
kill the process. The problem could also be reduced by re-installing
the handler inside the handler, but there's still a race-condition and
the risk of the handler being called inside the handler).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31738 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-07-15 18:09:14 +00:00 committed by Uoti Urpala
parent 5ed772b9cd
commit 5544c07aab
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
stream/cache2.c
View File

@ -365,7 +365,8 @@ static void dummy_sighandler(int x) {
static void cache_mainloop(cache_vars_t *s) {
int sleep_count = 0;
#if FORKED_CACHE
signal(SIGUSR1, SIG_IGN);
struct sigaction sa = { .sa_handler = SIG_IGN };
sigaction(SIGUSR1, &sa, NULL);
#endif
do {
if (!cache_fill(s)) {
@ -373,7 +374,8 @@ static void cache_mainloop(cache_vars_t *s) {
// Let signal wake us up, we cannot leave this
// enabled since we do not handle EINTR in most places.
// This might need extra code to work on BSD.
signal(SIGUSR1, dummy_sighandler);
sa.sa_handler = dummy_sighandler;
sigaction(SIGUSR1, &sa, NULL);
#endif
if (sleep_count < INITIAL_FILL_USLEEP_COUNT) {
sleep_count++;
@ -381,7 +383,8 @@ static void cache_mainloop(cache_vars_t *s) {
} else
usec_sleep(FILL_USLEEP_TIME); // idle
#if FORKED_CACHE
signal(SIGUSR1, SIG_IGN);
sa.sa_handler = SIG_IGN;
sigaction(SIGUSR1, &sa, NULL);
#endif
} else
sleep_count = 0;