Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

properly restart epoll_wait() if it got interrupted by a signal

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-03 00:11:28 +00:00
parent 14eb37a05e
commit e169ac8108
1 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/unix/epolldispatcher.cpp
View File

@@ -23,6 +23,7 @@
#include "wx/unix/private/epolldispatcher.h" #include "wx/unix/private/epolldispatcher.h"
#include "wx/unix/private.h" #include "wx/unix/private.h"
#include "wx/stopwatch.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/log.h" #include "wx/log.h"
@@ -162,26 +163,41 @@ bool wxEpollDispatcher::Dispatch(int timeout)
{ {
epoll_event events[16]; epoll_event events[16];
const int e_num = epoll_wait // the code below relies on TIMEOUT_INFINITE being -1 so that we can pass
( // timeout value directly to epoll_wait() which interprets -1 as meaning to
m_epollDescriptor, // wait forever and would need to be changed if the value of
events, // TIMEOUT_INFINITE ever changes
WXSIZEOF(events), wxCOMPILE_TIME_ASSERT( TIMEOUT_INFINITE == -1, UpdateThisCode );
timeout == TIMEOUT_INFINITE ? -1 : timeout
);
if ( e_num == -1 ) wxMilliClock_t timeEnd;
if ( timeout != -1 )
timeEnd = wxGetLocalTimeMillis();
int rc;
for ( ;; )
{ {
if ( errno != EINTR ) rc = epoll_wait(m_epollDescriptor, events, WXSIZEOF(events), timeout);
{ if ( rc != -1 || errno != EINTR )
wxLogSysError(_("Waiting for IO on epoll descriptor %d failed"), break;
m_epollDescriptor);
// we got interrupted, update the timeout and restart
if ( timeout == -1 )
continue;
timeout = wxMilliClockToLong(timeEnd - wxGetLocalTimeMillis());
if ( timeout < 0 )
return false; return false;
} }
if ( rc == -1 )
{
wxLogSysError(_("Waiting for IO on epoll descriptor %d failed"),
m_epollDescriptor);
return false;
} }
bool gotEvents = false; bool gotEvents = false;
for ( epoll_event *p = events; p < events + e_num; p++ ) for ( epoll_event *p = events; p < events + rc; p++ )
{ {
wxFDIOHandler * const handler = (wxFDIOHandler *)(p->data.ptr); wxFDIOHandler * const handler = (wxFDIOHandler *)(p->data.ptr);
if ( !handler ) if ( !handler )