Register threads explicitely created by cubeb

This covers some callbacks, but not all of them: the APIs that don't
require explicitely creating the thread will see their thread registered
separately.

src/cubeb_alsa.c

@@ -10,6 +10,7 @@
 #define _XOPEN_SOURCE 500
 #include "cubeb-internal.h"
 #include "cubeb/cubeb.h"
+#include "cubeb_tracing.h"
 #include <alsa/asoundlib.h>
 #include <assert.h>
 #include <dlfcn.h>
@@ -579,10 +580,14 @@ alsa_run_thread(void * context)
   cubeb * ctx = context;
   int r;
 
+  CUBEB_REGISTER_THREAD("cubeb rendering thread");
+
   do {
     r = alsa_run(ctx);
   } while (r >= 0);
 
+  CUBEB_UNREGISTER_THREAD();
+
   return NULL;
 }
 

src/cubeb_oss.c

@@ -14,6 +14,7 @@
 #include "cubeb/cubeb.h"
 #include "cubeb_mixer.h"
 #include "cubeb_strings.h"
+#include "cubeb_tracing.h"
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
@@ -975,6 +976,8 @@ oss_io_routine(void * arg)
   cubeb_state new_state;
   int stopped;
 
+  CUBEB_REGISTER_THREAD("cubeb rendering thread");
+
   do {
     pthread_mutex_lock(&s->mtx);
     if (s->destroying) {
@@ -1005,6 +1008,9 @@ oss_io_routine(void * arg)
   pthread_mutex_lock(&s->mtx);
   s->thread_created = false;
   pthread_mutex_unlock(&s->mtx);
+
+  CUBEB_UNREGISTER_THREAD();
+
   return NULL;
 }
 

src/cubeb_sndio.c

@@ -6,6 +6,7 @@
  */
 #include "cubeb-internal.h"
 #include "cubeb/cubeb.h"
+#include "cubeb_tracing.h"
 #include <assert.h>
 #include <dlfcn.h>
 #include <inttypes.h>
@@ -161,10 +162,14 @@ sndio_mainloop(void * arg)
   size_t pstart = 0, pend = 0, rstart = 0, rend = 0;
   long nfr;
 
+  CUBEB_REGISTER_THREAD("cubeb rendering thread");
+
   nfds = WRAP(sio_nfds)(s->hdl);
   pfds = calloc(nfds, sizeof(struct pollfd));
-  if (pfds == NULL)
+  if (pfds == NULL) {
+    CUBEB_UNREGISTER_THREAD();
     return NULL;
+  }
 
   DPR("sndio_mainloop()\n");
   s->state_cb(s, s->arg, CUBEB_STATE_STARTED);
@@ -172,6 +177,7 @@ sndio_mainloop(void * arg)
   if (!WRAP(sio_start)(s->hdl)) {
     pthread_mutex_unlock(&s->mtx);
     free(pfds);
+    CUBEB_UNREGISTER_THREAD();
     return NULL;
   }
   DPR("sndio_mainloop(), started\n");
@@ -300,6 +306,7 @@ sndio_mainloop(void * arg)
   pthread_mutex_unlock(&s->mtx);
   s->state_cb(s, s->arg, state);
   free(pfds);
+  CUBEB_UNREGISTER_THREAD();
   return NULL;
 }
 

src/cubeb_sun.c

@@ -6,6 +6,7 @@
  */
 #include "cubeb-internal.h"
 #include "cubeb/cubeb.h"
+#include "cubeb_tracing.h"
 #include <fcntl.h>
 #include <limits.h>
 #include <pthread.h>
@@ -428,6 +429,8 @@ sun_io_routine(void * arg)
   size_t read_ofs = 0;
   int drain = 0;
 
+  CUBEB_REGISTER_THREAD("cubeb rendering thread");
+
   s->state_cb(s, s->user_ptr, CUBEB_STATE_STARTED);
   while (state != CUBEB_STATE_ERROR) {
     pthread_mutex_lock(&s->mutex);
@@ -505,6 +508,7 @@ sun_io_routine(void * arg)
     }
   }
   s->state_cb(s, s->user_ptr, state);
+  CUBEB_UNREGISTER_THREAD();
   return NULL;
 }
 

src/cubeb_wasapi.cpp

@@ -30,6 +30,7 @@
 #include "cubeb_mixer.h"
 #include "cubeb_resampler.h"
 #include "cubeb_strings.h"
+#include "cubeb_tracing.h"
 #include "cubeb_utils.h"
 
 // Windows 10 exposes the IAudioClient3 interface to create low-latency streams.
@@ -223,6 +224,11 @@ private:
   com_heap_ptr<wchar_t> capture_comms_id;
 };
 
+struct AutoRegisterThread {
+  AutoRegisterThread(const char * name) { CUBEB_REGISTER_THREAD(name); }
+  ~AutoRegisterThread() { CUBEB_UNREGISTER_THREAD(); }
+};
+
 int
 wasapi_stream_stop(cubeb_stream * stm);
 int
@@ -463,6 +469,7 @@ public:
 private:
   static unsigned int __stdcall thread_proc(LPVOID args)
   {
+    AutoRegisterThread raii("WASAPI device notification thread");
     XASSERT(args);
     auto mdn = static_cast<monitor_device_notifications *>(args);
     mdn->notification_thread_loop();
@@ -1337,6 +1344,8 @@ handle_emergency_bailout(cubeb_stream * stm)
 
 static unsigned int __stdcall wasapi_stream_render_loop(LPVOID stream)
 {
+  AutoRegisterThread raii("cubeb rendering thread");
+
   cubeb_stream * stm = static_cast<cubeb_stream *>(stream);
 
   bool is_playing = true;