asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-09-19 01:29:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

axfer: fix regression of timeout in timer-based scheduling model

Browse source 
In timer-based scheduling model, event waiting is just to measure time
elapse since no event is expected to occur. However, as a result to
applying commit e5e6a7838b, -ETIMEDOUT returns in the case and
the caller handles it as error. This results in disorder of the
scheduling model.

This commit fixes the regression so that the -ETIMEDOUT case is expected.

Reported-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/alsa-devel/687f9871-7484-1370-04d1-9c968e86f72b@linux.intel.com/
Fixes: e5e6a7838b ("axfer: return ETIMEDOUT when no event occurs after waiter expiration")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Takashi Sakamoto 2021-05-13 22:48:28 +09:00 committed by Jaroslav Kysela
parent 76b4af2616
commit 9af7148fa3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
axfer/xfer-libasound-timer-mmap.c
View file

@ -171,7 +171,8 @@ static int timer_mmap_process_frames(struct libasound_state *state,
// exactly the mechanism yet.
err = xfer_libasound_wait_event(state, timeout_msec,
&revents);
if (err < 0)
// MEMO: timeout is expected since the above call is just to measure time elapse.
if (err < 0 && err != -ETIMEDOUT)
return err;
if (revents & POLLERR) {
// TODO: error reporting.