Changeset 1332

Timestamp:

Dec 12, 2008, 2:06:40 AM (17 years ago)

Author:

Steven Levine

Message:

Ticket 26: Clean up output. Add logic to support thread 1.

Location:

trunk/dll

Files:

• excputil.c (modified) (12 diffs)
• excputil.h (modified) (1 diff)

trunk/dll/excputil.c

@@ -22 +22 @@
 #define INCL_DOSMISC                    // DosDumpProcess?
 #define INCL_DOSERRORS                  // NO_ERROR
-#include <os2.h>
+// #include <os2.h>
 
 #include "wrappers.h"                   // xmalloc xfree
@@ -29 +29 @@
 #include "strutil.h"                    // GetPString
 
-// #include "excputil.h"                // 08 Dec 08 SHL fixme
+#include "excputil.h"
 
 static PSZ pszSrcFile = __FILE__;
@@ -38 +38 @@
 } THREADDATA;
 
-_ERR HandleException;
-
 /**
  * Wrapper thread that installs exception handler and invokes
@@ -47 +45 @@
 static VOID WrapperThread(PVOID pvArgs)
 {
-  EXCEPTIONREGISTRATIONRECORD excpQReg = { NULL, NULL };
+  EXCEPTIONREGISTRATIONRECORD regRec = { NULL, NULL };
   APIRET apiret;
   THREADDATA *ptd = (THREADDATA*)pvArgs;
@@ -56 +54 @@
 # endif
 
-  excpQReg.ExceptionHandler = HandleException;
-  apiret = DosSetExceptionHandler(&excpQReg);
+  regRec.ExceptionHandler = HandleException;
+  apiret = DosSetExceptionHandler(&regRec);
   if (apiret != NO_ERROR) {
     Dos_Error(MB_ENTER, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -63 +61 @@
   }
 
+#if 0 // 11 Dec 08 SHL fixme tobe gone - debug
+  {
+    static UINT when;
+    if (++when == 2)
+      *(char*)0 = 0;
+  }
+#endif
+
   (*ptd->pfnThread)(ptd->pvArgs);       // Invoke thread
 
@@ -68 +74 @@
 
   if (apiret == NO_ERROR) {
-    apiret = DosUnsetExceptionHandler(&excpQReg);
+    apiret = DosUnsetExceptionHandler(&regRec);
     if (apiret != NO_ERROR) {
       Dos_Error(MB_ENTER, apiret, HWND_DESKTOP, pszSrcFile, __LINE__,
@@ -88 +94 @@
 
 int xbeginthread(VOID (*pfnThread)(PVOID),
-                 PVOID unused,
                  UINT cStackBytes,
-                 PVOID pvArgs)
+                 PVOID pvArgs,
+                 PSZ pszSrcFile,
+                 UINT uiLineNumber)
 {
   int rc;
@@ -98 +105 @@
   rc = _beginthread(WrapperThread, NULL, cStackBytes, ptd);
   if (rc == -1)
-    Runtime_Error(pszSrcFile, __LINE__,
+    Runtime_Error(pszSrcFile, uiLineNumber,
                   GetPString(IDS_COULDNTSTARTTHREADTEXT));
   return rc;
@@ -120 +127 @@
   PIB *ppib;
   TIB *ptib;
+  ULONG ulpid;
+  ULONG ultid;
   APIRET apiret;
+  HMODULE hmod;
 
   static unsigned working;
-
-  // Report exception in handler only once
+  static PSZ pszExcpMsg = "Caught exception %lx in process %lx (%lu) thread %u at %.24s";
+
+  // Try to report cascading exceptions in handler only once
+  // This simple test can get confused if multiple threads trap at same time
   if (++working > 1) {
     if (working == 2) {
-      DbgMsg(pszSrcFile, __LINE__, "Caught exception %lx in exception handler at %p",
+      DbgMsg(pszSrcFile, __LINE__, "Caught exception %lx at %p while handler active",
              ex, pContext->ctx_RegEip);
     }
@@ -134 +146 @@
   }
 
+  // Bypass exceptions we don't handle or exceptions we ignore
+  // Keep in sync with exceptq selections since exceptq will ignore anyway
   if ((pReport->fHandlerFlags & (EH_UNWINDING | EH_NESTED_CALL)) ||
-      (pReport->ExceptionNum & XCPT_SEVERITY_CODE) != XCPT_FATAL_EXCEPTION)
+      (ex & XCPT_SEVERITY_CODE) != XCPT_FATAL_EXCEPTION ||
+      ex == XCPT_ASYNC_PROCESS_TERMINATE ||
+      ex == XCPT_PROCESS_TERMINATE ||
+      ex == XCPT_UNWIND ||
+      ex == XCPT_SIGNAL ||
+      ex == XCPT_BREAKPOINT ||
+      ex == XCPT_SINGLE_STEP)
   {
     working--;
@@ -147 +167 @@
   apiret = DosGetInfoBlocks(&ptib, &ppib);
   if (apiret) {
-    ppib = NULL;
-    ptib = NULL;
-  }
-
-  // 08 Dec 08 SHL fixme to report thread ordinal?
-  DbgMsg(pszSrcFile, __LINE__, "Caught exception %lx in process %lx (%lu) thread %u at %.24s",
-         ex,
-         ppib->pib_ulpid,
-         ppib->pib_ulpid,
-         ptib ? ptib->tib_ptib2->tib2_ultid : 0,
-         pszTime);
-
-  // Check if this is an exception exceptq can handle
-  // Keep in sync with exceptq selections since exceptq will ignore anyway
-  if (ex != XCPT_PROCESS_TERMINATE &&
-      ex != XCPT_UNWIND &&
-      ex != XCPT_SIGNAL &&
-      ex != XCPT_BREAKPOINT &&
-      ex != XCPT_SINGLE_STEP &&
-      ex != XCPT_ASYNC_PROCESS_TERMINATE)
-  {
-    HMODULE hmod;
-    apiret = DosLoadModule (0, 0, "exceptq" ,&hmod);
-    // Report errors with DbgMsg, Dos_Error unsafe here
-    if (apiret) {
-      if (apiret != ERROR_FILE_NOT_FOUND)
-        DbgMsg(pszSrcFile, __LINE__, "DosLoadModule(exceptq) reported error %u", apiret);
-    }
+    ulpid = 0;
+    ultid = 0;
+  }
+  else {
+    ulpid = ppib->pib_ulpid;
+    ultid = ptib->tib_ptib2->tib2_ultid;
+  }
+
+  DbgMsg(pszSrcFile, __LINE__, pszExcpMsg,
+         ex, ulpid, ulpid, ultid, pszTime);
+
+  // Report errors with DbgMsg, Dos_Error unsafe here
+  apiret = DosLoadModule (0, 0, "exceptq" ,&hmod);
+  if (apiret) {
+    if (apiret != ERROR_FILE_NOT_FOUND)
+      DbgMsg(pszSrcFile, __LINE__, "DosLoadModule(exceptq) reported error %u", apiret);
+  }
+  else {
+    ERR pfn;
+    apiret = DosQueryProcAddr(hmod, 0, "MYHANDLER", (PFN*)&pfn);
+    if (apiret)
+      DbgMsg(pszSrcFile, __LINE__, "DosQueryProcAddr(MYHANDLER) reported error %u", apiret);
     else {
-      ERR pfn;
-      apiret = DosQueryProcAddr(hmod, 0, "MYHANDLER", (PFN*)&pfn);
-      if (apiret)
-        DbgMsg(pszSrcFile, __LINE__, "DosQueryProcAddr(MYHANDLER) reported error %u", apiret);
-      else {
-        // DbgMsg(pszSrcFile, __LINE__, "Invoking exceptq handler at %p", pfn);
-        (*pfn)(pReport, pReg, pContext, pv);
-        handled = TRUE;
-      }
-      DosFreeModule(hmod);
-    }
-
-    // If exceptq not available use local handler
-    if (!handled) {
-      union {
-        struct {
-          ULONG ulEBP;
-          ULONG ulEIP;
-        } stk32;
-        struct {
-          USHORT usBP;
-          USHORT usIP;
-          USHORT usCS;                  // > 1 and < 0xfff
-        } stk16;
-      } u;
-      ULONG ulObjNum;
-      ULONG ulOffset;
-      ULONG ulEIP;
-      ULONG ulEBP;
-      CHAR szFileName[CCHMAXPATH];
-      BOOL is32Bit;
-      APIRET apiret;
-      ULONG flags;
-      ULONG cnt;
-      ULONG ulOldEBP = 0;
-      INT c;
-      FILE* fp;
-
+      // DbgMsg(pszSrcFile, __LINE__, "Invoking exceptq handler at %p", pfn);
+      (*pfn)(pReport,   pReg, pContext, pv);
       handled = TRUE;
-
-      fp = fopen("fm2_trap.log", "a");
-      if (!fp)
-        fp = stderr;                    // Oh well
-
-      if (fp == stderr)
-        fputc('\n', stderr);
-      else {
-        fprintf(fp, "\nCaught exception %lx in process %x (%u) thread %u at %s\n",
-                ex,
-                ppib->pib_ulpid,
-                ppib->pib_ulpid,
-                ptib ? ptib->tib_ptib2->tib2_ultid : 0,
-                pszTime);
-      }
-
-      // fixme to do 16 bit better, 5b = FLAT_CS
-      if (pContext->ctx_SegCs == 0x5b) {
-        is32Bit = TRUE;                 // Assume 32-bit
-        u.stk32.ulEIP = pContext->ctx_RegEip;
-        u.stk32.ulEBP = pContext->ctx_RegEbp;
+    }
+    DosFreeModule(hmod);
+  }
+
+  // If exceptq not available use local handler
+  if (!handled) {
+    union {
+      struct {
+        ULONG ulEBP;
+        ULONG ulEIP;
+      } stk32;
+      struct {
+        USHORT usBP;
+        USHORT usIP;
+        USHORT usCS;                    // > 1 and < 0xfff
+      } stk16;
+    } u;
+    ULONG ulObjNum;
+    ULONG ulOffset;
+    ULONG ulEIP;
+    ULONG ulEBP;
+    CHAR szFileName[CCHMAXPATH];
+    BOOL is32Bit;
+    APIRET apiret;
+    ULONG flags;
+    ULONG cnt;
+    ULONG ulOldEBP = 0;
+    INT c;
+    FILE* fp;
+
+    handled = TRUE;
+
+    // Write stack trace to log file - let kernel do popuplog.os2
+    fp = fopen("fm2_trap.log", "a");
+    if (!fp)
+      fp = stderr;                      // Oh well
+
+    if (fp != stderr) {
+      fputc('\n', fp);
+      fprintf(fp, pszExcpMsg,
+              ex, ulpid, ulpid, ultid, pszTime);
+      fputc('\n', stderr);
+    }
+    fputc('\n', stderr);
+
+    // fixme to support mixed 32-bit/16-bit stacks, 5b = FLAT_CS
+    if (pContext->ctx_SegCs == 0x5b) {
+      is32Bit = TRUE;                   // Assume 32-bit
+      u.stk32.ulEIP = pContext->ctx_RegEip;
+      u.stk32.ulEBP = pContext->ctx_RegEbp;
+    }
+    else {
+      is32Bit = FALSE;
+      u.stk16.usIP = pContext->ctx_RegEip;
+      u.stk16.usBP = pContext->ctx_RegEbp;
+    }
+
+    // Walk stack frames
+    for (c = 0; c < 100; c++) {
+      if (is32Bit) {
+        ulEIP = u.stk32.ulEIP;
+        ulEBP = u.stk32.ulEBP;
       }
       else {
-        is32Bit = FALSE;
-        u.stk16.usIP = pContext->ctx_RegEip;
-        u.stk16.usBP = pContext->ctx_RegEbp;
+        ulEIP = ((ULONG) (pContext->ctx_SegCs & ~7) << 13) | u.stk16.usIP;
+        ulEBP = ((ULONG) (pContext->ctx_SegSs & ~7) << 13) | u.stk16.usBP;
       }
 
-      // Walk stack
-      for (c = 0; c < 100; c++) {
-        if (is32Bit) {
-          ulEIP = u.stk32.ulEIP;
-          ulEBP = u.stk32.ulEBP;
-        }
-        else {
-          ulEIP = ((ULONG) (pContext->ctx_SegCs & ~7) << 13) | u.stk16.usIP;
-          ulEBP = ((ULONG) (pContext->ctx_SegSs & ~7) << 13) | u.stk16.usBP;
-        }
-
-        apiret = DosQueryModFromEIP(&hmod, &ulObjNum, CCHMAXPATH, szFileName,
-                                &ulOffset, ulEIP);
-        if (apiret) {
-          ulObjNum = 0;
-          ulOffset = 0;
-          strcpy(szFileName, "n/a");
-        }
-        else
-          ulObjNum++;                   // Number from 1..n for display
-
-        fprintf(fp, " Stack frame %u @ %lx:%lx %s %lx:%lx\n",
-                c,
-                pContext->ctx_SegCs, ulEIP,
-                szFileName, ulObjNum, ulOffset);
-
-        if (apiret)
-          break;
-
-        if (!ulEBP || ulEBP <= ulOldEBP)
-          break;
-
-        cnt = sizeof(u);
-
-        apiret = DosQueryMem((void*)ulEBP, &cnt, &flags);
-        if (apiret || (flags & (PAG_COMMIT | PAG_READ)) != (PAG_COMMIT | PAG_READ))
-          break;                        // We are lost
-
-        ulOldEBP = ulEBP;
-        memcpy((void*)&u, (void*)ulEBP, sizeof(u));
-
-      } // for
-
-      if (fp && fp != stderr)
-        fclose(fp);
-
-    } // if !handled
-
-    // DbgMsg(pszSrcFile, __LINE__, "We are going to die now");
-
-  } // if can handle here
+      apiret = DosQueryModFromEIP(&hmod, &ulObjNum, CCHMAXPATH, szFileName,
+                              &ulOffset, ulEIP);
+      if (apiret) {
+        ulObjNum = 0;
+        ulOffset = 0;
+        strcpy(szFileName, "n/a");
+      }
+      else
+        ulObjNum++;                     // Number from 1..n for display
+
+      fprintf(fp, " Stack frame %u @ %lx:%lx %s %lx:%lx\n",
+              c,
+              pContext->ctx_SegCs, ulEIP,
+              szFileName, ulObjNum, ulOffset);
+
+      if (apiret)
+        break;
+
+      if (!ulEBP || ulEBP <= ulOldEBP)
+        break;
+
+      cnt = sizeof(u);
+
+      apiret = DosQueryMem((void*)ulEBP, &cnt, &flags);
+      if (apiret || (flags & (PAG_COMMIT | PAG_READ)) != (PAG_COMMIT | PAG_READ))
+        break;                  // We are lost
+
+      ulOldEBP = ulEBP;
+      memcpy((void*)&u, (void*)ulEBP, sizeof(u));
+
+    } // for
+
+    if (fp || fp != stderr)
+      fclose(fp);
+
+  } // if !handled
+
+  // DbgMsg(pszSrcFile, __LINE__, "We are going to die now");
 
   working--;

trunk/dll/excputil.h

@@ -13 +13 @@
 
 #if !defined(OS2_INCLUDED)
+#define INCL_DOSEXCEPTIONS              // XCTP_...
 #include <os2.h>
 #endif
 
 int xbeginthread(VOID (*pfnThread)(PVOID),
-                 PVOID unused,
                  UINT cStackBytes,
-                 PVOID pvArgs);
+                 PVOID pvArgs,
+                 PSZ pszSrcFile,
+                 UINT uiLineNumber);
+
+_ERR HandleException;
 
 #endif // EXCPUTIL_H