From df659e91f1ad8b5d71838abc130dce8eacdf7cc1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 29 Aug 2017 17:23:19 +0200 Subject: Consolidate _realtime_pthread_create() into libpbd. --- libs/backends/alsa/alsa_audiobackend.cc | 6 +-- libs/backends/alsa/alsa_midi.cc | 4 +- libs/backends/alsa/rt_thread.h | 55 ---------------------- libs/backends/coreaudio/coreaudio_backend.cc | 4 +- libs/backends/coreaudio/rt_thread.h | 55 ---------------------- libs/backends/portaudio/portaudio_backend.cc | 6 +-- libs/backends/portaudio/rt_thread.h | 55 ---------------------- .../backends/portaudio/winmmemidi_output_device.cc | 4 +- 8 files changed, 12 insertions(+), 177 deletions(-) delete mode 100644 libs/backends/alsa/rt_thread.h delete mode 100644 libs/backends/coreaudio/rt_thread.h delete mode 100644 libs/backends/portaudio/rt_thread.h diff --git a/libs/backends/alsa/alsa_audiobackend.cc b/libs/backends/alsa/alsa_audiobackend.cc index e7cdfedcb9..9f42145314 100644 --- a/libs/backends/alsa/alsa_audiobackend.cc +++ b/libs/backends/alsa/alsa_audiobackend.cc @@ -24,11 +24,11 @@ #include #include "alsa_audiobackend.h" -#include "rt_thread.h" #include "pbd/compose.h" #include "pbd/error.h" #include "pbd/file_utils.h" +#include "pbd/pthread_utils.h" #include "ardour/filesystem_paths.h" #include "ardour/port_manager.h" #include "ardouralsautil/devicelist.h" @@ -992,7 +992,7 @@ AlsaAudioBackend::_start (bool for_latency_measurement) _run = true; _port_change_flag = false; - if (_realtime_pthread_create (SCHED_FIFO, -20, 100000, + if (pbd_realtime_pthread_create (SCHED_FIFO, -20, 100000, &_main_thread, pthread_process, this)) { if (pthread_create (&_main_thread, NULL, pthread_process, this)) @@ -1129,7 +1129,7 @@ AlsaAudioBackend::create_process_thread (boost::function func) ThreadData* td = new ThreadData (this, func, stacksize); - if (_realtime_pthread_create (SCHED_FIFO, -22, stacksize, + if (pbd_realtime_pthread_create (SCHED_FIFO, -22, stacksize, &thread_id, alsa_process_thread, td)) { pthread_attr_init (&attr); pthread_attr_setstacksize (&attr, stacksize); diff --git a/libs/backends/alsa/alsa_midi.cc b/libs/backends/alsa/alsa_midi.cc index 76738e9db5..348586ad20 100644 --- a/libs/backends/alsa/alsa_midi.cc +++ b/libs/backends/alsa/alsa_midi.cc @@ -21,9 +21,9 @@ #include #include "alsa_midi.h" -#include "rt_thread.h" #include "pbd/error.h" +#include "pbd/pthread_utils.h" #include "pbd/i18n.h" using namespace ARDOUR; @@ -72,7 +72,7 @@ static void * pthread_process (void *arg) int AlsaMidiIO::start () { - if (_realtime_pthread_create (SCHED_FIFO, -21, 100000, + if (pbd_realtime_pthread_create (SCHED_FIFO, -21, 100000, &_main_thread, pthread_process, this)) { if (pthread_create (&_main_thread, NULL, pthread_process, this)) { diff --git a/libs/backends/alsa/rt_thread.h b/libs/backends/alsa/rt_thread.h deleted file mode 100644 index 3d2efe2063..0000000000 --- a/libs/backends/alsa/rt_thread.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2014 Robin Gareus - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __libbackend_alsa_rthread_h__ -#define __libbackend_alsa_rthread_h__ - -#include -#include - -static int -_realtime_pthread_create ( - const int policy, int priority, const size_t stacksize, - pthread_t *thread, - void *(*start_routine) (void *), - void *arg) -{ - int rv; - - pthread_attr_t attr; - struct sched_param parm; - - const int p_min = sched_get_priority_min (policy); - const int p_max = sched_get_priority_max (policy); - priority += p_max; - if (priority > p_max) priority = p_max; - if (priority < p_min) priority = p_min; - parm.sched_priority = priority; - - pthread_attr_init (&attr); - pthread_attr_setschedpolicy (&attr, policy); - pthread_attr_setschedparam (&attr, &parm); - pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); - pthread_attr_setinheritsched (&attr, PTHREAD_EXPLICIT_SCHED); - pthread_attr_setstacksize (&attr, stacksize); - rv = pthread_create (thread, &attr, start_routine, arg); - pthread_attr_destroy (&attr); - return rv; -} - -#endif diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index f9dd15ea8d..3e4a38e7a3 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -27,11 +27,11 @@ #include #include "coreaudio_backend.h" -#include "rt_thread.h" #include "pbd/compose.h" #include "pbd/error.h" #include "pbd/file_utils.h" +#include "pbd/pthread_utils.h" #include "ardour/filesystem_paths.h" #include "ardour/port_manager.h" #include "pbd/i18n.h" @@ -859,7 +859,7 @@ CoreAudioBackend::create_process_thread (boost::function func) ThreadData* td = new ThreadData (this, func, stacksize); - if (_realtime_pthread_create (SCHED_FIFO, -22, stacksize, + if (pbd_realtime_pthread_create (SCHED_FIFO, -22, stacksize, &thread_id, coreaudio_process_thread, td)) { pthread_attr_init (&attr); pthread_attr_setstacksize (&attr, stacksize); diff --git a/libs/backends/coreaudio/rt_thread.h b/libs/backends/coreaudio/rt_thread.h deleted file mode 100644 index 3d2efe2063..0000000000 --- a/libs/backends/coreaudio/rt_thread.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2014 Robin Gareus - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __libbackend_alsa_rthread_h__ -#define __libbackend_alsa_rthread_h__ - -#include -#include - -static int -_realtime_pthread_create ( - const int policy, int priority, const size_t stacksize, - pthread_t *thread, - void *(*start_routine) (void *), - void *arg) -{ - int rv; - - pthread_attr_t attr; - struct sched_param parm; - - const int p_min = sched_get_priority_min (policy); - const int p_max = sched_get_priority_max (policy); - priority += p_max; - if (priority > p_max) priority = p_max; - if (priority < p_min) priority = p_min; - parm.sched_priority = priority; - - pthread_attr_init (&attr); - pthread_attr_setschedpolicy (&attr, policy); - pthread_attr_setschedparam (&attr, &parm); - pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); - pthread_attr_setinheritsched (&attr, PTHREAD_EXPLICIT_SCHED); - pthread_attr_setstacksize (&attr, stacksize); - rv = pthread_create (thread, &attr, start_routine, arg); - pthread_attr_destroy (&attr); - return rv; -} - -#endif diff --git a/libs/backends/portaudio/portaudio_backend.cc b/libs/backends/portaudio/portaudio_backend.cc index 5bb8ecb08d..3433ca3585 100644 --- a/libs/backends/portaudio/portaudio_backend.cc +++ b/libs/backends/portaudio/portaudio_backend.cc @@ -31,11 +31,11 @@ #include #include "portaudio_backend.h" -#include "rt_thread.h" #include "pbd/compose.h" #include "pbd/error.h" #include "pbd/file_utils.h" +#include "pbd/pthread_utils.h" #include "pbd/windows_timer_utils.h" #include "pbd/windows_mmcss.h" @@ -787,7 +787,7 @@ PortAudioBackend::process_callback(const float* input, bool PortAudioBackend::start_blocking_process_thread () { - if (_realtime_pthread_create (SCHED_FIFO, -20, 100000, + if (pbd_realtime_pthread_create (SCHED_FIFO, -20, 100000, &_main_blocking_thread, blocking_thread_func, this)) { if (pthread_create (&_main_blocking_thread, NULL, blocking_thread_func, this)) @@ -1115,7 +1115,7 @@ PortAudioBackend::create_process_thread (boost::function func) ThreadData* td = new ThreadData (this, func, stacksize); - if (_realtime_pthread_create (SCHED_FIFO, -22, stacksize, + if (pbd_realtime_pthread_create (SCHED_FIFO, -22, stacksize, &thread_id, portaudio_process_thread, td)) { pthread_attr_init (&attr); pthread_attr_setstacksize (&attr, stacksize); diff --git a/libs/backends/portaudio/rt_thread.h b/libs/backends/portaudio/rt_thread.h deleted file mode 100644 index 0535602bf2..0000000000 --- a/libs/backends/portaudio/rt_thread.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2014 Robin Gareus - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __libbackend_portaudio_rthread_h__ -#define __libbackend_portaudio_rthread_h__ - -#include -#include - -static int -_realtime_pthread_create ( - const int policy, int priority, const size_t stacksize, - pthread_t *thread, - void *(*start_routine) (void *), - void *arg) -{ - int rv; - - pthread_attr_t attr; - struct sched_param parm; - - const int p_min = sched_get_priority_min (policy); - const int p_max = sched_get_priority_max (policy); - priority += p_max; - if (priority > p_max) priority = p_max; - if (priority < p_min) priority = p_min; - parm.sched_priority = priority; - - pthread_attr_init (&attr); - pthread_attr_setschedpolicy (&attr, policy); - pthread_attr_setschedparam (&attr, &parm); - pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM); - pthread_attr_setinheritsched (&attr, PTHREAD_EXPLICIT_SCHED); - pthread_attr_setstacksize (&attr, stacksize); - rv = pthread_create (thread, &attr, start_routine, arg); - pthread_attr_destroy (&attr); - return rv; -} - -#endif diff --git a/libs/backends/portaudio/winmmemidi_output_device.cc b/libs/backends/portaudio/winmmemidi_output_device.cc index 2f6ad01895..25201af67b 100644 --- a/libs/backends/portaudio/winmmemidi_output_device.cc +++ b/libs/backends/portaudio/winmmemidi_output_device.cc @@ -22,10 +22,10 @@ #include "pbd/debug.h" #include "pbd/compose.h" +#include "pbd/pthread_utils.h" #include "pbd/windows_timer_utils.h" #include "pbd/windows_mmcss.h" -#include "rt_thread.h" #include "midi_util.h" #include "debug.h" @@ -230,7 +230,7 @@ WinMMEMidiOutputDevice::start_midi_output_thread () size_t stacksize = 100000; // TODO Use native threads - if (_realtime_pthread_create (SCHED_FIFO, -21, stacksize, + if (pbd_realtime_pthread_create (SCHED_FIFO, -21, stacksize, &m_output_thread_handle, midi_output_thread, this)) { return false; } -- cgit v1.2.3