Changeset 2298 for trunk/src

Timestamp:

Jan 2, 2000, 11:09:02 PM (26 years ago)

Author:

sandervl

Message:

Fixed Odin zombie processes when there's a trap inside vfprintf during logging.

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (3 diffs)
• makefile (modified) (2 diffs)
• misc.cpp (modified) (6 diffs)
• wprocess.cpp (modified) (2 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.30 1999-11-22 20:35:49 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.31 2000-01-02 22:09:01 sandervl Exp $ */
 
 /*
@@ -932 +932 @@
 #define XCPT_CONTINUE_STOP 0x00716668
 #endif
+
+//in misc.cpp
+void CheckLogException();
 
 ULONG APIENTRY OS2ExceptionHandler(PEXCEPTIONREPORTRECORD       pERepRec,
@@ -1021 +1024 @@
   case XCPT_IN_PAGE_ERROR:
 CrashAndBurn:
+        CheckLogException();
         dprintfException(pERepRec, pERegRec, pCtxRec, p);
         if(fIsOS2Image == FALSE)  //Only for real win32 apps

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.76 1999-12-31 10:47:11 sandervl Exp $
+# $Id: makefile,v 1.77 2000-01-02 22:09:01 sandervl Exp $
 
 #
@@ -233 +233 @@
     .\misc.cpp \
     initterm.h \
-    $(PDWIN32_INCLUDE)\misc.h
+    $(PDWIN32_INCLUDE)\misc.h \
+    $(PDWIN32_INCLUDE)\win\thread.h
 
 win32util.OBJ: \

trunk/src/kernel32/misc.cpp

@@ -1 @@
-/* $Id: misc.cpp,v 1.15 1999-12-12 14:32:38 sandervl Exp $ */
+/* $Id: misc.cpp,v 1.16 2000-01-02 22:09:01 sandervl Exp $ */
 
 /*
@@ -29 +29 @@
 #include "initterm.h"
 #include "logging.h"
+#include <wprocess.h>
 
 /*****************************************************************************
@@ -273 +274 @@
   if(fLogging && flog)
   {
+    THDB *thdb = GetThreadTHDB();
+
     va_start(argptr, tekst);
+    if(thdb) thdb->logfile = (DWORD)flog;
     vfprintf(flog, tekst, argptr);
+    if(thdb) thdb->logfile = 0;
     va_end(argptr);
 
@@ -280 +285 @@
       fprintf(flog, "\n");
   }
-
+  fflush(flog);
   SetFS(sel);
   return 1;
@@ -293 +298 @@
   if(fLogging && logfile)
   {
+    THDB *thdb = GetThreadTHDB();
+
     va_start(argptr, tekst);
+    if(thdb) thdb->logfile = (DWORD)logfile;
     vfprintf((FILE *)logfile, tekst, argptr);
+    if(thdb) thdb->logfile = 0;
     va_end(argptr);
 
@@ -303 +312 @@
   SetFS(sel);
   return 1;
+}
+//******************************************************************************
+//Check if the exception occurred inside a fprintf (logging THDB member set)
+//If true, decrease the lock count for that file stream 
+//NOTE: HACK: DEPENDS ON COMPILER VERSION!!!!
+//******************************************************************************
+void CheckLogException()
+{
+  THDB *thdb = GetThreadTHDB();
+  USHORT *lock;
+
+  if(!thdb) return;
+
+  if(thdb->logfile) {
+        //oops, exception in vfprintf; let's clear the lock count
+#if (__IBMCPP__ == 300) || (__IBMC__ == 300)
+        lock = (USHORT *)(thdb->logfile+0x1C);
+#else
+#error Check the offset of the lock count word in the file stream structure for this compiler revision!!!!!
+#endif
+        (*lock)--;
+  }
 }
 //******************************************************************************

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.63 1999-12-31 10:47:12 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.64 2000-01-02 22:09:02 sandervl Exp $ */
 
 /*
@@ -245 +245 @@
         //And free our own
         OSLibFreeSel(thdb->teb_sel);
+
+        *TIBFlatPtr = 0;
    }
    else dprintf(("Already destroyed TIB"));
 
    dprintf(("DestroyTIB: FS(%x):[0] = %x", GetFS(), QueryExceptionChain()));
-   *TIBFlatPtr = 0;
    return;
 }