diff --git a/src/db/dbAccess.c b/src/db/dbAccess.c index 593992595..3231e7b93 100644 --- a/src/db/dbAccess.c +++ b/src/db/dbAccess.c @@ -83,7 +83,7 @@ #include #include -extern struct dbBase *pdbBase; +extern struct dbBase *pdbbase; extern long lset_stack_not_empty; static short mapDBFToDBR[DBF_NTYPES] = { @@ -433,7 +433,7 @@ long dbNameToAddr(char *pname,DBADDR *paddr) struct rset *prset; dbFldDes *pflddes; - dbInitEntry(pdbBase,&dbEntry); + dbInitEntry(pdbbase,&dbEntry); if(status = dbFindRecord(&dbEntry,pname)) return(status); paddr->precord = dbEntry.precnode->precord; if(!dbEntry.pfield) { diff --git a/src/db/dbFastLinkConv.c b/src/db/dbFastLinkConv.c index ee59395de..186204e03 100644 --- a/src/db/dbFastLinkConv.c +++ b/src/db/dbFastLinkConv.c @@ -55,7 +55,7 @@ #include #include -extern struct dbBase *pdbBase; +extern struct dbBase *pdbbase; /* * In the following functions: diff --git a/src/db/dbScan.c b/src/db/dbScan.c index 9c9996be8..6c0a7473a 100644 --- a/src/db/dbScan.c +++ b/src/db/dbScan.c @@ -69,7 +69,7 @@ #include #include -extern struct dbBase *pdbBase; +extern struct dbBase *pdbbase; /* SCAN ONCE */ #define ONCE_QUEUE_SIZE 256 @@ -465,7 +465,7 @@ static void initPeriodic() float temp; int i; - pmenu = dbFindMenu(pdbBase,"menuScan"); + pmenu = dbFindMenu(pdbbase,"menuScan"); if(!pmenu) { epicsPrintf("initPeriodic: menuScan not present\n"); return; @@ -660,7 +660,7 @@ static void buildScanLists(void) dbCommon *precord; /*Look for first record*/ - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { for (pdbRecordNode=(dbRecordNode *)ellFirst(&pdbRecDes->recList); pdbRecordNode; diff --git a/src/db/dbTest.c b/src/db/dbTest.c index c8d88441e..c10ee6837 100644 --- a/src/db/dbTest.c +++ b/src/db/dbTest.c @@ -43,56 +43,22 @@ * .12 08-14-95 mrk Moved dbtpn to dbNotify */ -/* Global Database Test Routines - All can be invoked via vxWorks shell - * - * dba(pname) Print dbAddr info - * char *pname Pvname - * - * dbel(pname) Print Channel Access Event List - * char *pname Pvname - * - * dbl(ptypeName) list record names. - * char *ptypeName; Record type. If null all record types - * - * dbgrep(pmask) list record names that match the mask - * char *pmask; - * - * dbgf(pname) get field - * char *pname; - * - * dbpf(pname,pvalue) put field - * char *pname; - * char *pvalue - * - * dbpr(pname) print record - * char *pname; - * - * dbtr(pname) test record and print - * char *pname; - * - * dbtgf(pname) test get field - * char *pname; - * - * dbtpf(pname,pvalue) test put field - * char *pname; - * char *pvalue - * - * dbior(pname,type) io_report - * char *pname Driver name. If null all drivers - * int type <0,1> => report - * - * dbhcr(null) hardware configuration report - * - * dblls(ptypeName) list lock sets - * char *ptypeName; Record type. If null all record types - * - * int dbllsdblinks(int lset) - * - * dbt(record_name) time 100 executions of "record_name" - * (includes what records are processed - * as a result of that record) - * - */ +/* Global Database Test Routines - All can be invoked via vxWorks shell*/ +long dba(char*pname); /*dbAddr info */ +long dbel(char*pname); /*CA event list */ +long dbl(char *precdesname); /*list records*/ +long dbnr(int verbose); /*list number of records of each type*/ +long dbgrep(char *pmask); /*list records with mask*/ +long dbgf(char *pname); /*get field value*/ +long dbpf(char *pname,char *pvalue); /*put field value*/ +long dbpr(char *pname,int interest_level); /*print record*/ +long dbtr(char *pname); /*test record*/ +long dbtgf(char *pname); /*test get field*/ +long dbtpf(char *pname,char *pvalue); /*test put field*/ +long dbior(char *pdrvName,int type); /*I/O report */ +int dbhcr(void); /*Hardware Configuration Report*/ +long dblls(int lockset); /*list lock sets*/ +int dbllsdblinks(int lset); /*List dblinks for each record in lock set*/ #include #include @@ -116,7 +82,7 @@ #include #include -extern struct dbBase *pdbBase; +extern struct dbBase *pdbbase; #define MAXLINE 80 struct msgBuff { /* line output structure */ @@ -199,7 +165,7 @@ long dbl(char *precdesname) DBENTRY *pdbentry=&dbentry; long status; - dbInitEntry(pdbBase,pdbentry); + dbInitEntry(pdbbase,pdbentry); if(!precdesname) status = dbFirstRecdes(pdbentry); else @@ -218,6 +184,26 @@ long dbl(char *precdesname) return(0); } +long dbnr(int verbose) +{ + DBENTRY dbentry; + DBENTRY *pdbentry=&dbentry; + long status; + int nrecords; + + dbInitEntry(pdbbase,pdbentry); + status = dbFirstRecdes(pdbentry); + if(status) printf("No record description\n"); + while(!status) { + nrecords = dbGetNRecords(pdbentry); + if(verbose || nrecords) + printf("%.4d %s\n",nrecords,dbGetRecdesName(pdbentry)); + status = dbNextRecdes(pdbentry); + } + dbFinishEntry(pdbentry); + return(0); +} + static int specified_by(char *ptest, char *pspec) { short inx; @@ -272,7 +258,7 @@ long dbgrep(char *pmask) long status; char *pname; - dbInitEntry(pdbBase,pdbentry); + dbInitEntry(pdbbase,pdbentry); status = dbFirstRecdes(pdbentry); while(!status) { status = dbFirstRecord(pdbentry); @@ -659,7 +645,7 @@ long dbior(char *pdrvName,int type) devSup *pdevSup; struct dset *pdset; - for(pdrvSup = (drvSup *)ellFirst(&pdbBase->drvList); pdrvSup; + for(pdrvSup = (drvSup *)ellFirst(&pdbbase->drvList); pdrvSup; pdrvSup = (drvSup *)ellNext(&pdrvSup->node)) { pname = pdrvSup->name; if(pdrvName!=NULL && (strcmp(pdrvName,pname)!=0)) continue; @@ -676,7 +662,7 @@ long dbior(char *pdrvName,int type) } } /* now check devSup reports */ - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { for(pdevSup = (devSup *)ellFirst(&pdbRecDes->devList); pdevSup; pdevSup = (devSup *)ellNext(&pdevSup->node)) { @@ -695,11 +681,11 @@ long dbior(char *pdrvName,int type) int dbhcr(void) { - if(!pdbBase) { + if(!pdbbase) { printf("No database\n"); return(0); } - dbReportDeviceConfig(pdbBase,stdout); + dbReportDeviceConfig(pdbbase,stdout); fflush(stdout); return(0); } @@ -711,7 +697,7 @@ long dblls(int lockset) long status; struct dbCommon *precord; - dbInitEntry(pdbBase,pdbentry); + dbInitEntry(pdbbase,pdbentry); status = dbFirstRecdes(pdbentry); printf(" lset lcnt disv disa pact\n"); while(!status) { @@ -1497,7 +1483,7 @@ int dbllsdblinks(int lset) dbCommon *precord; DBLINK *plink; - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { for (pdbRecordNode=(dbRecordNode *)ellFirst(&pdbRecDes->recList); pdbRecordNode; diff --git a/src/db/iocInit.c b/src/db/iocInit.c index 7fa611cb9..3e107fd33 100644 --- a/src/db/iocInit.c +++ b/src/db/iocInit.c @@ -107,7 +107,7 @@ LOCAL int initialized=FALSE; /* The following is for use by interrupt routines */ volatile int interruptAccept=FALSE; -struct dbBase *pdbBase=NULL; +struct dbBase *pdbbase=NULL; /* define forward references*/ LOCAL long initDrvSup(void); @@ -141,7 +141,7 @@ int iocInit(char * pResourceFilename) return(-1); } - if (!pdbBase) { + if (!pdbbase) { logMsg("iocInit aborting because No database loaded by dbAsciiRead\n", 0,0,0,0,0,0); return(-1); @@ -270,7 +270,7 @@ LOCAL long initDrvSup(void) /* Locate all driver support entry tables */ * a driver entry table doesn't exist, report that * fact. */ - for(pdrvSup = (drvSup *)ellFirst(&pdbBase->drvList); pdrvSup; + for(pdrvSup = (drvSup *)ellFirst(&pdbbase->drvList); pdrvSup; pdrvSup = (drvSup *)ellNext(&pdrvSup->node)) { strcpy(name,"_"); strcat(name,pdrvSup->name); @@ -311,7 +311,7 @@ LOCAL long initRecSup(void) dbRecDes *pdbRecDes; struct rset *prset; - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { strcpy(name,"_"); strcat(name,pdbRecDes->name); @@ -353,7 +353,7 @@ LOCAL long initDevSup(void) devSup *pdevSup; struct dset *pdset; - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { for(pdevSup = (devSup *)ellFirst(&pdbRecDes->devList); pdevSup; pdevSup = (devSup *)ellNext(&pdevSup->node)) { @@ -387,7 +387,7 @@ LOCAL long finishDevSup(void) devSup *pdevSup; struct dset *pdset; - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { for(pdevSup = (devSup *)ellFirst(&pdbRecDes->devList); pdevSup; pdevSup = (devSup *)ellNext(&pdevSup->node)) { @@ -414,7 +414,7 @@ LOCAL long initDatabase(void) DBLINK *plink; int j; - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { prset = pdbRecDes->prset; for (pdbRecordNode=(dbRecordNode *)ellFirst(&pdbRecDes->recList); @@ -446,7 +446,7 @@ LOCAL long initDatabase(void) /* * Second pass to resolve links */ - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { prset = pdbRecDes->prset; for (pdbRecordNode=(dbRecordNode *)ellFirst(&pdbRecDes->recList); @@ -505,7 +505,7 @@ LOCAL long initDatabase(void) } /* Call record support init_record routine - Second pass */ - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { prset = pdbRecDes->prset; for (pdbRecordNode=(dbRecordNode *)ellFirst(&pdbRecDes->recList); @@ -537,7 +537,7 @@ LOCAL void createLockSets(void) int anyChange; nset = 0; - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { for (pdbRecordNode=(dbRecordNode *)ellFirst(&pdbRecDes->recList); pdbRecordNode; @@ -619,7 +619,7 @@ LOCAL void createLockSetsExtraPass(int *anyChange) DBLINK *plink; int again; - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { for (pdbRecordNode=(dbRecordNode *)ellFirst(&pdbRecDes->recList); pdbRecordNode; @@ -727,7 +727,7 @@ LOCAL long initialProcess(void) dbRecordNode *pdbRecordNode; dbCommon *precord; - for(pdbRecDes = (dbRecDes *)ellFirst(&pdbBase->recDesList); pdbRecDes; + for(pdbRecDes = (dbRecDes *)ellFirst(&pdbbase->recDesList); pdbRecDes; pdbRecDes = (dbRecDes *)ellNext(&pdbRecDes->node)) { for (pdbRecordNode=(dbRecordNode *)ellFirst(&pdbRecDes->recList); pdbRecordNode; @@ -1096,9 +1096,9 @@ LOCAL int getResourceTokenInternal(FILE *fp, char *pToken, unsigned maxToken) int dbLoadAscii(char *filename) { - if(pdbBase) { + if(pdbbase) { epicsPrintf("Ascii file was already loaded\n"); return(-1); } - return(dbAsciiRead(&pdbBase,filename)); + return(dbAsciiRead(&pdbbase,filename)); } diff --git a/src/db/recGbl.c b/src/db/recGbl.c index 06c9f8be0..71ce53cff 100644 --- a/src/db/recGbl.c +++ b/src/db/recGbl.c @@ -59,7 +59,6 @@ #include #include -extern struct dbBase *pdbBase; /* local routines */ static void getMaxRangeValues();