[PATCH v6 0/1] MR125: vkd3d: Print the thread id in trace messages.

[Conor McCarthy (＠cmccarthy)]

--
  v6: vkd3d: Print the thread id in trace messages.

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/125

[PATCH v6 1/1] vkd3d: Print the thread id in trace messages.

[Conor McCarthy]

From: Conor McCarthy

---
 configure.ac              | 1 +
 libs/vkd3d-common/debug.c | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index 3cc949383..b58c2f4d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,6 +144,7 @@ VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_
 VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)])
 VKD3D_CHECK_FUNC([HAVE_SYNC_BOOL_COMPARE_AND_SWAP], [__sync_bool_compare_and_swap], [__sync_bool_compare_and_swap((int *)0, 0, 0)])
 VKD3D_CHECK_FUNC([HAVE_ATOMIC_EXCHANGE_N], [__atomic_exchange_n], [__atomic_exchange_n((int *)0, 0, 0)])
+VKD3D_CHECK_FUNC([HAVE_GETTID], [gettid], [gettid()])

dnl Makefiles
 case $host_os in
diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c
index b363efbd3..dd733c99b 100644
--- a/libs/vkd3d-common/debug.c
+++ b/libs/vkd3d-common/debug.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
+#include <unistd.h>
 #ifdef HAVE_PTHREAD_H
 #include <pthread.h>
 #endif
@@ -105,7 +106,13 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const ch

assert(level < ARRAY_SIZE(debug_level_names));

+#ifdef _WIN32
+    vkd3d_dbg_output("vkd3d:%04lx:%s:%s ", GetCurrentThreadId(), debug_level_names[level], function);
+#elif HAVE_GETTID
+    vkd3d_dbg_output("vkd3d:%u:%s:%s ", gettid(), debug_level_names[level], function);
+#else
     vkd3d_dbg_output("vkd3d:%s:%s ", debug_level_names[level], function);
+#endif
     va_start(args, fmt);
     vkd3d_dbg_voutput(fmt, args);
     va_end(args);

[PATCH v6 0/1] MR125: vkd3d: Print the thread id in trace messages. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.