Changeset 77982 in vbox for trunk

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Runtime

Files:

• common/misc/thread.cpp (modified) (3 diffs)
• include/internal/thread.h (modified) (1 diff)
• r3/linux/sched-linux.cpp (modified) (4 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]);
+    }
 }
 

trunk/src/VBox/Runtime/include/internal/thread.h

@@ -137 +137 @@
 /** @} */
 
+/** Counters for each thread type. */
+extern DECLHIDDEN(uint32_t volatile)   g_acRTThreadTypeStats[RTTHREADTYPE_END];
+
 
 /**

trunk/src/VBox/Runtime/r3/linux/sched-linux.cpp

@@ -54 +54 @@
 #include <errno.h>
 #include <pthread.h>
+#include <limits.h>
 #include <sched.h>
 #include <unistd.h>
@@ -542 +543 @@
 
     /*
-     * Set the priority to the current value for specified thread type
-     */
-    if (setpriority(PRIO_PROCESS, 0, pPrioPair->iCurrent))
-        rc = RTErrConvertFromErrno(errno);
+     * Set the priority to the current value for specified thread type, but
+     * only if we have any threads of this type (caller checked - INT_MAX).
+     */
+    if (pPrioPair->iCurrent != INT_MAX)
+        if (setpriority(PRIO_PROCESS, 0, pPrioPair->iCurrent))
+            rc = RTErrConvertFromErrno(errno);
 
     /*
@@ -572 +575 @@
 static int rtSchedNativeCheckThreadTypes(const PROCPRIORITY *pCfg, bool fHavePriorityProxy)
 {
-    /** @todo Only check transitions of thread types that actually are in use.
-     * For the others, just check we can create threads with the new priority
-     * scheme (ignoring the old). Best done by having an array of
-     * per-threadtype counters in common/misc/thread.cpp. */
     int i = RTTHREADTYPE_END;
     while (--i > RTTHREADTYPE_INVALID)
@@ -582 +581 @@
         PrioPair.iCurrent = g_pProcessPriority->paTypes[i].iPriority + g_pProcessPriority->iDelta;
         PrioPair.iNew     = pCfg->paTypes[i].iPriority               + pCfg->iDelta;
+        if (g_acRTThreadTypeStats[i] == 0)
+            PrioPair.iCurrent = INT_MAX;
 
 #ifdef RT_STRICT