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

Revert "fix crash in PINI: use local db_field_log"

Browse Source 
This reverts commit a590151accb1d187562c515a48e013244dd98a45.

Conflicts:
	modules/database/src/ioc/db/dbDbLink.c
This commit is contained in:
zimoch
2020-02-25 09:59:21 +01:00
committed by Andrew Johnson
parent d0ef45acc3
commit c51c83b1d5
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/database/src/ioc/db/dbDbLink.c
View File

@@ -180,21 +180,28 @@ static long dbDbGetValue(struct link *plink, short dbrType, void *pbuffer,
/* If filters are involved in a read, create field log and run filters */
if (ellCount(&chan->filters)) {
db_field_log *pfl;
long options = 0;
db_field_log fl = {};
fl.ctx = dbfl_context_read;
fl.type = dbfl_type_rec;
/* For the moment, empty arrays are not supported by EPICS */
if (dbChannelFinalElements(chan) > 0)
if (dbChannelFinalElements(chan) <= 0)
{
dbChannelRunPreChain(chan, &fl);
dbChannelRunPostChain(chan, &fl);
status = dbChannelGet(chan, dbrType, pbuffer, &options, pnRequest, &fl);
if (!status && pnRequest && *pnRequest <= 0)
status = S_db_badField;
} else {
/* empty array request */
status = S_db_badField;
} else {
pfl = db_create_read_log(chan);
if (!pfl) {
status = S_db_noMemory;
} else {
pfl = dbChannelRunPreChain(chan, pfl);
pfl = dbChannelRunPostChain(chan, pfl);
status = dbChannelGet(chan, dbrType, pbuffer, &options, pnRequest, pfl);
db_delete_field_log(pfl);
if (!status && pnRequest && *pnRequest <= 0) {
/* empty array result */
status = S_db_badField;
}
}
}
if (status) {
recGblSetSevr(precord, LINK_ALARM, UDF_ALARM);