vbox的更動 41881 路徑 trunk/src/VBox/Runtime/r3/posix

時間撮記:

2012-6-22 上午10:53:32 (12 年 以前)

作者:

vboxsync

訊息:

IPRT: Name threads on linux when supported.

檔案:

• trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp (修改) (5 筆差異)

trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp

@@ -48 +48 @@
 # include <mach/mach_host.h>
 #endif
-#if defined(RT_OS_DARWIN) /*|| defined(RT_OS_FREEBSD) || defined(RT_OS_LINUX) - later */ \
+#if defined(RT_OS_DARWIN) /*|| defined(RT_OS_FREEBSD) - later */ || defined(RT_OS_LINUX) \
  || defined(IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP)
 # define IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
@@ -92 +92 @@
  */
 typedef int (*PFNPTHREADSETNAME)(const char *pszName);
-# elif
+# else
 /**
  * The variant of pthread_setname_np most other unix-like systems implement.
@@ -256 +256 @@
 {
     PRTTHREADINT  pThread = (PRTTHREADINT)pvArgs;
+    pthread_t     Self    = pthread_self();
+    Assert((uintptr_t)Self == (RTNATIVETHREAD)Self && (uintptr_t)Self != NIL_RTNATIVETHREAD);
 
 #if defined(RT_OS_LINUX)
@@ -287 +289 @@
 #ifdef IPRT_MAY_HAVE_PTHREAD_SET_NAME_NP
     if (g_pfnThreadSetName)
+# ifdef RT_OS_DARWIN
         g_pfnThreadSetName(pThread->szName);
+# else
+        g_pfnThreadSetName(Self, pThread->szName);
+# endif
 #endif
 
@@ -293 +299 @@
      * Call common main.
      */
-    pthread_t Self = pthread_self();
-    Assert((uintptr_t)Self == (RTNATIVETHREAD)Self && (uintptr_t)Self != NIL_RTNATIVETHREAD);
     rc = rtThreadMain(pThread, (uintptr_t)Self, &pThread->szName[0]);