X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=alsa_pool.cpp;h=348c6232303ab561d3a4039ca69932261bd3e8bc;hb=fa54f2630c56a1df0046923d6a77b1bd58abf240;hp=5983446e37ab4f687cfaa7a9e4db11d497eff711;hpb=9932a195e442b67ba95bb1377f29aac27f68eb0e;p=nageru

diff --git a/alsa_pool.cpp b/alsa_pool.cpp
index 5983446..348c623 100644
--- a/alsa_pool.cpp
+++ b/alsa_pool.cpp
@@ -1,15 +1,22 @@
 #include "alsa_pool.h"
 
-#include <alsa/control.h>
-#include <alsa/error.h>
-#include <alsa/pcm.h>
+#include <alsa/asoundlib.h>
 #include <assert.h>
+#include <errno.h>
 #include <limits.h>
+#include <pthread.h>
+#include <poll.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <sys/eventfd.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 #include <algorithm>
+#include <chrono>
+#include <functional>
+#include <iterator>
 #include <memory>
+#include <ratio>
 
 #include "alsa_input.h"
 #include "audio_mixer.h"
@@ -20,6 +27,12 @@
 using namespace std;
 using namespace std::placeholders;
 
+ALSAPool::ALSAPool()
+{
+	should_quit_fd = eventfd(/*initval=*/0, /*flags=*/0);
+	assert(should_quit_fd != -1);
+}
+
 ALSAPool::~ALSAPool()
 {
 	for (Device &device : devices) {
@@ -28,6 +41,11 @@ ALSAPool::~ALSAPool()
 		}
 	}
 	should_quit = true;
+	const uint64_t one = 1;
+	if (write(should_quit_fd, &one, sizeof(one)) != sizeof(one)) {
+		perror("write(should_quit_fd)");
+		exit(1);
+	}
 	inotify_thread.join();
 
 	while (retry_threads_running > 0) {
@@ -117,6 +135,10 @@ void ALSAPool::probe_device_retry_thread_func(unsigned card_index, unsigned dev_
 	char address[256];
 	snprintf(address, sizeof(address), "hw:%d,%d", card_index, dev_index);
 
+	char thread_name[16];
+	snprintf(thread_name, sizeof(thread_name), "Reprobe_hw:%d,%d", card_index, dev_index);
+	pthread_setname_np(pthread_self(), thread_name);
+
 	for ( ;; ) {  // Termination condition within the loop.
 		sleep(1);
 
@@ -271,6 +293,8 @@ void ALSAPool::init()
 
 void ALSAPool::inotify_thread_func()
 {
+	pthread_setname_np(pthread_self(), "ALSA_Hotplug");
+
 	int inotify_fd = inotify_init();
 	if (inotify_fd == -1) {
 		perror("inotify_init()");
@@ -289,12 +313,15 @@ void ALSAPool::inotify_thread_func()
 	int size = sizeof(inotify_event) + NAME_MAX + 1;
 	unique_ptr<char[]> buf(new char[size]);
 	while (!should_quit) {
-		pollfd fds;
-		fds.fd = inotify_fd;
-		fds.events = POLLIN;
-		fds.revents = 0;
-
-		int ret = poll(&fds, 1, 100);
+		pollfd fds[2];
+		fds[0].fd = inotify_fd;
+		fds[0].events = POLLIN;
+		fds[0].revents = 0;
+		fds[1].fd = should_quit_fd;
+		fds[1].events = POLLIN;
+		fds[1].revents = 0;
+
+		int ret = poll(fds, 2, -1);
 		if (ret == -1) {
 			if (errno == EINTR) {
 				continue;
@@ -307,6 +334,8 @@ void ALSAPool::inotify_thread_func()
 			continue;
 		}
 
+		if (fds[1].revents) break;  // should_quit_fd asserted.
+
 		ret = read(inotify_fd, buf.get(), size);
 		if (ret == -1) {
 			if (errno == EINTR) {
@@ -350,6 +379,7 @@ void ALSAPool::inotify_thread_func()
 	}
 	close(watch_fd);
 	close(inotify_fd);
+	close(should_quit_fd);
 }
 
 void ALSAPool::reset_device(unsigned index)
@@ -363,7 +393,7 @@ void ALSAPool::reset_device(unsigned index)
 		inputs[index].reset();
 	} else {
 		// TODO: Put on a background thread instead of locking?
-		auto callback = bind(&AudioMixer::add_audio, global_audio_mixer, DeviceSpec{InputSourceType::ALSA_INPUT, index}, _1, _2, _3, _4);
+		auto callback = bind(&AudioMixer::add_audio, global_audio_mixer, DeviceSpec{InputSourceType::ALSA_INPUT, index}, _1, _2, _3, _4, _5);
 		inputs[index].reset(new ALSAInput(device->address.c_str(), OUTPUT_FREQUENCY, device->num_channels, callback, this, index));
 		inputs[index]->start_capture_thread();
 	}