Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 202553, replace reference mutex with atomic calls in PK11SlotInfo

Browse Source 
r=relyea,wtc
This commit is contained in:
ian.mcgreer%sun.com 2003-04-22 14:11:53 +00:00
parent 0da475046e
commit 2d396349bc
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
security/nss/lib/pk11wrap/pk11slot.c
View File

@ -406,15 +406,9 @@ PK11_NewSlotInfo(SECMODModule *mod)
if (slot == NULL) return slot;
#ifdef PKCS11_USE_THREADS
slot->refLock = PZ_NewLock(nssILockSlot);
if (slot->refLock == NULL) {
PORT_Free(slot);
return slot;
}
slot->freeListLock = PZ_NewLock(nssILockFreelist);
if (slot->freeListLock == NULL) {
PZ_DestroyLock(slot->sessionLock);
PZ_DestroyLock(slot->refLock);
PORT_Free(slot);
return slot;
}
@ -422,13 +416,11 @@ PK11_NewSlotInfo(SECMODModule *mod)
slot->sessionLock = mod->isThreadSafe ?
PZ_NewLock(nssILockSession) : (PZLock *)mod->refLock;
if (slot->sessionLock == NULL) {
PZ_DestroyLock(slot->refLock);
PORT_Free(slot);
return slot;
}
#else
slot->sessionLock = NULL;
slot->refLock = NULL;
slot->freeListLock = NULL;
#endif
slot->freeSymKeysHead = NULL;
@ -479,9 +471,7 @@ PK11_NewSlotInfo(SECMODModule *mod)
PK11SlotInfo *
PK11_ReferenceSlot(PK11SlotInfo *slot)
{
PK11_USE_THREADS(PZ_Lock(slot->refLock);)
slot->refCount++;
PK11_USE_THREADS(PZ_Unlock(slot->refLock);)
PR_AtomicIncrement(&slot->refCount);
return slot;
}
@ -501,10 +491,6 @@ PK11_DestroySlot(PK11SlotInfo *slot)
PORT_Free(slot->mechanismList);
}
#ifdef PKCS11_USE_THREADS
if (slot->refLock) {
PZ_DestroyLock(slot->refLock);
slot->refLock = NULL;
}
if (slot->isThreadSafe && slot->sessionLock) {
PZ_DestroyLock(slot->sessionLock);
}
@ -529,13 +515,9 @@ PK11_DestroySlot(PK11SlotInfo *slot)
void
PK11_FreeSlot(PK11SlotInfo *slot)
{
PRBool freeit = PR_FALSE;
PK11_USE_THREADS(PZ_Lock(slot->refLock);)
if (slot->refCount-- == 1) freeit = PR_TRUE;
PK11_USE_THREADS(PZ_Unlock(slot->refLock);)
if (freeit) PK11_DestroySlot(slot);
if (PR_AtomicDecrement(&slot->refCount) == 0) {
PK11_DestroySlot(slot);
}
}
void

3
security/nss/lib/pk11wrap/secmodti.h
View File

@ -90,8 +90,7 @@ struct PK11SlotInfoStr {
unsigned long defaultFlags;
/* keep track of who is using us so we don't accidently get freed while
* still in use */
int refCount;
PZLock *refLock;
PRInt32 refCount; /* to be in/decremented by atomic calls ONLY! */
PZLock *freeListLock;
PK11SymKey *freeSymKeysHead;
int keyCount;