Fix recursion problems when loading pages from a virtual file system using the WebKit...

[wxWidgets.git] / src / common / fdiodispatcher.cpp

diff --git a/src/common/fdiodispatcher.cpp b/src/common/fdiodispatcher.cpp
index 112f892dc29a71de032e4f0199e233fd1ddc37f0..607519b365e4833cf35971cb52eb988134924ad1 100644 (file)
--- a/src/common/fdiodispatcher.cpp
+++ b/src/common/fdiodispatcher.cpp
@@ -24,14 +24,56 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

+    #include "wx/module.h"

 #endif //WX_PRECOMP
 
 #include "wx/private/fdiodispatcher.h"
 
 #endif //WX_PRECOMP
 
 #include "wx/private/fdiodispatcher.h"
 

+#include "wx/private/selectdispatcher.h"
+#ifdef __UNIX__
+    #include "wx/unix/private/epolldispatcher.h"
+#endif
+
+wxFDIODispatcher *gs_dispatcher = NULL;
+

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ============================================================================
 // implementation
 // ============================================================================
 

+// ----------------------------------------------------------------------------
+// wxFDIODispatcher
+// ----------------------------------------------------------------------------
+
+/* static */
+wxFDIODispatcher *wxFDIODispatcher::Get()
+{
+    if ( !gs_dispatcher )
+    {
+#if wxUSE_EPOLL_DISPATCHER
+        gs_dispatcher = wxEpollDispatcher::Create();
+        if ( !gs_dispatcher )
+#endif // wxUSE_EPOLL_DISPATCHER
+#if wxUSE_SELECT_DISPATCHER
+            gs_dispatcher = new wxSelectDispatcher();
+#endif // wxUSE_SELECT_DISPATCHER
+    }
+
+    wxASSERT_MSG( gs_dispatcher, "failed to create any IO dispatchers" );
+
+    return gs_dispatcher;
+}
+
+/* static */
+void wxFDIODispatcher::DispatchPending()
+{
+    if ( gs_dispatcher )
+        gs_dispatcher->Dispatch(0);
+}
+
+// ----------------------------------------------------------------------------
+// wxMappedFDIODispatcher
+// ----------------------------------------------------------------------------
+

 wxFDIOHandler *wxMappedFDIODispatcher::FindHandler(int fd) const
 {
     const wxFDIOHandlerMap::const_iterator it = m_handlers.find(fd);
 wxFDIOHandler *wxMappedFDIODispatcher::FindHandler(int fd) const
 {
     const wxFDIOHandlerMap::const_iterator it = m_handlers.find(fd);


@@ -40,11 +82,10 @@ wxFDIOHandler *wxMappedFDIODispatcher::FindHandler(int fd) const
 }
 
 
 }
 
 

-bool wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
+bool
+wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)

 {
 {

-    wxUnusedVar(flags);
-
-    wxCHECK_MSG( handler, false, _T("handler can't be NULL") );
+    wxCHECK_MSG( handler, false, "handler can't be NULL" );

 
     // notice that it's not an error to register a handler for the same fd
     // twice as it can be done with different flags -- but it is an error to
 
     // notice that it's not an error to register a handler for the same fd
     // twice as it can be done with different flags -- but it is an error to


@@ -53,9 +94,9 @@ bool wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flag
     if ( i != m_handlers.end() )
     {
         wxASSERT_MSG( i->second.handler == handler,
     if ( i != m_handlers.end() )
     {
         wxASSERT_MSG( i->second.handler == handler,

-                        _T("registering different handler for the same fd?") );
+                        "registering different handler for the same fd?" );

         wxASSERT_MSG( i->second.flags != flags,
         wxASSERT_MSG( i->second.flags != flags,

-                        _T("reregistering with the same flags?") );
+                        "reregistering with the same flags?" );

     }
 
     m_handlers[fd] = wxFDIOHandlerEntry(handler, flags);
     }
 
     m_handlers[fd] = wxFDIOHandlerEntry(handler, flags);


@@ -63,15 +104,14 @@ bool wxMappedFDIODispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flag
     return true;
 }
 
     return true;
 }
 

-bool wxMappedFDIODispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags)
+bool
+wxMappedFDIODispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags)

 {
 {

-    wxUnusedVar(flags);
-
-    wxCHECK_MSG( handler, false, _T("handler can't be NULL") );
+    wxCHECK_MSG( handler, false, "handler can't be NULL" );

 
     wxFDIOHandlerMap::iterator i = m_handlers.find(fd);
     wxCHECK_MSG( i != m_handlers.end(), false,
 
     wxFDIOHandlerMap::iterator i = m_handlers.find(fd);
     wxCHECK_MSG( i != m_handlers.end(), false,

-                    _T("modifying unregistered handler?") );
+                    "modifying unregistered handler?" );

 
     i->second = wxFDIOHandlerEntry(handler, flags);
 
 
     i->second = wxFDIOHandlerEntry(handler, flags);
 


@@ -89,3 +129,18 @@ bool wxMappedFDIODispatcher::UnregisterFD(int fd)
     return true;
 }
 
     return true;
 }
 

+// ----------------------------------------------------------------------------
+// wxSelectDispatcherModule
+// ----------------------------------------------------------------------------
+
+class wxFDIODispatcherModule : public wxModule
+{
+public:
+    virtual bool OnInit() { return true; }
+    virtual void OnExit() { wxDELETE(gs_dispatcher); }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxFDIODispatcherModule)
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxFDIODispatcherModule, wxModule)