From a07eb8e235dd01f60bc8b2ea4be783e201e28311 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Wed, 30 Oct 2019 00:14:14 +0900 Subject: [PATCH] axfer: handle -ETIMEDOUT before handle mmap 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 mmap 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 --- axfer/xfer-libasound-irq-mmap.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/axfer/xfer-libasound-irq-mmap.c b/axfer/xfer-libasound-irq-mmap.c index 71ee79f..a13b3c3 100644 --- a/axfer/xfer-libasound-irq-mmap.c +++ b/axfer/xfer-libasound-irq-mmap.c @@ -82,10 +82,28 @@ static int irq_mmap_process_frames(struct libasound_state *state, int err; if (state->use_waiter) { + unsigned int msec_per_buffer; unsigned short revents; + // 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 avail space in buffer. - err = xfer_libasound_wait_event(state, -1, &revents); + err = xfer_libasound_wait_event(state, msec_per_buffer, + &revents); + if (err == -ETIMEDOUT) { + logging(state, + "No event occurs for PCM substream during %u " + "msec. The implementaion of kernel driver or " + "userland backend causes this issue.\n", + msec_per_buffer); + return err; + } if (err < 0) return err; if (revents & POLLERR) { -- 2.47.1