Changeset 19707 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 14, 2009 5:36:11 PM (16 years ago)

Author:

vboxsync

Message:

GVMM: Count EMTs instead of VMs to determin if we've got company or not. (scheduling)

File:

• trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp (modified) (13 diffs)

trunk/src/VBox/VMM/VMMR0/GVMMR0.cpp

@@ -115 +115 @@
 //    /** The number of halted EMT threads. */
 //    uint16_t volatile   cHaltedEMTs;
+    /** The number of EMTs. */
+    uint32_t volatile   cEMTs;
     /** The lock used to serialize VM creation, destruction and associated events that
      * isn't performance critical. Owners may acquire the list lock. */
@@ -127 +129 @@
     GVMHANDLE           aHandles[GVMM_MAX_HANDLES];
 
-    /** @gcfgm{/GVMM/cVMsMeansCompany, 32-bit, 0, UINT32_MAX, 1}
-     * The number of VMs that means we no longer consider ourselves alone on a CPU/Core.
-     */
-    uint32_t            cVMsMeansCompany;
+    /** @gcfgm{/GVMM/cEMTsMeansCompany, 32-bit, 0, UINT32_MAX, 1}
+     * The number of EMTs that means we no longer consider ourselves alone on a
+     * CPU/Core.
+     */
+    uint32_t            cEMTsMeansCompany;
     /** @gcfgm{/GVMM/MinSleepAlone,32-bit, 0, 100000000, 750000, ns}
      * The minimum sleep time for when we're alone, in nano seconds.
@@ -243 +246 @@
 
             /* The default configuration values. */
-            pGVMM->cVMsMeansCompany  = 1;                           /** @todo should be adjusted to relative to the cpu count or something... */
+            pGVMM->cEMTsMeansCompany = 1;                           /** @todo should be adjusted to relative to the cpu count or something... */
             pGVMM->nsMinSleepAlone   = 750000 /* ns (0.750 ms) */;  /** @todo this should be adjusted to be 75% (or something) of the scheduler granularity... */
             pGVMM->nsMinSleepCompany =  15000 /* ns (0.015 ms) */;
@@ -291 +294 @@
     if (pGVMM->iUsedHead)
     {
-        SUPR0Printf("GVMMR0Term: iUsedHead=%#x! (cVMs=%#x)\n", pGVMM->iUsedHead, pGVMM->cVMs);
+        SUPR0Printf("GVMMR0Term: iUsedHead=%#x! (cVMs=%#x cEMTs=%#x)\n", pGVMM->iUsedHead, pGVMM->cVMs, pGVMM->cEMTs);
         pGVMM->iUsedHead = 0;
     }
@@ -325 +328 @@
     int rc = VINF_SUCCESS;
     pszName += sizeof("/GVMM/") - 1;
-    if (!strcmp(pszName, "cVMsMeansCompany"))
+    if (!strcmp(pszName, "cEMTsMeansCompany"))
     {
         if (u64Value <= UINT32_MAX)
-            pGVMM->cVMsMeansCompany = u64Value;
+            pGVMM->cEMTsMeansCompany = u64Value;
         else
             rc = VERR_OUT_OF_RANGE;
@@ -393 +396 @@
     int rc = VINF_SUCCESS;
     pszName += sizeof("/GVMM/") - 1;
-    if (!strcmp(pszName, "cVMsMeansCompany"))
-        *pu64Value = pGVMM->cVMsMeansCompany;
+    if (!strcmp(pszName, "cEMTsMeansCompany"))
+        *pu64Value = pGVMM->cEMTsMeansCompany;
     else if (!strcmp(pszName, "MinSleepAlone"))
         *pu64Value = pGVMM->nsMinSleepAlone;
@@ -655 +658 @@
                                         pGVM->pVM           = pVM;
                                         pGVM->aCpus[0].hEMT = hEMT0;
+                                        pGVMM->cEMTs += cCpus;
 
                                         gvmmR0UsedUnlock(pGVMM);
@@ -997 +1001 @@
     pGVMM->cVMs--;
 
-    gvmmR0UsedUnlock(pGVMM);
-
     /*
      * Do the global cleanup round.
@@ -1006 +1008 @@
         &&  pGVM->u32Magic == GVM_MAGIC)
     {
+        pGVMM->cEMTs -= pGVM->cCpus;
+        gvmmR0UsedUnlock(pGVMM);
+
         gvmmR0CleanupVM(pGVM);
 
@@ -1048 +1053 @@
         pGVM->u32Magic |= UINT32_C(0x80000000);
         RTMemFree(pGVM);
-    }
-    /* else: GVMMR0CreateVM cleanup.  */
+
+        /* Re-acquire the UsedLock before freeing the handle since we're updating handle fields. */
+        rc = gvmmR0UsedLock(pGVMM);
+        AssertRC(rc);
+    }
+    /* else: GVMMR0CreateVM cleanup. */
 
     /*
      * Free the handle.
-     * Reacquire the UsedLock here to since we're updating handle fields.
-     */
-    rc = gvmmR0UsedLock(pGVMM);
-    AssertRC(rc);
-
+     */
     pHandle->iNext = pGVMM->iFreeHead;
     pGVMM->iFreeHead = iHandle;
@@ -1537 +1542 @@
      */
     if (    u64Now < u64ExpireGipTime
-        &&  u64ExpireGipTime - u64Now > (pGVMM->cVMs > pGVMM->cVMsMeansCompany
+        &&  u64ExpireGipTime - u64Now > (pGVMM->cEMTs > pGVMM->cEMTsMeansCompany
                                          ? pGVMM->nsMinSleepCompany
                                          : pGVMM->nsMinSleepAlone))
@@ -1921 +1926 @@
      */
     pStats->cVMs = 0;
+    pStats->cEMTs = 0;
     memset(&pStats->SchedSum, 0, sizeof(pStats->SchedSum));
 
@@ -1935 +1941 @@
         {
             pStats->cVMs++;
+            pStats->cEMTs += pGVM->cCpus;
 
             pStats->SchedSum.cHaltCalls        += pGVM->gvmm.s.StatsSched.cHaltCalls;