Merge pull request #15419 from peak3d/threads

[Threads] revert #15263, log tid instead posix thread
xbmc · Feb 4, 2019 · ac68103 · ac68103
2 parents d8363ba + 8d694d5
commit ac68103
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/xbmc/threads/Thread.cpp b/xbmc/threads/Thread.cpp
@@ -103,7 +103,7 @@ THREADFUNC CThread::staticThread(void* data)
   }
 
   name = pThread->m_ThreadName;
-  id = pThread->m_ThreadId;
+  id = GetDisplayThreadId(pThread->m_ThreadId);
   autodelete = pThread->m_bAutoDelete;
 
   pThread->SetThreadInfo();

diff --git a/xbmc/threads/Thread.h b/xbmc/threads/Thread.h
@@ -61,6 +61,7 @@ class CThread
 
   static bool IsCurrentThread(const ThreadIdentifier tid);
   static ThreadIdentifier GetCurrentThreadId();
+  static ThreadIdentifier GetDisplayThreadId(const ThreadIdentifier tid);
   static CThread* GetCurrentThread();
 
   virtual void OnException(){} // signal termination handler

diff --git a/xbmc/threads/platform/pthreads/ThreadImpl.cpp b/xbmc/threads/platform/pthreads/ThreadImpl.cpp
@@ -115,21 +115,22 @@ void CThread::SetThreadInfo()
 }
 
 ThreadIdentifier CThread::GetCurrentThreadId()
+{
+  return pthread_self();
+}
+
+ThreadIdentifier CThread::GetDisplayThreadId(const ThreadIdentifier tid)
 {
 #if defined(TARGET_ANDROID)
-  return gettid();
+  return pthread_gettid_np(tid);
 #else
-  return pthread_self();
+  return tid;
 #endif
 }
 
 bool CThread::IsCurrentThread(const ThreadIdentifier tid)
 {
-#if defined(TARGET_ANDROID)
-  return gettid() == tid;
-#else
   return pthread_equal(pthread_self(), tid);
-#endif
 }
 
 int CThread::GetMinPriority(void)

diff --git a/xbmc/threads/platform/win/ThreadImpl.cpp b/xbmc/threads/platform/win/ThreadImpl.cpp
@@ -70,6 +70,11 @@ ThreadIdentifier CThread::GetCurrentThreadId()
   return ::GetCurrentThreadId();
 }
 
+ThreadIdentifier CThread::GetDisplayThreadId(const ThreadIdentifier tid)
+{
+  return tid;
+}
+
 bool CThread::IsCurrentThread(const ThreadIdentifier tid)
 {
   return (::GetCurrentThreadId() == tid);

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