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

Check free-list size to ensure field-logs freed properly

Browse Source 
Moves where the field-logs get freed into the mustPass/mustDrop routines,
where it only happens if the filter didn't free them itself.

Filters that save field-logs can't use this code as-is.
This commit is contained in:
Andrew Johnson
2019-06-26 23:32:52 -05:00
parent 398fdee33e
commit e03c7edfe5
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/std/filters/test/decTest.c
View File

@@ -64,15 +64,29 @@ static void testHead (char* title) {
}
static void mustDrop(dbChannel *pch, db_field_log *pfl, char* m) {
int oldFree = db_available_logs();
db_field_log *pfl2 = dbChannelRunPreChain(pch, pfl);
int newFree = db_available_logs();
testOk(NULL == pfl2, "filter drops field_log (%s)", m);
testOk(newFree == oldFree + 1, "field_log was freed - %d+1 => %d",
oldFree, newFree);
if (newFree == oldFree)
db_delete_field_log(pfl);
}
static void mustPass(dbChannel *pch, db_field_log *pfl, char* m) {
int oldFree = db_available_logs();
db_field_log *pfl2 = dbChannelRunPreChain(pch, pfl);
int newFree = db_available_logs();
testOk(pfl == pfl2, "filter passes field_log (%s)", m);
testOk(newFree == oldFree, "field_log was not freed - %d => %d",
oldFree, newFree);
if (newFree == oldFree)
db_delete_field_log(pfl);
}
static void checkAndOpenChannel(dbChannel *pch, const chFilterPlugin *plug) {
@@ -114,7 +128,7 @@ MAIN(decTest)
int i;
dbEventCtx evtctx;
testPlan(68);
testPlan(103);
testdbPrepare();
@@ -165,9 +179,6 @@ MAIN(decTest)
mustPass(pch, pfl[3], "i=3");
mustPass(pch, pfl[4], "i=4");
for (i = 0; i < 5; i++)
db_delete_field_log(pfl[i]);
dbChannelDelete(pch);
/* Decimation (N=2) */
@@ -196,9 +207,6 @@ MAIN(decTest)
mustPass(pch, pfl[8], "i=8");
mustDrop(pch, pfl[9], "i=9");
for (i = 0; i < 10; i++)
db_delete_field_log(pfl[i]);
dbChannelDelete(pch);
/* Decimation (N=3) */
@@ -227,9 +235,6 @@ MAIN(decTest)
mustDrop(pch, pfl[8], "i=8");
mustPass(pch, pfl[9], "i=9");
for (i = 0; i < 10; i++)
db_delete_field_log(pfl[i]);
dbChannelDelete(pch);
/* Decimation (N=4) */
@@ -258,9 +263,6 @@ MAIN(decTest)
mustPass(pch, pfl[8], "i=8");
mustDrop(pch, pfl[9], "i=9");
for (i = 0; i < 10; i++)
db_delete_field_log(pfl[i]);
dbChannelDelete(pch);
db_close_events(evtctx);