epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

dbScan: rename scanOnce3 to scanOnceCallback

Browse Source
This commit is contained in:
Michael Davidsaver
2015-02-17 11:31:05 -05:00
parent b9b8cde5f6
commit bbbf05414d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ioc/db/dbCa.c
View File

@@ -637,7 +637,7 @@ static void scanComplete(void *raw, dbCommon *prec)
errlogPrintf("dbCa.c complete callback w/ scanningOnce==0\n");
else if(--pca->scanningOnce){
/* another scan is queued */
if(scanOnce3(prec, scanComplete, raw)) {
if(scanOnceCallback(prec, scanComplete, raw)) {
errlogPrintf("dbCa.c failed to re-queue scanOnce\n");
}
}
@@ -646,7 +646,7 @@ static void scanComplete(void *raw, dbCommon *prec)
/* must be called with pca->lock held */
static void scanLinkOnce(dbCommon *prec, caLink *pca) {
if(pca->scanningOnce==0 && scanOnce3(prec, scanComplete, pca)) {
if(pca->scanningOnce==0 && scanOnceCallback(prec, scanComplete, pca)) {
errlogPrintf("dbCa.c failed to queue scanOnce\n");
}
if(pca->scanningOnce<5)

4
src/ioc/db/dbScan.c
View File

@@ -612,7 +612,7 @@ void scanIoSetComplete(IOSCANPVT piosh, io_scan_complete cb, void *arg)
}
int scanOnce(struct dbCommon *precord) {
return scanOnce3(precord, NULL, NULL);
return scanOnceCallback(precord, NULL, NULL);
}
typedef struct {
@@ -621,7 +621,7 @@ typedef struct {
void *usr;
} onceEntry;
int scanOnce3(struct dbCommon *precord, once_complete cb, void *usr)
int scanOnceCallback(struct dbCommon *precord, once_complete cb, void *usr)
{
static int newOverflow = TRUE;
onceEntry ent;

2
src/ioc/db/dbScan.h
View File

@@ -56,7 +56,7 @@ epicsShareFunc void scanAdd(struct dbCommon *);
epicsShareFunc void scanDelete(struct dbCommon *);
epicsShareFunc double scanPeriod(int scan);
epicsShareFunc int scanOnce(struct dbCommon *);
epicsShareFunc int scanOnce3(struct dbCommon *, once_complete cb, void *usr);
epicsShareFunc int scanOnceCallback(struct dbCommon *, once_complete cb, void *usr);
epicsShareFunc int scanOnceSetQueueSize(int size);
/*print periodic lists*/

4
src/ioc/db/test/dbScanTest.c
View File

@@ -36,7 +36,7 @@ static void onceComp(void *junk, dbCommon *prec)
static void testOnce(void)
{
testDiag("check scanOnce3() callback");
testDiag("check scanOnceCallback() callback");
waiter = epicsEventMustCreate(epicsEventError);
testdbPrepare();
@@ -52,7 +52,7 @@ static void testOnce(void)
prec = testdbRecordPtr("reca");
testDiag("scanOnce %s", prec->name);
scanOnce3(prec, onceComp, &waiter);
scanOnceCallback(prec, onceComp, &waiter);
testDiag("Waiting");
epicsEventMustWait(waiter);
testOk1(called==1);