From 5ca094e66716eee2ef8950d4f3f4b2b2a99700b9 Mon Sep 17 00:00:00 2001 From: Simon Rose Date: Tue, 28 Oct 2025 14:19:39 +0100 Subject: [PATCH 1/3] Fetch epicsEnvVars data from CONFIG_ENV in EPICS base --- iocAdmin/Db/Makefile | 13 +++++----- iocAdmin/Db/epicsEnvVars.substitutions | 29 ----------------------- iocAdmin/Db/iocAdminRTEMS.substitutions | 2 +- iocAdmin/Db/iocAdminSoft.substitutions | 5 ---- iocAdmin/Db/iocAdminVxWorks.substitutions | 2 +- 5 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 iocAdmin/Db/epicsEnvVars.substitutions diff --git a/iocAdmin/Db/Makefile b/iocAdmin/Db/Makefile index 91b8013..efc38aa 100644 --- a/iocAdmin/Db/Makefile +++ b/iocAdmin/Db/Makefile @@ -12,7 +12,6 @@ include $(TOP)/configure/CONFIG # databases, templates, substitutions like this # DB += siteEnvVars.db -DB += epicsEnvVars.db DB += iocAdminScanMon.db DB += ioc.db DB += iocRTOS.db @@ -38,17 +37,17 @@ include $(TOP)/configure/RULES #---------------------------------------- # ADD RULES AFTER THIS LINE -$(COMMON_DIR)/iocAdminRTEMS.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db +$(COMMON_DIR)/iocAdminRTEMS.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db -$(COMMON_DIR)/iocAdminSoft.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db +$(COMMON_DIR)/iocAdminSoft.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db -$(COMMON_DIR)/iocAdminVxWorks.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/epicsEnvVars.db $(COMMON_DIR)/siteEnvVars.db +$(COMMON_DIR)/iocAdminVxWorks.db: $(COMMON_DIR)/iocAdminScanMon.db $(COMMON_DIR)/siteEnvVars.db -$(COMMON_DIR)/siteEnvVars.substitutions: $(EPICS_BASE)/configure/CONFIG_SITE_ENV - @echo Expanding siteEnvVars.substitutions from CONFIG_SITE_ENV.... +$(COMMON_DIR)/siteEnvVars.substitutions: $(EPICS_BASE)/configure/CONFIG_SITE_ENV $(EPICS_BASE)/configure/CONFIG_ENV + @echo Expanding siteEnvVars.substitutions from $^.... @echo file iocEnvVar.template > $@ @echo { >> $@ @echo pattern >> $@ @echo { ENVNAME, ENVVAR, ENVTYPE } >> $@ - @sed -n "s/^EPICS_\([A-Z_]*\).*/{\1, EPICS_\1, epics}/p" $< >> $@ + @sed -n "s/^EPICS_\([A-Z_]*\).*/{\1, EPICS_\1, epics}/p" $^ >> $@ @echo } >> $@ diff --git a/iocAdmin/Db/epicsEnvVars.substitutions b/iocAdmin/Db/epicsEnvVars.substitutions deleted file mode 100644 index 128d0a0..0000000 --- a/iocAdmin/Db/epicsEnvVars.substitutions +++ /dev/null @@ -1,29 +0,0 @@ -#============================================================================== -# -# Abs: Records for EPICS environment variables -# -# Name: epicsEnvVars.substitutions -# -#============================================================================== -# -file iocEnvVar.template -{ - pattern - { ENVNAME , ENVVAR , ENVTYPE} - { CA_ADDR_LIST , EPICS_CA_ADDR_LIST , epics } - { CA_CONN_TIME , EPICS_CA_CONN_TMO , epics } - { CA_AUTO_ADDR , EPICS_CA_AUTO_ADDR_LIST , epics } - { CA_RPTR_PORT , EPICS_CA_REPEATER_PORT , epics } - { CA_SRVR_PORT , EPICS_CA_SERVER_PORT , epics } - { CA_MAX_ARRAY , EPICS_CA_MAX_ARRAY_BYTES , epics } - { CA_SRCH_TIME , EPICS_CA_MAX_SEARCH_PERIOD , epics } - { CA_BEAC_TIME , EPICS_CA_BEACON_PERIOD , epics } - - { CAS_SRVR_PORT , EPICS_CAS_SERVER_PORT , epics } - { CAS_AUTO_ADDR , EPICS_CAS_AUTO_BEACON_ADDR_LIST , epics } - { CAS_ADDR_LIST , EPICS_CAS_BEACON_ADDR_LIST , epics } - { CAS_BEACON_PERIOD , EPICS_CAS_BEACON_PERIOD , epics } - { CAS_BEACON_PORT , EPICS_CAS_BEACON_PORT , epics } - { CAS_ADDR_INTF_LIST , EPICS_CAS_INTF_ADDR_LIST , epics } - { CAS_ADDR_IGNORE_LIST , EPICS_CAS_IGNORE_ADDR_LIST , epics } -} diff --git a/iocAdmin/Db/iocAdminRTEMS.substitutions b/iocAdmin/Db/iocAdminRTEMS.substitutions index f87f77f..e825928 100644 --- a/iocAdmin/Db/iocAdminRTEMS.substitutions +++ b/iocAdmin/Db/iocAdminRTEMS.substitutions @@ -32,7 +32,7 @@ file iocRTEMSOnly.template pattern { IOCNAME } { "$(IOC)" } } -file epicsEnvVars.db +file siteEnvVars.db { pattern { IOCNAME, } { "$(IOC)" } diff --git a/iocAdmin/Db/iocAdminSoft.substitutions b/iocAdmin/Db/iocAdminSoft.substitutions index 095b5c0..b6d59c6 100644 --- a/iocAdmin/Db/iocAdminSoft.substitutions +++ b/iocAdmin/Db/iocAdminSoft.substitutions @@ -22,11 +22,6 @@ file iocAdminScanMon.db { IOCNAME } { "$(IOC)" } } -file epicsEnvVars.db -{ -pattern { IOCNAME, } - { "$(IOC)" } -} file siteEnvVars.db { diff --git a/iocAdmin/Db/iocAdminVxWorks.substitutions b/iocAdmin/Db/iocAdminVxWorks.substitutions index 773ab56..065f05b 100644 --- a/iocAdmin/Db/iocAdminVxWorks.substitutions +++ b/iocAdmin/Db/iocAdminVxWorks.substitutions @@ -32,7 +32,7 @@ file iocVxWorksOnly.template pattern { IOCNAME , DAT_MBUF_FLNK } { "$(IOC)" , "$(IOC):CLUST_0_0_0"} } -file epicsEnvVars.db +file siteEnvVars.db { pattern { IOCNAME, } { "$(IOC)" } From ce798468bc5866431c4b239556356c4434a19817 Mon Sep 17 00:00:00 2001 From: Simon Rose Date: Wed, 19 Nov 2025 13:17:35 +0100 Subject: [PATCH 2/3] Add aliases for old PV names --- iocAdmin/Db/iocAdminRTEMS.substitutions | 5 +++++ iocAdmin/Db/iocAdminSoft.substitutions | 8 +++++++- iocAdmin/Db/iocAdminVxWorks.substitutions | 5 +++++ iocAdmin/Db/siteEnvVarAliases.template | 14 ++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 iocAdmin/Db/siteEnvVarAliases.template diff --git a/iocAdmin/Db/iocAdminRTEMS.substitutions b/iocAdmin/Db/iocAdminRTEMS.substitutions index e825928..c023ba8 100644 --- a/iocAdmin/Db/iocAdminRTEMS.substitutions +++ b/iocAdmin/Db/iocAdminRTEMS.substitutions @@ -37,6 +37,11 @@ file siteEnvVars.db pattern { IOCNAME, } { "$(IOC)" } } +file siteEnvVarAliases.template +{ +pattern { IOCNAME } + { "$(IOC)" } +} file iocCluster.template { # Pool Size diff --git a/iocAdmin/Db/iocAdminSoft.substitutions b/iocAdmin/Db/iocAdminSoft.substitutions index b6d59c6..af3b872 100644 --- a/iocAdmin/Db/iocAdminSoft.substitutions +++ b/iocAdmin/Db/iocAdminSoft.substitutions @@ -26,5 +26,11 @@ file iocAdminScanMon.db file siteEnvVars.db { pattern { IOCNAME, } - { "$(IOC)" } + { "$(IOC)" } +} + +file siteEnvVarAliases.template +{ +pattern { IOCNAME } + { "$(IOC)" } } diff --git a/iocAdmin/Db/iocAdminVxWorks.substitutions b/iocAdmin/Db/iocAdminVxWorks.substitutions index 065f05b..7789e2e 100644 --- a/iocAdmin/Db/iocAdminVxWorks.substitutions +++ b/iocAdmin/Db/iocAdminVxWorks.substitutions @@ -37,6 +37,11 @@ file siteEnvVars.db pattern { IOCNAME, } { "$(IOC)" } } +file siteEnvVarAliases.template +{ +pattern { IOCNAME } + { "$(IOC)" } +} file iocCluster.template { # Pool Size diff --git a/iocAdmin/Db/siteEnvVarAliases.template b/iocAdmin/Db/siteEnvVarAliases.template new file mode 100644 index 0000000..b454204 --- /dev/null +++ b/iocAdmin/Db/siteEnvVarAliases.template @@ -0,0 +1,14 @@ +# These are deprecated aliases to maintain consistency with old record names + +alias("$(IOCNAME):CA_CONN_TMO", "$(IOCNAME):CA_CONN_TIME") +alias("$(IOCNAME):CA_AUTO_ADDR_LIST", "$(IOCNAME):CA_AUTO_ADDR") +alias("$(IOCNAME):CA_REPEATER_PORT", "$(IOCNAME):CA_RPTR_PORT") +alias("$(IOCNAME):CA_SERVER_PORT", "$(IOCNAME):CA_SRVR_PORT") +alias("$(IOCNAME):CA_MAX_ARRAY_BYTES", "$(IOCNAME):CA_MAX_ARRAY") +alias("$(IOCNAME):CA_MAX_SEARCH_PERIOD", "$(IOCNAME):CA_SRCH_TIME") +alias("$(IOCNAME):CA_BEACON_PERIOD", "$(IOCNAME):CA_BEAC_TIME") +alias("$(IOCNAME):CAS_SERVER_PORT", "$(IOCNAME):CAS_SRVR_PORT") +alias("$(IOCNAME):CAS_AUTO_BEACON_ADDR_LIST", "$(IOCNAME):CAS_AUTO_ADDR") +alias("$(IOCNAME):CAS_BEACON_ADDR_LIST", "$(IOCNAME):CAS_ADDR_LIST") +alias("$(IOCNAME):CAS_INTF_ADDR_LIST", "$(IOCNAME):CAS_ADDR_INTF_LIST") +alias("$(IOCNAME):CAS_IGNORE_ADDR_LIST", "$(IOCNAME):CAS_ADDR_IGNORE_LIST") From 98ab345ee4203f753fc97abe17fd23bcfdac7d91 Mon Sep 17 00:00:00 2001 From: Simon Rose Date: Wed, 19 Nov 2025 13:25:56 +0100 Subject: [PATCH 3/3] Add release note --- RELEASE_NOTES | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 20456c6..39662e6 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -4,6 +4,20 @@ Release Notes for iocStats # Releases +## Unreleased + +**DEPRECATION NOTE** Due to fetching variables directly from CONFIG_ENV from EPICS base, some +PV names have changes. For example, we are changing `$(IOCNAME):CA_CONN_TIME` to +`$(IOCNAME):CA_CONN_TMO` in order to match the name of the environment variable that +is the origin of the PV; see `siteEnvVarAliases.template` for the full list. + +These PVs are to be considered deprecated and will be removed entirely in a future +release. + +* Changes by Simon Rose: + - Fetch CONFIG_ENV variables from EPICS base for record population in + `iocAdminSoft*` .db files + ## iocStats-R3-2-0: **NOTE** Please note that as of 3-2-0, there is a pre-commit (https://pre-commit.com/) workflow that