Changeset 136 for trunk

Timestamp:

Oct 18, 2006, 11:58:35 PM (19 years ago)

Author:

dmik

Message:

Kernel: Added the Qt-wide OS/2 system exception handler (see ticket:33 for details). It may be disabled by defining QT_PM_NO_SYSEXCEPTIONS when building Qt.

Location:

trunk

Files:

• include/qwindowdefs_pm.h (modified) (2 diffs)
• src/kernel/qapplication_pm.cpp (modified) (4 diffs)
• src/kernel/qsysxcpt_pm.cpp (added)
• src/kernel/qt_kernel.pri (modified) (1 diff)
• src/kernel/qthread_pm.cpp (modified) (2 diffs)

trunk/include/qwindowdefs_pm.h

@@ -99 +99 @@
 const ULONG QT_EXTRAWINDATASIZE = sizeof(LONG) * 2;
 
-#ifdef __cplusplus
 class Q_EXPORT QPMObjectWindow
 {
@@ -124 +123 @@
     HWND w;
 };
-#endif
+
+// OS/2 system exception handler callback interface
+
+enum QtSysXcptReq
+{
+    QtSysXcptReq_AppName = 0,
+    QtSysXcptReq_AppVer = 1,
+    QtSysXcptReq_ReportTo = 2,
+    QtSysXcptReq_ReportSubj = 3,
+};
+
+typedef void (*QtSysXcptWriter)( const char *str );
+typedef int (*QtSysXcptCallback)( QtSysXcptReq req, QtSysXcptWriter writer,
+                                  int reserved );
+
+Q_EXPORT QtSysXcptCallback qInstallSysXcptCallback( QtSysXcptCallback cb );
 
 #endif

trunk/src/kernel/qapplication_pm.cpp

@@ -6 +6 @@
 ** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 ** Copyright (C) 2004 Norman ASA.  Initial OS/2 Port.
-** Copyright (C) 2005 netlabs.org.  Further OS/2 Development.
+** Copyright (C) 2005-2006 netlabs.org.  Further OS/2 Development.
 **
 ** This file is part of the kernel module of the Qt GUI Toolkit.
@@ -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
+
 // need to get default font?
 extern bool qt_app_has_font;
@@ -458 +467 @@
 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,
+    // we can enable our exception handling on the main thread only if the LIBC
+    // library of the compiler provides an exception handler (already allocated
+    // on the stack before main() is called). In this case, we replace the LIBC
+    // 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 ) {
+            if ( ptib->tib_pexchain != END_OF_CHAIN ) {
+                PEXCEPTIONREGISTRATIONRECORD rec =
+                    (PEXCEPTIONREGISTRATIONRECORD) ptib->tib_pexchain;
+                qt_libcExceptionHandler = rec->ExceptionHandler;
+                rec->ExceptionHandler = qt_exceptionHandler;
+            } else {
+                Q_ASSERT( 0 /* no exception handler for the main thread */ );
+            }
+        }
+    }
+#endif
 
 #if defined(QT_DEBUG)
@@ -539 +576 @@
 //@@TODO (dmik): remove?
 //    QInputContext::shutdown();
+
+#if !defined(QT_PM_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 ) {
+            Q_ASSERT( ptib->tib_pexchain != END_OF_CHAIN );
+            if ( ptib->tib_pexchain != END_OF_CHAIN ) {
+                PEXCEPTIONREGISTRATIONRECORD rec =
+                    (PEXCEPTIONREGISTRATIONRECORD) ptib->tib_pexchain;
+                Q_ASSERT( rec->ExceptionHandler == qt_exceptionHandler );
+                if ( rec->ExceptionHandler == qt_exceptionHandler ) {
+                    rec->ExceptionHandler = qt_libcExceptionHandler;
+                    qt_libcExceptionHandler = NULL;
+                }
+            }
+        }
+    }
+#endif
 }
 

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/qfontengine_pm.cpp \
+                  $$KERNEL_CPP/qsysxcpt_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"
@@ -106 +115 @@
     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 ( setException )
+        DosSetExceptionHandler( &excRegRec );
+#endif
+
     ( (QThread *) arg[0] )->run();
 
     finish( (QThreadInstance *) arg[1] );
 
+#if !defined(QT_PM_NO_SYSEXCEPTIONS)
+    if ( setException )
+        DosUnsetExceptionHandler( &excRegRec );
+#endif
+    
     return;
 }