From c365c6cdb28a4be958cd8405039f6a588d1af21f Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 29 Mar 2020 14:56:22 +0200 Subject: Set thread-names (libs) --- libs/ardour/analyser.cc | 4 ++++ libs/ardour/audioengine.cc | 2 ++ libs/ardour/automation_watch.cc | 1 + libs/ardour/midi_patch_manager.cc | 1 + libs/ardour/rt_tasklist.cc | 1 + libs/ardour/session.cc | 2 +- libs/ardour/session_process.cc | 2 ++ libs/ardour/source_factory.cc | 1 + libs/ardour/worker.cc | 8 ++++++-- libs/audiographer/audiographer/sndfile/tmp_file_rt.h | 4 ++++ libs/backends/alsa/alsa_midi.cc | 1 + libs/backends/alsa/alsa_slave.cc | 1 + libs/backends/coreaudio/coreaudio_backend.cc | 1 + libs/pbd/system_exec.cc | 2 ++ libs/waveview/wave_view_private.cc | 2 ++ libs/zita-convolver/zita-convolver.cc | 3 +++ 16 files changed, 33 insertions(+), 3 deletions(-) diff --git a/libs/ardour/analyser.cc b/libs/ardour/analyser.cc index 7f8cb1cc95..b5a9d08e81 100644 --- a/libs/ardour/analyser.cc +++ b/libs/ardour/analyser.cc @@ -19,6 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + #include "ardour/analyser.h" #include "ardour/audiofilesource.h" #include "ardour/rc_configuration.h" @@ -27,6 +28,8 @@ #include "pbd/compose.h" #include "pbd/error.h" +#include "pbd/pthread_utils.h" + #include "pbd/i18n.h" using namespace std; @@ -51,6 +54,7 @@ Analyser::~Analyser () static void analyser_work () { + pthread_set_name ("Analyzer"); Analyser::work (); } diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index c525c33fd4..c0350a7802 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -598,6 +598,7 @@ void AudioEngine::do_reset_backend() { SessionEvent::create_per_thread_pool (X_("Backend reset processing thread"), 1024); + pthread_set_name ("EngineWatchdog"); Glib::Threads::Mutex::Lock guard (_reset_request_lock); @@ -658,6 +659,7 @@ void AudioEngine::do_devicelist_update() { SessionEvent::create_per_thread_pool (X_("Device list update processing thread"), 512); + pthread_set_name ("DeviceList"); Glib::Threads::Mutex::Lock guard (_devicelist_update_lock); diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc index f3e2ae5f81..b0613a4994 100644 --- a/libs/ardour/automation_watch.cc +++ b/libs/ardour/automation_watch.cc @@ -190,6 +190,7 @@ void AutomationWatch::thread () { pbd_set_thread_priority (pthread_self(), PBD_SCHED_FIFO, AudioEngine::instance()->client_real_time_priority() - 3); + pthread_set_name ("AutomationWatch"); while (_run_thread) { Glib::usleep ((gulong) floor (Config->get_automation_interval_msecs() * 1000)); timer (); diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc index b208920603..3d5c41ef42 100644 --- a/libs/ardour/midi_patch_manager.cc +++ b/libs/ardour/midi_patch_manager.cc @@ -274,6 +274,7 @@ MidiPatchManager::load_midnams () */ PBD::notify_event_loops_about_thread_creation (pthread_self(), "midi-patch-manager", 8); + pthread_set_name ("MIDNAMLoader"); { Glib::Threads::Mutex::Lock lm (_lock); diff --git a/libs/ardour/rt_tasklist.cc b/libs/ardour/rt_tasklist.cc index 9dc9b635b4..1472f8e350 100644 --- a/libs/ardour/rt_tasklist.cc +++ b/libs/ardour/rt_tasklist.cc @@ -63,6 +63,7 @@ RTTaskList::drop_threads () RTTaskList::_thread_run (void *arg) { RTTaskList *d = static_cast(arg); + pthread_set_name ("RTTaskList"); d->run (); pthread_exit (0); return 0; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index bb13cee49e..7a36c3e61e 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -6922,6 +6922,7 @@ void * Session::auto_connect_thread (void *arg) { Session *s = static_cast(arg); + pthread_set_name (X_("autoconnect")); s->auto_connect_thread_run (); pthread_exit (0); return 0; @@ -6930,7 +6931,6 @@ Session::auto_connect_thread (void *arg) void Session::auto_connect_thread_run () { - pthread_set_name (X_("autoconnect")); SessionEvent::create_per_thread_pool (X_("autoconnect"), 1024); PBD::notify_event_loops_about_thread_creation (pthread_self(), X_("autoconnect"), 1024); pthread_mutex_lock (&_auto_connect_mutex); diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index bc8cb91a51..089aed7c03 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -31,6 +31,7 @@ #include "pbd/i18n.h" #include "pbd/error.h" #include "pbd/enumwriter.h" +#include "pbd/pthread_utils.h" #include @@ -1087,6 +1088,7 @@ void * Session::emit_thread (void *arg) { Session *s = static_cast(arg); + pthread_set_name ("SessionSignals"); s->emit_thread_run (); pthread_exit (0); return 0; diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 74bf610cee..349a30292b 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -63,6 +63,7 @@ static void peak_thread_work () { SessionEvent::create_per_thread_pool (X_("PeakFile Builder "), 64); + pthread_set_name ("PeakFileBuilder"); while (true) { diff --git a/libs/ardour/worker.cc b/libs/ardour/worker.cc index 67fede4613..73d4e1de83 100644 --- a/libs/ardour/worker.cc +++ b/libs/ardour/worker.cc @@ -20,11 +20,13 @@ #include #include -#include "ardour/worker.h" +#include + #include "pbd/error.h" #include "pbd/compose.h" +#include "pbd/pthread_utils.h" -#include +#include "ardour/worker.h" namespace ARDOUR { @@ -136,6 +138,8 @@ Worker::emit_responses() void Worker::run() { + pthread_set_name ("LV2Worker"); + void* buf = NULL; size_t buf_size = 0; while (true) { diff --git a/libs/audiographer/audiographer/sndfile/tmp_file_rt.h b/libs/audiographer/audiographer/sndfile/tmp_file_rt.h index 1e2786252b..d9523549ca 100644 --- a/libs/audiographer/audiographer/sndfile/tmp_file_rt.h +++ b/libs/audiographer/audiographer/sndfile/tmp_file_rt.h @@ -5,13 +5,16 @@ #include #include + #include "pbd/gstdio_compat.h" +#include "pbd/pthread_utils.h" #include "pbd/ringbuffer.h" #include "audiographer/flag_debuggable.h" #include "audiographer/sink.h" #include "sndfile_writer.h" #include "sndfile_reader.h" + #include "tmp_file.h" namespace AudioGrapher @@ -133,6 +136,7 @@ class TmpFileRt static void * _disk_thread (void *arg) { TmpFileRt *d = static_cast(arg); + pthread_set_name ("ExportDiskIO"); d->disk_thread (); pthread_exit (0); return 0; diff --git a/libs/backends/alsa/alsa_midi.cc b/libs/backends/alsa/alsa_midi.cc index f7c6b21809..db64611919 100644 --- a/libs/backends/alsa/alsa_midi.cc +++ b/libs/backends/alsa/alsa_midi.cc @@ -64,6 +64,7 @@ AlsaMidiIO::~AlsaMidiIO () static void * pthread_process (void *arg) { AlsaMidiIO *d = static_cast(arg); + pthread_set_name ("AlsaMidiIO"); d->main_process_thread (); pthread_exit (0); return 0; diff --git a/libs/backends/alsa/alsa_slave.cc b/libs/backends/alsa/alsa_slave.cc index 7d489fd6ea..af7b62ed9e 100644 --- a/libs/backends/alsa/alsa_slave.cc +++ b/libs/backends/alsa/alsa_slave.cc @@ -143,6 +143,7 @@ void* AlsaAudioSlave::_process_thread (void* arg) { AlsaAudioSlave* aas = static_cast (arg); + pthread_set_name ("AlsaAudioSlave"); return aas->process_thread (); } diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index c7d2754b2d..3e99155bda 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -504,6 +504,7 @@ CoreAudioBackend::launch_control_app () static void * pthread_freewheel (void *arg) { CoreAudioBackend *d = static_cast(arg); + pthread_set_name ("CAFreewheel"); d->freewheel_thread (); pthread_exit (0); return 0; diff --git a/libs/pbd/system_exec.cc b/libs/pbd/system_exec.cc index e97bcce922..d1079a311f 100644 --- a/libs/pbd/system_exec.cc +++ b/libs/pbd/system_exec.cc @@ -47,6 +47,7 @@ #include "pbd/file_utils.h" #include "pbd/search_path.h" +#include "pbd/pthread_utils.h" #include "pbd/system_exec.h" using namespace std; @@ -370,6 +371,7 @@ SystemExec::~SystemExec () static void* interposer_thread (void *arg) { SystemExec *sex = static_cast(arg); + pthread_set_name ("ExecStdOut"); sex->output_interposer(); pthread_exit(0); return 0; diff --git a/libs/waveview/wave_view_private.cc b/libs/waveview/wave_view_private.cc index 74e7dc97f6..acbec9678a 100644 --- a/libs/waveview/wave_view_private.cc +++ b/libs/waveview/wave_view_private.cc @@ -21,6 +21,7 @@ #include "ardour/lmath.h" #include "pbd/cpus.h" +#include "pbd/pthread_utils.h" #include "ardour/audioregion.h" #include "ardour/audiosource.h" @@ -438,6 +439,7 @@ WaveViewDrawingThread::quit () void WaveViewDrawingThread::run () { + pthread_set_name ("WaveViewDrawing"); while (true) { if (g_atomic_int_get (&_quit)) { diff --git a/libs/zita-convolver/zita-convolver.cc b/libs/zita-convolver/zita-convolver.cc index eb7d6603e1..20971c99e6 100644 --- a/libs/zita-convolver/zita-convolver.cc +++ b/libs/zita-convolver/zita-convolver.cc @@ -680,6 +680,9 @@ void* Convlevel::static_main (void* arg) { ((Convlevel*)arg)->main (); +#if !defined PTW32_VERSION && defined _GNU_SOURCE + pthread_setname_np (pthread_self(), "ZConvlevel"); +#endif return 0; } -- cgit v1.2.3