Debug: add trace to debug out

If enabled, TRACE macros (in Reactor and Vulkan) will use OutputDebugString on Windows, printf otherwise, to print the trace. On Windows, this allows us to use DbgView to monitor and filter the trace easily, especially useful when running with Chrome, for e.g. Bug: b/146051794 Change-Id: I15a46f5f0e8bc4e9edcacaf63c15dc605323356d Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39568 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Antonio Maiorano <amaiorano@google.com>

Debug: add trace to debug out
f47a73af · Antonio Maiorano · 19e00af6 · f47a73af · f47a73af
Commit f47a73af authored Dec 13, 2019 by Antonio Maiorano
Show whitespace changes
Inline Side-by-side

Showing with 39 additions and 5 deletions

Debug.cpp src/Reactor/Debug.cpp +21 -2

VkDebug.cpp src/Vulkan/VkDebug.cpp +18 -3

No files found.
--- a/src/Reactor/Debug.cpp
+++ b/src/Reactor/Debug.cpp
@@ -14,15 +14,34 @@
 #include "Debug.hpp"
-#include <stdarg.h>
+#include <cstdarg>
+#include <cstdio>
 #include <string>
+#if defined(_WIN32)
+#	include <windows.h>
+#endif
 namespace rr {
 void tracev(const char *format, va_list args)
 {
 #ifndef RR_DISABLE_TRACE
-	if(false)
+	const bool traceToDebugOut = false;
+	const bool traceToFile = false;
+	if(traceToDebugOut)
+	{
+		char buffer[2048];
+		vsnprintf(buffer, sizeof(buffer), format, args);
+#	if defined(_WIN32)
+		::OutputDebugString(buffer);
+#	else
+		printf("%s", buffer);
+#	endif
+	}
+	if(traceToFile)
 	{
 		FILE *file = fopen(TRACE_OUTPUT_FILE, "a");

--- a/src/Vulkan/VkDebug.cpp
+++ b/src/Vulkan/VkDebug.cpp
@@ -14,8 +14,9 @@
 #include "VkDebug.hpp"
-#include <stdarg.h>
 #include <atomic>
+#include <cstdarg>
+#include <cstdio>
 #include <string>
 #if defined(__unix__)
@@ -90,7 +91,21 @@ namespace vk {
 void tracev(const char *format, va_list args)
 {
 #ifndef SWIFTSHADER_DISABLE_TRACE
-	if(false)
+	const bool traceToDebugOut = false;
+	const bool traceToFile = false;
+	if(traceToDebugOut)
+	{
+		char buffer[2048];
+		vsnprintf(buffer, sizeof(buffer), format, args);
+#	if defined(_WIN32)
+		::OutputDebugString(buffer);
+#	else
+		printf("%s", buffer);
+#	endif
+	}
+	if(traceToFile)
 	{
 		FILE *file = fopen(TRACE_OUTPUT_FILE, "a");
@@ -100,7 +115,7 @@ void tracev(const char *format, va_list args)
 			fclose(file);
 		}
 	}
-#endif
+#endif  // SWIFTSHADER_DISABLE_TRACE
 }
 void trace(const char *format, ...)