Changeset 21837 for branches/gcc-kmk/src

Timestamp:

Nov 30, 2011, 2:58:20 PM (14 years ago)

Author:

dmik

Message:

Use pid instead of the ordinal number in log file names.

This in particular fixes the problem when WGSS50 writes to the log
before the ordinal is correctly initialized by KERNEL32 which resulted
into two processes writing to the same log file.

This also guarantees that a subsequent re-run will not vanish the
previous log file which is also useful sometimes.

Location:

branches/gcc-kmk/src

Files:

• kernel32/_ras.cpp (modified) (2 diffs)
• kernel32/dbglog.cpp (modified) (4 diffs)
• kernel32/globaldata.asm (modified) (1 diff)
• kernel32/initterm.cpp (modified) (3 diffs)
• kernel32/initterm.h (modified) (1 diff)
• kernel32/perfview.cpp (modified) (2 diffs)
• kernel32/winimagepeldr.cpp (modified) (2 diffs)
• oleaut32/old/typelib.cpp (modified) (2 diffs)

branches/gcc-kmk/src/kernel32/_ras.cpp

@@ -7 +7 @@
 #include <_ras.h>
 #include <umalloc.h>
+#include <process.h>
 
 #include <custombuild.h>
@@ -786 +787 @@
 
     snprintf (uniqueLogFileName, sizeof(uniqueLogFileName),
-              "%s.%d", filename, loadNr);
+              "%s.%d", filename, getpid());
 
     if (rasdata.rlc.hlogfile == -1)

branches/gcc-kmk/src/kernel32/dbglog.cpp

@@ -26 +26 @@
 #include <string.h>
 #include <stdarg.h>
+#include <process.h>
 #include <win32type.h>
 #include <win32api.h>
@@ -332 +333 @@
 #ifdef WIN32_IP_LOGGING
         char *logserver = getenv("WIN32LOG_IPSERVER");
-        if(logserver && loadNr == 0) {
+        if(logserver) {
              sock_init();
 
@@ -348 +349 @@
             pszLogBase = "odin32_";
 
-        sprintf(szLogFile, "%s%d.log", pszLogBase, loadNr);
+        sprintf(szLogFile, "%s%d.log", pszLogBase, getpid());
         flog = fopen(szLogFile, "w");
         if(flog == NULL)
         {//probably running exe on readonly device
-            sprintf(szLogFile, "%sodin32_%d.log", kernel32Path, loadNr);
+            sprintf(szLogFile, "%sodin32_%d.log", kernel32Path, getpid());
             flog = fopen(szLogFile, "w");
         }
@@ -576 +577 @@
         char logname[CCHMAXPATH];
 
-        sprintf(logname, "odin32_%d.log", loadNr);
+        sprintf(logname, "odin32_%d.log", getpid());
         flog = fopen(logname, "w");
         if(flog == NULL) {//probably running exe on readonly device
-            sprintf(logname, "%sodin32_%d.log", kernel32Path, loadNr);
+            sprintf(logname, "%sodin32_%d.log", kernel32Path, getpid());
             flog = fopen(logname, "w");
         }

branches/gcc-kmk/src/kernel32/globaldata.asm

@@ -11 +11 @@
 
 _GLOBALDATA     SEGMENT DWORD PUBLIC USE32 'DATA'
-
-;
-; initterm.cpp:
-;
-                PUBLIC _globLoadNr
-
-; extern int globLoadNr; // = 0
-_globLoadNr     DD 0
 
 ;

branches/gcc-kmk/src/kernel32/initterm.cpp

@@ -60 +60 @@
 extern PFN pfnImSetMsgQueueProperty;
 
-//
-// Global DLL Data (keep it in sync with globaldata.asm!)
-//
-extern int globLoadNr; // = 0
-
 BOOL    fVersionWarp3 = FALSE;
 BOOL    fCustomBuild  = FALSE;
@@ -70 +65 @@
 ULONG   flAllocMem = 0;    /* flag to optimize DosAllocMem to use all the memory on SMP machines */
 ULONG   ulMaxAddr = 0x20000000; /* end of user address space. */
-int     loadNr = 0;
 char    kernel32Path[CCHMAXPATH] = "";
 BOOL    fInit     = FALSE;
@@ -359 +353 @@
 {
     HMODULE hModule;
-
-    if (!fInit)
-        loadNr = globLoadNr++;
 
     BOOL WGSS_OK = FALSE;

branches/gcc-kmk/src/kernel32/initterm.h

@@ -28 +28 @@
 void CloseLogFile(); //misc.cpp
 
-extern int globLoadNr; //global data
-extern int loadNr;
 extern BOOL fVersionWarp3;
 extern BOOL fInit;

branches/gcc-kmk/src/kernel32/perfview.cpp

@@ -28 +28 @@
 #else
 
+#include <process.h>
+
 #include <ccollection.h>
 #include <winbase.h>
 
 // imported from the kernel loader (initterm)
-extern int loadNr;
 extern char  kernel32Path[];
 
@@ -348 +349 @@
   char szFilename[260];
 
-  sprintf(szFilename, "perf_%d.log", loadNr);
+  sprintf(szFilename, "perf_%d.log", getpid());
   _privateLogFile = fopen(szFilename, "w");
   
   if(_privateLogFile == NULL) 
   {
-    sprintf(szFilename, "%sperf_%d.log", kernel32Path, loadNr);
+    sprintf(szFilename, "%sperf_%d.log", kernel32Path, getpid());
     _privateLogFile = fopen(szFilename, "w");
   }

branches/gcc-kmk/src/kernel32/winimagepeldr.cpp

@@ -41 +41 @@
 
 #ifdef DEBUG
+#include <process.h>
 //use a different logfile
 #define PRIVATE_LOGGING
@@ -86 +87 @@
  char logname[CCHMAXPATH];
 
-    sprintf(logname, "pe_%d.log", loadNr);
+    sprintf(logname, "pe_%d.log", getpid());
         _privateLogFile = fopen(logname, "w");
     if(_privateLogFile == NULL) {
-        sprintf(logname, "%spe_%d.log", kernel32Path, loadNr);
+        sprintf(logname, "%spe_%d.log", kernel32Path, getpid());
             _privateLogFile = fopen(logname, "w");
     }

branches/gcc-kmk/src/oleaut32/old/typelib.cpp

@@ -20 +20 @@
 #define DEBUG2
 
+#ifdef DEBUG
+#include <process.h>
+#endif
+
 #include "oleaut32.h"
 #include "olectl.h"
@@ -39 +43 @@
     char logname[1024];
 
-    sprintf(logname, "tlib_%d.log", loadNr);
+    sprintf(logname, "tlib_%d.log", getpid());
     _privateLogFile = fopen(logname, "w");
     if(_privateLogFile == NULL)
     {
-        sprintf(logname, "%stlib_%d.log", oleaut32Path, loadNr);
+        sprintf(logname, "%stlib_%d.log", oleaut32Path, getpid());
         _privateLogFile = fopen(logname, "w");
     }