Changeset 21979 for trunk/src/kernel32/dbglog.cpp

Timestamp:

Mar 9, 2012, 10:26:22 PM (13 years ago)

Author:

dmik

Message:

kernel32: Release log file lock on unexpected thread termination.

This fixes hard deadlocks in debug builds when the application is killed
or terminated with Ctrl-C.

File:

• trunk/src/kernel32/dbglog.cpp (modified) (7 diffs)

trunk/src/kernel32/dbglog.cpp

@@ -317 +317 @@
 }
 
+static ULONG _System WriteLogExcHandler(PEXCEPTIONREPORTRECORD pReport,
+                                        PEXCEPTIONREGISTRATIONRECORD pRegRec,
+                                        PCONTEXTRECORD pContext,
+                                        PVOID pv)
+{
+    switch (pReport->ExceptionNum)
+    {
+    case XCPT_PROCESS_TERMINATE:
+    case XCPT_ASYNC_PROCESS_TERMINATE:
+    case XCPT_UNWIND:
+        // disable further (possibly, recursive) handler calls
+        DosUnsetExceptionHandler(pRegRec);
+        // free the mutex to avoid deadlocks and make sure other threads can print
+        logMutex.leave();
+        break;
+    }
+
+    return XCPT_CONTINUE_SEARCH;
+}
+
 int SYSTEM WriteLog(const char *tekst, ...)
 {
@@ -322 +342 @@
     va_list argptr;
     TEB *teb = GetThreadTEB();
+
+    EXCEPTIONREGISTRATIONRECORD RegRec = {0, WriteLogExcHandler};
+    DosSetExceptionHandler(&RegRec);
 
     logMutex.enter();
@@ -396 +419 @@
         if(teb->o.odin.threadId < 5 && fDisableThread[teb->o.odin.threadId-1] == 1)
         {
+            logMutex.leave();
+            DosUnsetExceptionHandler(&RegRec);
             SetFS(sel);
-            logMutex.leave();
             return 1;
         }
@@ -407 +431 @@
             fflush(flog);
 
+        logMutex.leave();
+        DosUnsetExceptionHandler(&RegRec);
         SetFS(sel);
-        logMutex.leave();
         return 1;
     }
@@ -621 +646 @@
     }
 
+    logMutex.leave();
+    DosUnsetExceptionHandler(&RegRec);
     SetFS(sel);
-    logMutex.leave();
     return 1;
 }
@@ -631 +657 @@
     USHORT  sel = RestoreOS2FS();
     va_list argptr;
+
+    EXCEPTIONREGISTRATIONRECORD RegRec = {0, WriteLogExcHandler};
+    DosSetExceptionHandler(&RegRec);
 
     logMutex.enter();
@@ -673 +702 @@
     }
 
+    logMutex.leave();
+    DosUnsetExceptionHandler(&RegRec);
     SetFS(sel);
-    logMutex.leave();
     return 1;
 }