diff options
| author | J. Alexander Treuman <jat@spatialrift.net> | 2007-08-27 21:18:35 +0000 |
|---|---|---|
| committer | J. Alexander Treuman <jat@spatialrift.net> | 2007-08-27 21:18:35 +0000 |
| commit | 1b045d0672cb1a069efd2d150d81ae3d5253ada5 (patch) | |
| tree | 39080f9f722639ffef7b98441942052c9d5e4025 /src/player.c | |
| parent | 752bf24b7475d89e97a450bab353f3a1892a1ce0 (diff) | |
| download | mpd-1b045d0672cb1a069efd2d150d81ae3d5253ada5.tar.gz mpd-1b045d0672cb1a069efd2d150d81ae3d5253ada5.tar.xz mpd-1b045d0672cb1a069efd2d150d81ae3d5253ada5.zip | |
removing debug messages from signal handlers
As unfortunate as it is to remove such useful debugging messages, it's
necessary to fix a potential deadlock with signal handling. A bunch of
functions the debug functions call aren't safe to call from a signal
handler. There are some alternate solutions, but they're neither pretty
nor simple. So just remove them entirely for now.
git-svn-id: https://svn.musicpd.org/mpd/trunk@6828 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/player.c')
| -rw-r--r-- | src/player.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/player.c b/src/player.c index e84f31828..6ae46eded 100644 --- a/src/player.c +++ b/src/player.c @@ -85,6 +85,7 @@ void player_sigChldHandler(int pid, int status) { if (player_pid == pid) { + /* DEBUG("SIGCHLD caused by player process\n"); if (WIFSIGNALED(status) && WTERMSIG(status) != SIGTERM && @@ -93,17 +94,20 @@ void player_sigChldHandler(int pid, int status) ERROR("player process died from signal: %i\n", WTERMSIG(status)); } + */ resetPlayer(); } else if (pid == getPlayerData()->playerControl.decode_pid && player_pid <= 0) { + /* if (WIFSIGNALED(status) && WTERMSIG(status) != SIGTERM) { ERROR("(caught by master parent) " "decode process died from a " "non-TERM signal: %i\n", WTERMSIG(status)); } + */ getPlayerData()->playerControl.decode_pid = 0; } } |