epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

dbLock: free lockSets

Browse Source
This commit is contained in:
Michael Davidsaver
2014-07-11 18:49:41 -04:00
parent edf1ad0362
commit 3755b9eaad
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ioc/db/dbLock.c
View File

@@ -394,7 +394,9 @@ void dbLockCleanupRecords(dbBase *pdbbase)
DBENTRY ent;
dbCommon *prec;
long status;
ELLNODE *cur;
/* free lockRecord */
dbInitEntry(pdbbase, &ent);
status=dbFirstRecordType(&ent);
if(status)
@@ -405,6 +407,25 @@ void dbLockCleanupRecords(dbBase *pdbbase)
prec = ent.precnode->precord;
free(prec->lset);
dbFinishEntry(&ent);
/* free lockSets */
/* ensure no lockSets are locked for re-compute */
assert(ellCount(&lockSetList[listTypeRecordLock])==0);
/* move allocated locks back to the free list */
while((cur=ellGet(&lockSetList[listTypeScanLock]))!=NULL)
{
lockSet *pset = CONTAINER(cur, lockSet, node);
assert(pset->state == lockSetStateFree); /* lock not held */
pset->type = listTypeFree;
ellAdd(&lockSetList[listTypeFree],&pset->node);
}
/* clean up free list */
while((cur=ellGet(&lockSetList[listTypeFree]))!=NULL)
{
lockSet *pset = CONTAINER(cur, lockSet, node);
epicsMutexDestroy(pset->lock);
free(pset);
}
}
void dbLockSetMerge(dbCommon *pfirst,dbCommon *psecond)