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

Added required mask per plugin to shorten check loop. Trivial test change. [src/db/chfPlugin.c src/db/test/chfPluginTest.c]

Browse Source
This commit is contained in:
Ralph Lange
2012-04-27 13:21:52 -04:00
committed by Michael Davidsaver
parent 52c6eaa848
commit 9f5f5246aa
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ioc/db/chfPlugin.c
View File

@@ -37,6 +37,7 @@
typedef struct chfPlugin {
const chfPluginArgDef *opts;
size_t nopts;
epicsUInt32 *required;
const chfPluginIf *pif;
} chfPlugin;
@@ -369,8 +370,9 @@ static parse_result parse_end(chFilter *filter)
const chfPluginArgDef *cur;
int i;
for(cur = p->opts, i = 0; cur && cur->name; cur++, i++) {
if ( !(f->found[i/32] & (1 << (i%32))) && cur->required ) {
/* Check if all required arguments were supplied */
for(i = 0; i < (p->nopts/32)+1; i++) {
if ((f->found[i] & p->required[i]) != p->required[i]) {
if (p->pif->parse_error) p->pif->parse_error();
if (p->pif->freePvt) p->pif->freePvt(f->puser);
freeInstanceData(f);
@@ -546,6 +548,7 @@ chfPluginRegister(const char* key, const chfPluginIf *pif, const chfPluginArgDef
chfPlugin *p;
size_t i;
const chfPluginArgDef *cur;
epicsUInt32 *reqd;
/* Check and count options */
for (i = 0, cur = opts; cur && cur->name; i++, cur++) {
@@ -601,11 +604,23 @@ chfPluginRegister(const char* key, const chfPluginIf *pif, const chfPluginArgDef
}
}
/* Bit array used to find missing required keys */
reqd = dbCalloc((i/32)+1, sizeof(epicsUInt32));
if (!reqd) {
fprintf(stderr,"Plugin %s: bit array calloc failed\n", key);
return -1;
}
for (i = 0, cur = opts; cur && cur->name; i++, cur++) {
if (cur->required) reqd[i/32] |= 1 << (i%32);
}
/* Plugin data */
p = dbCalloc(1, sizeof(chfPlugin));
p->pif = pif;
p->opts = opts;
p->nopts = i;
p->required = reqd;
dbRegisterFilter(key, &wrapper_fif, p);

8
src/ioc/db/test/chfPluginTest.c
View File

@@ -217,10 +217,10 @@ MAIN(chfPluginTest)
testOk1(!dbReadDatabase(&pdbbase, "dbChannelTest.dbx", ".:..", NULL));
testOk(!!pdbbase, "pdbbase was set");
testOk(chfPluginRegister("buggy", &myPif, brokenOpts1), "not enough storage for integer");
testOk(chfPluginRegister("buggy", &myPif, brokenOpts2), "not enough storage for double");
testOk(chfPluginRegister("buggy", &myPif, brokenOpts3), "not enough storage for string");
testOk(chfPluginRegister("buggy", &myPif, brokenOpts4), "not enough storage for enum");
testOk(!!chfPluginRegister("buggy", &myPif, brokenOpts1), "not enough storage for integer");
testOk(!!chfPluginRegister("buggy", &myPif, brokenOpts2), "not enough storage for double");
testOk(!!chfPluginRegister("buggy", &myPif, brokenOpts3), "not enough storage for string");
testOk(!!chfPluginRegister("buggy", &myPif, brokenOpts4), "not enough storage for enum");
testOk(!chfPluginRegister("strict", &myPif, strictOpts), "register plugin strict");
testOk(!chfPluginRegister("noconv", &myPif, noconvOpts), "register plugin noconv");