Fix wxHtmlHelpData::SetTempDir() to behave correctly without trailing slash.

[wxWidgets.git] / src / unix / evtloopunix.cpp

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index 5797b5eedb9e88abcf1f18143dea2c43e00ad959..daeac691d1dcbcd07e3a1b3dbe0d44dbe894d7f2 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -3,8 +3,9 @@
 // Purpose:     wxEventLoop implementation
 // Author:      Lukasz Michalski (lm@zork.pl)
 // Created:     2007-05-07
 // Purpose:     wxEventLoop implementation
 // Author:      Lukasz Michalski (lm@zork.pl)
 // Created:     2007-05-07

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 Zork Lukasz Michalski
 // Copyright:   (c) 2006 Zork Lukasz Michalski

+//              (c) 2009, 2013 Vadim Zeitlin <vadim@wxwidgets.org>
+//              (c) 2013 Rob Bresalier

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -28,156 +29,125 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

-#include <errno.h>

 #include "wx/apptrait.h"
 #include "wx/apptrait.h"

+#include "wx/scopedptr.h"

 #include "wx/thread.h"
 #include "wx/module.h"
 #include "wx/thread.h"
 #include "wx/module.h"

-#include "wx/unix/pipe.h"

 #include "wx/unix/private/timer.h"
 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/unix/private/timer.h"
 #include "wx/unix/private/epolldispatcher.h"

+#include "wx/unix/private/wakeuppipe.h"

 #include "wx/private/selectdispatcher.h"
 #include "wx/private/selectdispatcher.h"

+#include "wx/private/eventloopsourcesmanager.h"
+#include "wx/private/fdioeventloopsourcehandler.h"
+#include "wx/private/eventloopsourcesmanager.h"

 
 

-#define TRACE_EVENTS _T("events")
+#if wxUSE_EVENTLOOP_SOURCE
+    #include "wx/evtloopsrc.h"
+#endif // wxUSE_EVENTLOOP_SOURCE

 
 // ===========================================================================
 
 // ===========================================================================

-// wxEventLoop::PipeIOHandler implementation
+// wxEventLoop implementation

 // ===========================================================================
 
 // ===========================================================================
 

-namespace wxPrivate
-{
+//-----------------------------------------------------------------------------
+// initialization
+//-----------------------------------------------------------------------------

 
 

-// pipe used for wake up messages: when a child thread wants to wake up
-// the event loop in the main thread it writes to this pipe
-class PipeIOHandler : public wxFDIOHandler
+wxConsoleEventLoop::wxConsoleEventLoop()

 {
 {

-public:
-    // default ctor does nothing, call Create() to really initialize the
-    // object
-    PipeIOHandler() { }
-
-    bool Create();
-
-    // this method can be, and normally is, called from another thread
-    void WakeUp();
+    // Be pessimistic initially and assume that we failed to initialize.
+    m_dispatcher = NULL;
+    m_wakeupPipe = NULL;
+    m_wakeupSource = NULL;
+
+    // Create the pipe.
+    wxScopedPtr<wxWakeUpPipeMT> wakeupPipe(new wxWakeUpPipeMT);
+    const int pipeFD = wakeupPipe->GetReadFd();
+    if ( pipeFD == wxPipe::INVALID_FD )
+        return;

 
 

-    int GetReadFd() { return m_pipe[wxPipe::Read]; }
+    // And start monitoring it in our event loop.
+    m_wakeupSource = wxEventLoopBase::AddSourceForFD
+                                      (
+                                        pipeFD,
+                                        wakeupPipe.get(),
+                                        wxFDIO_INPUT
+                                      );

 
 

-    // implement wxFDIOHandler pure virtual methods
-    virtual void OnReadWaiting();
-    virtual void OnWriteWaiting() { }
-    virtual void OnExceptionWaiting() { }
+    if ( !m_wakeupSource )
+        return;

 
 

-private:
-    wxPipe m_pipe;
-};
+    // This is a bit ugly but we know that AddSourceForFD() used the currently
+    // active dispatcher to register this source, so use the same one for our
+    // other operations. Of course, currently the dispatcher returned by
+    // wxFDIODispatcher::Get() is always the same one anyhow so it doesn't
+    // really matter, but if we started returning different things later, it
+    // would.
+    m_dispatcher = wxFDIODispatcher::Get();

 
 

-// ----------------------------------------------------------------------------
-// initialization
-// ----------------------------------------------------------------------------
+    m_wakeupPipe = wakeupPipe.release();
+}

 
 

-bool PipeIOHandler::Create()
+wxConsoleEventLoop::~wxConsoleEventLoop()

 {
 {

-    if ( !m_pipe.Create() )
+    if ( m_wakeupPipe )

     {
     {

-        wxLogError(_("Failed to create wake up pipe used by event loop."));
-        return false;
-    }
+        delete m_wakeupSource;

 
 

-    const int fdRead = GetReadFd();
-
-    int flags = fcntl(fdRead, F_GETFL, 0);
-    if ( flags == -1 || fcntl(fdRead, F_SETFL, flags | O_NONBLOCK) == -1 )
-    {
-        wxLogSysError(_("Failed to switch wake up pipe to non-blocking mode"));
-        return false;
+        delete m_wakeupPipe;

     }
     }

-
-    wxLogTrace(TRACE_EVENTS, wxT("Wake up pipe (%d, %d) created"),
-               fdRead, m_pipe[wxPipe::Write]);
-
-    return true;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wakeup handling
-// ----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+// adding & removing sources
+//-----------------------------------------------------------------------------

 
 

-void PipeIOHandler::WakeUp()
-{
-    if ( write(m_pipe[wxPipe::Write], "s", 1) != 1 )
-    {
-        // don't use wxLog here, we can be in another thread and this could
-        // result in dead locks
-        perror("write(wake up pipe)");
-    }
-}
+#if wxUSE_EVENTLOOP_SOURCE

 
 

-void PipeIOHandler::OnReadWaiting()
+class wxConsoleEventLoopSourcesManager : public wxEventLoopSourcesManagerBase

 {
 {

-    // got wakeup from child thread: read all data available in pipe just to
-    // make it empty (even though we write one byte at a time from WakeUp(),
-    // it could have been called several times)
-    char buf[4];
-    for ( ;; )
+public:
+    wxEventLoopSource* AddSourceForFD( int fd,
+                                       wxEventLoopSourceHandler *handler,
+                                       int flags)

     {
     {

-        const int size = read(GetReadFd(), buf, WXSIZEOF(buf));
+        wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );

 
 

-        if ( size == 0 || (size == -1 && (errno == EAGAIN || errno == EINTR)) )
-        {
-            // nothing left in the pipe (EAGAIN is expected for an FD with
-            // O_NONBLOCK)
-            break;
-        }
+        wxLogTrace(wxTRACE_EVT_SOURCE,
+                    "Adding event loop source for fd=%d", fd);

 
 

-        if ( size == -1 )
-        {
-            wxLogSysError(_("Failed to read from wake-up pipe"));
+        // we need a bridge to wxFDIODispatcher
+        //
+        // TODO: refactor the code so that only wxEventLoopSourceHandler is used
+        wxScopedPtr<wxFDIOHandler>
+            fdioHandler(new wxFDIOEventLoopSourceHandler(handler));

 
 

-            break;
-        }
-    }
+        if ( !wxFDIODispatcher::Get()->RegisterFD(fd, fdioHandler.get(), flags) )
+            return NULL;

 
 

-    // writing to the wake up pipe will make wxConsoleEventLoop return from
-    // wxFDIODispatcher::Dispatch() it might be currently blocking in, nothing
-    // else needs to be done
-}
-
-} // namespace wxPrivate
+        return new wxUnixEventLoopSource(wxFDIODispatcher::Get(), fdioHandler.release(),
+                                         fd, handler, flags);
+    }
+};

 
 

-// ===========================================================================
-// wxEventLoop implementation
-// ===========================================================================
+wxEventLoopSourcesManagerBase* wxAppTraits::GetEventLoopSourcesManager()
+{
+    static wxConsoleEventLoopSourcesManager s_eventLoopSourcesManager;

 
 

-//-----------------------------------------------------------------------------
-// initialization
-//-----------------------------------------------------------------------------
+    return &s_eventLoopSourcesManager;
+}

 
 

-wxConsoleEventLoop::wxConsoleEventLoop()
+wxUnixEventLoopSource::~wxUnixEventLoopSource()

 {
 {

-    m_wakeupPipe = new wxPrivate::PipeIOHandler();
-    if ( !m_wakeupPipe->Create() )
-    {
-        wxDELETE(m_wakeupPipe);
-        m_dispatcher = NULL;
-        return;
-    }
+    wxLogTrace(wxTRACE_EVT_SOURCE,
+               "Removing event loop source for fd=%d", m_fd);

 
 

-    m_dispatcher = wxFDIODispatcher::Get();
-    if ( !m_dispatcher )
-        return;
+    m_dispatcher->UnregisterFD(m_fd);

 
 

-    m_dispatcher->RegisterFD
-                  (
-                    m_wakeupPipe->GetReadFd(),
-                    m_wakeupPipe,
-                    wxFDIO_INPUT
-                  );
+    delete m_fdioHandler;

 }
 
 }
 

-wxConsoleEventLoop::~wxConsoleEventLoop()
-{
-    delete m_wakeupPipe;
-}
+#endif // wxUSE_EVENTLOOP_SOURCE

 
 //-----------------------------------------------------------------------------
 // events dispatch and loop handling
 
 //-----------------------------------------------------------------------------
 // events dispatch and loop handling