From 440ea7d38df6a8b86a5819a42c473c57826f79e4 Mon Sep 17 00:00:00 2001 From: Takashi Sakamoto Date: Sun, 14 Oct 2018 23:36:32 +0900 Subject: [PATCH] alsactl: handle disconnection of sound card MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Once sound card becomes disconnection state, corresponding control node becomes to emit error event for listeners. When catching this type of event, event dispatcher should stop observation of the node. However, at present, a mode of monitor can't handle this correctly. As a result, poll(2) is executed quite frequently in loop with no wait. This results 100% consumption of CPU time. This commit takes the dispatcher to remove the node from observation list when detecting the disconnection state. Reported-by: Thomas Gläßle Signed-off-by: Takashi Sakamoto Signed-off-by: Jaroslav Kysela --- alsactl/monitor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/alsactl/monitor.c b/alsactl/monitor.c index 09ef63c..559fb4c 100644 --- a/alsactl/monitor.c +++ b/alsactl/monitor.c @@ -285,6 +285,10 @@ static int run_dispatcher(int epfd, struct list_head *srcs) struct src_entry *entry = (struct src_entry *)ev->data.ptr; if (ev->events & EPOLLIN) print_event(entry->handle, entry->name); + if (ev->events & EPOLLERR) { + operate_dispatcher(epfd, EPOLL_CTL_DEL, NULL, entry); + remove_source_entry(entry); + } } }