Commit c5ce5f3c authored by Warren Dukes's avatar Warren Dukes

new setSigHandlersForDecoder() function, and be sure player/decode processes ignore SIGHUP signals

git-svn-id: https://svn.musicpd.org/mpd/trunk@2492 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 118acc58
...@@ -11,10 +11,6 @@ ...@@ -11,10 +11,6 @@
*) command for displaying playlist contents *) command for displaying playlist contents
*) command for appending to playlist *) command for appending to playlist
*) use getaddrinfo instead of gethostbyname (check libshout)
*) have children ignore SIGHUP
*) put more debugging info when failing to read/write db and other similar *) put more debugging info when failing to read/write db and other similar
errors errors
......
...@@ -105,20 +105,12 @@ int playerInit() { ...@@ -105,20 +105,12 @@ int playerInit() {
player_pid = fork(); player_pid = fork();
if(player_pid==0) { if(player_pid==0) {
PlayerControl * pc = &(getPlayerData()->playerControl); PlayerControl * pc = &(getPlayerData()->playerControl);
struct sigaction sa;
clearUpdatePid(); clearUpdatePid();
unblockSignals(); unblockSignals();
sa.sa_flags = 0; setSigHandlersForDecoder();
sigemptyset(&sa.sa_mask);
finishSigHandlers();
sa.sa_handler = decodeSigHandler;
while(sigaction(SIGCHLD,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGTERM,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGINT,&sa,NULL)<0 && errno==EINTR);
while(close(listenSocket)<0 && errno==EINTR); while(close(listenSocket)<0 && errno==EINTR);
freeAllInterfaces(); freeAllInterfaces();
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include "signal_check.h" #include "signal_check.h"
#include "log.h" #include "log.h"
#include "player.h" #include "player.h"
#include "decode.h"
#include <signal.h> #include <signal.h>
#include <sys/types.h> #include <sys/types.h>
...@@ -89,6 +90,21 @@ void finishSigHandlers() { ...@@ -89,6 +90,21 @@ void finishSigHandlers() {
signal_unhandle(SIGHUP); signal_unhandle(SIGHUP);
} }
void setSigHandlersForDecoder() {
struct sigaction sa;
finishSigHandlers();
sa.sa_flags = 0;
sigemptyset(&sa.sa_mask);
sa.sa_handler = SIG_IGN;
while(sigaction(SIGHUP,&sa,NULL)<0 && errno==EINTR);
sa.sa_handler = decodeSigHandler;
while(sigaction(SIGCHLD,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGTERM,&sa,NULL)<0 && errno==EINTR);
while(sigaction(SIGINT,&sa,NULL)<0 && errno==EINTR);
}
void ignoreSignals() { void ignoreSignals() {
struct sigaction sa; struct sigaction sa;
......
...@@ -27,6 +27,8 @@ void initSigHandlers(); ...@@ -27,6 +27,8 @@ void initSigHandlers();
void finishSigHandlers(); void finishSigHandlers();
void setSigHandlersForDecoder();
void ignoreSignals(); void ignoreSignals();
void blockSignals(); void blockSignals();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment