From: Takashi Sakamoto Date: Tue, 29 Oct 2019 15:13:39 +0000 (+0900) Subject: axfer: handle -ETIMEDOUT before non-block I/O operation X-Git-Tag: v1.2.1~6 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=7d7c988e05cdaabd934d292c7c207d44729afd31;p=alsa-utils.git axfer: handle -ETIMEDOUT before non-block I/O operation When running for IRQ-based scheduling model, transmission backend is expected to queue PCM event in different context from the main thread. When queueing no events during time equivalent to one period of PCM buffer, the backend has problems. This commit outputs report it for non-blocking operation for IRQ-based scheduling model. The timeout is equivalent to all frames in buffer, instead of period for safe. Signed-off-by: Takashi Sakamoto Signed-off-by: Jaroslav Kysela --- diff --git a/axfer/xfer-libasound-irq-rw.c b/axfer/xfer-libasound-irq-rw.c index 184b85a..6ed1927 100644 --- a/axfer/xfer-libasound-irq-rw.c +++ b/axfer/xfer-libasound-irq-rw.c @@ -21,12 +21,21 @@ struct rw_closure { static int wait_for_avail(struct libasound_state *state) { + unsigned int msec_per_buffer; unsigned short revents; unsigned short event; int err; + // Wait during msec equivalent to all audio data frames in buffer + // instead of period, for safe. + err = snd_pcm_hw_params_get_buffer_time(state->hw_params, + &msec_per_buffer, NULL); + if (err < 0) + return err; + msec_per_buffer /= 1000; + // Wait for hardware IRQ when no available space. - err = xfer_libasound_wait_event(state, -1, &revents); + err = xfer_libasound_wait_event(state, msec_per_buffer, &revents); if (err < 0) return err;