Avoid deadlock when /dev/input node is hung up.

Themaister · Nov 18, 2023 · 7f4c4d4 · 7f4c4d4
1 parent 26172f7
commit 7f4c4d4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/application/input/input_linux.cpp b/application/input/input_linux.cpp
@@ -381,11 +381,14 @@ bool LinuxInputManager::poll()
 	{
 		for (int i = 0; i < ret; i++)
 		{
-			if (events[i].events & EPOLLIN)
+			auto &device = *static_cast<Device *>(events[i].data.ptr);
+			if ((events[i].events & (EPOLLHUP | EPOLLERR)) != 0)
+			{
+				remove_device(device.devnode.c_str());
+			}
+			else if ((events[i].events & EPOLLIN) != 0)
 			{
 				struct input_event input_events[32];
-				auto &device = *static_cast<Device *>(events[i].data.ptr);
-
 				ssize_t len;
 				while ((len = read(device.fd, input_events, sizeof(input_events))) > 0)
 				{