Changeset 121 for trunk

Timestamp:

Sep 3, 2006, 10:42:48 PM (19 years ago)

Author:

dmik

Message:

Kernel: Improved Qt timers:

• Fixed a regression caused by r113: the underlying PM timer was not stopped when killing a Qt timer, that could eventually waste all PM timer resources.
• Both Qt and PM timer IDs are now used more effectively (faster search for a next free ID, PM IDs are not lost when creating wasted zero timers).

File:

• trunk/src/kernel/qeventloop_pm.cpp (modified) (9 diffs)

trunk/src/kernel/qeventloop_pm.cpp

@@ -40 +40 @@
 #include "qapplication.h"
 #include "qptrlist.h"
+#include "qvaluelist.h"
 
 #include <sys/socket.h>
@@ -426 +427 @@
     QObject *obj;                               // - object to receive events
 };
-typedef QPtrVector<TimerInfo>  TimerVec;                // vector of TimerInfo structs
+typedef QPtrVector<TimerInfo>  TimerVec;        // vector of TimerInfo structs
 typedef QIntDict<TimerInfo> TimerDict;          // fast dict of timers
 
@@ -432 +433 @@
 static TimerDict *timerDict = 0;                // timer dict
 
+template <typename T>                           // template to track availability 
+class QFreeValueList                            // of free (unused) integer
+{                                               // values within some interval
+public:
+    QFreeValueList( T min, T max ) : intMin( min ), intMax( max ) {
+        freeValues.push_front( Span( min, max ) );
+    }
+    T take() {
+        Q_ASSERT( !isEmpty() );
+        Span &free = freeValues.first();
+        T freeValue = free.min;
+        if ( free.min == free.max ) freeValues.pop_front();
+        else free.min ++;
+        return freeValue;
+    }
+    void give( T val ) {
+        Q_ASSERT( val >= intMin && val <= intMax );
+        typename FreeList::iterator it = freeValues.begin();
+        for ( ; it != freeValues.end(); ++ it ) {
+            Span &span = (*it);
+            if ( val == span.min - 1 ) {
+                span.min --;
+                typename FreeList::iterator it2 = it;
+                if ( it2 != freeValues.begin() && (*--it2).max + 1 == span.min ) {
+                    span.min = (*it2).min;
+                    freeValues.erase( it2 );
+                }
+                return;
+            } else if ( val == span.max + 1 ) {
+                span.max ++;
+                typename FreeList::iterator it2 = it;
+                if ( ++it2 != freeValues.end() && (*it2).min - 1 == span.max ) {
+                    span.max = (*it2).max;
+                    freeValues.erase( it2 );
+                }
+                return;
+            }
+            else if ( val < span.min )
+                break;
+            Q_ASSERT( val > span.max );
+        }
+        if ( it == freeValues.end() ) freeValues.push_back( Span( val, val ) );
+        else freeValues.insert( it, Span( val, val ) );
+    }
+    bool isEmpty() { return freeValues.isEmpty(); }
+    T min() const { return intMin; }
+    T max() const { return intMax; }
+private:
+    struct Span {
+        Span() : min( 0 ), max( 0 ) {}
+        Span( T mn, T mx ) : min( mn ), max( mx ) {}
+        T min;
+        T max;
+    };
+    typedef QValueList<Span> FreeList;
+    FreeList freeValues;
+    T intMin;
+    T intMax;
+};
+
+typedef QFreeValueList<int> FreeQtTIDList;      // list of free Qt timer IDs
+static FreeQtTIDList *freeQtTIDs = 0;
+typedef QFreeValueList<ULONG> FreePMTIDList;    // list of free PM timer IDs
+static FreePMTIDList *freePMTIDs = 0;
 
 // Activate a timer, used by both event-loop based and simple timers.
@@ -492 +557 @@
     timerDict = new TimerDict( 29 );
     Q_CHECK_PTR( timerDict );
+    freeQtTIDs = new FreeQtTIDList( 0, INT_MAX );
+    Q_CHECK_PTR( freeQtTIDs );
+    freePMTIDs = new FreePMTIDList( 1, TID_USERMAX - 1 );
+    Q_CHECK_PTR( freePMTIDs );
 }
 
@@ -512 +581 @@
             WinStopTimer( 0, qt_aux_win.hwnd(), t->id );
     }
+    delete freePMTIDs;
+    freePMTIDs = 0;
+    delete freeQtTIDs;
+    freeQtTIDs = 0;
     delete timerDict;
     timerDict = 0;
@@ -539 +612 @@
         initTimers();
 
-    int ind = timerVec->findRef( 0 );           // get free timer
-    if ( ind == -1 ) {
-        ind = timerVec->size();                 // increase the size
-        if ( ind >= TID_USERMAX ) {
+    if ( freeQtTIDs->isEmpty() ) {
 #if defined(QT_CHECK_STATE)
-            qWarning( "qStartTimer: Maximum number of timers (%d) is reached.",
-                      TID_USERMAX );
-            return 0;
+        qWarning( "qStartTimer: Maximum number of timers (%d) is reached.",
+                  freeQtTIDs->max() - freeQtTIDs->min() + 1 );
 #endif
-        }
-        timerVec->resize( ind * 4 );
+        return 0;
+    }
+    
+    if ( freePMTIDs->isEmpty() ) {
+#if defined(QT_CHECK_STATE)
+        qWarning( "qStartTimer: Maximum number of non-zero timers (%ld) is reached.",
+                  freePMTIDs->max() - freePMTIDs->min() + 1 );
+#endif
+        return 0;
+    }
+    
+    int ind = freeQtTIDs->take();               // get free timer
+    if ( (uint) ind >= timerVec->size() ) {
+        uint newSize = timerVec->size() * 4;    // increase the size
+        if ( newSize <= (uint) ind )
+            newSize = (uint) ind + 1;
+        timerVec->resize( newSize );
     }
     t = new TimerInfo;                          // create timer entry
@@ -563 +647 @@
         WinPostMsg( qt_aux_win.hwnd(), WM_U_SEM_ZEROTIMER, 0, 0 );
     } else {
-        t->id = WinStartTimer( 0, qt_aux_win.hwnd(), ind + 1, (ULONG) interval );
-    }
-    if ( !t->zero && t->id == 0 ) {
+        ULONG freeId = freePMTIDs->take();      // get free timer ID
+        t->id = WinStartTimer( 0, qt_aux_win.hwnd(), freeId, (ULONG) interval );
+        if ( t->id == 0 ) {
 #if defined(QT_CHECK_STATE)
-        qSystemWarning( "qStartTimer: Failed to create a timer." );
+            qSystemWarning( "qStartTimer: Failed to create a timer." );
 #endif
-        delete t;                               // could not set timer
-        return 0;
+            freePMTIDs->give( freeId );         // could not start timer
+            freeQtTIDs->give( ind );
+            delete t;
+            return 0;
+        }
     }
     timerVec->insert( ind, t );                 // store in timer vector
@@ -588 +675 @@
         numZeroTimers--;
     } else {
-        WinStopTimer( 0, 0, t->id );
+        WinStopTimer( 0, qt_aux_win.hwnd(), t->id );
+        freePMTIDs->give( t->id );
         timerDict->remove( t->id );
     }
+    freeQtTIDs->give( t->ind );
     timerVec->remove( ind-1 );
     return TRUE;
@@ -606 +695 @@
                 numZeroTimers--;
             } else {
-                WinStopTimer( 0, 0, t->id );
+                WinStopTimer( 0, qt_aux_win.hwnd(), t->id );
+                freePMTIDs->give( t->id );
                 timerDict->remove( t->id );
             }
+            freeQtTIDs->give( t->ind );
             timerVec->remove( i );
         }