no real change; just reordered some implementations before real commit

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

diff --git a/src/common/selectdispatcher.cpp b/src/common/selectdispatcher.cpp
index 0188a76ec09f1e6d1a2c58dae3cf351267ef60e5..990b62c21c0fdf7eceae51b87574fe67f586a06a 100644 (file)
--- a/src/common/selectdispatcher.cpp
+++ b/src/common/selectdispatcher.cpp
@@ -30,7 +30,7 @@
     #include "wx/intl.h"
 #endif
 
     #include "wx/intl.h"
 #endif
 

-#ifdef HAVE_SYS_SELECT_H
+#if defined(HAVE_SYS_SELECT_H) || defined(__WATCOMC__)

     #include <sys/time.h>
     #include <sys/select.h>
 #endif
     #include <sys/time.h>
     #include <sys/select.h>
 #endif


@@ -96,14 +96,10 @@ bool wxSelectSets::SetFD(int fd, int flags)
         if ( flags & ms_flags[n] )
         {
             wxFD_SET(fd, &m_fds[n]);
         if ( flags & ms_flags[n] )
         {
             wxFD_SET(fd, &m_fds[n]);

-            wxLogTrace(wxSelectDispatcher_Trace,
-                       _T("Registered fd %d for %s events"), fd, ms_names[n]);

         }
         else if ( wxFD_ISSET(fd,  (fd_set*) &m_fds[n]) )
         {
             wxFD_CLR(fd, &m_fds[n]);
         }
         else if ( wxFD_ISSET(fd,  (fd_set*) &m_fds[n]) )
         {
             wxFD_CLR(fd, &m_fds[n]);

-            wxLogTrace(wxSelectDispatcher_Trace,
-                       _T("Unregistered fd %d from %s events"), fd, ms_names[n]);

         }
     }
 
         }
     }
 


@@ -124,6 +120,9 @@ void wxSelectSets::Handle(int fd, wxFDIOHandler& handler) const
             wxLogTrace(wxSelectDispatcher_Trace,
                        _T("Got %s event on fd %d"), ms_names[n], fd);
             (handler.*ms_handlers[n])();
             wxLogTrace(wxSelectDispatcher_Trace,
                        _T("Got %s event on fd %d"), ms_names[n], fd);
             (handler.*ms_handlers[n])();

+            // callback can modify sets and destroy handler
+            // this forces that one event can be processed at one time
+            return;

         }
     }
 }
         }
     }
 }


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

-/* static */
-wxSelectDispatcher *wxSelectDispatcher::Create()
-{
-    return new wxSelectDispatcher;
-}
-
-wxSelectDispatcher::wxSelectDispatcher()
-{
-    m_maxFD = -1;
-}
-

 bool wxSelectDispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
 {
     if ( !wxMappedFDIODispatcher::RegisterFD(fd, handler, flags) )
 bool wxSelectDispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
 {
     if ( !wxMappedFDIODispatcher::RegisterFD(fd, handler, flags) )


@@ -154,6 +142,8 @@ bool wxSelectDispatcher::RegisterFD(int fd, wxFDIOHandler *handler, int flags)
     if ( fd > m_maxFD )
       m_maxFD = fd;
 
     if ( fd > m_maxFD )
       m_maxFD = fd;
 

+    wxLogTrace(wxSelectDispatcher_Trace,
+                _T("Registered fd %d: input:%d, output:%d, exceptional:%d"), fd, (flags & wxFDIO_INPUT) == wxFDIO_INPUT, (flags & wxFDIO_OUTPUT), (flags & wxFDIO_EXCEPTION) == wxFDIO_EXCEPTION);

     return true;
 }
 
     return true;
 }
 


@@ -164,6 +154,8 @@ bool wxSelectDispatcher::ModifyFD(int fd, wxFDIOHandler *handler, int flags)
 
     wxASSERT_MSG( fd <= m_maxFD, _T("logic error: registered fd > m_maxFD?") );
 
 
     wxASSERT_MSG( fd <= m_maxFD, _T("logic error: registered fd > m_maxFD?") );
 

+    wxLogTrace(wxSelectDispatcher_Trace,
+                _T("Modified fd %d: input:%d, output:%d, exceptional:%d"), fd, (flags & wxFDIO_INPUT) == wxFDIO_INPUT, (flags & wxFDIO_OUTPUT) == wxFDIO_OUTPUT, (flags & wxFDIO_EXCEPTION) == wxFDIO_EXCEPTION);

     return m_sets.SetFD(fd, flags);
 }
 
     return m_sets.SetFD(fd, flags);
 }
 


@@ -186,16 +178,21 @@ bool wxSelectDispatcher::UnregisterFD(int fd)
                   ++it )
             {
                 if ( it->first > m_maxFD )
                   ++it )
             {
                 if ( it->first > m_maxFD )

+                {

                     m_maxFD = it->first;
                     m_maxFD = it->first;

+                }

             }
         }
     }
 
             }
         }
     }
 

+    wxLogTrace(wxSelectDispatcher_Trace,
+                _T("Removed fd %d, current max: %d"), fd, m_maxFD);

     return true;
 }
 
     return true;
 }
 

-void wxSelectDispatcher::ProcessSets(const wxSelectSets& sets)
+bool wxSelectDispatcher::ProcessSets(const wxSelectSets& sets)

 {
 {

+    bool gotEvent = false;

     for ( int fd = 0; fd <= m_maxFD; fd++ )
     {
         if ( !sets.HasFD(fd) )
     for ( int fd = 0; fd <= m_maxFD; fd++ )
     {
         if ( !sets.HasFD(fd) )


@@ -208,11 +205,15 @@ void wxSelectDispatcher::ProcessSets(const wxSelectSets& sets)
             continue;
         }
 
             continue;
         }
 

+        gotEvent = true;
+

         sets.Handle(fd, *handler);
     }
         sets.Handle(fd, *handler);
     }

+
+    return gotEvent;

 }
 
 }
 

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

 {
     struct timeval tv,
                   *ptv;
 {
     struct timeval tv,
                   *ptv;


@@ -244,8 +245,12 @@ void wxSelectDispatcher::Dispatch(int timeout)
             break;
 
         default:
             break;
 
         default:

-            ProcessSets(sets);
+            if ( ProcessSets(sets) )
+                return true;

     }
     }

+
+    // nothing happened
+    return false;

 }
 
 #endif // wxUSE_SELECT_DISPATCHER
 }
 
 #endif // wxUSE_SELECT_DISPATCHER