VirtualBox

Changeset 87122 in vbox for trunk


Ignore:
Timestamp:
Dec 24, 2020 2:12:03 PM (4 years ago)
Author:
vboxsync
Message:

VMM/PDM: Create unique lock validator classes for each device instance (untested) so it's possible to lock two devices at once. bugref:9888

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/VMMR3/PDMCritSect.cpp

    r82968 r87122  
    134134 * @param   pvKey           The owner key.
    135135 * @param   SRC_POS         The source position.
     136 * @param   fUniqueClass    Whether to create a unique lock validator class for
     137 *                          it or not.
    136138 * @param   pszNameFmt      Format string for naming the critical section.  For
    137139 *                          statistics and lock validation.
    138140 * @param   va              Arguments for the format string.
    139141 */
    140 static int pdmR3CritSectInitOne(PVM pVM, PPDMCRITSECTINT pCritSect, void *pvKey, RT_SRC_POS_DECL,
     142static int pdmR3CritSectInitOne(PVM pVM, PPDMCRITSECTINT pCritSect, void *pvKey, RT_SRC_POS_DECL, bool fUniqueClass,
    141143                                const char *pszNameFmt, va_list va)
    142144{
     
    161163            rc = RTLockValidatorRecExclCreate(&pCritSect->Core.pValidatorRec,
    162164# ifdef RT_LOCK_STRICT_ORDER
    163                                               RTLockValidatorClassForSrcPos(RT_SRC_POS_ARGS, "%s", pszName),
     165                                              fUniqueClass
     166                                              ? RTLockValidatorClassCreateUnique(RT_SRC_POS_ARGS, "%s", pszName)
     167                                              : RTLockValidatorClassForSrcPos(RT_SRC_POS_ARGS, "%s", pszName),
    164168# else
    165169                                              NIL_RTLOCKVALCLASS,
     
    339343    va_list va;
    340344    va_start(va, pszNameFmt);
    341     int rc = pdmR3CritSectInitOne(pVM, &pCritSect->s, pCritSect, RT_SRC_POS_ARGS, pszNameFmt, va);
     345    int rc = pdmR3CritSectInitOne(pVM, &pCritSect->s, pCritSect, RT_SRC_POS_ARGS, false /*fUniqueClass*/, pszNameFmt, va);
    342346    va_end(va);
    343347    return rc;
     
    389393                            const char *pszNameFmt, va_list va)
    390394{
    391     return pdmR3CritSectInitOne(pVM, &pCritSect->s, pDevIns, RT_SRC_POS_ARGS, pszNameFmt, va);
     395    return pdmR3CritSectInitOne(pVM, &pCritSect->s, pDevIns, RT_SRC_POS_ARGS, false /*fUniqueClass*/, pszNameFmt, va);
    392396}
    393397
     
    429433    va_list va;
    430434    va_start(va, pszNameFmt);
    431     int rc = pdmR3CritSectInitOne(pVM, &pCritSect->s, pDevIns, RT_SRC_POS_ARGS, pszNameFmt, va);
     435    int rc = pdmR3CritSectInitOne(pVM, &pCritSect->s, pDevIns, RT_SRC_POS_ARGS, true /*fUniqueClass*/, pszNameFmt, va);
    432436    if (RT_SUCCESS(rc))
    433437        pCritSect->s.fAutomaticDefaultCritsect = true;
     
    454458    va_list va;
    455459    va_start(va, pszNameFmt);
    456     int rc = pdmR3CritSectInitOne(pVM, &pCritSect->s, pDrvIns, RT_SRC_POS_ARGS, pszNameFmt, va);
     460    int rc = pdmR3CritSectInitOne(pVM, &pCritSect->s, pDrvIns, RT_SRC_POS_ARGS, false /*fUniqueClass*/, pszNameFmt, va);
    457461    va_end(va);
    458462    return rc;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette