diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-03 20:47:27 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-03 20:47:27 -0500 |
commit | 5c51b302cec5942a37f468903c4183b0a6c50695 (patch) | |
tree | d62466a4edb2dcd717c01915a423cfd3296db6e4 /libs/pbd/crossthread.cc | |
parent | 888bf2d551d633e8f5731e95af3cc48980221df1 (diff) |
manually merge new CrossThreadChannel implementation for windows from Tracks
Diffstat (limited to 'libs/pbd/crossthread.cc')
-rw-r--r-- | libs/pbd/crossthread.cc | 98 |
1 files changed, 21 insertions, 77 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 <cstdlib> #include <cerrno> #include <cstring> #include <fcntl.h> #include <unistd.h> +#ifdef PLATFORM_WINDOWS +#include <winsock2.h> +#include <ws2tcpip.h> +#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<CrossThreadChannel*>(data); + return ctc->receive_slot (Glib::IOCondition (condition)); } void -CrossThreadChannel::wakeup () -{ - char c = 0; - (void) ::write (fds[1], &c, 1); -} - -RefPtr<IOSource> -CrossThreadChannel::ios () +CrossThreadChannel::set_receive_handler (sigc::slot<bool,Glib::IOCondition> s) { - if (!_ios) { - _ios = new RefPtr<IOSource> (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<Glib::MainContext> 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()); } |