Changeset 77982 in vbox for trunk/src/VBox/Runtime/common/misc

Timestamp:

Apr 2, 2019 10:23:09 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

129750

Message:

IPRT: Addressed todo in rtSchedNativeCheckThreadTypes (sched-linux.cpp) about limiting the transition checking to thread types that are actually in use. bugref:7929

File:

• trunk/src/VBox/Runtime/common/misc/thread.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/misc/thread.cpp

@@ -73 +73 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-/** The AVL thread containing the threads. */
-static PAVLPVNODECORE       g_ThreadTree;
-/** The number of threads in the tree (for ring-0 termination kludge). */
-static uint32_t volatile    g_cThreadInTree;
+/** Indicates whether we've been initialized or not. */
+static bool                     g_frtThreadInitialized;
 #ifdef IN_RING3
 /** The RW lock protecting the tree. */
-static RTSEMRW          g_ThreadRWSem = NIL_RTSEMRW;
+static RTSEMRW                  g_ThreadRWSem = NIL_RTSEMRW;
 #else
 /** The spinlocks protecting the tree. */
-static RTSPINLOCK       g_ThreadSpinlock = NIL_RTSPINLOCK;
-#endif
-/** Indicates whether we've been initialized or not. */
-static bool             g_frtThreadInitialized;
+static RTSPINLOCK               g_ThreadSpinlock = NIL_RTSPINLOCK;
+#endif
+/** The AVL thread containing the threads. */
+static PAVLPVNODECORE           g_ThreadTree;
+/** The number of threads in the tree (for ring-0 termination kludge). */
+static uint32_t volatile        g_cThreadInTree;
+/** Counters for each thread type. */
+DECLHIDDEN(uint32_t volatile)   g_acRTThreadTypeStats[RTTHREADTYPE_END];
 
 
@@ -460 +462 @@
                 ASMAtomicOrU32(&pThread->fIntFlags, RTTHREADINT_FLAG_IN_TREE);
                 if (fRc)
+                {
                     ASMAtomicIncU32(&g_cThreadInTree);
+                    ASMAtomicIncU32(&g_acRTThreadTypeStats[pThread->enmType]);
+                }
 
                 AssertReleaseMsg(fRc, ("Lock problem? %p (%RTnthrd) %s\n", pThread, NativeThread, pThread->szName));
@@ -481 +486 @@
 {
     PRTTHREADINT pThread2 = (PRTTHREADINT)RTAvlPVRemove(&g_ThreadTree, pThread->Core.Key);
-#if !defined(RT_OS_OS2) /** @todo this asserts for threads created by NSPR */
     AssertMsg(pThread2 == pThread, ("%p(%s) != %p (%p/%s)\n", pThread2, pThread2  ? pThread2->szName : "<null>",
                                     pThread, pThread->Core.Key, pThread->szName));
-#endif
     if (pThread2)
+    {
         ASMAtomicDecU32(&g_cThreadInTree);
+        ASMAtomicDecU32(&g_acRTThreadTypeStats[pThread->enmType]);
+    }
 }