Changeset 2298 for trunk/src/kernel32/misc.cpp

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.

File:

• trunk/src/kernel32/misc.cpp (modified) (6 diffs)

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)--;
+  }
 }
 //******************************************************************************