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

remove special handling for inf and nan events

Browse Source
This commit is contained in:
zimoch
2018-03-07 14:49:12 +01:00
parent e50c468512
commit 396cf4ee3f
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ioc/db/dbScan.c
View File

@@ -27,7 +27,6 @@
#include "epicsEvent.h"
#include "epicsExit.h"
#include "epicsInterrupt.h"
#include "epicsMath.h"
#include "epicsMutex.h"
#include "epicsPrint.h"
#include "epicsRingPointer.h"
@@ -484,8 +483,6 @@ event_list *eventNameToHandle(const char *eventname)
*/
if (epicsParseDouble(eventname, &eventnumber, NULL) == 0)
{
if (!finite(eventnumber))
return NULL; /* Inf and NaN are no events */
if (eventnumber >= 0 && eventnumber < 256)
{
if (eventnumber < 1)
@@ -493,7 +490,7 @@ event_list *eventNameToHandle(const char *eventname)
if ((pel = pevent_list[(int)eventnumber]) != NULL)
return pel;
}
else
else
eventnumber = 0; /* not a numeric event between 1 and 255 */
}

29
src/std/rec/test/scanEventTest.c
View File

@@ -14,6 +14,7 @@
#include "dbUnitTest.h"
#include "testMain.h"
#include "osiFileName.h"
#include "epicsThread.h"
#include "dbScan.h"
void scanEventTest_registerRecordDeviceDriver(struct dbBase *);
@@ -24,23 +25,22 @@ void scanEventTest_registerRecordDeviceDriver(struct dbBase *);
num < 0 is string event (use same unique number for aliases)
*/
const struct {char* name; int num;} events[] = {
/* No events */
{NULL, 0},
{"", 0},
{" ", 0},
{"0", 0},
{"0.000000", 0},
{"-0.00000", 0},
{"0.9", 0},
{"nan", 0},
{"NaN", 0},
{"-NAN", 0},
{"-inf", 0},
{"inf", 0},
/* Numeric events */
{"2", 2},
{"2.000000", 2},
{"2.5", 2},
{" 2.5 ", 2},
{"+0x02", 2},
{"3", 3},
/* Named events */
{"info 1", -1},
{" info 1 ", -1},
{"-0.9", -2},
@@ -48,6 +48,11 @@ const struct {char* name; int num;} events[] = {
{"-2.000000", -4},
{"-2.5", -5},
{" -2.5 ", -5},
{"nan", -6},
{"NaN", -7},
{"-NAN", -8},
{"-inf", -9},
{"inf", -10},
};
MAIN(scanEventTest)
@@ -117,14 +122,14 @@ MAIN(scanEventTest)
testdbGetFieldEqual("e2", DBR_LONG, e);
testdbPutFieldOk("e3", DBR_LONG, e);
testdbPutFieldOk("e3.PROC", DBR_LONG, 1);
if (e != 0)
for (i = 0; i < NELEMENTS(events); i++)
if (events[i].num == e) {
expected_count[INDX(i)]+=3; /* +1 for eventnum->e1, +1 for e2<-eventnum, +1 for e3 */
break;
}
for (i = 0; i < NELEMENTS(events); i++)
if (e > 0 && e < 256 && events[i].num == e) { /* numeric events */
expected_count[INDX(i)]+=3; /* +1 for eventnum->e1, +1 for e2<-eventnum, +1 for e3 */
break;
}
}
/* Allow records to finish processing */
epicsThreadSleep(0.1);
testDiag("Check if events have been processed the expected number of times");
for (i = 0; i < NELEMENTS(events); i++) {
char pvname[100];