Changeset 139 for trunk/src/kernel

Timestamp:

Oct 20, 2006, 11:44:52 PM (19 years ago)

Author:

dmik

Message:

Kernel/Tools: Improved OS/2 exception handling:

• Moved the excpetion handler code from the kernel module to the tools module (defines are now in qt_os2.h instead of qwindowdefs_pm.h);
• QT_PM_NO_SYSEXCEPTIONS is renamed to QT_OS2_NO_SYSEXCEPTIONS;
• Added the QtOS2SysXcptMainHandler stack-based class to correctly install the exception handler on the main thread, as well as provide an optional callback.

Location:

trunk/src/kernel

Files:

• qapplication_pm.cpp (modified) (4 diffs)
• qt_kernel.pri (modified) (1 diff)
• qthread_pm.cpp (modified) (3 diffs)

trunk/src/kernel/qapplication_pm.cpp

@@ -453 +453 @@
  *****************************************************************************/
 
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)   
-extern // defined in qsysxcpt_pm.cpp
-ULONG APIENTRY qt_exceptionHandler( PEXCEPTIONREPORTRECORD pReportRec,
-                                    PEXCEPTIONREGISTRATIONRECORD pRegRec,
-                                    PCONTEXTRECORD pContextRec,
-                                    PVOID pv );
-ERR qt_libcExceptionHandler = NULL;
-#endif
+// wrapper for QtOS2SysXcptMainHandler to provide local access to private data
+class QtOS2SysXcptMainHandlerInternal : public QtOS2SysXcptMainHandler
+{
+public:
+    static bool &installed() { return QtOS2SysXcptMainHandler::installed; } 
+    static ERR &libcHandler() { return QtOS2SysXcptMainHandler::libcHandler; }
+    static ERR handler() { return QtOS2SysXcptMainHandler::handler; }
+};
+
+#define XcptMainHandler QtOS2SysXcptMainHandlerInternal
 
 // need to get default font?
@@ -467 +469 @@
 void qt_init( int *argcptr, char **argv, QApplication::Type )
 {
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)
-    // Since the exception registration record can only be located on the stack,
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
+    // Even if the user didn't install the exception handler for the main
+    // thread using QtOS2SysXcptMainHandler prior to constructing a QApplication
+    // instance, we still want it to be installed to catch system traps. But
+    // since the exception registration record can only be located on the stack,
     // we can enable our exception handling on the main thread only if the LIBC
     // library of the compiler provides an exception handler (already allocated
@@ -474 +479 @@
     // exception handler's pointer with our own (not nice but what to do?) and
     // call the former (to let it do signal processing and the stuff) after we
-    // generate the trap file. Note that if there is no LIBC exception handler
-    // provided, qt_libcExceptionHandler will remain NULL to tell QThread not to
-    // install our exception handler for newly created threads (all or nothing). 
-    {
-        PTIB ptib = NULL;
-        PPIB ppib = NULL;
-        DosGetInfoBlocks( &ptib, &ppib );
-        
-        Q_ASSERT( ptib && ppib );
-        if ( ptib && ppib ) {
+    // generate the trap file. Note that in this tricky case, the user has no
+    // possibility to install the exception handler callback (since it's only
+    // possible using QtOS2SysXcptMainHandler).
+
+    PTIB ptib = NULL;
+    DosGetInfoBlocks( &ptib, NULL );
+    Q_ASSERT( ptib && ptib->tib_ptib2 );
+    
+    if ( ptib && ptib->tib_ptib2 ) {
+        // must be called only on the main (first) thread 
+        Q_ASSERT( ptib->tib_ptib2->tib2_ultid == 1 );
+        // also make sure that QtOS2SysXcptMainHandler was not already
+        // instantiated on the main thread
+        if ( ptib->tib_ptib2->tib2_ultid == 1 &&
+             XcptMainHandler::installed() == FALSE )
+        {
             if ( ptib->tib_pexchain != END_OF_CHAIN ) {
-                PEXCEPTIONREGISTRATIONRECORD rec =
+                PEXCEPTIONREGISTRATIONRECORD r =
                     (PEXCEPTIONREGISTRATIONRECORD) ptib->tib_pexchain;
-                qt_libcExceptionHandler = rec->ExceptionHandler;
-                rec->ExceptionHandler = qt_exceptionHandler;
+                XcptMainHandler::libcHandler() = r->ExceptionHandler;
+                r->ExceptionHandler = XcptMainHandler::handler();
+                XcptMainHandler::installed() = TRUE;
             } else {
                 Q_ASSERT( 0 /* no exception handler for the main thread */ );
@@ -577 +589 @@
 //    QInputContext::shutdown();
 
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
     // remove the exception handler if it was installed in qt_init() 
-    if ( qt_libcExceptionHandler ) {
-        PTIB ptib = NULL;
-        PPIB ppib = NULL;
-        DosGetInfoBlocks( &ptib, &ppib );
-        
-        Q_ASSERT( ptib && ppib );
-        if ( ptib && ppib ) {
+    PTIB ptib = NULL;
+    DosGetInfoBlocks( &ptib, NULL );
+    Q_ASSERT( ptib && ptib->tib_ptib2 );
+    
+    if ( ptib && ptib->tib_ptib2 ) {
+        // must be called only on the main (first) thread 
+        Q_ASSERT( ptib->tib_ptib2->tib2_ultid == 1 );
+        // also make sure the handler was really installed by qt_init()
+        if ( ptib->tib_ptib2->tib2_ultid == 1 &&
+             XcptMainHandler::installed() == TRUE &&
+             XcptMainHandler::libcHandler() != NULL )
+        {
             Q_ASSERT( ptib->tib_pexchain != END_OF_CHAIN );
             if ( ptib->tib_pexchain != END_OF_CHAIN ) {
-                PEXCEPTIONREGISTRATIONRECORD rec =
+                PEXCEPTIONREGISTRATIONRECORD r =
                     (PEXCEPTIONREGISTRATIONRECORD) ptib->tib_pexchain;
-                Q_ASSERT( rec->ExceptionHandler == qt_exceptionHandler );
-                if ( rec->ExceptionHandler == qt_exceptionHandler ) {
-                    rec->ExceptionHandler = qt_libcExceptionHandler;
-                    qt_libcExceptionHandler = NULL;
+                Q_ASSERT( r->ExceptionHandler == XcptMainHandler::handler() );
+                if ( r->ExceptionHandler == XcptMainHandler::handler() ) {
+                    r->ExceptionHandler = XcptMainHandler::libcHandler();
+                    XcptMainHandler::libcHandler() = NULL;
+                    XcptMainHandler::installed() = FALSE;
                 }
             }

trunk/src/kernel/qt_kernel.pri

@@ -140 +140 @@
                   $$KERNEL_CPP/qthread_pm.cpp \
                   $$KERNEL_CPP/qwidget_pm.cpp \
-                  $$KERNEL_CPP/qfontengine_pm.cpp \
-                  $$KERNEL_CPP/qsysxcpt_pm.cpp
+                  $$KERNEL_CPP/qfontengine_pm.cpp
 
         unix:x11 {

trunk/src/kernel/qthread_pm.cpp

@@ -39 +39 @@
 
 #include "qt_os2.h"
-
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)
-extern // defined in qsysxcpt_pm.cpp
-ULONG APIENTRY qt_exceptionHandler( PEXCEPTIONREPORTRECORD pReportRec,
-                                    PEXCEPTIONREGISTRATIONRECORD pRegRec,
-                                    PCONTEXTRECORD pContextRec,
-                                    PVOID pv );
-extern ERR qt_libcExceptionHandler; // defined in qapplication_pm.cpp
-#endif
 
 #include "qthread.h"
@@ -115 +106 @@
     LocalStorage = arg [1];
 
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)
-    // don't set the exception handler if not able to do it for main thread
-    bool setException = qt_libcExceptionHandler != NULL;
-    EXCEPTIONREGISTRATIONRECORD excRegRec = { 0, qt_exceptionHandler };
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
+    // don't set the exception handler if not able to do it for the main thread
+    bool setException = QtOS2SysXcptMainHandler::installed;
+    EXCEPTIONREGISTRATIONRECORD excRegRec =
+        { 0, QtOS2SysXcptMainHandler::handler };
     if ( setException )
         DosSetExceptionHandler( &excRegRec );
@@ -127 +119 @@
     finish( (QThreadInstance *) arg[1] );
 
-#if !defined(QT_PM_NO_SYSEXCEPTIONS)
+#if !defined(QT_OS2_NO_SYSEXCEPTIONS)
     if ( setException )
         DosUnsetExceptionHandler( &excRegRec );