Improved DEBUG_TRACE, printStack()

bruderstein · bruderstein · commit d5d5eff3d448 · 2014-02-17T20:12:59.000+01:00
printStack() doesn't seem to work yet.
diff --git a/PythonScript/project/PythonSettings.props b/PythonScript/project/PythonSettings.props
@@ -3,7 +3,7 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros">
     <BoostBase>E:\libs\boost_1_55_0</BoostBase>
-    <PythonBase>E:\work\Python-2.7</PythonBase>
+    <PythonBase>E:\work\PythonGit\cpython</PythonBase>
     <PythonLibPath>$(PythonBase)\PCbuild</PythonLibPath>
     <BoostPythonLibPath>$(BoostBase)\stage\lib</BoostPythonLibPath>
     <HtmlHelpBase>C:\Program Files (x86)\HTML Help Workshop</HtmlHelpBase>
diff --git a/PythonScript/src/DebugTrace.cpp b/PythonScript/src/DebugTrace.cpp
@@ -1,5 +1,11 @@
 #include "stdafx.h"
 #include "DebugTrace.h"
+#include <malloc.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+#include <Windows.h>
+#include <DbgHelp.h>
 
 // stati volatile long s_debugLineCount;
 
@@ -14,13 +20,66 @@ volatile long *allocateLineCount()
     return lineCount;
 }
 
+void printStack()
+{
+     unsigned int   i;
+     void         * stack[ 100 ];
+     unsigned short frames;
+     SYMBOL_INFO  * symbol;
+     HANDLE         process;
+     char buffer[500];
+     int bufferRemaining = 500;
+     int usedBuffer;
+     char *output = buffer;
+
+     process = GetCurrentProcess();
+
+     SymInitialize( process, NULL, TRUE );
+
+     frames               = CaptureStackBackTrace( 1, 15, stack, NULL );
+     symbol               = ( SYMBOL_INFO * )calloc( sizeof( SYMBOL_INFO ) + 256 * sizeof( char ), 1 );
+     symbol->MaxNameLen   = 255;
+     symbol->SizeOfStruct = sizeof( SYMBOL_INFO );
+
+     
+     for( i = 0; i < frames; i++ )
+     {
+         SymFromAddr( process, ( DWORD64 )( stack[ i ] ), 0, symbol );
+
+         usedBuffer = _snprintf_s(output, bufferRemaining, bufferRemaining, "%i: %s - 0x%0X\n", frames - i - 1, symbol->Name, symbol->Address );
+         bufferRemaining -= usedBuffer;
+         output += usedBuffer;
+     }
+
+     debugTraceVars("STACK %s", buffer);
+
+     free( symbol );
+}
 
 void debugTraceStr(const std::wstringstream& item)
 {
     static volatile long *lineCount = allocateLineCount(); 
+    FILETIME timestamp;
+    GetSystemTimeAsFileTime(&timestamp);
 
+    
     long currentLine = InterlockedIncrement(lineCount);
     std::wstringstream debug;
-	debug << L"PY>" << std::setfill(L'0') << std::setw(5) << ::GetCurrentThreadId() << L" " << std::setw(5) << std::setfill(L' ') << currentLine << L"  " << item.str();
+	debug << L"PY>" << std::setfill(L'0') << std::setw(5) << ::GetCurrentThreadId() 
+		        << L" " << std::setw(5) << std::setfill(L' ') << currentLine 
+				<< L" " << std::setw(8) << std::setfill(L' ') << timestamp.dwLowDateTime 
+				<< L" " << item.str();
+
 	OutputDebugString(debug.str().c_str());
 }
+
+void debugTraceVars(const char *format, ...)
+{
+    va_list args;
+    va_start( args, format );
+    char buffer[500];
+    vsprintf_s<500>(buffer, format, args); 
+    std::wstringstream result;
+	result << buffer;
+    debugTraceStr(result);
+}
diff --git a/PythonScript/src/DebugTrace.h b/PythonScript/src/DebugTrace.h
@@ -19,10 +19,13 @@ void debugTrace(T msg)
     debugTraceStr(debug);
 }
 
+void printStack();
 
 void debugTraceStr(const std::wstringstream& item);
+void debugTraceVars(const char *format, ...);
 
 
 #define DEBUG_TRACE(msg)  debugTrace(msg)
 
+#define DEBUG_TRACE_S(args) debugTraceVars args
 #endif // DEBUGTRACE_20140215_H
diff --git a/PythonScript/src/stdafx.h b/PythonScript/src/stdafx.h
@@ -23,6 +23,11 @@
 #define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
 #endif
 
+// The stacktrace function only works on > NTDDI_WINXP, so for debug we limit it
+#ifdef _DEBUG
+#define NTDDI_VERSION NTDDI_WINXPSP2
+#endif
+
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 #define NOMINMAX
 // Windows Header Files:

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,13 @@ void debugTrace(T msg)`
`19`	`19`	`debugTraceStr(debug);`
`20`	`20`	`}`
`21`	`21`
	`22`	`+void printStack();`
`22`	`23`
`23`	`24`	`void debugTraceStr(const std::wstringstream& item);`
	`25`	`+void debugTraceVars(const char *format, ...);`
`24`	`26`
`25`	`27`
`26`	`28`	`#define DEBUG_TRACE(msg) debugTrace(msg)`
`27`	`29`
	`30`	`+#define DEBUG_TRACE_S(args) debugTraceVars args`
`28`	`31`	`#endif // DEBUGTRACE_20140215_H`