From bb6e8cee927dfdc3545aabc6a23eb4d6c5f3268b Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Mon, 9 Jul 2001 17:15:48 +0000 Subject: [PATCH] (toplevel): Include and "syssignal.h". (vox_configure, vox_close) [SIGIO]: Block/unblock SIGIO around ioctls. --- src/ChangeLog | 6 ++++++ src/sound.c | 24 +++++++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index da8913ea9ed..67be01f753b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-07-09 Gerd Moellmann + + * sound.c (toplevel): Include and "syssignal.h". + (vox_configure, vox_close) [SIGIO]: Block/unblock SIGIO + around ioctls. + 2001-07-06 Eli Zaretskii * dosfns.c (syms_of_dosfns): Add \n\ at the end of a line in the diff --git a/src/sound.c b/src/sound.c index 62d6cfb170b..e5c80059656 100644 --- a/src/sound.c +++ b/src/sound.c @@ -32,6 +32,8 @@ Boston, MA 02111-1307, USA. */ #include "lisp.h" #include "dispextern.h" #include "atimer.h" +#include +#include "syssignal.h" /* FreeBSD has machine/soundcard.h. Voxware sound driver docs mention sys/soundcard.h. So, let's try whatever's there. */ @@ -765,7 +767,13 @@ vox_configure (sd) xassert (sd->fd >= 0); + /* On GNU/Linux, it seems that the device driver doesn't like to be + interrupted by a signal. Block the ones we know to cause + troubles. */ turn_on_atimers (0); +#ifdef SIGIO + sigblock (sigmask (SIGIO)); +#endif val = sd->format; if (ioctl (sd->fd, SNDCTL_DSP_SETFMT, &sd->format) < 0 @@ -796,6 +804,9 @@ vox_configure (sd) } turn_on_atimers (1); +#ifdef SIGIO + sigunblock (sigmask (SIGIO)); +#endif } @@ -807,10 +818,21 @@ vox_close (sd) { if (sd->fd >= 0) { - /* Flush sound data, and reset the device. */ + /* On GNU/Linux, it seems that the device driver doesn't like to + be interrupted by a signal. Block the ones we know to cause + troubles. */ +#ifdef SIGIO + sigblock (sigmask (SIGIO)); +#endif turn_on_atimers (0); + + /* Flush sound data, and reset the device. */ ioctl (sd->fd, SNDCTL_DSP_SYNC, NULL); + turn_on_atimers (1); +#ifdef SIGIO + sigunblock (sigmask (SIGIO)); +#endif /* Close the device. */ emacs_close (sd->fd); -- 2.39.2