forked from pool/alsa-utils
Takashi Iwai
1f78ef5d8d
- Backport upstream fixes for alsactl: 0002-alsactl-don-t-exit-on-EINTR-from-epoll_wait.patch 0003-alsactl-avoid-needless-wakeups-in-monitor-loop.patch 0004-alsactl-fix-error-handling-for-sched_setscheduler-ca.patch OBS-URL: https://build.opensuse.org/request/show/796087 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=171
33 lines
991 B
Diff
33 lines
991 B
Diff
From 5830fc726ac9294641592a8c007502d573f6dea1 Mon Sep 17 00:00:00 2001
|
|
From: Zev Weiss <zev@bewilderbeest.net>
|
|
Date: Mon, 14 Oct 2019 23:36:50 -0500
|
|
Subject: [PATCH] alsactl: don't exit on EINTR from epoll_wait().
|
|
|
|
Previously, things like attaching strace to a running 'alsactl monitor'
|
|
process would cause it to exit.
|
|
|
|
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
|
|
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
|
|
Tested-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
alsactl/monitor.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/alsactl/monitor.c b/alsactl/monitor.c
|
|
index 6b090e4f5c92..cf4167bee165 100644
|
|
--- a/alsactl/monitor.c
|
|
+++ b/alsactl/monitor.c
|
|
@@ -342,6 +342,8 @@ static int run_dispatcher(int epfd, int sigfd, int infd, struct list_head *srcs,
|
|
|
|
count = epoll_wait(epfd, epev, max_ev_count, 200);
|
|
if (count < 0) {
|
|
+ if (errno == EINTR)
|
|
+ continue;
|
|
err = count;
|
|
break;
|
|
}
|
|
--
|
|
2.16.4
|
|
|