Skip to content

Use typed DSET for devIocStatsAnalog #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simon-ess wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use typed DSET for devIocStatsAnalog #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd7c31
Use typed DSET for devIocStatsAnalog
simon-ess Sep 23, 2025
acdb539
Update release notes
simon-ess Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions RELEASE_NOTES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ Release Notes for iocStats

# Releases

## Unreleased

* Use typed device support table

## iocStats-R3-2-0:

**NOTE** Please note that as of 3-2-0, there is a pre-commit (https://pre-commit.com/) workflow that
Expand Down
2 changes: 1 addition & 1 deletion devIocStats/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ INC += devIocStatsOSD.h

LIBRARY_IOC = devIocStats

USR_CFLAGS += -DUSE_TYPED_RSET
USR_CFLAGS += -DUSE_TYPED_RSET -DUSE_TYPED_DSET

devIocStats_LIBS = $(EPICS_BASE_IOC_LIBS)
devIocStats_SYS_LIBS_solaris = kstat
Expand Down
112 changes: 53 additions & 59 deletions devIocStats/devIocStatsAnalog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,6 @@
(EPICS_VERSION_INT == VERSION_INT(3, 16, 2, 0)) || \
(EPICS_VERSION_INT >= VERSION_INT(7, 0, 2, 0))

struct aStats {
long number;
DEVSUPFUN report;
DEVSUPFUN init;
DEVSUPFUN init_record;
DEVSUPFUN get_ioint_info;
DEVSUPFUN read_write;
DEVSUPFUN special_linconv;
};
typedef struct aStats aStats;

struct pvtArea {
int index;
int type;
Expand Down Expand Up @@ -178,16 +167,16 @@ struct scanInfo {
typedef struct scanInfo scanInfo;

static long ai_init(int pass);
static long ai_init_record(aiRecord *);
static long ai_read(aiRecord *);
static long ai_ioint_info(int cmd, aiRecord *pr, IOSCANPVT *iopvt);
static long ai_init_record(dbCommon *);
static long ai_read(struct aiRecord *);
static long ai_ioint_info(int cmd, dbCommon *pcommon, IOSCANPVT *iopvt);

static long ai_clusts_init(int pass);
static long ai_clusts_init_record(aiRecord *);
static long ai_clusts_read(aiRecord *);
static long ai_clusts_init_record(dbCommon *);
static long ai_clusts_read(struct aiRecord *);

static long ao_init_record(aoRecord *pr);
static long ao_write(aoRecord *);
static long ao_init_record(dbCommon *pcommon);
static long ao_write(struct aoRecord *);

static void statsFreeBytes(double *);
static void statsFreeBlocks(double *);
Expand Down Expand Up @@ -283,13 +272,14 @@ static validGetParms statsGetParms[] = {
{"cbHighQueueOverruns", statsCbHighQOverruns, QUEUE_TYPE},
{NULL, NULL, 0}};

aStats devAiStats = {6, NULL, ai_init, ai_init_record, ai_ioint_info,
ai_read, NULL};
aidset devAiStats = {
{6, NULL, ai_init, ai_init_record, ai_ioint_info}, ai_read, NULL};
epicsExportAddress(dset, devAiStats);
aStats devAoStats = {6, NULL, NULL, ao_init_record, NULL, ao_write, NULL};
aodset devAoStats = {{6, NULL, NULL, ao_init_record, NULL}, ao_write, NULL};
epicsExportAddress(dset, devAoStats);
aStats devAiClusts = {
6, NULL, ai_clusts_init, ai_clusts_init_record, NULL, ai_clusts_read, NULL};
aidset devAiClusts = {{6, NULL, ai_clusts_init, ai_clusts_init_record, NULL},
ai_clusts_read,
NULL};
epicsExportAddress(dset, devAiClusts);

static memInfo meminfo = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
Expand Down Expand Up @@ -480,17 +470,18 @@ static long ai_init(int pass) {
return 0;
}

static long ai_clusts_init_record(aiRecord *pr) {
static long ai_clusts_init_record(dbCommon *pcommon) {
int elem = 0, size = 0, pool = 0, parms = 0;
char *parm;
pvtClustArea *pvt = NULL;
struct aiRecord *prec = (struct aiRecord *)pcommon;

if (pr->inp.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)pr,
if (prec->inp.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)prec,
"devAiClusts (init_record) Illegal INP field");
return S_db_badField;
}
parm = pr->inp.value.instio.string;
parm = prec->inp.value.instio.string;
parms = sscanf(parm, "clust_info %d %d %d", &pool, &size, &elem);
if ((parms == 3) && (pool >= 0) && (pool < 2) && (size >= 0) && (elem >= 0) &&
(elem < 4)) {
Expand All @@ -502,27 +493,28 @@ static long ai_clusts_init_record(aiRecord *pr) {
}
}
if (pvt == NULL) {
recGblRecordError(S_db_badField, (void *)pr,
recGblRecordError(S_db_badField, (void *)prec,
"devAiClusts (init_record) Illegal INP parm field");
return S_db_badField;
}
/* Make sure record processing routine does not perform any conversion*/
pr->linr = menuConvertNO_CONVERSION;
pr->dpvt = pvt;
prec->linr = menuConvertNO_CONVERSION;
prec->dpvt = pvt;
return 0;
}

static long ai_init_record(aiRecord *pr) {
static long ai_init_record(dbCommon *pcommon) {
int i;
char *parm;
pvtArea *pvt = NULL;
struct aiRecord *prec = (struct aiRecord *)pcommon;

if (pr->inp.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)pr,
if (prec->inp.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)prec,
"devAiStats (init_record) Illegal INP field");
return S_db_badField;
}
parm = pr->inp.value.instio.string;
parm = prec->inp.value.instio.string;
for (i = 0; statsGetParms[i].name && pvt == NULL; i++) {
if (strcmp(parm, statsGetParms[i].name) == 0) {
pvt = (pvtArea *)malloc(sizeof(pvtArea));
Expand All @@ -532,28 +524,29 @@ static long ai_init_record(aiRecord *pr) {
}

if (pvt == NULL) {
recGblRecordError(S_db_badField, (void *)pr,
recGblRecordError(S_db_badField, (void *)prec,
"devAiStats (init_record) Illegal INP parm field");
return S_db_badField;
}

/* Make sure record processing routine does not perform any conversion*/
pr->linr = menuConvertNO_CONVERSION;
pr->dpvt = pvt;
prec->linr = menuConvertNO_CONVERSION;
prec->dpvt = pvt;
return 0;
}

static long ao_init_record(aoRecord *pr) {
static long ao_init_record(dbCommon *pcommon) {
int type;
char *parm;
pvtArea *pvt = NULL;
struct aoRecord *prec = (struct aoRecord *)pcommon;

if (pr->out.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)pr,
if (prec->out.type != INST_IO) {
recGblRecordError(S_db_badField, (void *)prec,
"devAiStats (init_record) Illegal OUT field");
return S_db_badField;
}
parm = pr->out.value.instio.string;
parm = prec->out.value.instio.string;
for (type = 0; type < TOTAL_TYPES; type++) {
if (parmTypes[type].name && strcmp(parm, parmTypes[type].name) == 0) {
pvt = (pvtArea *)malloc(sizeof(pvtArea));
Expand All @@ -562,23 +555,24 @@ static long ao_init_record(aoRecord *pr) {
}
}
if (pvt == NULL) {
recGblRecordError(S_db_badField, (void *)pr,
recGblRecordError(S_db_badField, (void *)prec,
"devAiStats (init_record) Illegal INP parm field");
return S_db_badField;
}

/* Initialize value with default if not set in db */
if (!pr->val)
pr->val = parmTypes[pvt->type].scan_rate;
if (!prec->val)
prec->val = parmTypes[pvt->type].scan_rate;

/* Make sure record processing routine does not perform any conversion*/
pr->linr = menuConvertNO_CONVERSION;
pr->dpvt = pvt;
prec->linr = menuConvertNO_CONVERSION;
prec->dpvt = pvt;
return 2;
}

static long ai_ioint_info(int cmd, aiRecord *pr, IOSCANPVT *iopvt) {
pvtArea *pvt = (pvtArea *)pr->dpvt;
static long ai_ioint_info(int cmd, dbCommon *pcommon, IOSCANPVT *iopvt) {
struct aiRecord *prec = (struct aiRecord *)pcommon;
pvtArea *pvt = (pvtArea *)prec->dpvt;

if (!pvt)
return S_dev_badInpType;
Expand All @@ -600,25 +594,25 @@ static long ai_ioint_info(int cmd, aiRecord *pr, IOSCANPVT *iopvt) {
return 0;
}

static long ao_write(aoRecord *pr) {
pvtArea *pvt = (pvtArea *)pr->dpvt;
static long ao_write(struct aoRecord *prec) {
pvtArea *pvt = (pvtArea *)prec->dpvt;
int type;

if (!pvt)
return S_dev_badInpType;

type = pvt->type;

if (pr->val > 0.0)
scan[type].rate_sec = pr->val;
if (prec->val > 0.0)
scan[type].rate_sec = prec->val;
else
pr->val = scan[type].rate_sec;
pr->udf = 0;
prec->val = scan[type].rate_sec;
prec->udf = 0;
return 0;
}

/* Cluster info read - returning value from global array */
static long ai_clusts_read(aiRecord *prec) {
static long ai_clusts_read(struct aiRecord *prec) {
pvtClustArea *pvt = (pvtClustArea *)prec->dpvt;

if (!pvt)
Expand All @@ -636,18 +630,18 @@ static long ai_clusts_read(aiRecord *prec) {
}

/* Generic read - calling function from table */
static long ai_read(aiRecord *pr) {
static long ai_read(struct aiRecord *prec) {
double val;
pvtArea *pvt = (pvtArea *)pr->dpvt;
pvtArea *pvt = (pvtArea *)prec->dpvt;

if (!pvt)
return S_dev_badInpType;

epicsMutexLock(scan_mutex);
statsGetParms[pvt->index].func(&val);
epicsMutexUnlock(scan_mutex);
pr->val = val;
pr->udf = 0;
prec->val = val;
prec->udf = 0;
return 2; /* don't convert */
}

Expand Down
Loading