Changeset 180

Timestamp:

Mar 1, 2008, 4:42:34 PM (17 years ago)

Author:

dmik

Message:

kernel: Make sure that eventloop is cleaned up after all post-routines (that may still use some eventloop services such as timers) are called and that start timer requests are ignored after the eventloop has been cleaned up during application termination. This fixes assertions and crashes that might have happened at program termination otherwise.

Location:

trunk/src/kernel

Files:

• qapplication.cpp (modified) (2 diffs)
• qeventloop_pm.cpp (modified) (3 diffs)

trunk/src/kernel/qapplication.cpp

@@ -1026 +1026 @@
 #endif
 
-    if ( eventloop )
-        eventloop->appClosingDown();
     if ( postRList ) {
         QVFuncList::Iterator it = postRList->begin();
@@ -1082 +1080 @@
     delete qt_dnd_manager;
 #endif
+
+    // make sure eventloop is cleaned up after all post-routines and some object
+    // destructors (that may still use some eventloop services such as timers)
+    // are called. Note that this place is still not perfect as destructors of
+    // children of QApplication will be called (by the QObject dtor) after this
+    // method anyway and nothing prevents them from using e.g. timers.
+    if ( eventloop )
+        eventloop->appClosingDown();
 
     qt_cleanup();

trunk/src/kernel/qeventloop_pm.cpp

@@ -764 +764 @@
 //  to properly destroy the window).
 
+static bool timersCleanedUp = false;
+
 static void cleanupTimers()                     // remove pending timers
 {
+    timersCleanedUp = true;
+
 #ifndef QT_PM_NO_DOSTIMERS
     if ( !timerDict )               // no timers were used
@@ -792 +796 @@
     timerDict = 0;
     delete timerVec;
-    timerVec  = 0;
+    timerVec = 0;
 #endif // ifndef QT_PM_NO_DOSTIMERS
+
+    numZeroTimers = 0;
 }
 
@@ -804 +810 @@
 int qStartTimer( int interval, QObject *obj )
 {
+    // ignore start timer requests after application termination has started
+    Q_ASSERT( !timersCleanedUp );
+    if ( timersCleanedUp )
+        return 0;
+
     Q_ASSERT( obj );
     if ( !obj || interval < 0 )