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

A cleaner way to close CA & DB links

Browse Source
This commit is contained in:
Andrew Johnson
2016-08-12 23:20:24 -05:00
parent 899feb24b2
commit bb58598eba
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ioc/db/dbDbLink.c
View File

@@ -93,13 +93,18 @@ void dbDbAddLink(struct dbLocker *locker, struct link *plink, short dbfType,
static void dbDbRemoveLink(struct dbLocker *locker, struct link *plink)
{
DBADDR *pdbAddr = (DBADDR *) plink->value.pv_link.pvt;
plink->value.pv_link.pvt = 0;
plink->value.pv_link.getCvt = 0;
plink->value.pv_link.pvlMask = 0;
plink->value.pv_link.lastGetdbrType = 0;
plink->type = PV_LINK;
ellDelete(&pdbAddr->precord->bklnk, &plink->value.pv_link.backlinknode);
dbLockSetSplit(locker, plink->precord, pdbAddr->precord);
/* locker is NULL when an isolated IOC is closing its links */
if (locker) {
plink->value.pv_link.pvt = 0;
plink->value.pv_link.getCvt = 0;
plink->value.pv_link.pvlMask = 0;
plink->value.pv_link.lastGetdbrType = 0;
ellDelete(&pdbAddr->precord->bklnk, &plink->value.pv_link.backlinknode);
dbLockSetSplit(locker, plink->precord, pdbAddr->precord);
}
free(pdbAddr);
}

13
src/ioc/misc/iocInit.c
View File

@@ -641,14 +641,11 @@ static void doCloseLinks(dbRecordType *pdbRecordType, dbCommon *precord,
dbScanLock(precord);
locked = 1;
}
if(plink->lset)
(*plink->lset->removeLink)(NULL, plink);
} else if (iocBuildMode==buildIsolated && plink->type == DB_LINK) {
/* free link, but don't split lockset like dbDbRemoveLink() */
free(plink->value.pv_link.pvt);
plink->type = PV_LINK;
plink->lset = NULL;
dbRemoveLink(NULL, plink);
}
else if (iocBuildMode==buildIsolated && plink->type == DB_LINK) {
/* free link, but don't split lockset */
dbRemoveLink(NULL, plink);
}
}