Changeset 421

Timestamp:

May 7, 2015, 1:27:58 AM (8 years ago)

Author:

roman

Message:

 

File:

• trunk/Utilities/Miscellaneous/AtlReleaseTrace/roatlreleasetrace.h (modified) (6 diffs)

trunk/Utilities/Miscellaneous/AtlReleaseTrace/roatlreleasetrace.h

@@ -8 +8 @@
 #pragma once
 
+#include <atlstr.h>
+
 ////////////////////////////////////////////////////////////
 // CDebugTrace, ATLTRACE, ATLTRACE2
@@ -14 +16 @@
         #define _TRACELEVEL 4
 #endif // !defined(_TRACELEVEL)
+
+#define _TRACESUFFIX_PROCESSIDENTIFIER 0x01
+#define _TRACESUFFIX_THREADIDENTIFIER  0x02
+
+#if !defined(_TRACESUFFIX)
+        #define _TRACESUFFIX _TRACESUFFIX_THREADIDENTIFIER
+#endif // !defined(_TRACESUFFIX)
 
 class CDebugTraceBase
@@ -28 +37 @@
                 }
                 return pszFileName;
+        }
+        static CString ApplyTraceSuffix(CString sText)
+        {
+                #if defined(_TRACESUFFIX) && _TRACESUFFIX > 0
+                        sText.TrimRight(_T("\t\n\r ."));
+                        sText.Append(_T(" ["));
+                        #if _TRACESUFFIX & _TRACESUFFIX_PROCESSIDENTIFIER
+                                sText.AppendFormat(_T("P %d, "), GetCurrentProcessId());
+                        #endif
+                        #if _TRACESUFFIX & _TRACESUFFIX_THREADIDENTIFIER
+                                sText.AppendFormat(_T("T %d, "), GetCurrentThreadId());
+                        #endif
+                        sText.TrimRight(_T(" ,"));
+                        sText.Append(_T("]\n"));
+                #endif // !defined(_TRACESUFFIX)
+                return sText;
         }
 };
@@ -52 +77 @@
                         nTextLength += sprintf_s(pszText + nTextLength, _countof(pszText) - nTextLength, "%hs(%d): %hs: ", pszFileName, nLineNumber, pszFunctionName);
                 nTextLength += vsprintf_s(pszText + nTextLength, _countof(pszText) - nTextLength, pszFormat, Arguments);
-                OutputDebugStringA(pszText);
+                #if defined(_TRACESUFFIX) && _TRACESUFFIX > 0
+                        CString sText(pszText);
+                        OutputDebugString(ApplyTraceSuffix(sText));
+                #else
+                        OutputDebugStringA(pszText);
+                #endif // defined(_TRACESUFFIX)
         }
         static VOID TraceV(LPCSTR pszFileName, INT nLineNumber, LPCSTR pszFunctionName, DWORD_PTR nCategory, UINT nLevel, LPCWSTR pszFormat, va_list& Arguments)
@@ -65 +95 @@
                         nTextLength += swprintf_s(pszText + nTextLength, _countof(pszText) - nTextLength, L"%hs(%d): %hs: ", pszFileName, nLineNumber, pszFunctionName);
                 nTextLength += vswprintf_s(pszText + nTextLength, _countof(pszText) - nTextLength, pszFormat, Arguments);
-                OutputDebugStringW(pszText);
+                #if defined(_TRACESUFFIX) && _TRACESUFFIX > 0
+                        CString sText(pszText);
+                        OutputDebugString(ApplyTraceSuffix(sText));
+                #else
+                        OutputDebugStringA(pszText);
+                #endif // defined(_TRACESUFFIX)
         }
 
@@ -213 +248 @@
                         if(!m_sText.IsEmpty())
                                 sText.AppendFormat(_T(", %s"), m_sText);
-                        OutputDebugString(sText);
+                        OutputDebugString(ApplyTraceSuffix(sText));
                 }
         }