create the single global IO dispatcher in wxFDIODispatcher; don't use wxSelectDispatc...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/private/fdiodispatcher.h b/include/wx/private/fdiodispatcher.h
index 52e8efba7bc6473bffc0075fb642fe2efcbf6e52..04128f858bc85c921897238f2105d390005de7c4 100644 (file)
--- a/include/wx/private/fdiodispatcher.h
+++ b/include/wx/private/fdiodispatcher.h
@@ -45,6 +45,18 @@ class WXDLLIMPEXP_BASE wxFDIODispatcher
 public:
     enum { TIMEOUT_INFINITE = -1 };
 
 public:
     enum { TIMEOUT_INFINITE = -1 };
 

+    // return the global dispatcher to be used for IO events, can be NULL only
+    // if wxSelectDispatcher wasn't compiled into the library at all as
+    // creating it never fails
+    //
+    // don't delete the returned pointer
+    static wxFDIODispatcher *Get();
+
+    // if we have any registered handlers, check for any pending events to them
+    // and dispatch them -- this is used from wxX11 and wxDFB event loops
+    // implementation
+    static void DispatchPending();
+

     // register handler for the given descriptor with the dispatcher, return
     // true on success or false on error
     virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags) = 0;
     // register handler for the given descriptor with the dispatcher, return
     // true on success or false on error
     virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags) = 0;

diff --git a/include/wx/private/selectdispatcher.h b/include/wx/private/selectdispatcher.h
index d61f0daf7786dd4605fc2f8a2dd71c3f3e9aaa1e..eea139f37c6b2fa5506f1249211ff0981dfc1f16 100644 (file)
--- a/include/wx/private/selectdispatcher.h
+++ b/include/wx/private/selectdispatcher.h
@@ -76,14 +76,8 @@ private:
 class WXDLLIMPEXP_BASE wxSelectDispatcher : public wxMappedFDIODispatcher
 {
 public:
 class WXDLLIMPEXP_BASE wxSelectDispatcher : public wxMappedFDIODispatcher
 {
 public:

-    // returns the unique instance of this class, the pointer shouldn't be
-    // deleted and is normally never NULL
-    static wxSelectDispatcher *Get();
-
-    // if we have any registered handlers, check for any pending events to them
-    // and dispatch them -- this is used from wxX11 and wxDFB event loops
-    // implementation
-    static void DispatchPending();
+    // creates an instance of this class, the caller takes ownership of it
+    static wxSelectDispatcher *Create();

 
     // implement pure virtual methods of the base class
     virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL);
 
     // implement pure virtual methods of the base class
     virtual bool RegisterFD(int fd, wxFDIOHandler *handler, int flags = wxFDIO_ALL);


@@ -92,6 +86,7 @@ public:
     virtual void Dispatch(int timeout = TIMEOUT_INFINITE);
 
 protected:
     virtual void Dispatch(int timeout = TIMEOUT_INFINITE);
 
 protected:

+    // ctor is not public, use Create()

     wxSelectDispatcher();
 
 private:
     wxSelectDispatcher();
 
 private:

diff --git a/include/wx/unix/gsockunx.h b/include/wx/unix/gsockunx.h
index 438b7255203dd650e17f0c07b144546bb900f8f7..a01f6013d2b4e2235ecdde7e19881a8ba06fe0e4 100644 (file)
--- a/include/wx/unix/gsockunx.h
+++ b/include/wx/unix/gsockunx.h
@@ -15,6 +15,8 @@
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"
 #endif
 

+class wxGSocketIOHandler;
+

 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #ifndef __GSOCKET_STANDALONE__
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #ifndef __GSOCKET_STANDALONE__


@@ -23,7 +25,7 @@
 #include "gsocket.h"
 #endif
 
 #include "gsocket.h"
 #endif
 

-class GSocketGUIFunctionsTableConcrete: public GSocketGUIFunctionsTable
+class GSocketGUIFunctionsTableConcrete : public GSocketGUIFunctionsTable

 {
 public:
     virtual bool OnInit();
 {
 public:
     virtual bool OnInit();


@@ -84,6 +86,7 @@ public:
     /* DFE: We can't protect these data member until the GUI code is updated */
     /* protected: */
   int m_fd;
     /* DFE: We can't protect these data member until the GUI code is updated */
     /* protected: */
   int m_fd;

+  wxGSocketIOHandler *m_handler;

   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;
   GAddress *m_local;
   GAddress *m_peer;
   GSocketError m_error;

diff --git a/include/wx/unix/private/epolldispatcher.h b/include/wx/unix/private/epolldispatcher.h
index c42b40f0a48ae65f4cfc81e80f5b342ba9a7cb2c..f76cf6e8d71971db850b526eb4aa3c5a528c91a9 100644 (file)
--- a/include/wx/unix/private/epolldispatcher.h
+++ b/include/wx/unix/private/epolldispatcher.h
@@ -20,11 +20,11 @@
 class WXDLLIMPEXP_CORE wxEpollDispatcher : public wxFDIODispatcher
 {
 public:
 class WXDLLIMPEXP_CORE wxEpollDispatcher : public wxFDIODispatcher
 {
 public:

-    // get pointer to the unique instance of this class, can return NULL if
+    // create a new instance of this class, can return NULL if

     // epoll() is not supported on this system
     //
     // epoll() is not supported on this system
     //

-    // do not delete the returned pointer
-    static wxEpollDispatcher *Get();
+    // the caller should delete the returned pointer
+    static wxEpollDispatcher *Create();

 
     // implement base class pure virtual methods
     virtual bool RegisterFD(int fd, wxFDIOHandler* handler, int flags = wxFDIO_ALL);
 
     // implement base class pure virtual methods
     virtual bool RegisterFD(int fd, wxFDIOHandler* handler, int flags = wxFDIO_ALL);


@@ -33,11 +33,8 @@ public:
     virtual void Dispatch(int timeout = TIMEOUT_INFINITE);
 
 private:
     virtual void Dispatch(int timeout = TIMEOUT_INFINITE);
 
 private:

-    // ctor is private, use Get()
-    wxEpollDispatcher();
-
-    // return true if the object was successfully initialized
-    bool IsOk() const { return m_epollDescriptor != -1; }
+    // ctor is private, use Create()
+    wxEpollDispatcher(int epollDescriptor);

 
     int m_epollDescriptor;
 };
 
     int m_epollDescriptor;
 };

diff --git a/src/common/fdiodispatcher.cpp b/src/common/fdiodispatcher.cpp
index 112f892dc29a71de032e4f0199e233fd1ddc37f0..f6a131dc01317c000a89b58a6a672e9439329c98 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 )
+    {
+#ifdef wxUSE_EPOLL_DISPATCHER
+        gs_dispatcher = wxEpollDispatcher::Create();
+        if ( !gs_dispatcher )
+#endif // wxUSE_EPOLL_DISPATCHER
+#if wxUSE_SELECT_DISPATCHER
+            gs_dispatcher = wxSelectDispatcher::Create();
+#endif // wxUSE_WCHAR_T
+    }
+
+    wxASSERT_MSG( gs_dispatcher, _T("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);


@@ -89,3 +131,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)

diff --git a/src/common/gsocketiohandler.cpp b/src/common/gsocketiohandler.cpp
index a5ae3e476d1364338e03f7606eee65e4917b4f1e..ece535c02cf910f62727c2b758b5d3a955afaad4 100644 (file)
--- a/src/common/gsocketiohandler.cpp
+++ b/src/common/gsocketiohandler.cpp
@@ -127,14 +127,21 @@ void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket,
     default: return;
   }
 
     default: return;
   }
 

-  wxSelectDispatcher * const dispatcher = wxSelectDispatcher::Get();
+  wxFDIODispatcher * const dispatcher = wxFDIODispatcher::Get();

   if ( !dispatcher )
       return;
 
   if ( !dispatcher )
       return;
 

-  wxGSocketIOHandler *
-      handler = (wxGSocketIOHandler*)dispatcher->FindHandler(fd);
-  if ( !handler )
+  wxGSocketIOHandler *& handler = socket->m_handler;
+
+  // we should register the new handlers but modify the existing ones in place
+  bool registerHandler;
+  if ( handler )

   {
   {

+      registerHandler = false;
+  }
+  else // no existing handler
+  {
+      registerHandler = true;

       handler = new wxGSocketIOHandler(socket);
   }
 
       handler = new wxGSocketIOHandler(socket);
   }
 


@@ -149,7 +156,10 @@ void GSocketGUIFunctionsTableConcrete::Install_Callback(GSocket *socket,
       handler->AddFlag(wxFDIO_OUTPUT);
   }
 
       handler->AddFlag(wxFDIO_OUTPUT);
   }
 

-  dispatcher->RegisterFD(fd, handler, handler->GetFlags());
+  if ( registerHandler )
+      dispatcher->RegisterFD(fd, handler, handler->GetFlags());
+  else
+      dispatcher->ModifyFD(fd, handler, handler->GetFlags());

 }
 
 void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket,
 }
 
 void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket,


@@ -175,12 +185,11 @@ void GSocketGUIFunctionsTableConcrete::Uninstall_Callback(GSocket *socket,
 
   const wxFDIODispatcherEntryFlags flag = c == 0 ? wxFDIO_INPUT : wxFDIO_OUTPUT;
 
 
   const wxFDIODispatcherEntryFlags flag = c == 0 ? wxFDIO_INPUT : wxFDIO_OUTPUT;
 

-  wxSelectDispatcher * const dispatcher = wxSelectDispatcher::Get();
+  wxFDIODispatcher * const dispatcher = wxFDIODispatcher::Get();

   if ( !dispatcher )
       return;
 
   if ( !dispatcher )
       return;
 

-  wxGSocketIOHandler * const
-      handler = wx_static_cast(wxGSocketIOHandler *, dispatcher->FindHandler(fd));
+  wxGSocketIOHandler *& handler = socket->m_handler;

   if ( handler )
   {
       handler->RemoveFlag(flag);
   if ( handler )
   {
       handler->RemoveFlag(flag);

diff --git a/src/common/selectdispatcher.cpp b/src/common/selectdispatcher.cpp
index 654eee9f4a028c96871860dfb8e64f0364ee0366..f13df0daa6c7e31cac77b0a0c2be4a7d8420add7 100644 (file)
--- a/src/common/selectdispatcher.cpp
+++ b/src/common/selectdispatcher.cpp
@@ -22,7 +22,6 @@
 #if wxUSE_SELECT_DISPATCHER
 
 #include "wx/private/selectdispatcher.h"
 #if wxUSE_SELECT_DISPATCHER
 
 #include "wx/private/selectdispatcher.h"

-#include "wx/module.h"

 #include "wx/unix/private.h"
 
 #ifndef WX_PRECOMP
 #include "wx/unix/private.h"
 
 #ifndef WX_PRECOMP


@@ -132,26 +131,10 @@ void wxSelectSets::Handle(int fd, wxFDIOHandler& handler) const
 // wxSelectDispatcher
 // ----------------------------------------------------------------------------
 
 // wxSelectDispatcher
 // ----------------------------------------------------------------------------
 

-static wxSelectDispatcher *gs_selectDispatcher = NULL;
-
-/* static */
-wxSelectDispatcher *wxSelectDispatcher::Get()
-{
-    if ( !gs_selectDispatcher )
-    {
-        // the dispatcher should be only created from one thread so it should
-        // be ok to use a global without any protection here
-        gs_selectDispatcher = new wxSelectDispatcher;
-    }
-
-    return gs_selectDispatcher;
-}
-

 /* static */
 /* static */

-void wxSelectDispatcher::DispatchPending()
+wxSelectDispatcher *wxSelectDispatcher::Create()

 {
 {

-    if ( gs_selectDispatcher )
-        gs_selectDispatcher->Dispatch(0);
+    return new wxSelectDispatcher;

 }
 
 wxSelectDispatcher::wxSelectDispatcher()
 }
 
 wxSelectDispatcher::wxSelectDispatcher()


@@ -264,20 +247,4 @@ void wxSelectDispatcher::Dispatch(int timeout)
     }
 }
 
     }
 }
 

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

 #endif // wxUSE_SELECT_DISPATCHER
 #endif // wxUSE_SELECT_DISPATCHER

diff --git a/src/unix/epolldispatcher.cpp b/src/unix/epolldispatcher.cpp
index 16ec914ad6a2019af69bdb3274a2d33c417abcba..a8cb94910c7ffcbd8dcf8d32f4ec09b51073c475 100644 (file)
--- a/src/unix/epolldispatcher.cpp
+++ b/src/unix/epolldispatcher.cpp
@@ -23,7 +23,6 @@
 
 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/unix/private.h"
 
 #include "wx/unix/private/epolldispatcher.h"
 #include "wx/unix/private.h"

-#include "wx/module.h"

 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"


@@ -35,8 +34,6 @@
 
 #define wxEpollDispatcher_Trace wxT("epolldispatcher")
 
 
 #define wxEpollDispatcher_Trace wxT("epolldispatcher")
 

-static wxEpollDispatcher *gs_epollDispatcher = NULL;
-

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


@@ -75,13 +72,24 @@ static uint32_t GetEpollMask(int flags, int fd)
 // wxEpollDispatcher
 // ----------------------------------------------------------------------------
 
 // 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"));
     {
         wxLogSysError(_("Failed to create epoll descriptor"));

+        return NULL;

     }
     }

+
+    return new wxEpollDispatcher(epollDescriptor);
+}
+
+wxEpollDispatcher::wxEpollDispatcher(int epollDescriptor)
+{
+    wxASSERT_MSG( epollDescriptor != -1, _T("invalid descriptor") );
+
+    m_epollDescriptor = epollDescriptor;

 }
 
 bool wxEpollDispatcher::RegisterFD(int fd, wxFDIOHandler* handler, int flags)
 }
 
 bool wxEpollDispatcher::RegisterFD(int fd, wxFDIOHandler* handler, int flags)


@@ -175,37 +183,4 @@ void wxEpollDispatcher::Dispatch(int timeout)
     }
 }
 
     }
 }
 

-/* static */
-wxEpollDispatcher *wxEpollDispatcher::Get()
-{
-    if ( !gs_epollDispatcher )
-    {
-        gs_epollDispatcher = new wxEpollDispatcher;
-        if ( !gs_epollDispatcher->IsOk() )
-        {
-            delete gs_epollDispatcher;
-            gs_epollDispatcher = NULL;
-        }
-    }
-
-    return gs_epollDispatcher;
-}
-
-// ----------------------------------------------------------------------------
-// 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 // wxUSE_EPOLL_DISPATCHER
 #endif // wxUSE_EPOLL_DISPATCHER

diff --git a/src/unix/evtloopunix.cpp b/src/unix/evtloopunix.cpp
index 39afb42db065a142ddfc7eae4ff88a0a1688ccdd..c147a7651d432f36266f923a216574d2ff2a5d74 100644 (file)
--- a/src/unix/evtloopunix.cpp
+++ b/src/unix/evtloopunix.cpp
@@ -125,15 +125,9 @@ wxConsoleEventLoop::wxConsoleEventLoop()
         return;
     }
 
         return;
     }
 

-#ifdef wxUSE_EPOLL_DISPATCHER
-    m_dispatcher = wxEpollDispatcher::Get();
+    m_dispatcher = wxFDIODispatcher::Get();

     if ( !m_dispatcher )
     if ( !m_dispatcher )

-#endif // wxUSE_EPOLL_DISPATCHER
-#if wxUSE_SELECT_DISPATCHER
-        m_dispatcher = wxSelectDispatcher::Get();
-#endif // wxUSE_WCHAR_T
-
-    wxCHECK_RET( m_dispatcher, _T("failed to create IO dispatcher") );
+        return;

 
     m_dispatcher->RegisterFD
                   (
 
     m_dispatcher->RegisterFD
                   (

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 13a3b5b12cf02b3c6ce9367615ddc1209882b630..0c8f5f9a403547afd33332ffe600d95a5fd8f365 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -20,6 +20,7 @@
 
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/defs.h"
 
 #ifndef __GSOCKET_STANDALONE__
 #include "wx/defs.h"

+#include "wx/private/gsocketiohandler.h"

 #endif
 
 #if defined(__VISAGECPP__)
 #endif
 
 #if defined(__VISAGECPP__)


@@ -520,6 +521,8 @@ GSocket::GSocket()
   int i;
 
   m_fd                  = INVALID_SOCKET;
   int i;
 
   m_fd                  = INVALID_SOCKET;

+  m_handler             = NULL;
+

   for (i=0;i<GSOCK_MAX_EVENT;i++)
   {
     m_cbacks[i]         = NULL;
   for (i=0;i<GSOCK_MAX_EVENT;i++)
   {
     m_cbacks[i]         = NULL;


@@ -565,6 +568,8 @@ GSocket::~GSocket()
   /* Per-socket GUI-specific cleanup */
   gs_gui_functions->Destroy_Socket(this);
 
   /* Per-socket GUI-specific cleanup */
   gs_gui_functions->Destroy_Socket(this);
 

+  delete m_handler;
+

   /* Destroy private addresses */
   if (m_local)
     GAddress_destroy(m_local);
   /* Destroy private addresses */
   if (m_local)
     GAddress_destroy(m_local);