From 5c51b302cec5942a37f468903c4183b0a6c50695 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 3 Dec 2014 20:47:27 -0500 Subject: [PATCH] manually merge new CrossThreadChannel implementation for windows from Tracks --- libs/pbd/crossthread.cc | 98 ++++++++------------------------------ libs/pbd/pbd/crossthread.h | 50 ++++++++++--------- 2 files changed, 45 insertions(+), 103 deletions(-) diff --git a/libs/pbd/crossthread.cc b/libs/pbd/crossthread.cc index 2ffede5163..1e5b9e29e4 100644 --- a/libs/pbd/crossthread.cc +++ b/libs/pbd/crossthread.cc @@ -17,12 +17,18 @@ */ + #include #include #include #include #include +#ifdef PLATFORM_WINDOWS +#include +#include +#endif + #include "pbd/error.h" #include "pbd/crossthread.h" @@ -30,91 +36,29 @@ using namespace std; using namespace PBD; using namespace Glib; -CrossThreadChannel::CrossThreadChannel (bool non_blocking) -{ - _ios = 0; - fds[0] = -1; - fds[1] = -1; - - if (pipe (fds)) { - error << "cannot create x-thread pipe for read (%2)" << ::strerror (errno) << endmsg; - return; - } +#ifndef PLATFORM_WINDOWS +#include "crossthread.posix.cc" +#else +#include "crossthread.win.cc" +#endif - if (non_blocking) { - if (fcntl (fds[0], F_SETFL, O_NONBLOCK)) { - error << "cannot set non-blocking mode for x-thread pipe (read) (" << ::strerror (errno) << ')' << endmsg; - return; - } - - if (fcntl (fds[1], F_SETFL, O_NONBLOCK)) { - error << "cannot set non-blocking mode for x-thread pipe (write) (%2)" << ::strerror (errno) << ')' << endmsg; - return; - } - } -} - -CrossThreadChannel::~CrossThreadChannel () +gboolean +cross_thread_channel_call_receive_slot (GIOChannel*, GIOCondition condition, void *data) { - /* glibmm hack */ - drop_ios (); - - if (fds[0] >= 0) { - close (fds[0]); - fds[0] = -1; - } - - if (fds[1] >= 0) { - close (fds[1]); - fds[1] = -1; - } + CrossThreadChannel* ctc = static_cast(data); + return ctc->receive_slot (Glib::IOCondition (condition)); } void -CrossThreadChannel::wakeup () -{ - char c = 0; - (void) ::write (fds[1], &c, 1); -} - -RefPtr -CrossThreadChannel::ios () +CrossThreadChannel::set_receive_handler (sigc::slot s) { - if (!_ios) { - _ios = new RefPtr (IOSource::create (fds[0], IOCondition(IO_IN|IO_PRI|IO_ERR|IO_HUP|IO_NVAL))); - } - return *_ios; + receive_slot = s; } void -CrossThreadChannel::drop_ios () -{ - delete _ios; - _ios = 0; -} - -void -CrossThreadChannel::drain () -{ - drain (fds[0]); -} - -void -CrossThreadChannel::drain (int fd) -{ - /* drain selectable fd */ - char buf[64]; - while (::read (fd, buf, sizeof (buf)) > 0) {}; -} - -int -CrossThreadChannel::deliver (char msg) -{ - return ::write (fds[1], &msg, 1); -} - -int -CrossThreadChannel::receive (char& msg) +CrossThreadChannel::attach (Glib::RefPtr context) { - return ::read (fds[0], &msg, 1); + receive_source = g_io_create_watch (receive_channel, GIOCondition(G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL)); + g_source_set_callback (receive_source, (GSourceFunc) cross_thread_channel_call_receive_slot, this, NULL); + g_source_attach (receive_source, context->gobj()); } diff --git a/libs/pbd/pbd/crossthread.h b/libs/pbd/pbd/crossthread.h index d172c9c60f..fd9c9f8eeb 100644 --- a/libs/pbd/pbd/crossthread.h +++ b/libs/pbd/pbd/crossthread.h @@ -28,6 +28,11 @@ #include "pbd/libpbd_visibility.h" +#ifdef PLATFORM_WINDOWS +#include +#endif // PLATFORM_WINDOWS + + /** A simple abstraction of a mechanism of signalling one thread from another. * The signaller calls ::wakeup() to tell the signalled thread to check for * work to be done. @@ -57,13 +62,13 @@ class LIBPBD_API CrossThreadChannel { * because there is no way to know which byte value will be used * for ::wakeup() */ - int deliver (char msg); + int deliver (char msg); /** if using ::deliver() to wakeup the listening thread, then * the listener should call ::receive() to fetch the message * type from the channel. */ - int receive (char& msg); + int receive (char& msg); /** empty the channel of all requests. * Typically this is done as soon as input @@ -73,33 +78,26 @@ class LIBPBD_API CrossThreadChannel { * in the channel will not be important. */ void drain (); - static void drain (int fd); - /** File descriptor that can be used with poll/select to - * detect when wakeup() has been called on this channel. - * It be marked as readable/input-ready when this condition - * is true. It has already been marked non-blocking. - */ - int selectable() const { return fds[0]; } - - /* glibmm 2.22 and earlier has a terrifying bug that will - cause crashes whenever a Source is removed from - a MainContext (including the destruction of the MainContext), - because the Source is destroyed "out from under the nose of" - the RefPtr. I (Paul) have fixed this (https://bugzilla.gnome.org/show_bug.cgi?id=561885) - but in the meantime, we need a hack to get around the issue. - */ - Glib::RefPtr ios(); - void drop_ios (); - - /** returns true if the CrossThreadChannel was - * correctly constructed. - */ - bool ok() const { return fds[0] >= 0 && fds[1] >= 0; } + void set_receive_handler (sigc::slot s); + void attach (Glib::RefPtr); + +private: + friend gboolean cross_thread_channel_call_receive_slot (GIOChannel*, GIOCondition condition, void *data); - private: - Glib::RefPtr* _ios; // lazily constructed + GIOChannel* receive_channel; + GSource* receive_source; + sigc::slot receive_slot; + +#ifndef PLATFORM_WINDOWS int fds[2]; // current implementation uses a pipe/fifo +#else + + SOCKET send_socket; + SOCKET receive_socket; + struct sockaddr_in recv_address; +#endif + }; #endif /* __pbd__crossthread_h__ */ -- 2.30.2