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

int64in: Fix monitor delta test

Browse Source 
Only the lower 32 bit used to be compared.
https://bugs.launchpad.net/epics-base/+bug/1938459
This commit is contained in:
Kay Kasemir
2021-07-29 14:38:16 -04:00
committed by GitHub
parent ec87b2a867
commit 3091f7c56f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/database/src/std/rec/int64inRecord.c
View File

@@ -359,16 +359,16 @@ static void checkAlarms(int64inRecord *prec, epicsTimeStamp *timeLast)
}
/* DELTA calculates the absolute difference between its arguments
* expressed as an unsigned 32-bit integer */
* expressed as an unsigned 64-bit integer */
#define DELTA(last, val) \
((epicsUInt32) ((last) > (val) ? (last) - (val) : (val) - (last)))
((epicsUInt64) ((last) > (val) ? (last) - (val) : (val) - (last)))
static void monitor(int64inRecord *prec)
{
unsigned short monitor_mask = recGblResetAlarms(prec);
if (prec->mdel < 0 ||
DELTA(prec->mlst, prec->val) > (epicsUInt32) prec->mdel) {
DELTA(prec->mlst, prec->val) > (epicsUInt64) prec->mdel) {
/* post events for value change */
monitor_mask |= DBE_VALUE;
/* update last value monitored */
@@ -376,7 +376,7 @@ static void monitor(int64inRecord *prec)
}
if (prec->adel < 0 ||
DELTA(prec->alst, prec->val) > (epicsUInt32) prec->adel) {
DELTA(prec->alst, prec->val) > (epicsUInt64) prec->adel) {
/* post events for archive value change */
monitor_mask |= DBE_LOG;
/* update last archive value monitored */