Merge pull request #16655 from peak3d/logpid

[Log] Use Thread ID instead NativeHandle for logging
xbmc · Sep 23, 2019 · 2284918 · 2284918
2 parents 57577ae + 3bd700c
commit 2284918
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/xbmc/threads/Thread.h b/xbmc/threads/Thread.h
@@ -56,6 +56,7 @@ class CThread
   static int GetMaxPriority(void);
   static int GetNormalPriority(void);
   static std::uintptr_t GetCurrentThreadNativeHandle();
+  static uint64_t GetCurrentThreadNativeId();
 
   // Get and set the thread's priority
   int GetPriority(void);

diff --git a/xbmc/threads/platform/pthreads/ThreadImpl.cpp b/xbmc/threads/platform/pthreads/ThreadImpl.cpp
@@ -139,6 +139,11 @@ std::uintptr_t CThread::GetCurrentThreadNativeHandle()
 #endif
 }
 
+uint64_t CThread::GetCurrentThreadNativeId()
+{
+  return static_cast<uint64_t>(GetCurrentThreadPid_());
+}
+
 int CThread::GetMinPriority(void)
 {
   // one level lower than application

diff --git a/xbmc/threads/platform/win/ThreadImpl.cpp b/xbmc/threads/platform/win/ThreadImpl.cpp
@@ -50,6 +50,11 @@ std::uintptr_t CThread::GetCurrentThreadNativeHandle()
   return reinterpret_cast<std::uintptr_t>(::GetCurrentThread());
 }
 
+uint64_t CThread::GetCurrentThreadNativeId()
+{
+  return static_cast<uint64_t>(::GetCurrentThreadId());
+}
+
 int CThread::GetMinPriority(void)
 {
   return(THREAD_PRIORITY_IDLE);

diff --git a/xbmc/utils/log.cpp b/xbmc/utils/log.cpp
@@ -206,7 +206,7 @@ bool CLog::WriteLogString(int logLevel, const std::string& logString)
                                   minute,
                                   second,
                                   static_cast<int>(millisecond),
-                                  static_cast<uint64_t>(CThread::GetCurrentThreadNativeHandle()),
+                                  static_cast<uint64_t>(CThread::GetCurrentThreadNativeId()),
                                   levelNames[logLevel]) + strData;
 
   return g_logState.m_platform.WriteStringToLog(strData);