install msi for all "Command" builds

This protects the cases of:
- simultaneously adding and requesting of an error symbol
- simultaneously adding many error symbols

x

.github/workflows/ci-scripts-build.yml

@@ -51,25 +51,6 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - os: ubuntu-22.04
-            cmp: gcc-12
-            name: "Ub-22 gcc-12 c++20 Werror"
-            # Turn all warnings into errors,
-            # except for those we could not fix (yet).
-            # Remove respective -Wno-error=... flag once it is fixed.
-            extra: "CMD_CXXFLAGS=-std=c++20
-                    CMD_CPPFLAGS='-fdiagnostics-color
-                                  -Werror
-                                  -Wno-error=deprecated-declarations
-                                  -Wno-error=stringop-truncation
-                                  -Wno-error=restrict
-                                  -Wno-error=sizeof-pointer-memaccess
-                                  -Wno-error=nonnull
-                                  -Wno-error=dangling-pointer
-                                  -Wno-error=format-overflow
-                                  -Wno-error=format-security
-                                  -Wno-error=stringop-overread'"
-
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default

.gitignore

@@ -17,4 +17,3 @@ O.*/
 *.log
 .*.swp
 .DS_Store
-.iocsh_history

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "modules/pvData"]
     path = modules/pvData
-    url = https://github.com/epics-base/pvDataCPP
+#    url = https://github.com/epics-base/pvDataCPP
+    url = git@git.psi.ch:epics_base/pvData.git
     branch = master
 [submodule "modules/pvAccess"]
     path = modules/pvAccess
@@ -26,3 +27,6 @@
     path = .ci
     url = https://github.com/epics-base/ci-scripts
     branch = master
+[submodule "modules/pcas"]
+    path = modules/pcas
+    url = https://github.com/epics-modules/pcas

Makefile

@@ -23,3 +23,10 @@ DIRS += modules
 modules_DEPEND_DIRS = src
 
 include $(TOP)/configure/RULES_TOP
+
+UNINSTALL_DIRS += $(INSTALL_LOCATION)/src
+copysrc:
+	tar cf - --exclude-vcs --exclude-backups --exclude=O.* modules/*/src | tar xf - -C $(INSTALL_LOCATION)
+
+tar:
+	tar cfjP epics_base-$(EPICS_VERSION_NUMBER).tar.bz2 $(INSTALL_LOCATION)

configure/CONFIG.gnuCommon

@@ -33,7 +33,11 @@ CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
 CODE_CFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CFLAGS_YES = -Wall -Werror-implicit-function-declaration
 WARN_CFLAGS_NO = -w
-OPT_CFLAGS_YES = -O3
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES = -O3 -g
 OPT_CFLAGS_NO = -g
 
 PROF_CXXFLAGS_YES = -p
@@ -42,7 +46,7 @@ CODE_CXXFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 CODE_CXXFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CXXFLAGS_YES = -Wall
 WARN_CXXFLAGS_NO = -w
-OPT_CXXFLAGS_YES = -O3
+OPT_CXXFLAGS_YES = -O3 -g
 OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))

configure/CONFIG_BASE_VERSION

@@ -48,15 +48,15 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 8
+EPICS_MODIFICATION = 7
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
-EPICS_PATCH_LEVEL = 0
+EPICS_PATCH_LEVEL = 1
 
 # Immediately after an official release the EPICS_PATCH_LEVEL is incremented
 # and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
-EPICS_DEV_SNAPSHOT=
+EPICS_DEV_SNAPSHOT=-DEV
 
 # No changes should be needed below here
 

configure/CONFIG_CA_VERSION

@@ -6,7 +6,7 @@ EPICS_CA_MAINTENANCE_VERSION = 3
 
 # Development flag, set to zero for release versions
 
-EPICS_CA_DEVELOPMENT_FLAG = 0
+EPICS_CA_DEVELOPMENT_FLAG = 1
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_DATABASE_VERSION

@@ -1,12 +1,12 @@
 # Version number for the database APIs and shared library
 
 EPICS_DATABASE_MAJOR_VERSION = 3
-EPICS_DATABASE_MINOR_VERSION = 23
-EPICS_DATABASE_MAINTENANCE_VERSION = 0
+EPICS_DATABASE_MINOR_VERSION = 22
+EPICS_DATABASE_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions
 
-EPICS_DATABASE_DEVELOPMENT_FLAG = 0
+EPICS_DATABASE_DEVELOPMENT_FLAG = 1
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_LIBCOM_VERSION

@@ -1,12 +1,12 @@
 # Version number for the libcom APIs and shared library
 
 EPICS_LIBCOM_MAJOR_VERSION = 3
-EPICS_LIBCOM_MINOR_VERSION = 23
-EPICS_LIBCOM_MAINTENANCE_VERSION = 0
+EPICS_LIBCOM_MINOR_VERSION = 22
+EPICS_LIBCOM_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions
 
-EPICS_LIBCOM_DEVELOPMENT_FLAG = 0
+EPICS_LIBCOM_DEVELOPMENT_FLAG = 1
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

configure/CONFIG_SITE

@@ -157,7 +157,9 @@ USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES
 
 # Site version number, if set will append '-' and this string to the
 #  EPICS version number string that is reported by many tools.
-EPICS_SITE_VERSION =
+ifeq ($(INSTALL_LOCATION),$(EPICS_BASE))
+EPICS_SITE_VERSION=$(shell $(PERL) -MPOSIX -e 'print strftime "%Y-%m-%d", localtime')
+endif
 
 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.

configure/RULES_BUILD

@@ -100,6 +100,23 @@ include $(CONFIG)/RULES_FILE_TYPE
 
 include $(CONFIG)/RULES.Db
 
+#---------------------------------------------------------------
+# Do not build anything if current path matches SKIP_BUILDS
+
+ifneq (,$(strip $(SKIP_BUILDS)))
+CURRENT_MODULE=$(subst modules/,,$(subst $(realpath $(TOP)/..)/,,$(subst $(realpath $(dir $(lastword $(MAKEFILE_LIST)))..)/,,$(realpath ..))))
+ifneq ($(filter $(SKIP_BUILDS) $(addsuffix /%,$(SKIP_BUILDS)),$(CURRENT_MODULE)),)
+$(info Skipping $(CURRENT_MODULE) for $(T_A))
+PROD=
+TESTPROD=
+LIBRARY=
+TESTLIBRARY=
+LOADABLE_LIBRARY=
+TESTS=
+SRC_FILES=
+endif
+endif
+
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
 
@@ -226,7 +243,7 @@ $(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
 
 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
-$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
+$(TESTPRODNAME) $(PRODNAME): %$(EXE):
 	@$(RM) $@
 	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
@@ -329,10 +346,6 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
-$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
-$(INSTALL_LIB):
-	@$(MKDIR) $@
-
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 

configure/os/CONFIG.Common.RHEL7-x86_64

@@ -0,0 +1,6 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+TOOLSET_LOCATION = /opt/rh
+TOOLSET = devtoolset-12
+STD_CXXFLAGS = -std=c++20

configure/os/CONFIG.Common.RHEL7-x86_64-clang

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang

configure/os/CONFIG.Common.RHEL8-x86_64

@@ -0,0 +1,18 @@
+# Include definitions common to linux pentium targets
+include $(CONFIG)/os/CONFIG.Common.linux-x86_64
+
+TOOLSET_LOCATION = /opt/rh
+TOOLSET = gcc-toolset-12
+STD_CXXFLAGS = -std=c++20
+
+# Fix bug in gcc-toolset-11 calling the old assembler
+ifneq ($(filter %-11,$(TOOLSET)),)
+TARGET_CPPFLAGS += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+TARGET_LDFLAGS  += $(TOOLSET_DIR:%=-B$(SYSROOT)%/bin)
+endif
+
+ifneq (($(TOOLSET)),)
+# Perl requests (native) annobin incompatible with the annobin from any TOOLSET
+# Disable Perl specific CFLAGS
+override Cap5_CFLAGS=
+endif

configure/os/CONFIG.Common.RHEL8-x86_64-clang

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.linux-clang
+
+STD_CXXFLAGS = -std=c++2a

configure/os/CONFIG.Common.RTEMS-pc686

@@ -32,7 +32,7 @@ OP_SYS_LDFLAGS += -Wl,-Ttext,0x100000
 
 
 # This check must appear after the above include
-ifneq ($(RTEMS_VERSION),5)
+ifneq ($(firstword $(subst ., ,$(RTEMS_VERSION))),5)
   $(info *** This target is not compatible with the configured RTEMS version.)
   $(info *** Build the RTEMS-pc386 (-qemu) target for RTEMS 4.x)
   $(error Can't continue)

configure/os/CONFIG.Common.RTEMS-qoriq_e500

@@ -22,7 +22,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_HAS_ALTIVEC
 #OP_SYS_LDLIBS += -lbspExt #does not use posix stuff ... want to ignore
 OP_SYS_LDLIBS += -Wl,--gc-sections
 #ARCH_DEP_LDFLAGS = -mcpu=8540 -meabi -msdata=sysv -mstrict-align -mspe -mabi=spe -mfloat-gprs=double 
-ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/$(RTEMS_BSP)/lib
+ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/powerpc-rtems5/qoriq_e500/lib  
 
 MUNCH_SUFFIX = .img
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))

configure/os/CONFIG.Common.RTEMS49-pc386

@@ -0,0 +1,2 @@
+RTEMS_VERSION = 4.9
+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386

configure/os/CONFIG.Common.RTEMS51-pc686

@@ -0,0 +1,2 @@
+RTEMS_VERSION = 5
+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc686

configure/os/CONFIG.Common.T2-ppc604

@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 5.5.1
+WIND_BASE = /afs/psi.ch/project/vxworks/Tornado2.2.1
+
+#there is a problem with our ccppc and optimization
+# -O0 works, -O and -O1 and higher are buggy
+OPT_CFLAGS_YES = -O0
+OPT_CXXFLAGS_YES = -O0

configure/os/CONFIG.Common.V62-ppc604

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.2

configure/os/CONFIG.Common.V63-ppc603

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V63-ppc604

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.3
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V64-ppc604

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.4
+
+# Buggy "uninitialized variable" warning produces many false positives
+ARCH_DEP_CXXFLAGS += -Wno-uninitialized

configure/os/CONFIG.Common.V66-ppc603

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc603_long
+VXWORKS_VERSION = 6.6

configure/os/CONFIG.Common.V66-ppc604

@@ -0,0 +1,2 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.6

configure/os/CONFIG.Common.V67-ppc604

@@ -0,0 +1,8 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.7
+
+# needed when including memPartLib.h, e.g. through moduleLib.h or loadLib.h
+ARCH_DEP_CFLAGS += -D_VSB_CONFIG_FILE='<../lib/h/config/vsbConfig.h>'
+
+# compiler tries to access license server (even though no license isneeded)
+export LM_LICENSE_FILE=37000@lic-windriver.psi.ch

configure/os/CONFIG.Common.V69-ppc32

@@ -0,0 +1,3 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc32
+VXWORKS_VERSION = 6.9
+#export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib

configure/os/CONFIG.Common.V69-ppc604

@@ -0,0 +1,6 @@
+include $(CONFIG)/os/CONFIG.Common.vxWorks-ppc604_long
+VXWORKS_VERSION = 6.9
+#export LD_LIBRARY_PATH=$(WIND_BASE)/lmapi-5.0/$(WIND_HOST_TYPE)/lib
+
+# -fno-implicit-fp causes error: "unable to find a register to spill in class 'FLOAT_REGS'"
+ARCH_DEP_CFLAGS = -mcpu=604 -mstrict-align

configure/os/CONFIG.Common.deb10-x86_64

@@ -0,0 +1,22 @@
+# Cross Debian 10 with gcc 8.3
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = x86_64
+
+LDLIBS_SHARED_YES=LDLIBS
+
+SDK = gcc
+SDK_DIR  = /opt/xgcc/gcc-8.3.0-deb10
+GNU_ARCH = x86_64-deb10-linux-gnu
+SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
+GNU_DIR = $(SDK_DIR)
+GNU_BIN = $(GNU_DIR)/bin/
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=x86_64-deb10-linux-gnu
+
+ARCH_DEP_CPPFLAGS =
+AS=$(GNU_BIN)/$(GNU_TARGET)-as
+
+STD_CXXFLAGS = -std=c++17

configure/os/CONFIG.Common.eldk42-ppc4xxFP

@@ -0,0 +1,28 @@
+# DeltaTau PowerPMAC with ELDK 4.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+ARCH_CLASS = ppc
+
+ELDK=/opt/eldk-4.2
+GNU_TARGET=ppc_4xxFP
+GNU_DIR=$(ELDK)/usr
+
+# This cross tool chain is installed in a somehow weired way
+# Without the following lines it does not work on RHEL7
+# but it worked on SL6
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward
+
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
+ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib
+
+# have no C++11
+STD_CXXFLAGS =
+
+# suppress strict alias warnings
+CODE_CPPFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -0,0 +1,17 @@
+# Virtex FPGA embedded Processor with ELDK 5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-4xx-softfloat
+GNU_ARCH = ppc405-linux
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x

configure/os/CONFIG.Common.eldk52-e500v2

@@ -0,0 +1,18 @@
+# IOxOS IFC1210 with ELDK 5.2
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.2
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_TARGET = powerpc-e500v2
+GNU_ARCH = ppce500v2-linux-gnuspe
+GNU_DIR = $(SDK_DIR)/$(GNU_TARGET)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x

configure/os/CONFIG.Common.eldk53-ppc4xxFP

@@ -0,0 +1,20 @@
+# DeltaTau PowerPMAC with ELDK 5.3
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = eldk
+SDK_DIR = /opt/eldk-5.3
+SDK_HOST_ARCH = $(GNU_HOST_ARCH)-$(SDK)-$(GNU_HOST_OS)
+GNU_ARCH = ppc440e-linux
+SDKTARGETSYSROOT=$(SDK_DIR)/powerpc-4xx/sysroots
+GNU_DIR = $(SDKTARGETSYSROOT)/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_ARCH)
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-linux
+SYSROOT = $(SDKTARGETSYSROOT)/$(GNU_ARCH)
+
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.fslqoriq20-e6500_64

@@ -0,0 +1,17 @@
+# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = fslsdk
+SDK_DIR = /opt/fsl-qoriq/2.0
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = ppc64e6500-fsl-linux
+GNU_TARGET = powerpc64-fsl-linux
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float

configure/os/CONFIG.Common.gcc8-ppc4xxFP

@@ -0,0 +1,21 @@
+# DeltaTau PowerPMAC with gcc 8.5
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = ppc
+
+SDK = gcc
+SDK_DIR = /opt/xgcc/gcc-8.5.0
+GNU_ARCH = powerpc-ppmac-linux-gnu
+SDKTARGETSYSROOT=$(SDK_DIR)/$(GNU_ARCH)/sys-root/
+GNU_DIR = $(SDK_DIR)
+GNU_BIN = $(GNU_DIR)/bin/
+GNU_TARGET_INCLUDE_DIR =
+GNU_TARGET=powerpc-ppmac-linux-gnu
+
+ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
+ARCH_DEP_LDFLAGS+=-Wl,-rpath,/opt/xgcc/gcc-8.5.0/$(GNU_ARCH)/lib
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/lib/powerpc-linux-gnu/
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(SDKTARGETSYSROOT)/usr/lib/powerpc-linux-gnu/
+AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.linux-clang

@@ -0,0 +1,5 @@
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++

configure/os/CONFIG.Common.moxa42-armv6l

@@ -0,0 +1,26 @@
+# Moxa DA-66x with SDK 4.2 and ARM7 processor
+
+# Include definitions common to all Linux ARM targets
+include $(CONFIG)/os/CONFIG.Common.linux-arm
+
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/arm-linux-4.4.2-v4
+GNU_TARGET=arm
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(GNU_DIR)/arm-none-linux-gnueabi/lib
+ARCH_DEP_LDFLAGS+=-Wl,-rpath-link,$(INSTALL_LIB)
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES
+
+# suppress note "the mangling of 'va_list' has changed in GCC 4.4"
+ARCH_DEP_CXXFLAGS += -Wno-psabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# have no full C++11
+STD_CXXFLAGS = -std=c++0x
+
+# suppress strict alias warnings
+CODE_CPPFLAGS += -fno-strict-aliasing
+
+# accept4() exists but does not work
+# Give fake __rtems__ macro to posix/osdSock.c because that disables accept4()
+osdSock_CFLAGS += -D__rtems__

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -0,0 +1,18 @@
+# Moxa DA-66x with Montavista Linux 4.0
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+COMMANDLINE_LIBRARY = READLINE_CURSES
+
+ARCH_CLASS = xscale
+
+GNU_DIR=/afs/psi.ch/project/embeddedlinux/moxa/xscale_be/armv5teb-montavista-linuxeabi
+
+ARCH_DEP_CFLAGS += -funwind-tables
+
+# have no C++11
+STD_CXXFLAGS =
+
+# Cannot build PVA because of missing boost support
+SKIP_BUILDS = pv% normativeTypes

configure/os/CONFIG.Common.nilrt7-armv7a

@@ -0,0 +1,17 @@
+# National Instruments CompactRIO running LabView RT 19.5.1
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm
+
+GNU_TARGET = arm-linux-gnu
+
+SYSROOT = /opt/LabVIEW-RT-19.5.1/arm/sysroots/armv7a-vfp-neon-nilrt-linux-gnueabi
+GNU_BIN = /bin
+
+ARCH_DEP_CPPFLAGS += -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon
+ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/arm-nilrt-linux-gnueabi/
+ARCH_DEP_CXXFLAGS += -I$(SYSROOT)/usr/include/c++/4.7.2/
+
+COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.raspbian-arm

@@ -0,0 +1,41 @@
+# RaspberryPi with github.com/raspberrypi/tools toolchain
+# Tested on:
+# * Raspberry 3B+ Raspbian 9
+# * Raspberry 2   Raspbian 7
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+# Using readline:
+# Due to missing/messed up libs in the toolchain, readline needs copies of
+# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
+# /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
+# $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
+# and manually created links libtinfo.so.5 and libreadline.so.
+# For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
+# libtinfo.so.5 is in the way. Remove it.
+# (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
+# Also copy /usr/include/readline/ directory from some readline 6 installation
+# to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/
+
+ARCH_CLASS = arm
+
+SDK_DIR = /opt/raspberrypi/arm-bcm2708
+
+# Available SDK_TARGETs:
+
+# gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+
+# gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+
+# gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
+# SDK_TARGET = arm-linux-gnueabihf
+
+# gcc 4.7.1 for 32 bit hosts with GLIBC 2.4 or higher
+# SDK_TARGET = arm-bcm2708hardfp-linux-gnueabi
+# SDK_TARGET = arm-bcm2708-linux-gnueabi
+
+GNU_DIR = $(SDK_DIR)/$(SDK_TARGET)
+GNU_TARGET = $(if $(filter arm-bcm2708%,SDK_TARGET),$(SDK_TARGET),arm-linux-gnueabihf)

configure/os/CONFIG.Common.yocto21-aarch64

@@ -0,0 +1,15 @@
+# XILINX Zynq with Yocto 2.1 / Petalinux toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm64
+
+SDK = petalinux
+SDK_DIR = /opt/petalinux-gfa/2018.1
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = aarch64-xilinx-linux
+GNU_TARGET = $(SDK_TARGET)
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)

configure/os/CONFIG.Common.yocto40-aarch64

@@ -0,0 +1,19 @@
+# XILINX Zynq with Yocto 4.0 toolchain
+
+# Include definitions common to all Linux targets
+include $(CONFIG)/os/CONFIG.Common.linuxCommon
+
+ARCH_CLASS = arm64
+
+SDK = pokysdk
+SDK_DIR = /opt/yocto40-aarch64
+SDK_HOST_ARCH = $(GNU_HOST_ARCH_64)-$(SDK)-$(GNU_HOST_OS)
+SDK_TARGET = cortexa53-poky-linux
+GNU_TARGET = aarch64-poky-linux
+SYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
+GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
+GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
+
+ARCH_DEP_CPPFLAGS = -mcpu=cortex-a53 -march=armv8-a+crc
+
+STD_CXXFLAGS = -std=c++23

configure/os/CONFIG.Linux.windows-x64

@@ -0,0 +1,6 @@
+include $(CONFIG)/os/CONFIG.windows-x64.windows-x64
+
+VALID_BUILDS = Ioc Command
+
+PATH := /opt/wine-msvc-2017/bin/x64:$(PATH)
+export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)

configure/os/CONFIG.RHEL7-x86_64.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.RHEL7-x86_64.RHEL7-x86_64

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.RHEL7-x86_64.windows-x64

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG.RHEL8-x86_64.Common

@@ -0,0 +1,3 @@
+#CONFIG.$(EPICS_HOST_ARCH).Common is required by build system
+#Include definitions common to linux hosts
+include $(CONFIG)/os/CONFIG.linux-x86_64.Common

configure/os/CONFIG.RHEL8-x86_64.RHEL7-x86_64

@@ -0,0 +1,22 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
+
+# "Cross compile" for RHEL7-x86_64
+# Expects RHEL7 RPMs c++ and readline-devel installed
+# in $(SYSROOT)
+# This can be installed on RHEL7 with:
+#    yum install --installroot=$(SYSROOT) <packages>
+# (Assuming $(SYSROOT) is on a shared network volume.)
+# Optionally use a newer TOOLSET (installed on $(SYSROOT)).
+
+SYSROOT = /opt/RHEL7
+
+# "Cross" TOOLSET progs need to find their libraries
+LD_LIBRARY_PATH = $(TOOLSET_DIR:%=$(SYSROOT)%/usr/$$LIB)
+
+# These programs have library problems when using them
+# from SYSROOT but without TOOLSET.
+# But provinding LD_LIBRARY PATH crashes other progams.
+# Our host versions work just fine.
+AR = ar -rc
+RANLIB = ranlib

configure/os/CONFIG.RHEL8-x86_64.RHEL8-x86_64

@@ -0,0 +1,2 @@
+# Include common linux definitions
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86

configure/os/CONFIG.RHEL8-x86_64.nilrt7-armv7a

@@ -0,0 +1 @@
+GNU_BIN = /opt/RHEL7/bin

configure/os/CONFIG.RHEL8-x86_64.windows-x64

@@ -0,0 +1 @@
+include $(CONFIG)/os/CONFIG.Linux.windows-x64

configure/os/CONFIG_SITE.Common.RTEMS

@@ -24,6 +24,9 @@
 #RTEMS_VERSION = 5
 #RTEMS_BASE = /usr/local/vw/rtems/rtems-5.1
 
+# PSI:
+RTEMS_BASE = /opt/rtems/$(RTEMS_VERSION)
+
 # Cross-compile toolchain in $(RTEMS_TOOLS)/bin
 #
 RTEMS_TOOLS = $(RTEMS_BASE)

configure/os/CONFIG_SITE.Common.UnixCommon

@@ -0,0 +1,2 @@
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)

configure/os/CONFIG_SITE.Common.deb10-x86_64

@@ -0,0 +1,2 @@
+# Debian 10
+COMMANDLINE_LIBRARY=READLINE_NCURSES

configure/os/CONFIG_SITE.Common.gcc8-ppc4xxFP

@@ -0,0 +1,2 @@
+# DeltaTau PowerPMAC with gcc
+COMMANDLINE_LIBRARY=READLINE

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -8,3 +8,16 @@
 # They must be set in the host+target specific file instead:
 #   CONFIG_SITE.<linux-arch>.<linux-arch>
 
+COMMANDLINE_LIBRARY = READLINE
+
+USR_CXXFLAGS += $(STD_CXXFLAGS)
+STD_CXXFLAGS = -std=c++11
+
+TOOLSET_DIR      = $(TOOLSET:%=$(TOOLSET_LOCATION)/%/root)
+GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
+TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
+TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
+
+ifeq ($(filter SL% RHEL%,$(T_A)),)
+VALID_BUILDS = Ioc Command
+endif

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -18,8 +18,82 @@ VXWORKS_VERSION = 6.9
 # architecture by adding it to an appropriate
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
+#### Fixes for CONFIG.Common.vxWorksCommon  #######
+
+VX_GNU_VERSION_7 = 4.8.1.11
+
+
+# These are needed for vxWorks 6.x; the GNU toolset version number
+# is in the path to the compiler tools:
+VX_GNU_VERSION_5   = 2.96
+VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
+VX_GNU_MAJOR_VERSION = $(firstword $(subst ., ,$(VX_GNU_VERSION)))
+VX_GNU_MINOR_VERSION = $(word 2,$(subst ., ,$(VX_GNU_VERSION)))
+
+# gcc version before 3.4 are "old" and need special treatment
+VX_OLD_GCC_2   = OLD
+VX_OLD_GCC_3.3 = OLD
+VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
+VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
+
+# vxWorks directory definitions
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR_7 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/pkgs/os
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+
+VX_INCLUDE_DIRS_5  = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6  = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 += $(VX_DIR)/target/h/wrn/coreip
+VX_INCLUDE_DIRS_7  = $(VX_DIR)/core/kernel-1.2.8.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/lang-lib/libc-1.0.0.1/libc-kernel-1.0.8.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/h
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/utils/ostools-1.0.5.0/shareh
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/base/h/
+VX_INCLUDE_DIRS_7 += $(VX_DIR)/arch/ppc-1.3.4.0/kernel/60x/h/arch/ppc/
+VX_INCLUDE_DIRS_7 += $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/krnl/h/public
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+
+TARGET_CPPFLAGS_5 = -isystem $(VX_DIR)/target/h
+TARGET_CPPFLAGS_6 = -isystem $(VX_DIR)/target/h
+TARGET_CPPFLAGS_7 = -isystem $(VX_DIR)/core/kernel-1.2.8.0/h -D_VSB_CONFIG_FILE='<$(WIND_BASE)/vxworks-$(VXWORKS_VERSION)/samples/prebuilt_projects/vsb_vxsim_linux/h/config/vsbConfig.h>'
+TARGET_CPPFLAGS = $(TARGET_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
+
+# vxWorks GNU directories
+
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR_7 = $(WIND_BASE)/compilers/gnu-$(VX_GNU_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+
+# Operating system flags
+
+OP_SYS_INCLUDE_CPPFLAGS_5 += -include $(VX_DIR)/target/h/vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS_5 += -I$(EPICS_BASE)/include/os/vxWorks/vxWorks5
+OP_SYS_INCLUDE_CPPFLAGS_6 += -include $(VX_DIR)/target/h/vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS_7 += -include vxWorks.h
+OP_SYS_INCLUDE_CPPFLAGS = $(OP_SYS_INCLUDE_CPPFLAGS_$(VXWORKS_MAJOR_VERSION))
+
+OP_SYS_LDFLAGS += $(OP_SYS_LDFLAGS_$@)
+OP_SYS_LDFLAGS_softIoc = -whole-archive
+OP_SYS_LDFLAGS_softIocPVA = -whole-archive
+
+# code flags (delete -fno-implicit-templates)
+CODE_CXXFLAGS =
+
 # WIND_BASE is where you installed the Wind River software.
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
+WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)
+
+#--------------------------------------------------
+# Modules we cannot build with old compiler
+
+PV_MODULES = pv% normativeTypes
+SKIP_BUILDS_5 = $(PV_MODULES)
+SKIP_BUILDS_OLD = $(PV_MODULES)
+SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
+SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -0,0 +1,10 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
+CROSS_COMPILER_RUNTEST_ARCHS += RHEL7-x86_64-clang
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+# Not available on RHEL8
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/os/CONFIG_SITE.RHEL8-x86_64.Common

@@ -0,0 +1,11 @@
+include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
+
+# Improved error checking with clang
+CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64-clang
+
+# Build for old RHEL7 64 bit
+CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
+
+# NI Linux Real-Time 7.x
+# requires RPM gcc-c++-arm-linux-gnu
+CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a

configure/os/CONFIG_SITE.linux-x86.Common

@@ -5,3 +5,53 @@
 
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386-qemu
+
+INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+
+GNU_HOST_ARCH=i686
+GNU_HOST_OS=linux
+
+# set LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
+# not exported LD_LIBRARY_PATH causes problem for RHEL7 cross compilation
+export LD_LIBRARY_PATH=
+
+# vxWorks for MVxxxx boards
+#CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
+CROSS_COMPILER_TARGET_ARCHS += V69-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V69-ppc32
+
+# NI compact RIO
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc603
+
+# MOXA montavista linux (No PVA because of missing boost support)
+CROSS_COMPILER_TARGET_ARCHS += mvl40-xscale_be
+
+# MOXA SDK 4.2
+CROSS_COMPILER_TARGET_ARCHS += moxa42-armv6l
+
+# Virtex embedded PPC
+CROSS_COMPILER_TARGET_ARCHS += eldk51-ppc4xxSF
+
+# IOxOS IFC1210
+CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
+
+# DeltaTau PowerPMAC
+CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
+#CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+
+# Test other vxWorks versions
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc603
+#CROSS_COMPILER_TARGET_ARCHS += V66-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V63-ppc604
+#CROSS_COMPILER_TARGET_ARCHS += V64-ppc604
+# (No PVA because of old compiler)
+#CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
+
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
+
+# RTEMS (Can only have 1 RTEMS major version in 1 EPICS installation
+# because they overwrite their header files.)
+#CROSS_COMPILER_TARGET_ARCHS += RTEMS49-pc386
+CROSS_COMPILER_TARGET_ARCHS += RTEMS51-pc686

configure/os/CONFIG_SITE.linux-x86.linux-x86

@@ -3,13 +3,6 @@
 # Site specific definitions for linux-x86 host - linux-x86 target builds
 #-------------------------------------------------------
 
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
 # Uncomment the followings lines to build with CLANG instead of GCC.
 #
 #GNU         = NO

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -7,3 +7,22 @@
 #CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
 #CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
 
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+
+GNU_HOST_ARCH_64=x86_64
+
+# Windows cross builds using Wine
+CROSS_COMPILER_TARGET_ARCHS += windows-x64
+
+# IOxOS IFC1211
+#CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
+
+# Zynq
+#CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64
+CROSS_COMPILER_TARGET_ARCHS += yocto40-aarch64
+
+# Debian 10
+CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
+
+# Newer DeltaTau PowerPMAC
+#CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP

configure/os/CONFIG_SITE.linux-x86_64.linux-x86_64

@@ -3,13 +3,6 @@
 # Site specific definitions for linux-x86_64 host - linux-x86_64 target builds
 #-------------------------------------------------------
 
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g
-
 # Uncomment the followings lines to build with CLANG instead of GCC.
 #
 #GNU         = NO

documentation/RELEASE_NOTES.md

@@ -18,58 +18,9 @@ should also be read to understand what has changed since earlier releases:
 - [pva2pva](https://epics-base.github.io/pva2pva/release_notes.html)
 - [pvaClient](https://github.com/epics-base/pvaClientCPP/blob/master/documentation/RELEASE_NOTES.md)
 
+**This version of EPICS has not been released yet.**
 
-## EPICS Release 7.0.8
-
-### bi "Raw Soft Channel" use MASK
-
-If MASK is non-zero, The raw device support will now apply MASK to the
-value read into RVAL.
-eg. allows extraction of a bit from an input integer.
-
-```
-record(longin, "integer") {
-    field(VAL, "0xff")
-}
-record(bi, "bit1") {
-    field(DESC, "extract bit 1")
-    field(DTYP, "Raw Soft Channel")
-    field(INP , "integer")
-    field(MASK, "0x2")
-    field(ZNAM, "Clear")
-    field(ONAM, "Set")
-}
-```
-
-### ANSI escapes in stderr
-
-ANSI escape charactor sequences may now be printed to the stderr stream.
-These escapes will appear in logs captured from that stream.
-Tools which parse and/or render these logs may need to be adjusted to
-either strip out the escapes, or to translate them into markup.
-(see [ansi2html](https://pypi.org/project/ansi2html/) for example)
-
-### Allow explicit append with `dbRecordsOnceOnly!=0`
-
-Previously setting `dbRecordsOnceOnly!=0` prevented any further changes to a record via a .db file.  eg.
-
-```
-record(ai, "myrec") {}
-```
-
-`dbRecordsOnceOnly!=0` previously disallowed appending fields with either form:
-
-```
-record("*", "myrec") {} # error
-record(ai, "myrec") {}  # error
-```
-
-Beginning with this release, `dbRecordsOnceOnly!=0` allows appending when explicitly intended (when record type is `"*"`).
-
-```
-record("*", "myrec") {} # allowed
-record(ai, "myrec") {}  # error
-```
+## Changes made on the 7.0 branch since 7.0.7
 
 ### Add `$EPICS_CLI_TIMEOUT`
 
@@ -112,7 +63,7 @@ Previously, if a subRecord has an invalid `INP*` link, it was silently failing
 (and not running the proc function).  Now the the status code returned by the
 subroutine is returned from `dbProcess()`.
 
-### COMMANDLINE\_LIBRARY fallback to GNU\_DIR
+### COMMANDLINE_LIBRARY fallback to GNU_DIR
 
 Fall back to the previous behavior when searching for `readline.h` with older compilers.
 
@@ -167,9 +118,7 @@ This functionality was suggested in
 be added to other output record types if the community finds it useful,
 please send feedback about the feature to tech-talk.
 
-### IOC Shell
-
-#### Tab completion
+### Tab completion for IOC shell
 
 When built with optional GNU libreadline support, the interactive IOC shell
 will perform tab completion for command names as well as for some arguments
@@ -181,25 +130,14 @@ using the new `iocshArgStringRecord` and `iocshArgStringPath` argument types.
 Both function identically to `iocshArgString` but indicate how to suggest
 completion strings.
 
-Builds on macOS (`darwin-x86` or `darwin-aarch64` targets) normally use Apple's
+Builds on macOS (darwin-x86 or darwin-aarch64 targets) normally use Apple's
 libedit library in readline compatibility mode, which doesn't support the tab
 completion API that GNU readline provides. You can use Homebrew or some other
 third-party package manager to install the GNU readline package, then edit the
-`configure/os/CONFIG_SITE.darwinCommon.darwinCommon` file to have EPICS use the
+configure/os/CONFIG_SITE.darwinCommon.darwinCommon file to have EPICS use the
 real thing to get tab completion in the IOC shell. The default settings in that
 file currently look for and use a Homebrew-installed readline if present.
 
-#### Persist history
-
-Attempt to read and write command to a file (`./.iocsh_history` by default).
-Name may be overwritten with by setting `$EPICS_IOCSH_HISTFILE` to an
-alternate path, or disabled by setting to an empty string.
-
-#### Changes to help output
-
-Rework the `help` command output to improve formatting and readability,
-and include a visual marker (a line of underlines) between different help commands.
-
 ### Add FMOD as CALC Expression
 
 The floating point modulo function `FMOD(NUM,DEN)` has been added to the CALC
@@ -646,6 +584,33 @@ make INSTALL_LOCATION=/tmp/build FINAL_LOCATION=/usr/lib/epics
 `FINAL_LOCATION` is now correctly used in systemd and sysv init scripts
 `caRepeater.service`, `S99caRepeater`, and `S99logServer`.
 
+### epicsEnvShow accepts glob pattern
+
+The optional argument to epicsEnvShow can now be a glob pattern.
+
+### New function `epicsStrnGlobMatch()`
+
+The function `epicsStrnGlobMatch(char* str, size_t len, char* pattern)`
+works exactly the same as `epicsStrGlobMatch()` but takes an additional
+length arguments which limits the number of characters of `str` to match.
+
+### Glob pattern allowed in `var` command
+
+When used with one argument, the `var` command can be used with a glob pattern
+for printing matching variables.
+
+### Fix for input links marked "special"
+
+The calcout record (and a number of synApps record types) marks its input
+link fields with the attribute `special(SPC_MOD)` and provides code in
+the record's `special()` routine to reinitialize the related value field
+whenever the input link field is set to a numeric constant. Unfortunately the
+changes to the link handling code broke this behaviour (reported as Launchpad
+[bug #1824277](https://bugs.launchpad.net/epics-base/+bug/1824277))
+back in the Base 3.16.1 release. This issue has been fixed in Base, although
+external record types may require some fixing to ensure they are correctly
+checking for and initializing the link in their `special()` routine.
+
 ### IOCsh sets `${PWD}`
 
 IOC shell will now ensure `${PWD}` is set on startup,
@@ -735,6 +700,33 @@ that the variables referenced by output pointers are initialized.
 ```
 
 
+### Timeouts for Unit Test Programs
+
+The unit test programs that are run by the `make runtests` or `make tapfiles`
+commands get executed by a `.t` wrapper script which is normally generated by
+the EPICS `makeTestfile.pl` program. Those generated wrapper scripts now
+impose a time-limit on the test program they execute, and will kill it if it
+runs for longer than 500 seconds (8 minutes 20) without exiting. That
+time-limit can be changed for any such test by modifying the Makefile which
+creates and runs the `.t` wrapper script.
+
+Setting the environment variable `EPICS_UNITTEST_TIMEOUT` to the desired
+number of seconds while the Makefile is generating the test script changes the
+timeout in that script. For example:
+
+```
+  TESTSCRIPTS_HOST += hourLongTest.t
+  hourLongTest.t: export EPICS_UNITTEST_TIMEOUT=3600
+```
+
+When selecting such a timeout remember that different Continuous Integration
+systems such as GitHub Actions and Appveyor run on processors with different
+speeds, so allow enough head-room for slower systems to complete the test.
+
+Test programs written directly in Perl as a `.plt` script should implement a
+similar timeout for themselves. The "netget" test in Base does this in a way
+that works on Windows as well as Unix-like hosts.
+
 ### Timeouts for Unit Test Programs
 
 The unit test programs that are run by the `make runtests` or `make tapfiles`

documentation/ReleaseChecklist.html

@@ -48,14 +48,14 @@ everything that has to be done since it's so easy to miss steps.</p>
 <p>The following roles are used below:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong></dt>
+  <dt><strong>Release Manager</strong> ()</dt>
     <dd>Responsible for managing and tagging the release</dd>
-  <dt><strong>Core Developers</strong></dt>
-    <dd>Responsible for maintaining the EPICS software</dd>
+  <dt><strong>Platform Developers</strong> (informal)</dt>
+    <dd>Responsible for individual operating system platforms</dd>
   <dt><strong>Application Developers</strong></dt>
     <dd>Responsible for support modules that depend on EPICS Base.</dd>
-  <dt><strong>Website Editors</strong></dt>
-    <dd>Responsible for the EPICS websites</dd>
+  <dt><strong>APS Website Editor</strong> (Andrew Johnson)</dt>
+    <dd>Responsible for the APS EPICS website</dd>
 </dl>
 
 <form>
@@ -72,22 +72,23 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Notify core developers about the upcoming release and ask about any
-        remaining tasks that must be finished.</td>
+      <td>Email all developers about the upcoming release and ask for a list
+        of remaining tasks that must be finished.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>All developers</td>
       <td>Check the bug tracker for any outstanding items and handle
-        appropriately.</td>
+        appropriately. All bugs that have been fixed should have been marked
+        as Fix Committed.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Set a Feature Freeze date, by which time all Git branches for
-        enhancements and new functionality should have been merged. After this
-        date, commits and merges should only be made to fix problems that show
-        up during testing.</td>
+      <td>Set the Feature Freeze date, by which time all Git commits for
+        enhancements and new functionality should have been completed. After
+        this date, commits should only be made to fix problems that show up
+        during testing.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -96,7 +97,6 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Ensure that documentation will be updated before the release date:
         <ul>
           <li>Release Notes</li>
-          <li>Doxygen annotations</li>
           <li>Other documents</li>
         </ul>
       </td>
@@ -104,8 +104,13 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Review and update this checklist for the upcoming release.
-        Update the release version number in the tags and messages below.</td>
+      <td>Review and update this checklist for the upcoming release.</td>
+      </tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>Release Manager</td>
+      <td>Create a release milestone on Launchpad. If a target release date is
+        known set "Date Targeted" to the expected release date.</td>
       </tr>
     <tr>
       <th colspan="3">Testing</th>
@@ -113,7 +118,7 @@ everything that has to be done since it's so easy to miss steps.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Platform Developers</td>
-      <td>Run the internal test programs on all available host platforms using
+      <td>Run the built-in test programs on all available host platforms using
         <blockquote><tt>
           make -s runtests
         </tt></blockquote></td>
@@ -151,7 +156,6 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Check that documentation has been updated:
         <ul>
           <li>Release Notes</li>
-          <li>Doxygen annotations</li>
           <li>Other documents</li>
           </ul>
         </td>
@@ -163,8 +167,8 @@ everything that has to be done since it's so easy to miss steps.</p>
     </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Core Developers</td>
-      <td>Reach a consensus that the software is ready to release.</td>
+      <td>Release Manager</td>
+      <td>Obtain a positive <q>Ok to release</q> from developers.</td>
       </tr>
     <tr>
       <th colspan="3">Creating the final release version</th>
@@ -187,29 +191,27 @@ everything that has to be done since it's so easy to miss steps.</p>
               cd base-7.0/modules/&lt;module&gt;/documentation<br />
               pandoc -f gfm -t html -o RELEASE_NOTES.html RELEASE_NOTES.md
               </tt></blockquote>
-            Commit these changes (don't push).</li>
+            Commit changes (don't push).</li>
 
           <li>Edit the module's release version file
-            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and the
-            <tt>Doxyfile</tt>s in the top-level and/or documentation
-            directories. In these, set <tt>DEVELOPMENT_FLAG</tt> to 0 and remove
-            <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string. Commit these
-            changes (don't push).</li>
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
+            <tt>Doxyfile</tt>; set the <tt>DEVELOPMENT_FLAG</tt> value to 0 and
+            remove <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string.
+            Commit changes (don't push).</li>
 
           <li>Tag the module:
             <blockquote><tt>
-              git tag -m 'ANJ: Tag for EPICS 7.0.8' &lt;module-version&gt;
+              git tag -m 'ANJ: Tag for EPICS 7.0.7' &lt;module-version&gt;
               </tt></blockquote>
             </li>
 
           <li>Update the git submodule on the Base-7.0 branch to the
-            newly-tagged version, check the module's status matches the tag:
+            newly-tagged version, but don't commit yet:
             <blockquote><tt>
               cd base-7.0/modules<br />
               git add &lt;module&gt;<br />
               git submodule status --cached
               </tt></blockquote>
-            Don't commit the submodule updates yet.
             </li>
 
           <li>Edit the module's release version file
@@ -219,8 +221,7 @@ everything that has to be done since it's so easy to miss steps.</p>
             <tt>PROJECT_NUMBER</tt> string, appending <tt>-dev</tt> to the new
             module version number. Commit changes.</li>
 
-          <li>Push commits and the new tag to the submodule's GitHub repository
-            (assumed to be the <tt>upstream</tt> remote):
+          <li>Push commits and the new tag to the submodule's GitHub repository:
             <blockquote><tt>
               cd base-7.0/modules/&lt;module&gt;<br />
               git push --follow-tags upstream master
@@ -269,9 +270,10 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Tag the epics-base module in Git:
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for release' R7.0.8
+          git tag -m 'ANJ: Tagged for release' R7.0.7
           </tt></blockquote>
-        <p>Don't push to GitHub yet.</p>
+        <p>Don't push anything to the Launchpad repository
+          yet.</p>
         </td>
       </tr>
     <tr>
@@ -303,12 +305,12 @@ everything that has to be done since it's so easy to miss steps.</p>
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.8 ../base-7.0.8.tar.gz base-7.0.8/
+          ./.tools/make-tar.sh R7.0.7 ../base-7.0.7.tar.gz base-7.0.7/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
           cd ..<br />
-          gpg --armor --sign --detach-sig base-7.0.8.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.7.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -316,9 +318,8 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
-        least one supported platform. If this succeeds the commits and new git
-        tag can be pushed to the GitHub repository's 7.0 branch (assumed to be
-        the <tt>upstream</tt> remote):
+        least one supported platform. When this succeeds the commits and new git
+        tag can be pushed to the Launchpad repository:
         <blockquote><tt>
           git push --follow-tags upstream 7.0
           </tt></blockquote>
@@ -366,7 +367,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to epics-controls.org</th>
+      <th colspan="3">Publish to epics-controls</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
@@ -374,7 +375,7 @@ everything that has to be done since it's so easy to miss steps.</p>
       <td>Upload the tar file and its <tt>.asc</tt> signature file to the
         epics-controls web-server.
         <blockquote><tt>
-          scp base-7.0.8.tar.gz base-7.0.8.tar.gz.asc epics-controls:download/base<br />
+          scp base-7.0.7.tar.gz base-7.0.7.tar.gz.asc epics-controls:download/base<br />
           </tt></blockquote>
         </td>
       </tr>
@@ -391,22 +392,22 @@ everything that has to be done since it's so easy to miss steps.</p>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to GitHub</th>
+      <th colspan="3">Publish to Launchpad</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Go to the GitHub
-        <a href="https://github.com/epics-base/epics-base/releases/new?tag=R7.0.8">
-          Create release from tag R7.0.8</a> page.
-        Upload the tar file and its <tt>.asc</tt> signature file to the new
-        GitHub release page.</td>
+      <td>Go to the Launchpad milestone for this release. Click the Create
+        release button and add the release date. Put a URL for the release page
+        in the Release notes box, and click the Create release button. Upload
+        the tar file and its <tt>.asc</tt> signature file to the new Launchpad
+        release page.</td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>We used to close out bug reports in Launchpad at release-time, this
-        would be the time to do that if we have an equivalent on GitHub.</td>
+      <td>Find all Launchpad bug reports with the status Fix Committed which
+        have been fixed in this release and mark them Fix Released.</td>
       </tr>
 
     <tr>

modules/Makefile

@@ -34,6 +34,12 @@ pvDatabase_DEPEND_DIRS = pvAccess
 SUBMODULES += pva2pva
 pva2pva_DEPEND_DIRS = pvAccess
 
+SUBMODULES += example
+example_DEPEND_DIRS = pva2pva pvaClient
+
+SUBMODULES += pcas
+pcas_DEPEND_DIRS = ca
+
 # Allow sites to add extra submodules
 -include Makefile.local
 

modules/ca/src/client/acctst.c

@@ -2575,8 +2575,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
     SEVCHK ( ca_get ( DBR_FLOAT, chan, &temp ), NULL );
     SEVCHK ( ca_pend_io ( timeoutToPendIO ), NULL );
 
-    if (0)
-        printf ( "flow control bypassed %u events\n", flowCtrlCount );
+    /* printf ( "flow control bypassed %u events\n", flowCtrlCount ); */
 
     showProgressEnd ( interestLevel );
 }

modules/ca/src/client/cac.cpp

@@ -25,7 +25,6 @@
 #include <stdexcept>
 #include <string> // vxWorks 6.0 requires this include
 
-#include "epicsStdio.h"
 #include "dbDefs.h"
 #include "epicsGuard.h"
 #include "epicsVersion.h"
@@ -1009,7 +1008,7 @@ bool cac::defaultExcep (
     char buf[512];
     char hostName[64];
     iiu.getHostName ( guard, hostName, sizeof ( hostName ) );
-    epicsSnprintf( buf, sizeof(buf), "host=%s ctx=%.400s", hostName, pCtx );
+    sprintf ( buf, "host=%s ctx=%.400s", hostName, pCtx );
     this->notify.exception ( guard, status, buf, 0, 0u );
     return true;
 }
@@ -1313,7 +1312,7 @@ void cac::pvMultiplyDefinedNotify ( msgForMultiplyDefinedPV & mfmdpv,
     const char * pChannelName, const char * pAcc, const char * pRej )
 {
     char buf[256];
-    epicsSnprintf( buf, sizeof(buf), "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
+    sprintf ( buf, "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
             pChannelName, pAcc, pRej );
     {
         callbackManager mgr ( this->notify, this->cbMutex );

modules/ca/src/client/udpiiu.cpp

@@ -549,7 +549,7 @@ void epicsStdCall caRepeaterRegistrationMessage (
             char sockErrBuf[64];
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
-            fprintf ( stderr, ERL_ERROR " sending registration message to CA repeater daemon was \"%s\"\n",
+            fprintf ( stderr, "error sending registration message to CA repeater daemon was \"%s\"\n",
                 sockErrBuf );
         }
     }
@@ -813,13 +813,13 @@ bool udpiiu::exceptionRespAction (
 
     if ( msg.m_postsize > sizeof ( caHdr ) ){
         errlogPrintf (
-            ERL_ERROR " condition \"%s\" detected by %s with context \"%s\" at %s\n",
+            "error condition \"%s\" detected by %s with context \"%s\" at %s\n",
             ca_message ( msg.m_available ),
             name, reinterpret_cast <const char *> ( &reqMsg + 1 ), date );
     }
     else{
         errlogPrintf (
-            ERL_ERROR " condition \"%s\" detected by %s at %s\n",
+            "error condition \"%s\" detected by %s at %s\n",
             ca_message ( msg.m_available ), name, date );
     }
 

modules/ca/src/tools/caput.c

@@ -35,7 +35,6 @@
 #include <epicsStdlib.h>
 
 #include <cadef.h>
-#include <errlog.h>
 #include <epicsGetopt.h>
 #include <epicsEvent.h>
 #include <epicsString.h>
@@ -550,7 +549,7 @@ int main (int argc, char *argv[])
         result = ca_array_put (dbrType, count, pvs[0].chid, pbuf);
     }
     if (result != ECA_NORMAL) {
-        fprintf(stderr, ERL_ERROR " from put operation: %s\n", ca_message(result));
+        fprintf(stderr, "Error from put operation: %s\n", ca_message(result));
         free(sbuf); free(dbuf); free(ebuf);
         return 1;
     }
@@ -571,7 +570,7 @@ int main (int argc, char *argv[])
     }
 
     if (result != ECA_NORMAL) {
-        fprintf(stderr, ERL_ERROR " occured writing data: %s\n", ca_message(result));
+        fprintf(stderr, "Error occured writing data: %s\n", ca_message(result));
         free(sbuf); free(dbuf); free(ebuf);
         return 1;
     }

modules/database/src/ioc/as/asIocRegister.c

@@ -21,8 +21,7 @@ static const iocshArg * const asSetFilenameArgs[] = {&asSetFilenameArg0};
 static const iocshFuncDef asSetFilenameFuncDef =
     {"asSetFilename",1,asSetFilenameArgs,
      "Set path+file name of ACF file.\n"
-     "No immediate effect.  Run asInit to (re)load.\n"
-     "Example: asSetFilename /full/path/to/accessSecurityFile\n"};
+     "No immediate effect.  Run as asInit() to (re)load.\n"};
 static void asSetFilenameCallFunc(const iocshArgBuf *args)
 {
     asSetFilename(args[0].sval);
@@ -34,8 +33,7 @@ static const iocshArg * const asSetSubstitutionsArgs[] = {&asSetSubstitutionsArg
 static const iocshFuncDef asSetSubstitutionsFuncDef =
     {"asSetSubstitutions",1,asSetSubstitutionsArgs,
      "Set subtitutions used when reading ACF file.\n"
-     "No immediate effect.  Run asInit to (re)load.\n"
-     "Example: asSetSubstitutions var1=5,var2=hello\n"};
+     "No immediate effect.  Run as asInit() to (re)load.\n"};
 static void asSetSubstitutionsCallFunc(const iocshArgBuf *args)
 {
     asSetSubstitutions(args[0].sval);
@@ -61,10 +59,7 @@ static void asdbdumpCallFunc(const iocshArgBuf *args)
 static const iocshArg aspuagArg0 = { "uagname",iocshArgString};
 static const iocshArg * const aspuagArgs[] = {&aspuagArg0};
 static const iocshFuncDef aspuagFuncDef = {"aspuag",1,aspuagArgs,
-                                           "Show members of the User Access Group.\n"
-                                           "If no Group is specified then the members\n"
-                                           "of all user access groups are displayed.\n"
-                                           "Example: aspuag mygroup\n"};
+                                           "Show members of User Access Group.\n"};
 static void aspuagCallFunc(const iocshArgBuf *args)
 {
     aspuag(args[0].sval);
@@ -74,10 +69,7 @@ static void aspuagCallFunc(const iocshArgBuf *args)
 static const iocshArg asphagArg0 = { "hagname",iocshArgString};
 static const iocshArg * const asphagArgs[] = {&asphagArg0};
 static const iocshFuncDef asphagFuncDef = {"asphag",1,asphagArgs,
-                                           "Show members of the Host Access Group.\n"
-                                           "If no Group is specified then the members\n"
-                                           "of all host access groups are displayed\n"
-                                           "Example: asphag mygroup\n"};
+                                           "Show members of Host Access Group.\n"};
 static void asphagCallFunc(const iocshArgBuf *args)
 {
     asphag(args[0].sval);
@@ -86,12 +78,8 @@ static void asphagCallFunc(const iocshArgBuf *args)
 /* asprules */
 static const iocshArg asprulesArg0 = { "asgname",iocshArgString};
 static const iocshArg * const asprulesArgs[] = {&asprulesArg0};
-static const iocshFuncDef asprulesFuncDef = {
-    "asprules",1,asprulesArgs,
-    "List rules of an Access Security Group.\n"
-    "If no Group is specified then list the rules for all groups\n"
-    "Example: asprules mygroup\n"
-};
+static const iocshFuncDef asprulesFuncDef = {"asprules",1,asprulesArgs,
+                                             "List rules of an Access Security Group.\n"};
 static void asprulesCallFunc(const iocshArgBuf *args)
 {
     asprules(args[0].sval);
@@ -101,14 +89,8 @@ static void asprulesCallFunc(const iocshArgBuf *args)
 static const iocshArg aspmemArg0 = { "asgname",iocshArgString};
 static const iocshArg aspmemArg1 = { "clients",iocshArgInt};
 static const iocshArg * const aspmemArgs[] = {&aspmemArg0,&aspmemArg1};
-static const iocshFuncDef aspmemFuncDef = {
-    "aspmem",2,aspmemArgs,
-    "List members of Access Security Group.\n"
-    "If no Group is specified then print the members for all Groups.\n"
-    "If clients is (0, 1) then Channel Access clients attached to each member\n"
-    "(are not, are) shown\n"
-    "Example: aspmem mygroup 1\n",
-};
+static const iocshFuncDef aspmemFuncDef = {"aspmem",2,aspmemArgs,
+                                           "List members of Access Security Group.\n"};
 static void aspmemCallFunc(const iocshArgBuf *args)
 {
     aspmem(args[0].sval,args[1].ival);
@@ -119,10 +101,8 @@ static const iocshArg astacArg0 = { "recordname",iocshArgStringRecord};
 static const iocshArg astacArg1 = { "user",iocshArgString};
 static const iocshArg astacArg2 = { "host",iocshArgString};
 static const iocshArg * const astacArgs[] = {&astacArg0,&astacArg1,&astacArg2};
-static const iocshFuncDef astacFuncDef = {
-    "astac",3,astacArgs,
-    "Show what read/write permissions the user:host would have when\n"
-    "accessing a certain PV.\n"};
+static const iocshFuncDef astacFuncDef = {"astac",3,astacArgs,
+                                          "Test Access Security privlages granted to user+host.\n"};
 static void astacCallFunc(const iocshArgBuf *args)
 {
     astac(args[0].sval,args[1].sval,args[2].sval);
@@ -131,14 +111,8 @@ static void astacCallFunc(const iocshArgBuf *args)
 /* ascar */
 static const iocshArg ascarArg0 = { "level",iocshArgInt};
 static const iocshArg * const ascarArgs[] = {&ascarArg0};
-static const iocshFuncDef ascarFuncDef = {
-    "ascar",1,ascarArgs,
-    "Report status of PVs used in INP*() Access Security rules.\n"
-    "Level 0 - Summary report\n"
-    "      1 - Summary report plus details on unconnected channels\n"
-    "      2 - Summary report plus detail report on each channel\n"
-    "Example: ascar 1\n"
-};
+static const iocshFuncDef ascarFuncDef = {"ascar",1,ascarArgs,
+                                          "Report status of PVs used in INP*() Access Security rules.\n"};
 static void ascarCallFunc(const iocshArgBuf *args)
 {
     ascar(args[0].ival);

modules/database/src/ioc/bpt/makeBpt.c

@@ -21,7 +21,6 @@
 #include <ctype.h>
 
 #include "dbDefs.h"
-#include "errlog.h"
 #include "ellLib.h"
 #include "cvtTable.h"
 
@@ -126,12 +125,12 @@ int main(int argc, char **argv)
     }
     inFile = fopen(argv[1],"r");
     if(!inFile) {
-        fprintf(stderr,ERL_ERROR " opening %s\n",argv[1]);
+        fprintf(stderr,"Error opening %s\n",argv[1]);
         exit(-1);
     }
     outFile = fopen(outFilename,"w");
     if(!outFile) {
-        fprintf(stderr,ERL_ERROR " opening %s\n",outFilename);
+        fprintf(stderr,"Error opening %s\n",outFilename);
         exit(-1);
     }
     while(fgets(inbuf,MAX_LINE_SIZE,inFile)) {

modules/database/src/ioc/db/Makefile

@@ -42,6 +42,7 @@ INC += dbState.h
 INC += db_access_routines.h
 INC += db_convert.h
 INC += dbUnitTest.h
+INC += dbCaPvt.h
 
 # Generate menuGlobal.dbd, not really by concatenation, see RULES
 DBDCAT += menuGlobal.dbd

modules/database/src/ioc/db/callback.c

@@ -344,10 +344,6 @@ int callbackRequest(epicsCallback *pcallback)
         epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " pcallback was NULL\n");
         return S_db_notInit;
     }
-    if (!pcallback->callback) {
-        epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " pcallback->callback was NULL\n");
-        return S_db_notInit;
-    }
     priority = pcallback->priority;
     if (priority < 0 || priority >= NUM_CALLBACK_PRIORITIES) {
         epicsInterruptContextMessage("callbackRequest: " ERL_ERROR " Bad priority\n");

modules/database/src/ioc/db/dbAccess.c

@@ -798,13 +798,18 @@ int dbLoadRecords(const char* file, const char* subs)
         return -1;
     }
     status = dbReadDatabase(&pdbbase, file, 0, subs);
-    if(status==0) {
+    switch(status)
+    {
+    case 0:
         if(dbLoadRecordsHook)
             dbLoadRecordsHook(file, subs);
-    } else {
-        fprintf(stderr, ERL_ERROR " failed to load '%s'\n", file);
-        if(status==-2)
-            fprintf(stderr, "    Records cannot be loaded after iocInit!\n");
+        break;
+    case -2:
+        errlogPrintf("dbLoadRecords: failed to load '%s'\n"
+            "    Records cannot be loaded after iocInit!\n", file);
+        break;
+    default:
+        errlogPrintf("dbLoadRecords: failed to load '%s'\n", file);
     }
     return status;
 }
@@ -1172,7 +1177,44 @@ static long dbPutFieldLink(DBADDR *paddr,
 
     if (!status) status = dbSetLink(plink, &link_info, new_devsup);
 
-    if (!status && special) status = dbPutSpecial(paddr, 1);
+    if (status) {
+        if (isDevLink) {
+            precord->dset = NULL;
+            precord->pact = TRUE;
+        }
+        goto postScanEvent;
+    }
+
+    /* We need to initialize any links with a link support layer, i.e.
+     * any CONSTANT, JSON_LINK, or PV_LINK types. However for a PV_LINK
+     * when isDevLink is set (i.e. this is the record's INP or OUT link)
+     * we must wait until after calling dsxt->add_record(). This allows
+     * the Async Soft Channel input supports to change it to a PN_LINK.
+     * For other cases we initialize the link before the second call to
+     * dbPutSpecial() because some record types such as calcout need to
+     * be able to call link support methods from prset->special().
+     */
+
+    switch (plink->type) { /* New type */
+    case PV_LINK:
+        if (isDevLink)
+            break;
+        /* else fall through */
+    case CONSTANT:
+    case JSON_LINK:
+        dbAddLink(&locker, plink, pfldDes->field_type, chan);
+        chan = NULL; /* we used it, don't clean it up */
+    }
+
+    if (special) status = dbPutSpecial(paddr, 1);
+
+    if (!status && isDevLink) {
+        precord->dpvt = NULL;
+        precord->dset = new_dset;
+        precord->pact = FALSE;
+
+        status = new_dsxt->add_record(precord);
+    }
 
     if (status) {
         if (isDevLink) {
@@ -1182,29 +1224,21 @@ static long dbPutFieldLink(DBADDR *paddr,
         goto postScanEvent;
     }
 
-    if (isDevLink) {
-        precord->dpvt = NULL;
-        precord->dset = new_dset;
-        precord->pact = FALSE;
-
-        status = new_dsxt->add_record(precord);
-        if (status) {
-            precord->dset = NULL;
-            precord->pact = TRUE;
-            goto postScanEvent;
-        }
-    }
-
     switch (plink->type) { /* New link type */
-    case PV_LINK:
     case CONSTANT:
+    case CA_LINK:
+    case DB_LINK:
+    case PN_LINK:
     case JSON_LINK:
-        dbAddLink(&locker, plink, pfldDes->field_type, chan);
-        chan = NULL; /* don't clean it up */
         break;
 
-    case DB_LINK:
-    case CA_LINK:
+    case PV_LINK:
+        if (isDevLink) {
+            dbAddLink(&locker, plink, pfldDes->field_type, chan);
+            chan = NULL; /* we used it, don't clean it up */
+        }
+        break;
+
     case MACRO_LINK:
         break;  /* should never get here */
 
@@ -1213,7 +1247,6 @@ static long dbPutFieldLink(DBADDR *paddr,
             status = S_db_badHWaddr;
             goto postScanEvent;
         }
-        break;
     }
     db_post_events(precord, plink, DBE_VALUE | DBE_LOG);
 

modules/database/src/ioc/db/dbChannel.h

@@ -41,35 +41,20 @@ extern "C" {
 /**
  * event subscription
  */
-struct evSubscrip;
-
-typedef struct evSubscrip evSubscrip;
-
-#ifdef EPICS_PRIVATE_API
-struct evSubscrip {
+typedef struct evSubscrip {
     ELLNODE             node;
     struct dbChannel  * chan;
-    /* user_sub==NULL used to indicate db_cancel_event() */
     EVENTFUNC         * user_sub;
     void              * user_arg;
-    /* associated queue, may be shared with other evSubscrip */
     struct event_que  * ev_que;
-    /* NULL if !npend.  if npend!=0, pointer to last event added to event_que::valque */
     db_field_log     ** pLastLog;
-    /* n times this event is on the queue */
-    unsigned long       npend;
-    /* n times replacing event on the queue */
-    unsigned long       nreplace;
-    /* DBE mask */
+    unsigned long       npend;      /**< n times this event is on the queue */
+    unsigned long       nreplace;   /**< n times replacing event on the queue */
     unsigned char       select;
-    /* if set, subscription will yield dbfl_type_val */
     char                useValque;
-    /* event_task is handling this subscription */
     char                callBackInProgress;
-    /* this node added to dbCommon::mlis */
     char                enabled;
-};
-#endif
+} evSubscrip;
 
 typedef struct chFilter chFilter;
 

modules/database/src/ioc/db/dbConvertJSON.c

@@ -26,7 +26,7 @@ typedef struct parseContext {
     short dbrType;
     short dbrSize;
     char *pdest;
-    int elems;
+    size_t elems;
 } parseContext;
 
 static int dbcj_null(void *ctx) {
@@ -64,19 +64,20 @@ static int dbcj_double(void *ctx, double num) {
     return 1;
 }
 
-static int dblsj_number(void *ctx, const char *val, size_t len) {
-    errlogPrintf("dbLSConvertJSON: Numeric value %.*s provided, string expected\n",
-        (int)len, val);
-    return 0;    /* Illegal */
-}
-
 static int dbcj_string(void *ctx, const unsigned char *val, size_t len) {
     parseContext *parser = (parseContext *) ctx;
     char *pdest = parser->pdest;
 
-    /* Not attempting to handle char-array fields here, they need more
-     * metadata about the field than we have available at the moment.
-     */
+    if (parser->dbrType == DBF_CHAR || parser->dbrType == DBF_UCHAR) {
+        /* Treating char array as long string */
+        if (len > parser->elems)
+            len = parser->elems;
+        strncpy(pdest, (const char *) val, len);
+        parser->elems -= len;
+        parser->pdest += len;
+        return 1;
+    }
+
     if (parser->dbrType != DBF_STRING) {
         errlogPrintf("dbConvertJSON: String \"%.*s\" provided, numeric value expected\n",
             (int)len, val);
@@ -94,21 +95,6 @@ static int dbcj_string(void *ctx, const unsigned char *val, size_t len) {
     return 1;
 }
 
-static int dblsj_string(void *ctx, const unsigned char *val, size_t len) {
-    parseContext *parser = (parseContext *) ctx;
-    char *pdest = parser->pdest;
-
-    if (parser->elems > 0) {
-        if (len > parser->dbrSize - 1)
-            len = parser->dbrSize - 1;
-        strncpy(pdest, (const char *) val, len);
-        pdest[len] = 0;
-        parser->pdest = pdest + len;
-        parser->elems = 0;
-    }
-    return 1;
-}
-
 static int dbcj_start_map(void *ctx) {
     errlogPrintf("dbConvertJSON: Map type not supported\n");
     return 0;    /* Illegal */
@@ -148,6 +134,11 @@ long dbPutConvertJSON(const char *json, short dbrType,
         return 0;
     }
 
+    if (!jlen) {
+        *pnRequest = 0;
+        return 0;
+    }
+
     parser->depth = 0;
     parser->dbrType = dbrType;
     parser->dbrSize = dbValueSize(dbrType);
@@ -183,20 +174,10 @@ long dbPutConvertJSON(const char *json, short dbrType,
     return status;
 }
 
-
-static yajl_callbacks dblsj_callbacks = {
-    dbcj_null, dbcj_boolean, NULL, NULL, dblsj_number, dblsj_string,
-    dbcj_start_map, NULL, NULL,
-    dbcj_start_array, NULL
-};
-
 long dbLSConvertJSON(const char *json, char *pdest, epicsUInt32 size,
     epicsUInt32 *plen)
 {
-    parseContext context, *parser = &context;
-    yajl_handle yh;
-    yajl_status ys;
-    size_t jlen = strlen(json);
+    long nRequest = size-1;
     long status;
 
     if (!size) {
@@ -204,35 +185,8 @@ long dbLSConvertJSON(const char *json, char *pdest, epicsUInt32 size,
         return 0;
     }
 
-    parser->depth = 0;
-    parser->dbrType = DBF_STRING;
-    parser->dbrSize = size;
-    parser->pdest = pdest;
-    parser->elems = 1;
-
-    yh = yajl_alloc(&dblsj_callbacks, NULL, parser);
-    if (!yh) {
-        errlogPrintf("dbLSConvertJSON: out of memory\n");
-        return S_db_noMemory;
-    }
-
-    ys = yajl_parse(yh, (const unsigned char *) json, jlen);
-
-    switch (ys) {
-    case yajl_status_ok:
-        *plen = (char *) parser->pdest - pdest + 1;
-        status = 0;
-        break;
-
-    default: {
-            unsigned char *err = yajl_get_error(yh, 1,
-                (const unsigned char *) json, jlen);
-            errlogPrintf("dbLSConvertJSON: %s", err);
-            yajl_free_error(yh, err);
-            status = S_db_badField;
-        }
-    }
-
-    yajl_free(yh);
+    status = dbPutConvertJSON(json, DBF_CHAR, pdest, &nRequest);
+    pdest[nRequest++] = 0;
+    *plen = nRequest;
     return status;
 }

modules/database/src/ioc/db/dbEvent.c

@@ -18,7 +18,6 @@
  *          Ralph Lange <Ralph.Lange@bessy.de>
  */
 
-#define EPICS_PRIVATE_API
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -76,23 +75,23 @@ struct event_que {
     unsigned short          getix;
     unsigned short          quota;          /* the number of assigned entries*/
     unsigned short          nDuplicates;    /* N events duplicated on this q */
+    unsigned short          nCanceled;      /* the number of canceled entries */
     unsigned                possibleStall;
 };
 
 struct event_user {
     struct event_que    firstque;       /* the first event que */
 
-    ELLLIST             waiters;        /* event_waiter::node */
-
     epicsMutexId        lock;
     epicsEventId        ppendsem;       /* Wait while empty */
+    epicsEventId        pflush_sem;     /* wait for flush */
     epicsEventId        pexitsem;       /* wait for event task to join */
 
     EXTRALABORFUNC      *extralabor_sub;/* off load to event task */
     void                *extralabor_arg;/* parameter to above */
 
     epicsThreadId       taskid;         /* event handler task id */
-    epicsUInt32         pflush_seq;     /* worker cycle count for synchronization */
+    struct evSubscrip   *pSuicideEvent; /* event that is deleting itself */
     unsigned            queovr;         /* event que overflow count */
     unsigned char       pendexit;       /* exit pend task */
     unsigned char       extra_labor;    /* if set call extra labor func */
@@ -102,11 +101,6 @@ struct event_user {
     epicsThreadId       init_func_arg;
 };
 
-typedef struct {
-    ELLNODE node; /* event_user::waiters */
-    epicsEventId wake;
-} event_waiter;
-
 /*
  * Reliable intertask communication requires copying the current value of the
  * channel for later queuing so 3 stepper motor steps of 10 each do not turn
@@ -128,9 +122,10 @@ static void *dbevFieldLogFreeList;
 
 static char *EVENT_PEND_NAME = "eventTask";
 
+static struct evSubscrip canceledEvent;
+
 static epicsMutexId stopSync;
 
-/* unused space in queue (EVENTQUESIZE when empty) */
 static unsigned short ringSpace ( const struct event_que *pevq )
 {
     if ( pevq->evque[pevq->putix] == EVENTQEMPTY ) {
@@ -144,11 +139,17 @@ static unsigned short ringSpace ( const struct event_que *pevq )
     return 0;
 }
 
+/*
+ *  db_event_list ()
+ */
 int db_event_list ( const char *pname, unsigned level )
 {
     return dbel ( pname, level );
 }
 
+/*
+ * dbel ()
+ */
 int dbel ( const char *pname, unsigned level )
 {
     DBADDR              addr;
@@ -216,6 +217,7 @@ int dbel ( const char *pname, unsigned level )
 
             if ( level > 2 ) {
                 unsigned nDuplicates;
+                unsigned nCanceled;
                 if ( pevent->nreplace ) {
                     printf (", discarded by replacement=%ld", pevent->nreplace);
                 }
@@ -224,10 +226,14 @@ int dbel ( const char *pname, unsigned level )
                 }
                 LOCKEVQUE(pevent->ev_que);
                 nDuplicates = pevent->ev_que->nDuplicates;
+                nCanceled = pevent->ev_que->nCanceled;
                 UNLOCKEVQUE(pevent->ev_que);
                 if  ( nDuplicates ) {
                     printf (", duplicate count =%u\n", nDuplicates );
                 }
+                if ( nCanceled ) {
+                    printf (", canceled count =%u\n", nCanceled );
+                }
             }
 
             if ( level > 3 ) {
@@ -312,6 +318,9 @@ dbEventCtx db_init_events (void)
     evUser->ppendsem = epicsEventCreate(epicsEventEmpty);
     if (!evUser->ppendsem)
         goto fail;
+    evUser->pflush_sem = epicsEventCreate(epicsEventEmpty);
+    if (!evUser->pflush_sem)
+        goto fail;
     evUser->lock = epicsMutexCreate();
     if (!evUser->lock)
         goto fail;
@@ -321,6 +330,7 @@ dbEventCtx db_init_events (void)
 
     evUser->flowCtrlMode = FALSE;
     evUser->extraLaborBusy = FALSE;
+    evUser->pSuicideEvent = NULL;
     return (dbEventCtx) evUser;
 fail:
     if(evUser->lock)
@@ -329,6 +339,8 @@ fail:
         epicsMutexDestroy (evUser->firstque.writelock);
     if(evUser->ppendsem)
         epicsEventDestroy (evUser->ppendsem);
+    if(evUser->pflush_sem)
+        epicsEventDestroy (evUser->pflush_sem);
     if(evUser->pexitsem)
         epicsEventDestroy (evUser->pexitsem);
     freeListFree(dbevEventUserFreeList,evUser);
@@ -392,6 +404,7 @@ void db_close_events (dbEventCtx ctx)
 
     epicsEventDestroy(evUser->pexitsem);
     epicsEventDestroy(evUser->ppendsem);
+    epicsEventDestroy(evUser->pflush_sem);
     epicsMutexDestroy(evUser->lock);
 
     epicsMutexUnlock (stopSync);
@@ -448,7 +461,8 @@ dbEventSubscription db_add_event (
     while ( TRUE ) {
         int success = 0;
         LOCKEVQUE ( ev_que );
-        success = ( ev_que->quota < EVENTQUESIZE - EVENTENTRIES );
+        success = ( ev_que->quota + ev_que->nCanceled <
+                                EVENTQUESIZE - EVENTENTRIES );
         if ( success ) {
             ev_que->quota += EVENTENTRIES;
         }
@@ -565,62 +579,62 @@ static void event_remove ( struct event_que *ev_que,
 void db_cancel_event (dbEventSubscription event)
 {
     struct evSubscrip * const pevent = (struct evSubscrip *) event;
-    struct event_que *que = pevent->ev_que;
-    char sync = 0;
+    unsigned short getix;
 
     db_event_disable ( event );
 
-    LOCKEVQUE (que);
+    /*
+     * flag the event as canceled by NULLing out the callback handler
+     *
+     * make certain that the event isn't being accessed while
+     * its call back changes
+     */
+    LOCKEVQUE (pevent->ev_que);
 
-    pevent->user_sub = NULL; /* callback pointer doubles as canceled flag */
+    pevent->user_sub = NULL;
 
-    if(pevent->callBackInProgress) {
-        /* this event callback is pending or in-progress in event_task. */
-        if(pevent->ev_que->evUser->taskid != epicsThreadGetIdSelf())
-            sync = 1; /* concurrent to event_task, so wait */
+    /*
+     * purge this event from the queue
+     *
+     * Its better to take this approach rather than waiting
+     * for the event thread to finish removing this event
+     * from the queue because the event thread will not
+     * process if we are in flow control mode. Since blocking
+     * here will block CA's TCP input queue then a dead lock
+     * would be possible.
+     */
+    for (   getix = pevent->ev_que->getix;
+            pevent->ev_que->evque[getix] != EVENTQEMPTY; ) {
+        if ( pevent->ev_que->evque[getix] == pevent ) {
+            assert ( pevent->ev_que->nCanceled < USHRT_MAX );
+            pevent->ev_que->nCanceled++;
+            event_remove ( pevent->ev_que, getix, &canceledEvent );
+        }
+        getix = RNGINC ( getix );
+        if ( getix == pevent->ev_que->getix ) {
+            break;
+        }
+    }
+    assert ( pevent->npend == 0u );
 
-    } else if(pevent->npend) {
-        /* some (now defunct) events in the queue, defer free() to event_task */
-
-    } else {
-        /* no other references, cleanup now */
-
-        pevent->ev_que->quota -= EVENTENTRIES;
-        freeListFree ( dbevEventSubscriptionFreeList, pevent );
+    if ( pevent->ev_que->evUser->taskid == epicsThreadGetIdSelf() ) {
+        pevent->ev_que->evUser->pSuicideEvent = pevent;
+    }
+    else {
+        while ( pevent->callBackInProgress ) {
+            UNLOCKEVQUE (pevent->ev_que);
+            epicsEventMustWait ( pevent->ev_que->evUser->pflush_sem );
+            LOCKEVQUE (pevent->ev_que);
+        }
     }
 
-    UNLOCKEVQUE (que);
+    pevent->ev_que->quota -= EVENTENTRIES;
 
-    if(sync) {
-        /* cycle through worker */
-        struct event_user *evUser = que->evUser;
-        epicsUInt32 curSeq;
-        event_waiter wait;
-        wait.wake = epicsEventCreate(epicsEventEmpty); /* may fail */
+    UNLOCKEVQUE (pevent->ev_que);
 
-        epicsMutexMustLock ( evUser->lock );
-        ellAdd(&evUser->waiters, &wait.node);
-        /* grab current cycle counter, then wait for it to change */
-        curSeq = evUser->pflush_seq;
-        do {
-            epicsMutexUnlock( evUser->lock );
-            /* ensure worker will cycle at least once */
-            epicsEventMustTrigger(evUser->ppendsem);
+    freeListFree ( dbevEventSubscriptionFreeList, pevent );
 
-            if(wait.wake) {
-                epicsEventMustWait(wait.wake);
-            } else {
-                epicsThreadSleep(0.01); /* ick. but better than cantProceed() */
-            }
-
-            epicsMutexMustLock ( evUser->lock );
-        } while(curSeq == evUser->pflush_seq);
-        ellDelete(&evUser->waiters, &wait.node);
-        /* destroy under lock to ensure epicsEventMustTrigger() has returned */
-        if(wait.wake)
-            epicsEventDestroy(wait.wake);
-        epicsMutexUnlock( evUser->lock );
-    }
+    return;
 }
 
 /*
@@ -920,7 +934,10 @@ void db_post_single_event (dbEventSubscription event)
  */
 static int event_read ( struct event_que *ev_que )
 {
+    db_field_log *pfl;
     int notifiedRemaining = 0;
+    void ( *user_sub ) ( void *user_arg, struct dbChannel *chan,
+            int eventsRemaining, db_field_log *pfl );
 
     /*
      * evUser ring buffer must be locked for the multiple
@@ -941,7 +958,19 @@ static int event_read ( struct event_que *ev_que )
     while ( ev_que->evque[ev_que->getix] != EVENTQEMPTY ) {
         struct evSubscrip *pevent = ev_que->evque[ev_que->getix];
         int eventsRemaining;
-        db_field_log *pfl = ev_que->valque[ev_que->getix];
+
+        pfl = ev_que->valque[ev_que->getix];
+        if ( pevent == &canceledEvent ) {
+            ev_que->evque[ev_que->getix] = EVENTQEMPTY;
+            if (ev_que->valque[ev_que->getix]) {
+                db_delete_field_log(ev_que->valque[ev_que->getix]);
+                ev_que->valque[ev_que->getix] = NULL;
+            }
+            ev_que->getix = RNGINC ( ev_que->getix );
+            assert ( ev_que->nCanceled > 0 );
+            ev_que->nCanceled--;
+            continue;
+        }
 
         /*
          * Simple type values queued up for reliable interprocess
@@ -951,7 +980,13 @@ static int event_read ( struct event_que *ev_que )
 
         event_remove ( ev_que, ev_que->getix, EVENTQEMPTY );
         ev_que->getix = RNGINC ( ev_que->getix );
-        eventsRemaining = ev_que->evque[ev_que->getix] != EVENTQEMPTY;
+        eventsRemaining = ev_que->evque[ev_que->getix] != EVENTQEMPTY && !ev_que->nCanceled;
+
+        /*
+         * create a local copy of the call back parameters while
+         * we still have the lock
+         */
+        user_sub = pevent->user_sub;
 
         /*
          * Next event pointer can be used by event tasks to determine
@@ -963,12 +998,14 @@ static int event_read ( struct event_que *ev_que )
          * record lock, and it is calling db_post_events() waiting
          * for the event queue lock (which this thread now has).
          */
-        if ( pevent->user_sub ) {
-            EVENTFUNC* user_sub = pevent->user_sub;
+        if ( user_sub ) {
+            /*
+             * This provides a way to test to see if an event is in use
+             * despite the fact that the event queue does not point to
+             * it.
+             */
             pevent->callBackInProgress = TRUE;
-
             UNLOCKEVQUE (ev_que);
-
             /* Run post-event-queue filter chain */
             if (ellCount(&pevent->chan->post_chain)) {
                 pfl = dbChannelRunPostChain(pevent->chan, pfl);
@@ -979,15 +1016,27 @@ static int event_read ( struct event_que *ev_que )
                                 eventsRemaining, pfl );
                 notifiedRemaining = eventsRemaining;
             }
-
             LOCKEVQUE (ev_que);
 
-            pevent->callBackInProgress = FALSE;
-        }
-        /* callback may have called db_cancel_event(), so must check user_sub again */
-        if(!pevent->user_sub && !pevent->npend) {
-            pevent->ev_que->quota -= EVENTENTRIES;
-            freeListFree ( dbevEventSubscriptionFreeList, pevent );
+            /*
+             * check to see if this event has been canceled each
+             * time that the callBackInProgress flag is set to false
+             * while we have the event queue lock, and post the flush
+             * complete sem if there are no longer any events on the
+             * queue
+             */
+            if ( ev_que->evUser->pSuicideEvent == pevent ) {
+                ev_que->evUser->pSuicideEvent = NULL;
+            }
+            else {
+                if ( pevent->user_sub==NULL && pevent->npend==0u ) {
+                    pevent->callBackInProgress = FALSE;
+                    epicsEventSignal ( ev_que->evUser->pflush_sem );
+                }
+                else {
+                    pevent->callBackInProgress = FALSE;
+                }
+            }
         }
         db_delete_field_log(pfl);
     }
@@ -1002,6 +1051,9 @@ static int event_read ( struct event_que *ev_que )
     return DB_EVENT_OK;
 }
 
+/*
+ * EVENT_TASK()
+ */
 static void event_task (void *pParm)
 {
     struct event_user * const evUser = (struct event_user *) pParm;
@@ -1042,25 +1094,13 @@ static void event_task (void *pParm)
         }
         evUser->extraLaborBusy = FALSE;
 
-        for ( ev_que = &evUser->firstque; ev_que; ev_que = ev_que->nextque ) {
-            /* unlock during iteration is safe as event_que will not be free'd */
+        for ( ev_que = &evUser->firstque; ev_que;
+                ev_que = ev_que->nextque ) {
             epicsMutexUnlock ( evUser->lock );
             event_read (ev_que);
             epicsMutexMustLock ( evUser->lock );
         }
         pendexit = evUser->pendexit;
-
-        evUser->pflush_seq++;
-        if(ellCount(&evUser->waiters)) {
-            /* hold lock throughout to avoid race between event trigger and destroy */
-            ELLNODE *cur;
-            for(cur = ellFirst(&evUser->waiters); cur; cur = ellNext(cur)) {
-                event_waiter *w = CONTAINER(cur, event_waiter, node);
-                if(w->wake)
-                    epicsEventMustTrigger(w->wake);
-            }
-        }
-
         epicsMutexUnlock ( evUser->lock );
 
     } while( ! pendexit );

modules/database/src/ioc/db/dbIocRegister.c

@@ -72,9 +72,7 @@ static void dbLoadRecordsCallFunc(const iocshArgBuf *args)
 static const iocshArg dbbArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg * const dbbArgs[1] = {&dbbArg0};
 static const iocshFuncDef dbbFuncDef = {"dbb",1,dbbArgs,
-                                        "Set Breakpoint on a record\n"
-                                        "This command spawns one breakpoint continuation task per lockset,"
-                                        " in which further record execution is run\n"};
+                                        "Add breakpoint to a lock set.\n"};
 static void dbbCallFunc(const iocshArgBuf *args) { dbb(args[0].sval);}
 
 /* dbd */
@@ -88,36 +86,27 @@ static void dbdCallFunc(const iocshArgBuf *args) { dbd(args[0].sval);}
 static const iocshArg dbcArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg * const dbcArgs[1] = {&dbcArg0};
 static const iocshFuncDef dbcFuncDef = {"dbc",1,dbcArgs,
-                                        "Continue processing in a lockset until next breakpoint is found.\n"};
+                                        "Continue processing in a lock set.\n"};
 static void dbcCallFunc(const iocshArgBuf *args) { dbc(args[0].sval);}
 
 /* dbs */
 static const iocshArg dbsArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg * const dbsArgs[1] = {&dbsArg0};
 static const iocshFuncDef dbsFuncDef = {"dbs",1,dbsArgs,
-                                        "Step through record processing within a lockset.\n"
-                                        "If called without an argument, automatically steps with the last breakpoint.\n"};
+                                        "Step through record processing.\n"};
 static void dbsCallFunc(const iocshArgBuf *args) { dbs(args[0].sval);}
 
 /* dbstat */
 static const iocshFuncDef dbstatFuncDef = {"dbstat",0,0,
-                                           "Print list of suspended records, and breakpoints set in locksets.\n"};
+                                           "print list of stopped records, and breakpoints set in locksets.\n"};
 static void dbstatCallFunc(const iocshArgBuf *args) { dbstat();}
 
 /* dbp */
 static const iocshArg dbpArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg dbpArg1 = { "interest level",iocshArgInt};
 static const iocshArg * const dbpArgs[2] = {&dbpArg0,&dbpArg1};
-static const iocshFuncDef dbpFuncDef = {
-    "dbp",2,dbpArgs,
-    "Print Fields of a currently suspended record by a breakpoint.\n"
-    "interest level 0 - Fields of interest to an Application developer and\n"
-    "                     that can be changed as a result of record processing.\n"
-    "               1 - Fields of interest to an Application developer and\n"
-    "                     that do not change during record processing.\n"
-    "               2 - Fields of major interest to a System developer.\n"
-    "               3 - Fields of minor interest to a System developer.\n"
-    "               4 - Internal record fields.\n"};
+static const iocshFuncDef dbpFuncDef = {"dbp",2,dbpArgs,
+                                        "print stopped record.\n"};
 static void dbpCallFunc(const iocshArgBuf *args)
 { dbp(args[0].sval,args[1].ival);}
 
@@ -125,17 +114,14 @@ static void dbpCallFunc(const iocshArgBuf *args)
 static const iocshArg dbapArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg * const dbapArgs[1] = {&dbapArg0};
 static const iocshFuncDef dbapFuncDef = {"dbap",1,dbapArgs,
-                                         "Auto Print.\n"
-                                         "Toggle automatic printing after processing a record that has a breakpoint.\n"};
+                                         "toggle printing after processing a certain record.\n"};
 static void dbapCallFunc(const iocshArgBuf *args) { dbap(args[0].sval);}
 
 /* dbsr */
 static const iocshArg dbsrArg0 = { "interest level",iocshArgInt};
 static const iocshArg * const dbsrArgs[1] = {&dbsrArg0};
 static const iocshFuncDef dbsrFuncDef = {"dbsr",1,dbsrArgs,
-                                         "Database Server Report.\n"
-                                         "Print current status of server and number of connected clients.\n"
-                                         "Level 0 prints summary information. Higher levels print more.\n"};
+                                         "Database Server Report.\n"};
 static void dbsrCallFunc(const iocshArgBuf *args) { dbsr(args[0].ival);}
 
 /* dbcar */
@@ -145,9 +131,9 @@ static const iocshArg * const dbcarArgs[2] = {&dbcarArg0,&dbcarArg1};
 static const iocshFuncDef dbcarFuncDef = {"dbcar",2,dbcarArgs,
                                           "Database Channel Access Report.\n"
                                           "Shows status of Channel Access links (CA_LINK).\n"
-                                          " level 0 - Shows statistics for all links.\n"
-                                          "       1 - Shows info. of only disconnected links.\n"
-                                          "       2 - Shows info. for all links.\n"};
+                                          "interest level 0 - Shows statistics for all links.\n"
+                                          "               1 - Shows info. of only disconnected links.\n"
+                                          "               2 - Shows info. for all links.\n"};
 static void dbcarCallFunc(const iocshArgBuf *args)
 {
     dbcar(args[0].sval,args[1].ival);
@@ -158,8 +144,7 @@ static const iocshArg dbjlrArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg dbjlrArg1 = { "level",iocshArgInt};
 static const iocshArg * const dbjlrArgs[2] = {&dbjlrArg0,&dbjlrArg1};
 static const iocshFuncDef dbjlrFuncDef = {"dbjlr",2,dbjlrArgs,
-                                          "Database JSON link Report.\n"
-                                          "List all JSON links in a record. If no record is specified, print for all\n"};
+                                          "Database JSON link Report.\n"};
 static void dbjlrCallFunc(const iocshArgBuf *args)
 {
     dbjlr(args[0].sval,args[1].ival);
@@ -171,9 +156,7 @@ static const iocshArg dbelArg1 = { "level",iocshArgInt};
 static const iocshArg * const dbelArgs[2] = {&dbelArg0,&dbelArg1};
 static const iocshFuncDef dbelFuncDef = {"dbel",2,dbelArgs,
                                          "Database event list.\n"
-                                         "Show information on dbEvent subscriptions.\n"
-                                         "Higher level shows more information (0 - 4)\n"
-                                         "Example: dbel aitest 2\n"};
+                                         "Show information on dbEvent subscriptions.\n"};
 static void dbelCallFunc(const iocshArgBuf *args)
 {
     dbel(args[0].sval, args[1].ival);
@@ -183,10 +166,7 @@ static void dbelCallFunc(const iocshArgBuf *args)
 static const iocshArg dbaArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg * const dbaArgs[1] = {&dbaArg0};
 static const iocshFuncDef dbaFuncDef = {"dba",1,dbaArgs,
-                                        "Database Address.\n"
-                                        "Print information in the dbAddr structure for a specific field.\n"
-                                        "If no field is specified, VAL is assumed.\n\n"
-                                        "Example: dba(\"aitest.HIGH\")\n"};
+                                        "dbAddr info.\n"};
 static void dbaCallFunc(const iocshArgBuf *args) { dba(args[0].sval);}
 
 /* dbl */
@@ -196,12 +176,7 @@ static const iocshArg * const dblArgs[] = {&dblArg0,&dblArg1};
 static const iocshFuncDef dblFuncDef = {"dbl",2,dblArgs,
                                         "Database list.\n"
                                         "List record/field names.\n"
-                                        "With no arguments, lists all record names.\n"
-                                        "If record type is given, then only the names of records maching the type are printed\n"
-                                        "If a field list is given, then their values are also printed\n\n"
-                                        "Example: dbl(\"\")\n"
-                                        "         dbl(\"ai\")\n"
-                                        "         dbl(\"ai\",\"HIGH LOW VAL PREC\")\n"};
+                                        "With no arguments, lists all record names.\n"};
 static void dblCallFunc(const iocshArgBuf *args)
 {
     dbl(args[0].sval,args[1].sval);
@@ -211,35 +186,28 @@ static void dblCallFunc(const iocshArgBuf *args)
 static const iocshArg dbnrArg0 = { "verbose",iocshArgInt};
 static const iocshArg * const dbnrArgs[1] = {&dbnrArg0};
 static const iocshFuncDef dbnrFuncDef = {"dbnr",1,dbnrArgs,
-                                         "List number of records and aliases by type.\n"
-                                         "If verbose, list all record types regardless of being instanced\n"};
+                                         "List stats on record alias()s.\n"};
 static void dbnrCallFunc(const iocshArgBuf *args) { dbnr(args[0].ival);}
 
 /* dbli */
 static const iocshArg dbliArg0 = { "pattern",iocshArgString};
 static const iocshArg * const dbliArgs[1] = {&dbliArg0};
 static const iocshFuncDef dbliFuncDef = {"dbli",1,dbliArgs,
-                                         "List info() tags with names matching pattern.\n\n"
-                                         "Example: dbli(\"autosave*\")\n"};
+                                        "List info() tags with names matching pattern.\n"};
 static void dbliCallFunc(const iocshArgBuf *args) { dbli(args[0].sval);}
 
 /* dbla */
 static const iocshArg dblaArg0 = { "pattern",iocshArgStringRecord};
 static const iocshArg * const dblaArgs[1] = {&dblaArg0};
 static const iocshFuncDef dblaFuncDef = {"dbla",1,dblaArgs,
-                                         "List record alias()s by alias name pattern.\n\n"
-                                         "Example: dbla(\"alia*\")\n"};
+                                         "List record alias()s by alias name pattern.\n"};
 static void dblaCallFunc(const iocshArgBuf *args) { dbla(args[0].sval);}
 
 /* dbgrep */
 static const iocshArg dbgrepArg0 = { "pattern",iocshArgStringRecord};
 static const iocshArg * const dbgrepArgs[1] = {&dbgrepArg0};
 static const iocshFuncDef dbgrepFuncDef = {"dbgrep",1,dbgrepArgs,
-                                           "List record names matching pattern.\n"
-                                           "The pattern can contain any characters that are legal in record names as well as:\n"
-                                           " - \"?\", which matches 0 or one characters.\n"
-                                           " - \"*\", which matches 0 or more characters.\n\n"
-                                           "Example: dbgrep(\"*gpibAi*\")\n"};
+                                           "List record names matching pattern.\n"};
 static void dbgrepCallFunc(const iocshArgBuf *args) { dbgrep(args[0].sval);}
 
 /* dbgf */
@@ -247,9 +215,7 @@ static const iocshArg dbgfArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg * const dbgfArgs[1] = {&dbgfArg0};
 static const iocshFuncDef dbgfFuncDef = {"dbgf",1,dbgfArgs,
                                          "Database Get Field.\n"
-                                         "Print current value of record field.\n"
-                                         "If no field name is specified, VAL is assumed.\n\n"
-                                         "Example: dbgf(\"aitest.VAL\")\n"};
+                                         "Print current value of record field.\n"};
 static void dbgfCallFunc(const iocshArgBuf *args) { dbgf(args[0].sval);}
 
 /* dbpf */
@@ -258,8 +224,7 @@ static const iocshArg dbpfArg1 = { "value",iocshArgString};
 static const iocshArg * const dbpfArgs[2] = {&dbpfArg0,&dbpfArg1};
 static const iocshFuncDef dbpfFuncDef = {"dbpf",2,dbpfArgs,
                                          "Database Put Field.\n"
-                                         "Change value of record field and read it back with dbgf.\n"
-                                         "If no field is specified, VAL is assumed\n"};
+                                         "Change value of record field.\n"};
 static void dbpfCallFunc(const iocshArgBuf *args)
 { dbpf(args[0].sval,args[1].sval);}
 
@@ -267,17 +232,9 @@ static void dbpfCallFunc(const iocshArgBuf *args)
 static const iocshArg dbprArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg dbprArg1 = { "interest level",iocshArgInt};
 static const iocshArg * const dbprArgs[2] = {&dbprArg0,&dbprArg1};
-static const iocshFuncDef dbprFuncDef = {
-    "dbpr",2,dbprArgs,
-    "Database Print Record.\n"
-    "Print values of record fields for given interest level.\n"
-    "interest level 0 - Fields that can be changed as a result of record processing.\n"
-    "               1 - Fields that do not change during record processing.\n"
-    "               2 - Fields of major interest to a System developer.\n"
-    "               3 - Fields of minor interest to a System developer.\n"
-    "               4 - Internal record fields.\n\n"
-    "Example: dbpr aitest 3\n"
-};
+static const iocshFuncDef dbprFuncDef = {"dbpr",2,dbprArgs,
+                                         "Database Print Record.\n"
+                                         "Print values of record fields.\n"};
 static void dbprCallFunc(const iocshArgBuf *args)
 { dbpr(args[0].sval,args[1].ival);}
 
@@ -293,9 +250,7 @@ static const iocshArg dbtgfArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg * const dbtgfArgs[1] = {&dbtgfArg0};
 static const iocshFuncDef dbtgfFuncDef = {"dbtgf",1,dbtgfArgs,
                                           "Database Test Get Field.\n"
-                                          "Get and print the specified field with all possible DBR_* types\n"
-                                          "Example: dbtgf aitest\n"
-                                          "Example: dbtgf aitest.VAL\n"};
+                                          "Get field with different DBR_* types\n"};
 static void dbtgfCallFunc(const iocshArgBuf *args) { dbtgf(args[0].sval);}
 
 /* dbtpf */
@@ -303,10 +258,7 @@ static const iocshArg dbtpfArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg dbtpfArg1 = { "value",iocshArgString};
 static const iocshArg * const dbtpfArgs[2] = {&dbtpfArg0,&dbtpfArg1};
 static const iocshFuncDef dbtpfFuncDef = {"dbtpf",2,dbtpfArgs,
-                                          "Database Test Put Field.\n"
-                                          "Put the given value to the given PV, then get the value\n"
-                                          "for all possible DBR_* types\n\n"
-                                          "Example: dbtpf aitest 5.0\n"};
+                                          "Database Test Put Field.\n"};
 static void dbtpfCallFunc(const iocshArgBuf *args)
 { dbtpf(args[0].sval,args[1].sval);}
 
@@ -321,21 +273,14 @@ static void dbiorCallFunc(const iocshArgBuf *args)
 
 /* dbhcr */
 static const iocshFuncDef dbhcrFuncDef = {"dbhcr",0,0,
-                                          "Database Hardware Configuration Report.\n"
-                                          "Produce a report of all hardware links.\n"
-                                          "The produced report will probably not be in the sort order desired.\n"
-                                          "Use the UNIX sort command:\n"
-                                          "dbhcr > report\n"
-                                          "sort report > report.sorted\n"};
+                                          "Database Report Device Config.\n"};
 static void dbhcrCallFunc(const iocshArgBuf *args) { dbhcr();}
 
 /* gft */
 static const iocshArg gftArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg * const gftArgs[1] = {&gftArg0};
 static const iocshFuncDef gftFuncDef = {"gft",1,gftArgs,
-                                        "Report dbChannel info and value.\n"
-                                        "Example: gft aitest\n"
-                                        "Example: gft aitest.VAL\n"};
+                                        "Report dbChannel info and value.\n"};
 static void gftCallFunc(const iocshArgBuf *args) { gft(args[0].sval);}
 
 /* pft */
@@ -343,8 +288,7 @@ static const iocshArg pftArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg pftArg1 = { "value",iocshArgString};
 static const iocshArg * const pftArgs[2] = {&pftArg0,&pftArg1};
 static const iocshFuncDef pftFuncDef = {"pft",2,pftArgs,
-                                        "dbChannel put value.\n"
-                                        "Example: pft aitest 5.0\n"};
+                                        "dbChannel put value.\n"};
 static void pftCallFunc(const iocshArgBuf *args)
 { pft(args[0].sval,args[1].sval);}
 
@@ -353,11 +297,9 @@ static const iocshArg dbtpnArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg dbtpnArg1 = { "value",iocshArgString};
 static const iocshArg * const dbtpnArgs[2] = {&dbtpnArg0,&dbtpnArg1};
 static const iocshFuncDef dbtpnFuncDef = {"dbtpn",2,dbtpnArgs,
-                                          "Database Test Process Notify\n"
+                                          "Database Put Notify\n"
                                           "Without value, begin async. processing and get\n"
-                                          "With value, begin put, process, and get\n"
-                                          "Example: dbtpn aitest\n"
-                                          "Example: dbtpn aitest 5.0\n"};
+                                          "With value, begin put, process, and get\n"};
 static void dbtpnCallFunc(const iocshArgBuf *args)
 { dbtpn(args[0].sval,args[1].sval);}
 
@@ -372,8 +314,9 @@ static const iocshArg dbPutAttrArg1 = { "attribute name",iocshArgString};
 static const iocshArg dbPutAttrArg2 = { "value",iocshArgString};
 static const iocshArg * const dbPutAttrArgs[] =
     {&dbPutAttrArg0, &dbPutAttrArg1, &dbPutAttrArg2};
-static const iocshFuncDef dbPutAttrFuncDef = {"dbPutAttribute",3,dbPutAttrArgs,
-                                              "Set/Create record attribute.\n"};
+static const iocshFuncDef dbPutAttrFuncDef =
+    {"dbPutAttribute",3,dbPutAttrArgs,
+     "Set/Create record attribute.\n"};
 static void dbPutAttrCallFunc(const iocshArgBuf *args)
 { dbPutAttribute(args[0].sval,args[1].sval,args[2].sval);}
 
@@ -382,8 +325,7 @@ static const iocshArg tpnArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg tpnArg1 = { "value",iocshArgString};
 static const iocshArg * const tpnArgs[2] = {&tpnArg0,&tpnArg1};
 static const iocshFuncDef tpnFuncDef = {"tpn",2,tpnArgs,
-                                        "Test Process Notify.\n\n"
-                                        "Example: tpn aitest 5.0\n"};
+                                        "Begin async. process and get.\n"};
 static void tpnCallFunc(const iocshArgBuf *args)
 { tpn(args[0].sval,args[1].sval);}
 
@@ -392,25 +334,16 @@ static const iocshArg dblsrArg0 = { "record name",iocshArgStringRecord};
 static const iocshArg dblsrArg1 = { "interest level",iocshArgInt};
 static const iocshArg * const dblsrArgs[2] = {&dblsrArg0,&dblsrArg1};
 static const iocshFuncDef dblsrFuncDef = {"dblsr",2,dblsrArgs,
-                                          "Database Lockset report.\n"
-                                          "Generate a report showing the lock set to which each record belongs.\n"
-                                          "interest level 0 - Show lock set information only.\n"
-                                          "               1 - Show each record in the lock set.\n"
-                                          "               2 - Show each record and all database links in the lock set.\n\n"
-                                          "Example: dblsr aitest 2\n"};
+                                          "Database Lockset report.\n"};
 static void dblsrCallFunc(const iocshArgBuf *args)
 { dblsr(args[0].sval,args[1].ival);}
 
 /* dbLockShowLocked */
 static const iocshArg dbLockShowLockedArg0 = { "interest level",iocshArgInt};
 static const iocshArg * const dbLockShowLockedArgs[1] = {&dbLockShowLockedArg0};
-static const iocshFuncDef dbLockShowLockedFuncDef = {
-    "dbLockShowLocked",1,dbLockShowLockedArgs,
-    "Show Locksets which are currently locked.\n"
-    "interest level argument is passed to epicsMutexShow to adjust reported\n"
-    "information.\n\n"
-    "Example: dbLockShowLocked 0\n"
-};
+static const iocshFuncDef dbLockShowLockedFuncDef =
+    {"dbLockShowLocked",1,dbLockShowLockedArgs,
+     "Show Locksets which are currently locked.\n"};
 static void dbLockShowLockedCallFunc(const iocshArgBuf *args)
 { dbLockShowLocked(args[0].ival);}
 
@@ -418,9 +351,10 @@ static void dbLockShowLockedCallFunc(const iocshArgBuf *args)
 static const iocshArg scanOnceSetQueueSizeArg0 = { "size",iocshArgInt};
 static const iocshArg * const scanOnceSetQueueSizeArgs[1] =
     {&scanOnceSetQueueSizeArg0};
-static const iocshFuncDef scanOnceSetQueueSizeFuncDef = {"scanOnceSetQueueSize",1,scanOnceSetQueueSizeArgs,
-                                                         "Change size of Scan once queue.\n"
-                                                         "Must be called before iocInit().\n"};
+static const iocshFuncDef scanOnceSetQueueSizeFuncDef =
+    {"scanOnceSetQueueSize",1,scanOnceSetQueueSizeArgs,
+     "Change size of Scan once queue.\n"
+     "Must be called before iocInit().\n"};
 static void scanOnceSetQueueSizeCallFunc(const iocshArgBuf *args)
 {
     scanOnceSetQueueSize(args[0].ival);
@@ -430,8 +364,9 @@ static void scanOnceSetQueueSizeCallFunc(const iocshArgBuf *args)
 static const iocshArg scanOnceQueueShowArg0 = { "reset",iocshArgInt};
 static const iocshArg * const scanOnceQueueShowArgs[1] =
     {&scanOnceQueueShowArg0};
-static const iocshFuncDef scanOnceQueueShowFuncDef = {"scanOnceQueueShow",1,scanOnceQueueShowArgs,
-                                                      "Show details and statitics of scan once queue processing.\n"};
+static const iocshFuncDef scanOnceQueueShowFuncDef =
+    {"scanOnceQueueShow",1,scanOnceQueueShowArgs,
+     "Show details and statitics of scan once queue processing.\n"};
 static void scanOnceQueueShowCallFunc(const iocshArgBuf *args)
 {
     scanOnceQueueShow(args[0].ival);
@@ -441,8 +376,7 @@ static void scanOnceQueueShowCallFunc(const iocshArgBuf *args)
 static const iocshArg scanpplArg0 = { "rate",iocshArgDouble};
 static const iocshArg * const scanpplArgs[1] = {&scanpplArg0};
 static const iocshFuncDef scanpplFuncDef = {"scanppl",1,scanpplArgs,
-                                            "Print info for records with periodic scan.\n"
-                                            "If rate == 0.0, all periods are shown.\n"};
+                                            "print periodic scan lists.\n"};
 static void scanpplCallFunc(const iocshArgBuf *args)
 { scanppl(args[0].dval);}
 
@@ -474,9 +408,10 @@ static void scanpiolCallFunc(const iocshArgBuf *args) { scanpiol();}
 static const iocshArg callbackSetQueueSizeArg0 = { "bufsize",iocshArgInt};
 static const iocshArg * const callbackSetQueueSizeArgs[1] =
     {&callbackSetQueueSizeArg0};
-static const iocshFuncDef callbackSetQueueSizeFuncDef = {"callbackSetQueueSize",1,callbackSetQueueSizeArgs,
-                                                         "Change depth of queue for callback workers.\n"
-                                                         "Must be called before iocInit().\n"};
+static const iocshFuncDef callbackSetQueueSizeFuncDef =
+    {"callbackSetQueueSize",1,callbackSetQueueSizeArgs,
+     "Change depth of queue for callback workers.\n"
+     "Must be called before iocInit().\n"};
 static void callbackSetQueueSizeCallFunc(const iocshArgBuf *args)
 {
     callbackSetQueueSize(args[0].ival);
@@ -486,8 +421,9 @@ static void callbackSetQueueSizeCallFunc(const iocshArgBuf *args)
 static const iocshArg callbackQueueShowArg0 = { "reset", iocshArgInt};
 static const iocshArg * const callbackQueueShowArgs[1] =
     {&callbackQueueShowArg0};
-static const iocshFuncDef callbackQueueShowFuncDef = {"callbackQueueShow",1,callbackQueueShowArgs,
-                                                      "Show status of callback thread processing queue.\n"};
+static const iocshFuncDef callbackQueueShowFuncDef =
+    {"callbackQueueShow",1,callbackQueueShowArgs,
+     "Show status of callback thread processing queue.\n"};
 static void callbackQueueShowCallFunc(const iocshArgBuf *args)
 {
     callbackQueueShow(args[0].ival);
@@ -498,10 +434,11 @@ static const iocshArg callbackParallelThreadsArg0 = { "no of threads", iocshArgI
 static const iocshArg callbackParallelThreadsArg1 = { "priority", iocshArgString};
 static const iocshArg * const callbackParallelThreadsArgs[2] =
     {&callbackParallelThreadsArg0,&callbackParallelThreadsArg1};
-static const iocshFuncDef callbackParallelThreadsFuncDef = {"callbackParallelThreads",2,callbackParallelThreadsArgs,
-                                                            "Configure multiple workers for a given callback queue priority level.\n"
-                                                            "priority may be omitted or \"*\" to act on all priorities\n"
-                                                            "or one of LOW, MEDIUM, or HIGH.\n"};
+static const iocshFuncDef callbackParallelThreadsFuncDef =
+    {"callbackParallelThreads",2,callbackParallelThreadsArgs,
+     "Configure multiple workers for a given callback queue priority level.\n"
+     "priority may be omitted or \"*\" to act on all priorities\n"
+     "or one of LOW, MEDIUM, or HIGH.\n"};
 static void callbackParallelThreadsCallFunc(const iocshArgBuf *args)
 {
     callbackParallelThreads(args[0].ival, args[1].sval);
@@ -510,8 +447,8 @@ static void callbackParallelThreadsCallFunc(const iocshArgBuf *args)
 /* dbStateCreate */
 static const iocshArg dbStateArgName = { "name", iocshArgString };
 static const iocshArg * const dbStateCreateArgs[] = { &dbStateArgName };
-static const iocshFuncDef dbStateCreateFuncDef = {"dbStateCreate", 1, dbStateCreateArgs,
-                                                  "Allocate new state name for \"state\" filter.\n"};
+static const iocshFuncDef dbStateCreateFuncDef = { "dbStateCreate", 1, dbStateCreateArgs,
+                                                   "Allocate new state name for \"state\" filter.\n"};
 static void dbStateCreateCallFunc (const iocshArgBuf *args)
 {
     dbStateCreate(args[0].sval);
@@ -519,8 +456,8 @@ static void dbStateCreateCallFunc (const iocshArgBuf *args)
 
 /* dbStateSet */
 static const iocshArg * const dbStateSetArgs[] = { &dbStateArgName };
-static const iocshFuncDef dbStateSetFuncDef = {"dbStateSet", 1, dbStateSetArgs,
-                                              "Change state to set for \"state\" filter.\n"};
+static const iocshFuncDef dbStateSetFuncDef = { "dbStateSet", 1, dbStateSetArgs,
+                                                "Change state to set for \"state\" filter.\n"};
 static void dbStateSetCallFunc (const iocshArgBuf *args)
 {
     dbStateId sid = dbStateFind(args[0].sval);
@@ -531,8 +468,8 @@ static void dbStateSetCallFunc (const iocshArgBuf *args)
 
 /* dbStateClear */
 static const iocshArg * const dbStateClearArgs[] = { &dbStateArgName };
-static const iocshFuncDef dbStateClearFuncDef = {"dbStateClear", 1, dbStateClearArgs,
-                                                "Change state to clear for \"state\" filter.\n"};
+static const iocshFuncDef dbStateClearFuncDef = { "dbStateClear", 1, dbStateClearArgs,
+                                                  "Change state to clear for \"state\" filter.\n" };
 static void dbStateClearCallFunc (const iocshArgBuf *args)
 {
     dbStateId sid = dbStateFind(args[0].sval);
@@ -544,8 +481,8 @@ static void dbStateClearCallFunc (const iocshArgBuf *args)
 /* dbStateShow */
 static const iocshArg dbStateShowArg1 = { "level", iocshArgInt };
 static const iocshArg * const dbStateShowArgs[] = { &dbStateArgName, &dbStateShowArg1 };
-static const iocshFuncDef dbStateShowFuncDef = {"dbStateShow", 2, dbStateShowArgs,
-                                                "Show set/clear status of named state. (cf. \"state\" filter)\n"};
+static const iocshFuncDef dbStateShowFuncDef = { "dbStateShow", 2, dbStateShowArgs,
+                                                 "Show set/clear status of named state. (cf. \"state\" filter)\n" };
 static void dbStateShowCallFunc (const iocshArgBuf *args)
 {
     dbStateId sid = dbStateFind(args[0].sval);
@@ -557,8 +494,8 @@ static void dbStateShowCallFunc (const iocshArgBuf *args)
 /* dbStateShowAll */
 static const iocshArg dbStateShowAllArg0 = { "level", iocshArgInt };
 static const iocshArg * const dbStateShowAllArgs[] = { &dbStateShowAllArg0 };
-static const iocshFuncDef dbStateShowAllFuncDef = {"dbStateShowAll", 1, dbStateShowAllArgs,
-                                                   "Show set/clear status of all named states. (cf. \"state\" filter)\n"};
+static const iocshFuncDef dbStateShowAllFuncDef = { "dbStateShowAll", 1, dbStateShowAllArgs,
+                                                    "Show set/clear status of all named states. (cf. \"state\" filter)\n"  };
 static void dbStateShowAllCallFunc (const iocshArgBuf *args)
 {
     dbStateShowAll(args[0].ival);

modules/database/src/ioc/db/dbLink.h

@@ -359,8 +359,6 @@ typedef struct lset {
      * @param   plink   the link
      * @param   rtn     routine to execute
      * @returns status value
-     *
-     * @since 3.16.1
      */
     long (*doLocked)(struct link *plink, dbLinkUserCallback rtn, void *priv);
 

modules/database/src/ioc/db/dbLock.c

@@ -869,7 +869,7 @@ nosplit:
     }
 }
 
-static const char *msstring[4]={"NMS","MS","MSI","MSS"};
+static char *msstring[4]={"NMS","MS","MSI","MSS"};
 
 long dblsr(char *recordname,int level)
 {

modules/database/src/ioc/db/dbLock.h

@@ -24,64 +24,18 @@ extern "C" {
 
 struct dbCommon;
 struct dbBase;
-/** @brief Lock multiple records.
- *
- * A dbLocker allows a caller to simultaneously lock multiple records.
- * The list of records is provided to dbLockerAlloc().
- * And the resulting dbLocker can be locked/unlocked repeatedly.
- *
- * Each thread can only lock one dbLocker at a time.
- * While locked, dbScanLock() may be called only on those records
- * included in the dbLocker.
- *
- * @since 3.16.0.1
- */
-struct dbLocker;
 typedef struct dbLocker dbLocker;
 
-/** @brief Lock a record for modification.
- *
- *  While locked, caller may access record using eg. dbGet() or dbPut(),
- *  but not dbGetField() or dbPutField().
- *  The caller must later call dbScanUnlock().
- *  dbScanLock() may be called again as the record lock behaves as a recursive mutex.
- */
 DBCORE_API void dbScanLock(struct dbCommon *precord);
-/** @brief Unlock a record.
- *
- *  Reverse the action of dbScanLock()
- */
 DBCORE_API void dbScanUnlock(struct dbCommon *precord);
 
-/** @brief Prepare to lock a set of records.
- * @param precs Array of nrecs dbCommon pointers.
- * @param nrecs Length of precs array
- * @param flags Set to 0
- * @return NULL on error
- * @since 3.16.0.1
- */
 DBCORE_API dbLocker *dbLockerAlloc(struct dbCommon * const *precs,
                                        size_t nrecs,
                                        unsigned int flags);
 
-/** @brief Free dbLocker allocated by dbLockerAlloc()
- * @param plocker Must not be NULL
- * @since 3.16.0.1
- */
-DBCORE_API void dbLockerFree(dbLocker *plocker);
+DBCORE_API void dbLockerFree(dbLocker *);
 
-/** @brief Lock all records of dbLocker
- *
- * While locked, caller may access any associated record passed to dbLockerAlloc() .
- * dbScanLockMany() may not be called again (multi-lock is not recursive).
- * dbScanLock()/dbScanUnlock() may be called on individual record.
- * The caller must later call dbScanUnlockMany().
- * @since 3.16.0.1
- */
 DBCORE_API void dbScanLockMany(dbLocker*);
-/** @brief Unlock all records of dbLocker
- * @since 3.16.0.1
- */
 DBCORE_API void dbScanUnlockMany(dbLocker*);
 
 DBCORE_API unsigned long dbLockGetLockId(

modules/database/src/ioc/db/dbLockPvt.h

@@ -10,7 +10,6 @@
 #define DBLOCKPVT_H
 
 #include "dbLock.h"
-#include "epicsMutex.h"
 #include "epicsSpin.h"
 
 /* Define to enable additional error checking */

modules/database/src/ioc/db/dbTest.c

@@ -506,62 +506,62 @@ long dbtgf(const char *pname)
     ret_options=0;
 
     dbr_type = DBR_STRING;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/MAX_STRING_SIZE));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/MAX_STRING_SIZE));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_CHAR;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsInt8))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsInt8)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_UCHAR;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsUInt8))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsUInt8)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_SHORT;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsInt16))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsInt16)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_USHORT;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsUInt16))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsUInt16)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_LONG;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsInt32))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsInt32)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_ULONG;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsUInt32))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsUInt32)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_INT64;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsInt64))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsInt64)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_UINT64;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsUInt64))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsUInt64)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_FLOAT;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsFloat32))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsFloat32)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_DOUBLE;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsFloat64))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsFloat64)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 
     dbr_type = DBR_ENUM;
-    no_elements = MIN(addr.no_elements,(sizeof(buffer)/(sizeof(epicsEnum16))));
+    no_elements = MIN(addr.no_elements,((sizeof(buffer))/sizeof(epicsEnum16)));
     status = dbGetField(&addr,dbr_type,pbuffer,&ret_options,&no_elements,NULL);
     printBuffer(status,dbr_type,pbuffer,0L,0L,no_elements,pMsgBuff,tab_size);
 

modules/database/src/ioc/db/dbUnitTest.c

@@ -50,7 +50,6 @@ void testdbPrepare(void)
 {
     if(!testEvtLock)
         testEvtLock = epicsMutexMustCreate();
-    initHookAnnounce(initHookAfterPrepareDatabase);
 }
 
 void testdbReadDatabase(const char* file,
@@ -95,7 +94,6 @@ void testIocShutdownOk(void)
 
 void testdbCleanup(void)
 {
-    initHookAnnounce(initHookBeforeCleanupDatabase);
     dbFreeBase(pdbbase);
     db_cleanup_events();
     initHookFree();

modules/database/src/ioc/dbStatic/dbCompleteRecord.cpp

@@ -6,7 +6,6 @@
 \*************************************************************************/
 
 #include <algorithm>
-#include <limits>
 #include <string>
 #include <set>
 

modules/database/src/ioc/dbStatic/dbLexRoutines.c

@@ -1068,7 +1068,7 @@ int dbRecordNameValidate(const char *name)
     const char *pos = name;
 
     if (!*name) {
-        yyerrorAbort(ERL_ERROR ": Record/Alias name can't be empty");
+        yyerrorAbort("Error: Record/Alias name can't be empty");
         return 1;
     }
 
@@ -1086,7 +1086,7 @@ int dbRecordNameValidate(const char *name)
                          name, c);
 
         } else if(c==' ' || c=='\t' || c=='"' || c=='\'' || c=='.' || c=='$') {
-            epicsPrintf(ERL_ERROR ": Bad character '%c' in Record/Alias name \"%s\"\n",
+            epicsPrintf("Error: Bad character '%c' in Record/Alias name \"%s\"\n",
                 c, name);
             yyerrorAbort(NULL);
             return 1;
@@ -1110,10 +1110,14 @@ static void dbRecordHead(char *recordType, char *name, int visible)
     allocTemp(pdbentry);
 
     if (recordType[0] == '*' && recordType[1] == 0) {
-        status = dbFindRecord(pdbentry, name);
-        if (status == 0)
-            return; /* done */
-        epicsPrintf(ERL_ERROR ": Record \"%s\" not found\n", name);
+        if (dbRecordsOnceOnly)
+            epicsPrintf("Record-type \"*\" not valid with dbRecordsOnceOnly\n");
+        else {
+            status = dbFindRecord(pdbentry, name);
+            if (status == 0)
+                return; /* done */
+            epicsPrintf("Record \"%s\" not found\n", name);
+        }
         yyerror(NULL);
         duplicate = TRUE;
         return;
@@ -1132,16 +1136,15 @@ static void dbRecordHead(char *recordType, char *name, int visible)
     status = dbCreateRecord(pdbentry,name);
     if (status == S_dbLib_recExists) {
         if (strcmp(recordType, dbGetRecordTypeName(pdbentry)) != 0) {
-            epicsPrintf(ERL_ERROR ": Record \"%s\" of type \"%s\" redefined with new type "
+            epicsPrintf("Record \"%s\" of type \"%s\" redefined with new type "
                 "\"%s\"\n", name, dbGetRecordTypeName(pdbentry), recordType);
             yyerror(NULL);
             duplicate = TRUE;
             return;
         }
         else if (dbRecordsOnceOnly) {
-            epicsPrintf(ERL_ERROR ": Record \"%s\" already defined and dbRecordsOnceOnly set.\n"
-                        "Used record type \"*\" to append.\n",
-                name);
+            epicsPrintf("Record \"%s\" already defined (dbRecordsOnceOnly is "
+                "set)\n", name);
             yyerror(NULL);
             duplicate = TRUE;
         }
@@ -1167,28 +1170,8 @@ static void dbRecordField(char *name,char *value)
     pdbentry = ptempListNode->item;
     status = dbFindField(pdbentry,name);
     if (status) {
-        epicsPrintf("%s Record \"%s\" does not have a field \"%s\"\n",
-                    dbGetRecordTypeName(pdbentry), dbGetRecordName(pdbentry), name);
-        if(dbGetRecordName(pdbentry)) {
-            DBENTRY temp;
-            double bestSim = -1.0;
-            const dbFldDes *bestFld = NULL;
-            dbCopyEntryContents(pdbentry, &temp);
-            for(status = dbFirstField(&temp, 0); !status; status = dbNextField(&temp, 0)) {
-                double sim = epicsStrSimilarity(name, temp.pflddes->name);
-                if(!bestFld || sim > bestSim) {
-                    bestSim = sim;
-                    bestFld = temp.pflddes;
-                }
-            }
-            dbFinishEntry(&temp);
-            if(bestSim>0.0) {
-                epicsPrintf("    Did you mean \"%s\"?", bestFld->name);
-                if(bestFld->prompt)
-                    epicsPrintf("  (%s)", bestFld->prompt);
-                epicsPrintf("\n");
-            }
-        }
+        epicsPrintf("Record \"%s\" does not have a field \"%s\"\n",
+            dbGetRecordName(pdbentry), name);
         yyerror(NULL);
         return;
     }

modules/database/src/ioc/dbStatic/dbStaticIocRegister.c

@@ -10,7 +10,6 @@
 
 #include "iocsh.h"
 #include "errSymTbl.h"
-#include "errlog.h"
 
 #include "dbStaticIocRegister.h"
 #include "dbStaticLib.h"
@@ -25,8 +24,7 @@ static const iocshArg argRecType = { "recordTypeName", iocshArgString};
 /* dbDumpPath */
 static const iocshArg * const dbDumpPathArgs[] = {&argPdbbase};
 static const iocshFuncDef dbDumpPathFuncDef = {"dbDumpPath",1,dbDumpPathArgs,
-                                               "Dump .db/.dbd file search path.\n"
-                                               "Example: dbDumpPath pdbbase\n"};
+                                               "Dump .db/.dbd file search path.\n"};
 static void dbDumpPathCallFunc(const iocshArgBuf *args)
 {
     dbDumpPath(*iocshPpdbbase);
@@ -101,8 +99,7 @@ static void dbDumpDeviceCallFunc(const iocshArgBuf *args)
 static const iocshArg * const dbDumpDriverArgs[] = { &argPdbbase};
 static const iocshFuncDef dbDumpDriverFuncDef = {"dbDumpDriver",1,dbDumpDriverArgs,
                           "Dump device support information.\n"
-                          "Example: dbDumpDriver pdbbase\n"
-                          "If the last argument(s) are missing, dump all device support information.\n",};
+                          "Example: dbDumpDriver pdbbase\n"};
 static void dbDumpDriverCallFunc(const iocshArgBuf *args)
 {
     dbDumpDriver(*iocshPpdbbase);
@@ -127,8 +124,7 @@ static const iocshArg * const dbDumpRegistrarArgs[] = { &argPdbbase};
 static const iocshFuncDef dbDumpRegistrarFuncDef = {"dbDumpRegistrar",1,dbDumpRegistrarArgs,
                           "Dump list of registered functions including ones for subroutine records,\n"
                           "and ones that can be invoked from iocsh.\n"
-                          "Example: dbDumpRegistrar pdbbase\n"
-                          "If last argument(s) are missing, dump all registered functions\n"};
+                          "Example: dbDumpRegistrar pdbbase\n"};
 static void dbDumpRegistrarCallFunc(const iocshArgBuf *args)
 {
     dbDumpRegistrar(*iocshPpdbbase);
@@ -138,8 +134,7 @@ static void dbDumpRegistrarCallFunc(const iocshArgBuf *args)
 static const iocshArg * const dbDumpFunctionArgs[] = { &argPdbbase};
 static const iocshFuncDef dbDumpFunctionFuncDef = {"dbDumpFunction",1,dbDumpFunctionArgs,
                           "Dump list of registered subroutine functions.\n"
-                          "Example: dbDumpFunction pddbase\n"
-                          "If last argument(s) are missing, dump all registered subroutine functions\n"};
+                          "Example: dbDumpFunction pddbase\n"};
 static void dbDumpFunctionCallFunc(const iocshArgBuf *args)
 {
     dbDumpFunction(*iocshPpdbbase);
@@ -149,8 +144,7 @@ static void dbDumpFunctionCallFunc(const iocshArgBuf *args)
 static const iocshArg * const dbDumpVariableArgs[] = { &argPdbbase};
 static const iocshFuncDef dbDumpVariableFuncDef = {"dbDumpVariable",1,dbDumpVariableArgs,
                           "Dump list of variables used in the database.\n"
-                          "Example: dbDumpVariable pddbase\n"
-                          "If last argument(s) are missing, dump all variables.\n"};
+                          "Example: dbDumpVariable pddbase\n"};
 static void dbDumpVariableCallFunc(const iocshArgBuf *args)
 {
     dbDumpVariable(*iocshPpdbbase);
@@ -165,8 +159,7 @@ static const iocshFuncDef dbDumpBreaktableFuncDef = {
     2,
     dbDumpBreaktableArgs,
     "Dump the given break table\n"
-    "Example: dbDumpBreaktable pdbbase typeKdegC\n"
-    "If last argument(s) are missing, dump all breakpoint tables.\n",
+    "Example: dbDumpBreaktable pdbbase typeKdegC\n",
 };
 static void dbDumpBreaktableCallFunc(const iocshArgBuf *args)
 {
@@ -183,8 +176,7 @@ static const iocshFuncDef dbPvdDumpFuncDef = {
     dbPvdDumpArgs,
     "Dump the various buckets of the process variable directory.\n"
     "If verbose is greater than 0, also print the process variables in each bucket.\n"
-    "Example: dbPvdDump pdbbase 1\n"
-    "If the last argument(s) are missing, dump all buckets as though verbose is 0.\n",
+    "Example: dbPvdDump pdbbase 1\n",
 };
 static void dbPvdDumpCallFunc(const iocshArgBuf *args)
 {
@@ -255,7 +247,7 @@ static void dbCreateAliasCallFunc(const iocshArgBuf *args)
     }
     dbFinishEntry(&ent);
     if(status) {
-        fprintf(stderr, ERL_ERROR ": %ld %s\n", status, errSymMsg(status));
+        fprintf(stderr, "Error: %ld %s\n", status, errSymMsg(status));
         iocshSetError(1);
     }
 }

modules/database/src/ioc/dbStatic/dbStaticLib.c

@@ -57,10 +57,10 @@ static char *pNullString = "";
  */
 STATIC_ASSERT(messagesize >= 21);
 
-static const char *ppstring[5]={" NPP"," PP"," CA"," CP"," CPP"};
-static const char *msstring[4]={" NMS"," MS"," MSI"," MSS"};
+static char *ppstring[5]={" NPP"," PP"," CA"," CP"," CPP"};
+static char *msstring[4]={" NMS"," MS"," MSI"," MSS"};
 
-const maplinkType pamaplinkType[LINK_NTYPES] = {
+maplinkType pamaplinkType[LINK_NTYPES] = {
     {"CONSTANT",CONSTANT},
     {"PV_LINK",PV_LINK},
     {"VME_IO",VME_IO},
@@ -89,7 +89,7 @@ static FILE *openOutstream(const char *filename)
     errno = 0;
     stream = fopen(filename,"w");
     if(!stream) {
-        fprintf(stderr,ERL_ERROR " opening %s %s\n",filename,strerror(errno));
+        fprintf(stderr,"error opening %s %s\n",filename,strerror(errno));
         return 0;
     }
     return stream;
@@ -637,7 +637,7 @@ void dbFinishEntry(DBENTRY *pdbentry)
     }
 }
 
-DBENTRY * dbCopyEntry(const DBENTRY *pdbentry)
+DBENTRY * dbCopyEntry(DBENTRY *pdbentry)
 {
     DBENTRY *pnew;
 
@@ -647,7 +647,7 @@ DBENTRY * dbCopyEntry(const DBENTRY *pdbentry)
     return(pnew);
 }
 
-void dbCopyEntryContents(const DBENTRY *pfrom,DBENTRY *pto)
+void dbCopyEntryContents(DBENTRY *pfrom,DBENTRY *pto)
 {
     *pto = *pfrom;
     pto->message = NULL;
@@ -2204,12 +2204,12 @@ long dbInitRecordLinks(dbRecordType *rtyp, struct dbCommon *prec)
              */
 
         } else if(dbCanSetLink(plink, &link_info, devsup)!=0) {
-            errlogPrintf(ERL_ERROR ": %s.%s: can't initialize link type %d with \"%s\" (type %d)\n",
-                         prec->name, pflddes->name, plink->type, plink->text, link_info.ltype);
+            errlogPrintf("Error: %s.%s: can't initialize link type %s with \"%s\" (type %s)\n",
+                         prec->name, pflddes->name, pamaplinkType[plink->type].strvalue, plink->text, pamaplinkType[link_info.ltype].strvalue);
 
         } else if(dbSetLink(plink, &link_info, devsup)) {
-            errlogPrintf(ERL_ERROR ": %s.%s: failed to initialize link type %d with \"%s\" (type %d)\n",
-                         prec->name, pflddes->name, plink->type, plink->text, link_info.ltype);
+            errlogPrintf("Error: %s.%s: failed to initialize link type %s with \"%s\" (type %s)\n",
+                         prec->name, pflddes->name, pamaplinkType[plink->type].strvalue, plink->text, pamaplinkType[link_info.ltype].strvalue);
         }
         free(plink->text);
         plink->text = NULL;

modules/database/src/ioc/dbStatic/dbStaticLib.h

@@ -51,9 +51,9 @@ DBCORE_API void dbInitEntry(DBBASE *pdbbase,
     DBENTRY *pdbentry);
 
 DBCORE_API void dbFinishEntry(DBENTRY *pdbentry);
-DBCORE_API DBENTRY * dbCopyEntry(const DBENTRY *pdbentry);
-DBCORE_API void dbCopyEntryContents(const DBENTRY *pfrom,
-                                    DBENTRY *pto);
+DBCORE_API DBENTRY * dbCopyEntry(DBENTRY *pdbentry);
+DBCORE_API void dbCopyEntryContents(DBENTRY *pfrom,
+    DBENTRY *pto);
 
 DBCORE_API extern int dbBptNotMonotonic;
 

modules/database/src/ioc/dbStatic/dbStaticRun.c

@@ -143,7 +143,7 @@ long dbAllocRecord(DBENTRY *pdbentry,const char *precordName)
 
                 status = dbPutStringNum(pdbentry,pflddes->initial);
                 if(status)
-                    epicsPrintf(ERL_ERROR " initializing %s.%s initial %s\n",
+                    epicsPrintf("Error initializing %s.%s initial %s\n",
                                 pdbRecordType->name,pflddes->name,pflddes->initial);
             }
             break;

modules/database/src/ioc/dbStatic/dbYacc.y

@@ -370,9 +370,9 @@ json_value: jsonNULL    { $$ = dbmfStrdup("null"); }
 static int yyerror(char *str)
 {
     if (str)
-        epicsPrintf(ERL_ERROR ": %s\n", str);
+        epicsPrintf("Error: %s\n", str);
     else
-        epicsPrintf(ERL_ERROR "");
+        epicsPrintf("Error");
     if (!yyFailed) {    /* Only print this stuff once */
         epicsPrintf(" at or before '%s'", yytext);
         dbIncludePrint();

modules/database/src/ioc/dbStatic/link.h

@@ -43,11 +43,11 @@ extern "C" {
 #define VXI_IO          15
 #define LINK_NTYPES 16
 typedef struct maplinkType {
-    const char *strvalue;
+    char *strvalue;
     int  value;
 } maplinkType;
 
-DBCORE_API extern const maplinkType pamaplinkType[LINK_NTYPES];
+DBCORE_API extern maplinkType pamaplinkType[];
 
 #define VXIDYNAMIC      0
 #define VXISTATIC       1

modules/database/src/ioc/dbtemplate/Makefile

@@ -11,7 +11,7 @@
 
 SRC_DIRS += $(IOCDIR)/dbtemplate
 
-PROD_HOST += msi
+PROD_CMD += msi
 
 msi_SRCS = msi.cpp
 msi_LIBS += Com

modules/database/src/ioc/dbtemplate/dbLoadTemplate.y

@@ -16,7 +16,6 @@
 #include "osiUnistd.h"
 #include "macLib.h"
 #include "dbmf.h"
-#include "errlog.h"
 
 #include "epicsExport.h"
 #include "dbAccess.h"
@@ -338,7 +337,7 @@ int dbLoadTemplate(const char *sub_file, const char *cmd_collect)
 
     if (dbTemplateMaxVars < 1)
     {
-        fprintf(stderr,ERL_ERROR ": dbTemplateMaxVars = %d, must be +ve\n",
+        fprintf(stderr,"Error: dbTemplateMaxVars = %d, must be +ve\n",
                 dbTemplateMaxVars);
         return -1;
     }

modules/database/src/ioc/dbtemplate/msi.cpp

@@ -264,7 +264,7 @@ static void addMacroReplacements(MAC_HANDLE * const macPvt,
     if (status) {
         status = macInstallMacros(macPvt, pairs);
         if (!status) {
-            fprintf(stderr, ERL_ERROR " from macInstallMacros\n");
+            fprintf(stderr, "Error from macInstallMacros\n");
             usageExit(1);
         }
         free(pairs);
@@ -522,7 +522,7 @@ static void inputOpenFile(inputData *pinputData, const char * const filename)
     }
 
     if (!fp) {
-        fprintf(stderr, ERL_ERROR " msi: Can't open file '%s'\n", filename);
+        fprintf(stderr, "msi: Can't open file '%s'\n", filename);
         inputErrPrint(pinputData);
         abortExit(1);
     }
@@ -672,7 +672,7 @@ static void substituteOpen(subInfo **ppvt, const std::string& substitutionName)
 
     fp = fopen(substitutionName.c_str(), "r");
     if (!fp) {
-        fprintf(stderr, ERL_ERROR " msi: Can't open file '%s'\n", substitutionName.c_str());
+        fprintf(stderr, "msi: Can't open file '%s'\n", substitutionName.c_str());
         abortExit(1);
     }
 

modules/database/src/ioc/misc/iocInit.c

@@ -173,7 +173,7 @@ static int iocBuild_2(void)
 
     scanInit();
     if (asInit()) {
-        errlogPrintf(ERL_ERROR " iocBuild: asInit Failed.\n");
+        errlogPrintf("iocBuild: asInit Failed.\n");
         return -1;
     }
     dbProcessNotifyInit();

modules/database/src/ioc/misc/miscIocRegister.c

@@ -38,7 +38,7 @@ static void iocBuildCallFunc(const iocshArgBuf *args)
 /* iocRun */
 static const iocshFuncDef iocRunFuncDef = {"iocRun",0,NULL, 
              "Bring the IOC out of its initial quiescent state to the running state.\n"
-             "See more: iocBuild, iocPause\n"};
+             "See more: iocBuild, iocPause"};
 static void iocRunCallFunc(const iocshArgBuf *args)
 {
     iocshSetError(iocRun());
@@ -47,7 +47,7 @@ static void iocRunCallFunc(const iocshArgBuf *args)
 /* iocPause */
 static const iocshFuncDef iocPauseFuncDef = {"iocPause",0,NULL,
              "Brings a running IOC to a quiescent state with all record processing frozen.\n"
-             "See more: iocBuild, iocRub, iocInit\n"};
+             "See more: iocBuild, iocRub, iocInit"};
 static void iocPauseCallFunc(const iocshArgBuf *args)
 {
     iocshSetError(iocPause());