fix (harmless) VC7 warnings about auto_ptr assignment

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

diff --git a/src/unix/epolldispatcher.cpp b/src/unix/epolldispatcher.cpp
index 92a0bb0617c29176baa5ae0676f5cd9a38db81c1..f509c7be2556af9f903fd0c6449720d7977f85db 100644 (file)
--- a/src/unix/epolldispatcher.cpp
+++ b/src/unix/epolldispatcher.cpp
@@ -41,7 +41,7 @@
 
 // helper: return EPOLLxxx mask corresponding to the given flags (and also log
 // debugging messages about it)
 
 // 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;
 
 {
     uint32_t ep = 0;
 


@@ -82,7 +82,8 @@ wxEpollDispatcher *wxEpollDispatcher::Create()
         wxLogSysError(_("Failed to create epoll descriptor"));
         return NULL;
     }
         wxLogSysError(_("Failed to create epoll descriptor"));
         return NULL;
     }

-
+    wxLogTrace(wxEpollDispatcher_Trace,
+                   _T("Epoll fd %d created"), epollDescriptor);

     return new wxEpollDispatcher(epollDescriptor);
 }
 
     return new wxEpollDispatcher(epollDescriptor);
 }
 


@@ -115,6 +116,8 @@ bool wxEpollDispatcher::RegisterFD(int fd, wxFDIOHandler* handler, int flags)
 
         return false;
     }
 
         return false;
     }

+    wxLogTrace(wxEpollDispatcher_Trace,
+               _T("Added fd %d (handler %p) to epoll %d"), fd, handler, m_epollDescriptor);

 
     return true;
 }
 
     return true;
 }


@@ -134,6 +137,8 @@ bool wxEpollDispatcher::ModifyFD(int fd, wxFDIOHandler* handler, int flags)
         return false;
     }
 
         return false;
     }
 

+    wxLogTrace(wxEpollDispatcher_Trace,
+                _T("Modified fd %d (handler: %p) on epoll %d"), fd, handler, m_epollDescriptor);

     return true;
 }
 
     return true;
 }
 


@@ -148,11 +153,12 @@ bool wxEpollDispatcher::UnregisterFD(int fd)
         wxLogSysError(_("Failed to unregister descriptor %d from epoll descriptor %d"),
                       fd, m_epollDescriptor);
     }
         wxLogSysError(_("Failed to unregister descriptor %d from epoll descriptor %d"),
                       fd, m_epollDescriptor);
     }

-
+    wxLogTrace(wxEpollDispatcher_Trace,
+                _T("removed fd %d from %d"), fd, m_epollDescriptor);

     return true;
 }
 
     return true;
 }
 

-void wxEpollDispatcher::Dispatch(int timeout)
+bool wxEpollDispatcher::Dispatch(int timeout)

 {
     epoll_event events[16];
 
 {
     epoll_event events[16];
 


@@ -170,10 +176,11 @@ void wxEpollDispatcher::Dispatch(int timeout)
         {
             wxLogSysError(_("Waiting for IO on epoll descriptor %d failed"),
                           m_epollDescriptor);
         {
             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);
     for ( epoll_event *p = events; p < events + e_num; p++ )
     {
         wxFDIOHandler * const handler = (wxFDIOHandler *)(p->data.ptr);


@@ -183,13 +190,23 @@ void wxEpollDispatcher::Dispatch(int timeout)
             continue;
         }
 
             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();
         else if ( p->events & EPOLLOUT )
             handler->OnWriteWaiting();
             handler->OnReadWaiting();
         else if ( p->events & EPOLLOUT )
             handler->OnWriteWaiting();

-        else if ( p->events & (EPOLLERR | EPOLLHUP) )
+        else if ( p->events & EPOLLERR )

             handler->OnExceptionWaiting();
             handler->OnExceptionWaiting();

+        else
+            continue;
+
+        gotEvents = true;

     }
     }

+
+    return gotEvents;

 }
 
 #endif // wxUSE_EPOLL_DISPATCHER
 }
 
 #endif // wxUSE_EPOLL_DISPATCHER