VirtualBox

Changeset 25607 in vbox for trunk/src/VBox/Runtime/r3


Ignore:
Timestamp:
Dec 31, 2009 1:21:39 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
56298
Message:

iprt,pdmcritsect: Shortening and cleaning up the lock validator structure names.

Location:
trunk/src/VBox/Runtime/r3
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Runtime/r3/linux/semmutex-linux.cpp

    r25604 r25607  
    8181#ifdef RTSEMMUTEX_STRICT
    8282    /** Lock validator record associated with this mutex. */
    83     RTLOCKVALIDATORREC  ValidatorRec;
     83    RTLOCKVALRECEXCL    ValidatorRec;
    8484#endif
    8585};
    … …  
    120120        pThis->cNesting = 0;
    121121#ifdef RTSEMMUTEX_STRICT
    122         RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
     122        RTLockValidatorRecExclInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
    123123#endif
    124124
    … …  
    156156    pThis->cNesting = 0;
    157157#ifdef RTSEMMUTEX_STRICT
    158     RTLockValidatorRecDelete(&pThis->ValidatorRec);
     158    RTLockValidatorRecExclDelete(&pThis->ValidatorRec);
    159159#endif
    160160
    … …  
    167167
    168168
    169 DECL_FORCE_INLINE(int) rtSemMutexRequest(RTSEMMUTEX MutexSem, unsigned cMillies, bool fAutoResume, PCRTLOCKVALIDATORSRCPOS pSrcPos)
     169DECL_FORCE_INLINE(int) rtSemMutexRequest(RTSEMMUTEX MutexSem, unsigned cMillies, bool fAutoResume, PCRTLOCKVALSRCPOS pSrcPos)
    170170{
    171171    /*
    … …  
    310310    int rc = rtSemMutexRequest(MutexSem, cMillies, true, NULL);
    311311#else
    312     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
     312    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
    313313    int rc = rtSemMutexRequest(MutexSem, cMillies, true, &SrcPos);
    314314#endif
    … …  
    320320RTDECL(int) RTSemMutexRequestDebug(RTSEMMUTEX MutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    321321{
    322     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
     322    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
    323323    int rc = rtSemMutexRequest(MutexSem, cMillies, true, &SrcPos);
    324324    Assert(rc != VERR_INTERRUPTED);
    … …  
    332332    return rtSemMutexRequest(MutexSem, cMillies, false, NULL);
    333333#else
    334     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
     334    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
    335335    return rtSemMutexRequest(MutexSem, cMillies, false, &SrcPos);
    336336#endif
    … …  
    340340RTDECL(int) RTSemMutexRequestNoResumeDebug(RTSEMMUTEX MutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    341341{
    342     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
     342    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
    343343    return rtSemMutexRequest(MutexSem, cMillies, false, &SrcPos);
    344344}

  • trunk/src/VBox/Runtime/r3/posix/semmutex-posix.cpp

    r25604 r25607  
    6666#ifdef RTSEMMUTEX_STRICT
    6767    /** Lock validator record associated with this mutex. */
    68     RTLOCKVALIDATORREC  ValidatorRec;
     68    RTLOCKVALRECEXCL    ValidatorRec;
    6969#endif
    7070};
    … …  
    102102                pThis->u32Magic = RTSEMMUTEX_MAGIC;
    103103#ifdef RTSEMMUTEX_STRICT
    104                 RTLockValidatorRecInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
     104                RTLockValidatorRecExclInit(&pThis->ValidatorRec, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
    105105#endif
    106106
    … …  
    147147    pThis->cNesting = UINT32_MAX;
    148148#ifdef RTSEMMUTEX_STRICT
    149     RTLockValidatorRecDelete(&pThis->ValidatorRec);
     149    RTLockValidatorRecExclDelete(&pThis->ValidatorRec);
    150150#endif
    151151    RTMemTmpFree(pThis);
    … …  
    155155
    156156
    157 DECL_FORCE_INLINE(int) rtSemMutexRequest(RTSEMMUTEX MutexSem, unsigned cMillies, PCRTLOCKVALIDATORSRCPOS pSrcPos)
     157DECL_FORCE_INLINE(int) rtSemMutexRequest(RTSEMMUTEX MutexSem, unsigned cMillies, PCRTLOCKVALSRCPOS pSrcPos)
    158158{
    159159    /*
    … …  
    259259    return rtSemMutexRequest(MutexSem, cMillies, NULL);
    260260#else
    261     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
     261    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
    262262    return rtSemMutexRequest(MutexSem, cMillies, &SrcPos);
    263263#endif
    … …  
    267267RTDECL(int) RTSemMutexRequestDebug(RTSEMMUTEX MutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    268268{
    269     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
     269    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
    270270    return rtSemMutexRequest(MutexSem, cMillies, &SrcPos);
    271271}
    … …  
    278278    return rtSemMutexRequest(MutexSem, cMillies, NULL);
    279279#else
    280     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
     280    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
    281281    return rtSemMutexRequest(MutexSem, cMillies, &SrcPos);
    282282#endif
    … …  
    286286RTDECL(int) RTSemMutexRequestNoResumeDebug(RTSEMMUTEX MutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    287287{
    288     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
     288    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
    289289    return rtSemMutexRequest(MutexSem, cMillies, &SrcPos);
    290290}

  • trunk/src/VBox/Runtime/r3/posix/semrw-posix.cpp

    r25604 r25607  
    8686#ifdef RTSEMRW_STRICT
    8787    /** The validator record for the writer. */
    88     RTLOCKVALIDATORREC      ValidatorWrite;
     88    RTLOCKVALRECEXCL    ValidatorWrite;
    8989    /** The validator record for the readers. */
    90     RTLOCKVALIDATORSHARED   ValidatorRead;
     90    RTLOCKVALRECSHRD    ValidatorRead;
    9191#endif
    9292};
    … …  
    119119                pThis->Writer       = (pthread_t)-1;
    120120#ifdef RTSEMRW_STRICT
    121                 RTLockValidatorRecInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
    122                 RTLockValidatorSharedRecInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
    123                 RTLockValidatorMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
     121                RTLockValidatorRecExclInit(&pThis->ValidatorWrite, NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
     122                RTLockValidatorRecSharedInit(&pThis->ValidatorRead,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemRW", pThis);
     123                RTLockValidatorRecMakeSiblings(&pThis->ValidatorWrite.Core, &pThis->ValidatorRead.Core);
    124124#endif
    125125                *pRWSem = pThis;
    … …  
    163163    {
    164164#ifdef RTSEMRW_STRICT
    165         RTLockValidatorSharedRecDelete(&pThis->ValidatorRead);
    166         RTLockValidatorRecDelete(&pThis->ValidatorWrite);
     165        RTLockValidatorRecSharedDelete(&pThis->ValidatorRead);
     166        RTLockValidatorRecExclDelete(&pThis->ValidatorWrite);
    167167#endif
    168168        RTMemFree(pThis);
    … …  
    182182RTDECL(int) RTSemRWRequestRead(RTSEMRW RWSem, unsigned cMillies)
    183183{
    184     PRTLOCKVALIDATORSRCPOS pSrcPos = NULL;
     184    PRTLOCKVALSRCPOS pSrcPos = NULL;
    185185
    186186    /*
    … …  
    346346
    347347
    348 DECL_FORCE_INLINE(int) rtSemRWRequestWrite(RTSEMRW RWSem, unsigned cMillies, PCRTLOCKVALIDATORSRCPOS pSrcPos)
     348DECL_FORCE_INLINE(int) rtSemRWRequestWrite(RTSEMRW RWSem, unsigned cMillies, PCRTLOCKVALSRCPOS pSrcPos)
    349349{
    350350    /*
    … …  
    452452    return rtSemRWRequestWrite(RWSem, cMillies, NULL);
    453453#else
    454     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
     454    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
    455455    return rtSemRWRequestWrite(RWSem, cMillies, &SrcPos);
    456456#endif
    … …  
    460460RTDECL(int) RTSemRWRequestWriteDebug(RTSEMRW RWSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    461461{
    462     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
     462    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
    463463    return rtSemRWRequestWrite(RWSem, cMillies, &SrcPos);
    464464}
    … …  
    471471    return rtSemRWRequestWrite(RWSem, cMillies, NULL);
    472472#else
    473     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
     473    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
    474474    return rtSemRWRequestWrite(RWSem, cMillies, &SrcPos);
    475475#endif
    … …  
    480480{
    481481    /* EINTR isn't returned by the wait functions we're using. */
    482     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
     482    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
    483483    return rtSemRWRequestWrite(RWSem, cMillies, &SrcPos);
    484484}

  • trunk/src/VBox/Runtime/r3/win/semmutex-win.cpp

    r25604 r25607  
    6161#ifdef RTSEMMUTEX_STRICT
    6262    /** Lock validator record associated with this mutex. */
    63     RTLOCKVALIDATORREC  ValidatorRec;
     63    RTLOCKVALRECEXCL    ValidatorRec;
    6464#endif
    6565};
    … …  
    8787            pThis->hMtx = hMtx;
    8888#ifdef RTSEMMUTEX_STRICT
    89             RTLockValidatorRecInit(&pThis->ValidatorRec,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
     89            RTLockValidatorRecExclInit(&pThis->ValidatorRec,  NIL_RTLOCKVALIDATORCLASS, RTLOCKVALIDATOR_SUB_CLASS_NONE, "RTSemMutex", pThis);
    9090#endif
    9191            *pMutexSem = pThis;
    … …  
    127127
    128128#ifdef RTSEMMUTEX_STRICT
    129     RTLockValidatorRecDelete(&pThis->ValidatorRec);
     129    RTLockValidatorRecExclDelete(&pThis->ValidatorRec);
    130130#endif
    131131    RTMemFree(pThis);
    … …  
    142142 * @param   pSrcPos             The source position of the caller.
    143143 */
    144 DECL_FORCE_INLINE(int) rtSemMutexRequestNoResume(RTSEMMUTEX MutexSem, unsigned cMillies, PCRTLOCKVALIDATORSRCPOS pSrcPos)
     144DECL_FORCE_INLINE(int) rtSemMutexRequestNoResume(RTSEMMUTEX MutexSem, unsigned cMillies, PCRTLOCKVALSRCPOS pSrcPos)
    145145{
    146146    /*
    … …  
    205205    return rtSemMutexRequestNoResume(MutexSem, cMillies, NULL);
    206206#else
    207     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_NORMAL_API();
     207    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_NORMAL_API();
    208208    return rtSemMutexRequestNoResume(MutexSem, cMillies, &SrcPos);
    209209#endif
    … …  
    213213RTDECL(int) RTSemMutexRequestNoResumeDebug(RTSEMMUTEX MutexSem, unsigned cMillies, RTHCUINTPTR uId, RT_SRC_POS_DECL)
    214214{
    215     RTLOCKVALIDATORSRCPOS SrcPos = RTLOCKVALIDATORSRCPOS_INIT_DEBUG_API();
     215    RTLOCKVALSRCPOS SrcPos = RTLOCKVALSRCPOS_INIT_DEBUG_API();
    216216    return rtSemMutexRequestNoResume(MutexSem, cMillies, &SrcPos);
    217217}
Note: See TracChangeset for help on using the changeset viewer.

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