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

added wxPoll() implementation (based on patch 626861)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-03 20:58:52 +00:00
parent e0724c9d18
commit e1e57f73b3
2 changed files with 200 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
src/gtk/app.cpp
View File

@@ -46,25 +46,30 @@
#include <unistd.h> #include <unistd.h>
// TODO: use configure test to detect which of select()/poll() is available! #ifdef HAVE_POLL
#if defined(__DARWIN__) #if defined(__VMS)
#warning "FIXME: select must be used instead of poll (GD)" #include <poll.h>
#elif defined(__VMS) #else
#include <poll.h> // bug in the OpenBSD headers: at least in 3.1 there is no extern "C"
#else // in neither poll.h nor sys/poll.h which results in link errors later
// bug in the OpenBSD headers: at least in 3.1 there is no extern "C" in #ifdef __OPENBSD__
// neither poll.h nor sys/poll.h which results in link errors later extern "C"
#ifdef __OPENBSD__ {
extern "C" #endif
{
#endif
#include <sys/poll.h> #include <sys/poll.h>
#ifdef __OPENBSD__ #ifdef __OPENBSD__
}; };
#endif #endif
#endif // platform #endif // platform
#else // !HAVE_POLL
// we implement poll() ourselves using select() which is supposed exist in
// all modern Unices
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#endif // HAVE_POLL/!HAVE_POLL
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
@@ -265,22 +270,82 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
#if wxUSE_THREADS #if wxUSE_THREADS
#ifdef HAVE_POLL
#define wxPoll poll
#define wxPollFd pollfd
#else // !HAVE_POLL
typedef GPollFD wxPollFd;
int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
{
// convert timeout from ms to struct timeval (s/us)
timeval tv_timeout;
tv_timeout.tv_sec = timeout/1000;
tv_timeout.tv_usec = (timeout%1000)*1000;
// remember the highest fd used here
int fdMax = -1;
// and fill the sets for select()
fd_set readfds;
fd_set writefds;
fd_set exceptfds;
FD_ZERO(&readfds);
FD_ZERO(&writefds);
FD_ZERO(&exceptfds);
unsigned int i;
for ( i = 0; i < nfds; i++ )
{
wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
if ( ufds[i].events & G_IO_IN )
FD_SET(ufds[i].fd, &readfds);
if ( ufds[i].events & G_IO_PRI )
FD_SET(ufds[i].fd, &exceptfds);
if ( ufds[i].events & G_IO_OUT )
FD_SET(ufds[i].fd, &writefds);
if ( ufds[i].fd > fdMax )
fdMax = ufds[i].fd;
}
fdMax++;
int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout);
// translate the results back
for ( i = 0; i < nfds; i++ )
{
ufds[i].revents = 0;
if ( FD_ISSET(ufds[i].fd, &readfds ) )
ufds[i].revents |= G_IO_IN;
if ( FD_ISSET(ufds[i].fd, &exceptfds ) )
ufds[i].revents |= G_IO_PRI;
if ( FD_ISSET(ufds[i].fd, &writefds ) )
ufds[i].revents |= G_IO_OUT;
}
return res;
}
#endif // HAVE_POLL/!HAVE_POLL
static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
{ {
gint res;
gdk_threads_enter(); gdk_threads_enter();
wxMutexGuiLeave(); wxMutexGuiLeave();
g_mainThreadLocked = TRUE; g_mainThreadLocked = TRUE;
#ifdef __DARWIN__ // we rely on the fact that glib GPollFD struct is really just pollfd but
// FIXME: poll is not available under Darwin/Mac OS X and this needs // I wonder how wise is this in the long term (VZ)
// to be implemented using select instead (GD) gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
// what about other BSD derived systems?
res = -1;
#else
res = poll( (struct pollfd*) ufds, nfds, timeout );
#endif
wxMutexGuiEnter(); wxMutexGuiEnter();
g_mainThreadLocked = FALSE; g_mainThreadLocked = FALSE;
@@ -487,7 +552,7 @@ bool wxApp::ProcessIdle()
node = node->GetNext(); node = node->GetNext();
} }
wxIdleEvent event; wxIdleEvent event;
event.SetEventObject( this ); event.SetEventObject( this );
ProcessEvent( event ); ProcessEvent( event );
@@ -498,7 +563,7 @@ bool wxApp::ProcessIdle()
void wxApp::OnIdle( wxIdleEvent &event ) void wxApp::OnIdle( wxIdleEvent &event )
{ {
static bool s_inOnIdle = FALSE; static bool s_inOnIdle = FALSE;
// Avoid recursion (via ProcessEvent default case) // Avoid recursion (via ProcessEvent default case)
if (s_inOnIdle) if (s_inOnIdle)
return; return;
@@ -626,10 +691,6 @@ bool wxApp::Initialize()
{ {
wxClassInfo::InitializeClasses(); wxClassInfo::InitializeClasses();
#if wxUSE_INTL
wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
#endif
// GL: I'm annoyed ... I don't know where to put this and I don't want to // GL: I'm annoyed ... I don't know where to put this and I don't want to
// create a module for that as it's part of the core. // create a module for that as it's part of the core.
#if wxUSE_THREADS #if wxUSE_THREADS
@@ -648,7 +709,12 @@ bool wxApp::Initialize()
#endif #endif
wxModule::RegisterModules(); wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE; if (!wxModule::InitializeModules())
return FALSE;
#if wxUSE_INTL
wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
#endif
return TRUE; return TRUE;
} }
@@ -757,7 +823,7 @@ int wxEntryInitGui()
retValue = -1; retValue = -1;
wxGetRootWindow(); wxGetRootWindow();
return retValue; return retValue;
} }

134
src/gtk1/app.cpp
View File

@@ -46,25 +46,30 @@
#include <unistd.h> #include <unistd.h>
// TODO: use configure test to detect which of select()/poll() is available! #ifdef HAVE_POLL
#if defined(__DARWIN__) #if defined(__VMS)
#warning "FIXME: select must be used instead of poll (GD)" #include <poll.h>
#elif defined(__VMS) #else
#include <poll.h> // bug in the OpenBSD headers: at least in 3.1 there is no extern "C"
#else // in neither poll.h nor sys/poll.h which results in link errors later
// bug in the OpenBSD headers: at least in 3.1 there is no extern "C" in #ifdef __OPENBSD__
// neither poll.h nor sys/poll.h which results in link errors later extern "C"
#ifdef __OPENBSD__ {
extern "C" #endif
{
#endif
#include <sys/poll.h> #include <sys/poll.h>
#ifdef __OPENBSD__ #ifdef __OPENBSD__
}; };
#endif #endif
#endif // platform #endif // platform
#else // !HAVE_POLL
// we implement poll() ourselves using select() which is supposed exist in
// all modern Unices
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>
#endif // HAVE_POLL/!HAVE_POLL
#include "wx/gtk/win_gtk.h" #include "wx/gtk/win_gtk.h"
@@ -265,22 +270,82 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
#if wxUSE_THREADS #if wxUSE_THREADS
#ifdef HAVE_POLL
#define wxPoll poll
#define wxPollFd pollfd
#else // !HAVE_POLL
typedef GPollFD wxPollFd;
int wxPoll(wxPollFd *ufds, unsigned int nfds, int timeout)
{
// convert timeout from ms to struct timeval (s/us)
timeval tv_timeout;
tv_timeout.tv_sec = timeout/1000;
tv_timeout.tv_usec = (timeout%1000)*1000;
// remember the highest fd used here
int fdMax = -1;
// and fill the sets for select()
fd_set readfds;
fd_set writefds;
fd_set exceptfds;
FD_ZERO(&readfds);
FD_ZERO(&writefds);
FD_ZERO(&exceptfds);
unsigned int i;
for ( i = 0; i < nfds; i++ )
{
wxASSERT_MSG( ufds[i].fd < FD_SETSIZE, _T("fd out of range") );
if ( ufds[i].events & G_IO_IN )
FD_SET(ufds[i].fd, &readfds);
if ( ufds[i].events & G_IO_PRI )
FD_SET(ufds[i].fd, &exceptfds);
if ( ufds[i].events & G_IO_OUT )
FD_SET(ufds[i].fd, &writefds);
if ( ufds[i].fd > fdMax )
fdMax = ufds[i].fd;
}
fdMax++;
int res = select(fdMax, &readfds, &writefds, &exceptfds, &tv_timeout);
// translate the results back
for ( i = 0; i < nfds; i++ )
{
ufds[i].revents = 0;
if ( FD_ISSET(ufds[i].fd, &readfds ) )
ufds[i].revents |= G_IO_IN;
if ( FD_ISSET(ufds[i].fd, &exceptfds ) )
ufds[i].revents |= G_IO_PRI;
if ( FD_ISSET(ufds[i].fd, &writefds ) )
ufds[i].revents |= G_IO_OUT;
}
return res;
}
#endif // HAVE_POLL/!HAVE_POLL
static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout ) static gint wxapp_poll_func( GPollFD *ufds, guint nfds, gint timeout )
{ {
gint res;
gdk_threads_enter(); gdk_threads_enter();
wxMutexGuiLeave(); wxMutexGuiLeave();
g_mainThreadLocked = TRUE; g_mainThreadLocked = TRUE;
#ifdef __DARWIN__ // we rely on the fact that glib GPollFD struct is really just pollfd but
// FIXME: poll is not available under Darwin/Mac OS X and this needs // I wonder how wise is this in the long term (VZ)
// to be implemented using select instead (GD) gint res = wxPoll( (wxPollFd *) ufds, nfds, timeout );
// what about other BSD derived systems?
res = -1;
#else
res = poll( (struct pollfd*) ufds, nfds, timeout );
#endif
wxMutexGuiEnter(); wxMutexGuiEnter();
g_mainThreadLocked = FALSE; g_mainThreadLocked = FALSE;
@@ -487,7 +552,7 @@ bool wxApp::ProcessIdle()
node = node->GetNext(); node = node->GetNext();
} }
wxIdleEvent event; wxIdleEvent event;
event.SetEventObject( this ); event.SetEventObject( this );
ProcessEvent( event ); ProcessEvent( event );
@@ -498,7 +563,7 @@ bool wxApp::ProcessIdle()
void wxApp::OnIdle( wxIdleEvent &event ) void wxApp::OnIdle( wxIdleEvent &event )
{ {
static bool s_inOnIdle = FALSE; static bool s_inOnIdle = FALSE;
// Avoid recursion (via ProcessEvent default case) // Avoid recursion (via ProcessEvent default case)
if (s_inOnIdle) if (s_inOnIdle)
return; return;
@@ -626,10 +691,6 @@ bool wxApp::Initialize()
{ {
wxClassInfo::InitializeClasses(); wxClassInfo::InitializeClasses();
#if wxUSE_INTL
wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
#endif
// GL: I'm annoyed ... I don't know where to put this and I don't want to // GL: I'm annoyed ... I don't know where to put this and I don't want to
// create a module for that as it's part of the core. // create a module for that as it's part of the core.
#if wxUSE_THREADS #if wxUSE_THREADS
@@ -648,7 +709,12 @@ bool wxApp::Initialize()
#endif #endif
wxModule::RegisterModules(); wxModule::RegisterModules();
if (!wxModule::InitializeModules()) return FALSE; if (!wxModule::InitializeModules())
return FALSE;
#if wxUSE_INTL
wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
#endif
return TRUE; return TRUE;
} }
@@ -757,7 +823,7 @@ int wxEntryInitGui()
retValue = -1; retValue = -1;
wxGetRootWindow(); wxGetRootWindow();
return retValue; return retValue;
} }