X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fbase_ui.cc;h=14a3ef644d308b707221f8799ed57e8a52c17d04;hb=a22dd8c20a656a36d93e3e31ee3c04ca7e9b7278;hp=8dd056b783a2ab4fc9c0361eb9fccd94005fc526;hpb=87726495c30f90554b5204b5385d17274a8fe93e;p=ardour.git diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc index 8dd056b783..14a3ef644d 100644 --- a/libs/pbd/base_ui.cc +++ b/libs/pbd/base_ui.cc @@ -17,50 +17,44 @@ */ +#include #include #include #include -#include +#include +#include -#include -#include -#include -#include +#include "pbd/base_ui.h" +#include "pbd/debug.h" +#include "pbd/pthread_utils.h" +#include "pbd/error.h" +#include "pbd/compose.h" +#include "pbd/failed_constructor.h" #include "i18n.h" using namespace std; using namespace PBD; +using namespace Glib; -uint32_t BaseUI::rt_bit = 1; +uint64_t BaseUI::rt_bit = 1; BaseUI::RequestType BaseUI::CallSlot = BaseUI::new_request_type(); +BaseUI::RequestType BaseUI::Quit = BaseUI::new_request_type(); -BaseUI::BaseUI (string str, bool with_signal_pipe) - : _name (str) +BaseUI::BaseUI (const string& str) + : request_channel (true) + , run_loop_thread (0) + , _name (str) { - /* odd pseudo-singleton semantics */ - base_ui_instance = this; - signal_pipe[0] = -1; - signal_pipe[1] = -1; + request_channel.ios()->connect (sigc::mem_fun (*this, &BaseUI::request_handler)); - if (with_signal_pipe) { - if (setup_signal_pipe ()) { - throw failed_constructor (); - } - } + /* derived class must set _ok */ } BaseUI::~BaseUI() { - if (signal_pipe[0] >= 0) { - close (signal_pipe[0]); - } - - if (signal_pipe[1] >= 0) { - close (signal_pipe[1]); - } } BaseUI::RequestType @@ -76,32 +70,72 @@ BaseUI::new_request_type () return rt; } -int -BaseUI::setup_signal_pipe () +void +BaseUI::main_thread () +{ + DEBUG_TRACE (DEBUG::EventLoop, string_compose ("%1: event loop running in thread %2\n", name(), pthread_self())); + set_event_loop_for_thread (this); + thread_init (); + _main_loop->get_context()->signal_idle().connect (sigc::mem_fun (*this, &BaseUI::signal_running)); + _main_loop->run (); +} + +bool +BaseUI::signal_running () { - /* setup the pipe that other threads send us notifications/requests - through. + Glib::Mutex::Lock lm (_run_lock); + _running.signal (); + + return false; // don't call it again +} + +void +BaseUI::run () +{ + /* to be called by UI's that need/want their own distinct, self-created event loop thread. */ - if (pipe (signal_pipe)) { - error << string_compose (_("%1-UI: cannot create error signal pipe (%2)"), _name, std::strerror (errno)) - << endmsg; + _main_loop = MainLoop::create (MainContext::create()); + request_channel.ios()->attach (_main_loop->get_context()); + + /* glibmm hack - drop the refptr to the IOSource now before it can hurt */ + request_channel.drop_ios (); - return -1; + Glib::Mutex::Lock lm (_run_lock); + run_loop_thread = Thread::create (mem_fun (*this, &BaseUI::main_thread), true); + _running.wait (_run_lock); +} + +void +BaseUI::quit () +{ + if (_main_loop && _main_loop->is_running()) { + _main_loop->quit (); + run_loop_thread->join (); } +} + +bool +BaseUI::request_handler (Glib::IOCondition ioc) +{ + /* check the request pipe */ - if (fcntl (signal_pipe[0], F_SETFL, O_NONBLOCK)) { - error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal read pipe (%2)"), _name, std::strerror (errno)) - << endmsg; - return -1; + if (ioc & ~IO_IN) { + _main_loop->quit (); } - if (fcntl (signal_pipe[1], F_SETFL, O_NONBLOCK)) { - error << string_compose (_("%1-UI: cannot set O_NONBLOCK on signal write pipe (%2)"), _name, std::strerror (errno)) - << endmsg; - return -1; + if (ioc & IO_IN) { + request_channel.drain (); + + /* there may been an error. we'd rather handle requests first, + and then get IO_HUP or IO_ERR on the next loop. + */ + + /* handle requests */ + + handle_ui_requests (); } - return 0; + return true; } - +