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

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/kernel32/dbglog.cpp (modified) (19 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/kernel32/dbglog.cpp

@@ -26 +26 @@
 #include <string.h>
 #include <stdarg.h>
+#include <process.h>
 #include <win32type.h>
 #include <win32api.h>
@@ -93 +94 @@
 /* arguments.                                                        */
 /* ----------------------------------------------------------------- */
-int SYSTEM WriteLog(char *f, ...)
+int SYSTEM WriteLog(const char *f, ...)
   {
   TIB    *ptib;                    /* process/thread id structures */
@@ -257 +258 @@
 static BOOL fLogging = TRUE;
 static int  dwEnableLogging = 1;
+#ifdef __IBMC__
 static int  oldcrtmsghandle = 0;
+#endif
 
 static BOOL fDisableThread[5] = {0};
 static BOOL fFlushLines = TRUE;
 
-static char *pszLastLogEntry = NULL;
+static const char *pszLastLogEntry = NULL;
 
 //#define CHECK_ODINHEAP
@@ -305 +308 @@
 }
 
-int SYSTEM WriteLog(char *tekst, ...)
+int SYSTEM WriteLog(const char *tekst, ...)
 {
   USHORT  sel = RestoreOS2FS();
@@ -330 +333 @@
 #ifdef WIN32_IP_LOGGING
         char *logserver = getenv("WIN32LOG_IPSERVER");
-        if(logserver && loadNr == 0) {
+        if(logserver) {
              sock_init();
 
@@ -346 +349 @@
             pszLogBase = "odin32_";
 
-        sprintf(szLogFile, "%s%d.log", pszLogBase, loadNr);
+        sprintf(szLogFile, "%s%d.log", pszLogBase, getpid());
         flog = fopen(szLogFile, "w");
-        if(flog == NULL) 
+        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");
         }
+#ifdef __IBMC__
         oldcrtmsghandle = _set_crt_msg_handle(fileno(flog));
+#endif
     }
     else
@@ -385 +390 @@
     if(logSocket == -1) {
 #endif
-    if(teb) 
+    if(teb)
     {
       ULONG ulCallDepth;
@@ -393 +398 @@
       ulCallDepth = 0;
 #endif
-      
+
       teb->o.odin.logfile = (DWORD)flog;
-      
+
 #ifdef LOG_TIME
       if(sel == 0x150b && fSwitchTIBSel)
-        fprintf(flog, 
+        fprintf(flog,
                 "t%02d (%3d): (%x) (FS=150B) ",
                 LOWORD(teb->o.odin.threadId),
                 ulCallDepth,
                 GetTickCount());
-      else 
-        fprintf(flog, 
+      else
+        fprintf(flog,
                 "t%02d (%3d): (%x) ",
                 LOWORD(teb->o.odin.threadId),
@@ -410 +415 @@
                 GetTickCount());
 #else
-      if(sel == 0x150b && fSwitchTIBSel) 
-        fprintf(flog, 
+      if(sel == 0x150b && fSwitchTIBSel)
+        fprintf(flog,
 #ifdef SHOW_FPU_CONTROLREG
                 "t%02d (%3d)(%3x): ",
@@ -422 +427 @@
                 ulCallDepth);
 #endif
-      else 
-        fprintf(flog, 
+      else
+        fprintf(flog,
 #ifdef SHOW_FPU_CONTROLREG
                 "t%02d (%3d)(%3x): ",
@@ -450 +455 @@
         int  prefixlen = 0;
 
-        if(teb) 
+        if(teb)
         {
             ULONG ulCallDepth;
@@ -459 +464 @@
 #endif
 #ifdef LOG_TIME
-            if(sel == 0x150b && fSwitchTIBSel) 
+            if(sel == 0x150b && fSwitchTIBSel)
                 sprintf(logbuffer, "t%02d (%3d): %x (FS=150B) ",
                         LOWORD(teb->o.odin.threadId), ulCallDepth, GetTickCount());
-            else 
+            else
                 sprintf(logbuffer, "t%02d (%3d): %x ",
                         LOWORD(teb->o.odin.threadId), ulCallDepth, GetTickCount());
 #else
-            if(sel == 0x150b && fSwitchTIBSel) 
+            if(sel == 0x150b && fSwitchTIBSel)
                 sprintf(logbuffer, "t%02d (%3d): (FS=150B) ",
                         LOWORD(teb->o.odin.threadId), ulCallDepth);
-            else 
+            else
                 sprintf(logbuffer, "t%02d (%3d): ",
                         LOWORD(teb->o.odin.threadId), ulCallDepth);
@@ -497 +502 @@
         if(tekst[strlen(tekst)-1] != '\n')
             fprintf(flog, "\n");
-#if 0        
+#if 0
 if (teb && LOWORD(teb->o.odin.threadId) > 1)
 {
@@ -514 +519 @@
             break;
         }
-        
+
         if ((ULONG)pframe < getESP())
         {
@@ -554 +559 @@
 //******************************************************************************
 //******************************************************************************
-int SYSTEM WriteLogNoEOL(char *tekst, ...)
+int SYSTEM WriteLogNoEOL(const char *tekst, ...)
 {
   USHORT  sel = RestoreOS2FS();
@@ -572 +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");
         }
@@ -612 +617 @@
 //******************************************************************************
 //******************************************************************************
-int SYSTEM WritePrivateLog(void *logfile, char *tekst, ...)
+int SYSTEM WritePrivateLog(void *logfile, const char *tekst, ...)
 {
   USHORT  sel = RestoreOS2FS();
@@ -717 +722 @@
 void CloseLogFile()
 {
+#ifdef __IBMC__
   if(oldcrtmsghandle)
     _set_crt_msg_handle(oldcrtmsghandle);
+#endif
 
 #ifdef WIN32_IP_LOGGING
@@ -789 +796 @@
               "int 3"
 #endif
+extern "C"
 void WIN32API DebugBreak()
 {

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk