Changeset 21837 for branches/gcc-kmk/src/kernel32/dbglog.cpp

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.

File:

• branches/gcc-kmk/src/kernel32/dbglog.cpp (modified) (4 diffs)

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");
         }