manually merge new CrossThreadChannel implementation for windows from Tracks

diff --git a/libs/pbd/crossthread.cc b/libs/pbd/crossthread.cc
index 2ffede5163aecc736372818fd82ddb934b2d8d42..1e5b9e29e4e90d521a0d6a7355ec9ecd1a5f2bec 100644 (file)
--- 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());
 }

diff --git a/libs/pbd/pbd/crossthread.h b/libs/pbd/pbd/crossthread.h
index d172c9c60f65933df348e3130ab8ea74210b5d75..fd9c9f8eeb63b4a71bebb766fa58955ec0669516 100644 (file)
--- 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 <Windows.h>
+#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<Glib::IOSource> 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<bool,Glib::IOCondition> s);
+    void attach (Glib::RefPtr<Glib::MainContext>);
+
+private:
+       friend gboolean cross_thread_channel_call_receive_slot (GIOChannel*, GIOCondition condition, void *data);
 
-  private:
-       Glib::RefPtr<Glib::IOSource>* _ios; // lazily constructed
+       GIOChannel* receive_channel;
+    GSource*    receive_source;
+    sigc::slot<bool,Glib::IOCondition> 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__ */