Change UDF logic for output records with asyn:READBACK.

Change logic for output records with asyn:READBACK so they set udf=0 in the outputcallbackcallback() function, and not in the processXX function. This is needed to correctly clear the UDF status and severity. This problem is happening because for EPICS output records the only way to clear a UDF alarm is to put a value into the record, either from an external put from a CA or DB link (in which case code in the dbAccess.c dbPut() routine clears UDF and the record would get processed) or by reading a value through the DOL link during record processing triggered by some other means. In both cases UDF will have been cleared before the call to checkAlarms() in the boRecord::process() routine, which is where the UDF field is checked. Unfortunately for asyn all output records call the checkAlarms() routine before the device support's write_bo() routine, so clearing UDF in processBo() is too late for this process cycle, the UDF_ALARM has already been registered. This also means that if the bo record is configured with non-zero alarms in ZSV or OSV the initial read wouldn't trigger the appropriate STATE_ALARM either, since they get set in that routine as well.
epics-modules · Jun 2, 2021 · fdfca2f · fdfca2f
1 parent 603d54f
commit fdfca2f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/asyn/devEpics/devAsynFloat64.c b/asyn/devEpics/devAsynFloat64.c
@@ -463,6 +463,8 @@ static void outputCallbackCallback(CALLBACK *pcb)
         dbScanLock(pr);
         epicsMutexLock(pPvt->devPvtLock);
         pPvt->newOutputCallbackValue = 1;
+        /* We need to set udf=0 here so that it is already cleared when dbProcess is called */
+        pr->udf = 0;
         dbProcess(pr);
         if (pPvt->newOutputCallbackValue != 0) {
             /* We called dbProcess but the record did not process, perhaps because PACT was 1
@@ -664,7 +666,6 @@ static long processAo(aoRecord *pr)
             if (pr->aslo != 0.0) val64 *= pr->aslo;
             val64 += pr->aoff;
             pr->val = val64;
-            pr->udf = 0;
         }
     } else if(pr->pact == 0) {
         /* ASLO/AOFF conversion */

diff --git a/asyn/devEpics/devAsynInt32.c b/asyn/devEpics/devAsynInt32.c
@@ -645,6 +645,8 @@ static void outputCallbackCallback(CALLBACK *pcb)
         dbScanLock(pr);
         epicsMutexLock(pPvt->devPvtLock);
         pPvt->newOutputCallbackValue = 1;
+        /* We need to set udf=0 here so that it is already cleared when dbProcess is called */
+        pr->udf = 0;
         dbProcess(pr);
         if (pPvt->newOutputCallbackValue != 0) {
             /* We called dbProcess but the record did not process, perhaps because PACT was 1
@@ -987,7 +989,6 @@ static long processAo(aoRecord *pr)
         /* We got a callback from the driver */
         if (pPvt->result.status == asynSuccess) {
             pr->rval = pPvt->result.value;
-            pr->udf = 0;
             value = (double)pr->rval + (double)pr->roff;
             if(pr->aslo!=0.0) value *= pr->aslo;
             value += pr->aoff;
@@ -1113,7 +1114,6 @@ static long processLo(longoutRecord *pr)
         /* We got a callback from the driver */
         if (pPvt->result.status == asynSuccess) {
             pr->val = pPvt->result.value;
-            pr->udf = 0;
         }
     } else if(pr->pact == 0) {
         pPvt->result.value = pr->val;
@@ -1219,7 +1219,6 @@ static long processBo(boRecord *pr)
         if (pPvt->result.status == asynSuccess) {
             pr->rval = pPvt->result.value;
             pr->val = (pr->rval) ? 1 : 0;
-            pr->udf = 0;
         }
     } else if(pr->pact == 0) {
         pPvt->result.value = pr->rval;

diff --git a/asyn/devEpics/devAsynInt64.c b/asyn/devEpics/devAsynInt64.c
@@ -592,6 +592,8 @@ static void outputCallbackCallback(CALLBACK *pcb)
         dbScanLock(pr);
         epicsMutexLock(pPvt->devPvtLock);
         pPvt->newOutputCallbackValue = 1;
+        /* We need to set udf=0 here so that it is already cleared when dbProcess is called */
+        pr->udf = 0;
         dbProcess(pr);
         if (pPvt->newOutputCallbackValue != 0) {
             /* We called dbProcess but the record did not process, perhaps because PACT was 1
@@ -719,7 +721,6 @@ static long processLLo(int64outRecord *pr)
         /* We got a callback from the driver */
         if (pPvt->result.status == asynSuccess) {
             pr->val = pPvt->result.value;
-            pr->udf = 0;
         }
     } else if(pr->pact == 0) {
         pPvt->result.value = pr->val;
@@ -912,7 +913,6 @@ static long processAo(aoRecord *pr)
         /* We got a callback from the driver */
         if (pPvt->result.status == asynSuccess) {
             value = (double)pPvt->result.value;
-            pr->udf = 0;
             if (pr->linr == menuConvertNO_CONVERSION){
                 ; /*do nothing*/
             } else if ((pr->linr == menuConvertLINEAR) ||
@@ -1023,7 +1023,6 @@ static long processLo(longoutRecord *pr)
         /* We got a callback from the driver */
         if (pPvt->result.status == asynSuccess) {
             pr->val = (epicsInt32)pPvt->result.value;
-            pr->udf = 0;
         }
     } else if(pr->pact == 0) {
         pPvt->result.value = pr->val;

diff --git a/asyn/devEpics/devAsynOctet.c b/asyn/devEpics/devAsynOctet.c
@@ -592,6 +592,8 @@ static void outputCallbackCallback(CALLBACK *pcb)
         dbScanLock(pr);
         epicsMutexLock(pPvt->devPvtLock);
         pPvt->newOutputCallbackValue = 1;
+        /* We need to set udf=0 here so that it is already cleared when dbProcess is called */
+        pr->udf = 0;
         dbProcess(pr);
         if (pPvt->newOutputCallbackValue != 0) {
             /* We called dbProcess but the record did not process, perhaps because PACT was 1

diff --git a/asyn/devEpics/devAsynUInt32Digital.c b/asyn/devEpics/devAsynUInt32Digital.c
@@ -545,6 +545,8 @@ static void outputCallbackCallback(CALLBACK *pcb)
         dbScanLock(pr);
         epicsMutexLock(pPvt->devPvtLock);
         pPvt->newOutputCallbackValue = 1;
+        /* We need to set udf=0 here so that it is already cleared when dbProcess is called */
+        pr->udf = 0;
         dbProcess(pr);
         if (pPvt->newOutputCallbackValue != 0) {
             /* We called dbProcess but the record did not process, perhaps because PACT was 1
@@ -746,7 +748,6 @@ static long processBo(boRecord *pr)
         if (pPvt->result.status == asynSuccess) {
             pr->rval = pPvt->result.value & pr->mask;
             pr->val = (pr->rval) ? 1 : 0;
-            pr->udf = 0;
         }
     } else if(pr->pact == 0) {
         pPvt->result.value = pr->rval;;
@@ -851,7 +852,6 @@ static long processLo(longoutRecord *pr)
         /* We got a callback from the driver */
         if (pPvt->result.status == asynSuccess) {
             pr->val = pPvt->result.value & pPvt->mask;
-            pr->udf = 0;
         }
     } else if(pr->pact == 0) {
         pPvt->result.value = pr->val & pPvt->mask;