moving value setting conformance to impl

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

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index 76272844d3ea02f1a4c3d720cd591f1c6b5a7665..453f1c354ae6056d8c0c9f6b6764f956016d6dcb 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -21,6 +21,8 @@
 
 #if wxUSE_CONSOLE_EVENTLOOP
 
 
 #if wxUSE_CONSOLE_EVENTLOOP
 

+#include "wx/evtloop.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"


@@ -28,24 +30,57 @@
 
 #include <errno.h>
 #include "wx/apptrait.h"
 
 #include <errno.h>
 #include "wx/apptrait.h"

-#include "wx/evtloop.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/private/selectdispatcher.h"
 
 #include "wx/unix/private/timer.h"
 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/private/selectdispatcher.h"
 

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

 
 // ===========================================================================
 // wxEventLoop::PipeIOHandler implementation
 // ===========================================================================
 
 
 // ===========================================================================
 // wxEventLoop::PipeIOHandler implementation
 // ===========================================================================
 

+namespace wxPrivate
+{
+
+// 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
+{
+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();
+
+    int GetReadFd() { return m_pipe[wxPipe::Read]; }
+
+    // implement wxFDIOHandler pure virtual methods
+    virtual void OnReadWaiting();
+    virtual void OnWriteWaiting() { }
+    virtual void OnExceptionWaiting() { }
+
+private:
+    wxPipe m_pipe;
+};
+

 // ----------------------------------------------------------------------------
 // initialization
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // initialization
 // ----------------------------------------------------------------------------
 

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

 {
     if ( !m_pipe.Create() )
     {
 {
     if ( !m_pipe.Create() )
     {


@@ -72,7 +107,7 @@ bool wxConsoleEventLoop::PipeIOHandler::Create()
 // wakeup handling
 // ----------------------------------------------------------------------------
 
 // wakeup handling
 // ----------------------------------------------------------------------------
 

-void wxConsoleEventLoop::PipeIOHandler::WakeUp()
+void PipeIOHandler::WakeUp()

 {
     if ( write(m_pipe[wxPipe::Write], "s", 1) != 1 )
     {
 {
     if ( write(m_pipe[wxPipe::Write], "s", 1) != 1 )
     {


@@ -82,17 +117,17 @@ void wxConsoleEventLoop::PipeIOHandler::WakeUp()
     }
 }
 
     }
 }
 

-void wxConsoleEventLoop::PipeIOHandler::OnReadWaiting()
+void PipeIOHandler::OnReadWaiting()

 {
     // got wakeup from child thread: read all data available in pipe just to
 {
     // got wakeup from child thread: read all data available in pipe just to

-    // make it empty (evevn though we write one byte at a time from WakeUp(),
+    // 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 ( ;; )
     {
         const int size = read(GetReadFd(), buf, WXSIZEOF(buf));
 
     // it could have been called several times)
     char buf[4];
     for ( ;; )
     {
         const int size = read(GetReadFd(), buf, WXSIZEOF(buf));
 

-        if ( size == 0 || (size == -1 && errno == EAGAIN) )
+        if ( size == 0 || (size == -1 && (errno == EAGAIN || errno == EINTR)) )

         {
             // nothing left in the pipe (EAGAIN is expected for an FD with
             // O_NONBLOCK)
         {
             // nothing left in the pipe (EAGAIN is expected for an FD with
             // O_NONBLOCK)


@@ -107,9 +142,13 @@ void wxConsoleEventLoop::PipeIOHandler::OnReadWaiting()
         }
     }
 
         }
     }
 

-    wxTheApp->ProcessPendingEvents();
+    // 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
+

 // ===========================================================================
 // wxEventLoop implementation
 // ===========================================================================
 // ===========================================================================
 // wxEventLoop implementation
 // ===========================================================================


@@ -120,8 +159,10 @@ void wxConsoleEventLoop::PipeIOHandler::OnReadWaiting()
 
 wxConsoleEventLoop::wxConsoleEventLoop()
 {
 
 wxConsoleEventLoop::wxConsoleEventLoop()
 {

-    if ( !m_wakeupPipe.Create() )
+    m_wakeupPipe = new wxPrivate::PipeIOHandler();
+    if ( !m_wakeupPipe->Create() )

     {
     {

+        wxDELETE(m_wakeupPipe);

         m_dispatcher = NULL;
         return;
     }
         m_dispatcher = NULL;
         return;
     }


@@ -132,57 +173,150 @@ wxConsoleEventLoop::wxConsoleEventLoop()
 
     m_dispatcher->RegisterFD
                   (
 
     m_dispatcher->RegisterFD
                   (

-                    m_wakeupPipe.GetReadFd(),
-                    &m_wakeupPipe,
+                    m_wakeupPipe->GetReadFd(),
+                    m_wakeupPipe,

                     wxFDIO_INPUT
                   );
 }
 
                     wxFDIO_INPUT
                   );
 }
 

+wxConsoleEventLoop::~wxConsoleEventLoop()
+{
+    if ( m_wakeupPipe )
+    {
+        if ( m_dispatcher )
+        {
+            m_dispatcher->UnregisterFD(m_wakeupPipe->GetReadFd());
+        }
+
+        delete m_wakeupPipe;
+    }
+}
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// events dispatch and loop handling
+// adding & removing sources

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-bool wxConsoleEventLoop::Pending() const
+#if wxUSE_EVENTLOOP_SOURCE
+
+// This class is a temporary bridge between event loop sources and
+// FDIODispatcher. It is going to be removed soon, when all subject interfaces
+// are modified
+class wxFDIOEventLoopSourceHandler : public wxFDIOHandler
+{
+public:
+    wxFDIOEventLoopSourceHandler(wxEventLoopSourceHandler* handler) :
+        m_impl(handler) { }
+
+    virtual void OnReadWaiting()
+    {
+        m_impl->OnReadWaiting();
+    }
+    virtual void OnWriteWaiting()
+    {
+        m_impl->OnWriteWaiting();
+    }
+
+    virtual void OnExceptionWaiting()
+    {
+        m_impl->OnExceptionWaiting();
+    }
+
+protected:
+    wxEventLoopSourceHandler* m_impl;
+};
+
+wxEventLoopSource *
+wxConsoleEventLoop::AddSourceForFD(int fd,
+                                   wxEventLoopSourceHandler *handler,
+                                   int flags)

 {
 {

-    return wxTheApp->HasPendingEvents();
+    wxCHECK_MSG( fd != -1, NULL, "can't monitor invalid fd" );
+
+    wxLogTrace(wxTRACE_EVT_SOURCE,
+                "Adding event loop source for fd=%d", fd);
+
+    // we need a bridge to wxFDIODispatcher
+    //
+    // TODO: refactor the code so that only wxEventLoopSourceHandler is used
+    wxScopedPtr<wxFDIOHandler>
+        fdioHandler(new wxFDIOEventLoopSourceHandler(handler));
+
+    if ( !m_dispatcher->RegisterFD(fd, fdioHandler.get(), flags) )
+        return NULL;
+
+    return new wxUnixEventLoopSource(m_dispatcher, fdioHandler.release(),
+                                     fd, handler, flags);

 }
 
 }
 

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

 {
 {

-    m_dispatcher->Dispatch();
-    wxTheApp->ProcessPendingEvents();
-    return true;
+    wxLogTrace(wxTRACE_EVT_SOURCE,
+               "Removing event loop source for fd=%d", m_fd);
+
+    m_dispatcher->UnregisterFD(m_fd);
+
+    delete m_fdioHandler;

 }
 
 }
 

-void wxConsoleEventLoop::WakeUp()
+#endif // wxUSE_EVENTLOOP_SOURCE
+
+//-----------------------------------------------------------------------------
+// events dispatch and loop handling
+//-----------------------------------------------------------------------------
+
+bool wxConsoleEventLoop::Pending() const

 {
 {

-    m_wakeupPipe.WakeUp();
+    if ( m_dispatcher->HasPending() )
+        return true;
+
+#if wxUSE_TIMER
+    wxUsecClock_t nextTimer;
+    if ( wxTimerScheduler::Get().GetNext(&nextTimer) &&
+            !wxMilliClockToLong(nextTimer) )
+        return true;
+#endif // wxUSE_TIMER
+
+    return false;

 }
 
 }
 

-void wxConsoleEventLoop::OnNextIteration()
+bool wxConsoleEventLoop::Dispatch()

 {
 {

-    // calculate the timeout until the next timer expiration
-    int timeout;
+    DispatchTimeout(static_cast<unsigned long>(
+        wxFDIODispatcher::TIMEOUT_INFINITE));
+
+    return true;
+}

 
 

+int wxConsoleEventLoop::DispatchTimeout(unsigned long timeout)
+{

 #if wxUSE_TIMER
 #if wxUSE_TIMER

+    // check if we need to decrease the timeout to account for a timer

     wxUsecClock_t nextTimer;
     if ( wxTimerScheduler::Get().GetNext(&nextTimer) )
     {
     wxUsecClock_t nextTimer;
     if ( wxTimerScheduler::Get().GetNext(&nextTimer) )
     {

-        // timeout is in ms
-        timeout = (nextTimer / 1000).ToLong();
+        unsigned long timeUntilNextTimer = wxMilliClockToLong(nextTimer / 1000);
+        if ( timeUntilNextTimer < timeout )
+            timeout = timeUntilNextTimer;

     }
     }

-    else // no timers, we can block forever

 #endif // wxUSE_TIMER
 #endif // wxUSE_TIMER

-    {
-        timeout = wxFDIODispatcher::TIMEOUT_INFINITE;
-    }

 
 

-    m_dispatcher->Dispatch(timeout);
+    bool hadEvent = m_dispatcher->Dispatch(timeout) > 0;

 
 #if wxUSE_TIMER
 
 #if wxUSE_TIMER

-    wxTimerScheduler::Get().NotifyExpired();
-#endif
+    if ( wxTimerScheduler::Get().NotifyExpired() )
+        hadEvent = true;
+#endif // wxUSE_TIMER
+
+    return hadEvent ? 1 : -1;
+}

 
 

+void wxConsoleEventLoop::WakeUp()
+{
+    m_wakeupPipe->WakeUp();
+}
+
+void wxConsoleEventLoop::OnNextIteration()
+{

     // call the signal handlers for any signals we caught recently
     wxTheApp->CheckSignal();
 }
     // call the signal handlers for any signals we caught recently
     wxTheApp->CheckSignal();
 }