X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b46b1d59d6f69ad80dcf5955375578a6504d100a..b245cbc587f379bf9cc27122c3f3f50c1d424186:/src/unix/epolldispatcher.cpp

diff --git a/src/unix/epolldispatcher.cpp b/src/unix/epolldispatcher.cpp
index 011e8ae49e..f509c7be25 100644
--- a/src/unix/epolldispatcher.cpp
+++ b/src/unix/epolldispatcher.cpp
@@ -19,27 +19,29 @@
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef HAVE_SYS_EPOLL_H
+#if wxUSE_EPOLL_DISPATCHER
 
 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/unix/private.h"
-#include "wx/log.h"
-#include "wx/module.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/intl.h"
+#endif
 
 #include <sys/epoll.h>
 #include <errno.h>
+#include <unistd.h>
 
 #define wxEpollDispatcher_Trace wxT("epolldispatcher")
 
-static wxEpollDispatcher *gs_epollDispatcher = NULL;
-
 // ============================================================================
 // implementation
 // ============================================================================
 
 // helper: return EPOLLxxx mask corresponding to the given flags (and also log
 // debugging messages about it)
-static uint32_t GetEpollMask(int flags, int fd)
+static uint32_t GetEpollMask(int flags, int WXUNUSED_UNLESS_DEBUG(fd))
 {
     uint32_t ep = 0;
 
@@ -71,20 +73,37 @@ static uint32_t GetEpollMask(int flags, int fd)
 // wxEpollDispatcher
 // ----------------------------------------------------------------------------
 
-wxEpollDispatcher::wxEpollDispatcher()
+/* static */
+wxEpollDispatcher *wxEpollDispatcher::Create()
 {
-    m_epollDescriptor = epoll_create(1024);
-    if ( m_epollDescriptor == -1 )
+    int epollDescriptor = epoll_create(1024);
+    if ( epollDescriptor == -1 )
     {
         wxLogSysError(_("Failed to create epoll descriptor"));
+        return NULL;
     }
+    wxLogTrace(wxEpollDispatcher_Trace,
+                   _T("Epoll fd %d created"), epollDescriptor);
+    return new wxEpollDispatcher(epollDescriptor);
 }
 
-bool wxEpollDispatcher::RegisterFD(int fd, wxFDIOHandler* handler, int flags)
+wxEpollDispatcher::wxEpollDispatcher(int epollDescriptor)
 {
-    if ( !wxFDIODispatcher::RegisterFD(fd, handler, flags) )
-        return false;
+    wxASSERT_MSG( epollDescriptor != -1, _T("invalid descriptor") );
+
+    m_epollDescriptor = epollDescriptor;
+}
+
+wxEpollDispatcher::~wxEpollDispatcher()
+{
+    if ( close(m_epollDescriptor) != 0 )
+    {
+        wxLogSysError(_("Error closing epoll descriptor"));
+    }
+}
 
+bool wxEpollDispatcher::RegisterFD(int fd, wxFDIOHandler* handler, int flags)
+{
     epoll_event ev;
     ev.events = GetEpollMask(flags, fd);
     ev.data.ptr = handler;
@@ -97,15 +116,14 @@ bool wxEpollDispatcher::RegisterFD(int fd, wxFDIOHandler* handler, int flags)
 
         return false;
     }
+    wxLogTrace(wxEpollDispatcher_Trace,
+               _T("Added fd %d (handler %p) to epoll %d"), fd, handler, m_epollDescriptor);
 
     return true;
 }
 
 bool wxEpollDispatcher::ModifyFD(int fd, wxFDIOHandler* handler, int flags)
 {
-    if ( !wxFDIODispatcher::ModifyFD(fd, handler, flags) )
-        return false;
-
     epoll_event ev;
     ev.events = GetEpollMask(flags, fd);
     ev.data.ptr = handler;
@@ -119,15 +137,13 @@ bool wxEpollDispatcher::ModifyFD(int fd, wxFDIOHandler* handler, int flags)
         return false;
     }
 
+    wxLogTrace(wxEpollDispatcher_Trace,
+                _T("Modified fd %d (handler: %p) on epoll %d"), fd, handler, m_epollDescriptor);
     return true;
 }
 
-wxFDIOHandler *wxEpollDispatcher::UnregisterFD(int fd, int flags)
+bool wxEpollDispatcher::UnregisterFD(int fd)
 {
-    wxFDIOHandler * const handler = wxFDIODispatcher::UnregisterFD(fd, flags);
-    if ( !handler )
-        return NULL;
-
     epoll_event ev;
     ev.events = 0;
     ev.data.ptr = NULL;
@@ -137,11 +153,12 @@ wxFDIOHandler *wxEpollDispatcher::UnregisterFD(int fd, int flags)
         wxLogSysError(_("Failed to unregister descriptor %d from epoll descriptor %d"),
                       fd, m_epollDescriptor);
     }
-
-    return handler;
+    wxLogTrace(wxEpollDispatcher_Trace,
+                _T("removed fd %d from %d"), fd, m_epollDescriptor);
+    return true;
 }
 
-void wxEpollDispatcher::RunLoop(int timeout)
+bool wxEpollDispatcher::Dispatch(int timeout)
 {
     epoll_event events[16];
 
@@ -159,10 +176,11 @@ void wxEpollDispatcher::RunLoop(int timeout)
         {
             wxLogSysError(_("Waiting for IO on epoll descriptor %d failed"),
                           m_epollDescriptor);
-            return;
+            return false;
         }
     }
 
+    bool gotEvents = false;
     for ( epoll_event *p = events; p < events + e_num; p++ )
     {
         wxFDIOHandler * const handler = (wxFDIOHandler *)(p->data.ptr);
@@ -172,48 +190,23 @@ void wxEpollDispatcher::RunLoop(int timeout)
             continue;
         }
 
-        if ( p->events & EPOLLIN )
+        // note that for compatibility with wxSelectDispatcher we call
+        // OnReadWaiting() on EPOLLHUP as this is what epoll_wait() returns
+        // when the write end of a pipe is closed while with select() the
+        // remaining pipe end becomes ready for reading when this happens
+        if ( p->events & (EPOLLIN | EPOLLHUP) )
             handler->OnReadWaiting();
-
-        if ( p->events & EPOLLOUT )
+        else if ( p->events & EPOLLOUT )
             handler->OnWriteWaiting();
-
-        if ( p->events & (EPOLLERR | EPOLLHUP) )
+        else if ( p->events & EPOLLERR )
             handler->OnExceptionWaiting();
-    }
-}
+        else
+            continue;
 
-/* static */
-wxEpollDispatcher *wxEpollDispatcher::Get()
-{
-    if ( !gs_epollDispatcher )
-    {
-        gs_epollDispatcher = new wxEpollDispatcher;
-        if ( !gs_epollDispatcher->IsOk() )
-        {
-            delete gs_epollDispatcher;
-            gs_epollDispatcher = NULL;
-        }
+        gotEvents = true;
     }
 
-    return gs_epollDispatcher;
+    return gotEvents;
 }
 
-// ----------------------------------------------------------------------------
-// wxEpollDispatcherModule
-// ----------------------------------------------------------------------------
-
-class wxEpollDispatcherModule : public wxModule
-{
-public:
-    wxEpollDispatcherModule() { }
-
-    virtual bool OnInit() { return true; }
-    virtual void OnExit() { wxDELETE(gs_epollDispatcher); }
-
-    DECLARE_DYNAMIC_CLASS(wxEpollDispatcherModule)
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxEpollDispatcherModule, wxModule)
-
-#endif // HAVE_SYS_EPOLL_H
+#endif // wxUSE_EPOLL_DISPATCHER