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

epicsMutexLockWithTimeout no longer exists

Browse Source
This commit is contained in:
Marty Kraimer
2002-12-04 14:37:21 +00:00
parent faed748404
commit ace4e5a9f6
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/db/dbLock.c
View File

@@ -552,13 +552,18 @@ long epicsShareAPI dbLockShowLocked(int level)
int indListType;
lockSet *plockSet;
epicsMutexLockStatus status;
epicsMutexLockStatus lockSetModifyLockStatus;
epicsMutexLockStatus lockSetModifyLockStatus = epicsMutexLockOK;
int itry;
printf("listTypeScanLock %d listTypeRecordLock %d listTypeFree %d\n",
ellCount(&lockSetList[0]),
ellCount(&lockSetList[1]),
ellCount(&lockSetList[2]));
lockSetModifyLockStatus = epicsMutexLockWithTimeout(lockSetModifyLock,5.0);
for(itry=0; itry<100; itry++) {
lockSetModifyLockStatus = epicsMutexTryLock(lockSetModifyLock);
if(lockSetModifyLockStatus==epicsMutexLockOK) break;
epicsThreadSleep(.05);
}
if(lockSetModifyLockStatus!=epicsMutexLockOK) {
printf("Could not lock lockSetModifyLock\n");
epicsMutexShow(lockSetModifyLock,level);

7
src/db/dbNotify.c
View File

@@ -390,9 +390,14 @@ int epicsShareAPI dbNotifyDump(void)
putNotify *ppn;
putNotify *ppnRestart;
putNotifyRecord *ppnrWait;
int itry;
lockStatus = epicsMutexLockWithTimeout(notifyLock,2.0);
for(itry=0; itry<100; itry++) {
lockStatus = epicsMutexTryLock(notifyLock);
if(lockStatus==epicsMutexLockOK) break;
epicsThreadSleep(.05);
}
for(pdbRecordType = (dbRecordType *)ellFirst(&pdbbase->recordTypeList);
pdbRecordType;
pdbRecordType = (dbRecordType *)ellNext(&pdbRecordType->node)) {