older binutils compat

For linux, enable softIoc to find .dbd relative to the executable
location.

The same could be done for other targets

*bsd
  may have symlink /proc/curproc/file
  fallback to sysctl() with KERN_PROC_PATHNAME

solaris
  getexecname()

mac
  _NSGetExecutablePath()

WIN32
  GetModuleFileName(NULL)

others
  out of luck...

.gitmodules

@@ -22,6 +22,3 @@
     path = modules/pva2pva
     url = https://github.com/epics-base/pva2pva
     branch = master
-[submodule "modules/pcas"]
-	path = modules/pcas
-	url = https://github.com/epics-modules/pcas

.tools/make-tar.sh

@@ -36,10 +36,7 @@ case "$PREFIX" in
 esac
 
 # Check for both <tag> and R<tag>
-if [ "$TOPREV" = "HEAD" ]
-then
-  true
-elif ! [ `git tag -l $TOPREV` ]
+if ! [ `git tag -l $TOPREV` ]
 then
   if [ `git tag -l R$TOPREV` ]
   then

.travis.yml

@@ -15,7 +15,7 @@ addons:
 script:
   - .ci/travis-build.sh
 env:
-  - CMPLR=gcc
+  - CMPLR=gcc EXTRA=LINKER_USE_RPATH=ORIGIN
   - CMPLR=clang
   - CMPLR=gcc   STATIC=YES
   - CMPLR=clang STATIC=YES

Makefile

@@ -23,10 +23,3 @@ 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

@@ -24,14 +24,9 @@ LD = $(GNU_BIN)/$(CMPLR_PREFIX)ld$(CMPLR_SUFFIX) -r
 CPP = $(CC) -x c -E
 RANLIB = $(GNU_BIN)/$(CMPLR_PREFIX)ranlib$(CMPLR_SUFFIX)
 
-# Requires at least GCC 4.8 or LLVM (clang) 3.1
-ASAN_FLAGS_YES = -fsanitize=address
-ASAN_LDFLAGS_YES = $(ASAN_FLAGS_YES)
-
 PROF_CFLAGS_YES = -p
 GPROF_CFLAGS_YES = -pg
 CODE_CFLAGS = $(PROF_CFLAGS_$(PROFILE)) $(GPROF_CFLAGS_$(GPROF))
-CODE_CFLAGS += $(ASAN_FLAGS_$(ENABLE_ASAN))
 WARN_CFLAGS_YES = -Wall
 WARN_CFLAGS_NO = -w
 OPT_CFLAGS_YES = -O3
@@ -40,14 +35,12 @@ OPT_CFLAGS_NO = -g
 PROF_CXXFLAGS_YES = -p
 GPROF_CXXFLAGS_YES = -pg
 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_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
-CODE_LDFLAGS += $(ASAN_LDFLAGS_$(ENABLE_ASAN))
 
 PIPE_CFLAGS_YES_YES = -pipe
 PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))

configure/CONFIG_BASE

@@ -44,6 +44,8 @@ FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
 TAPTOJUNIT       = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
 GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
+MAKERPATH = $(PYTHON) $(TOOLS)/makeRPath.py
+
 #---------------------------------------------------------------
 # tools for installing libraries and products
 INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)

configure/CONFIG_BASE_VERSION

@@ -52,20 +52,19 @@ EPICS_MODIFICATION = 2
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
-EPICS_PATCH_LEVEL = 2
+EPICS_PATCH_LEVEL = 0
 
-# Between official releases, the EPICS_PATCH_LEVEL gets incremented
-# and a -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
-#EPICS_DEV_SNAPSHOT=
-EPICS_DEV_SNAPSHOT=-DEV
+# This will end in -DEV between official releases
+#EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
 #EPICS_DEV_SNAPSHOT=-pre2-DEV
 #EPICS_DEV_SNAPSHOT=-rc1
-#EPICS_DEV_SNAPSHOT=-rc1-DEV
+EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
+#EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -38,6 +38,8 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD
 
+PYTHON = python
+
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
@@ -76,14 +78,11 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Silencing the build - suppress messages during 'make -s'
+# Make echo output - suppress echoing if make's '-s' flag is set
 NOP = :
-ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
-QUIET_FLAG := $(if $(findstring s,$(MFLAGS)),-q,)
-
-#-------------------------------------------------------
-# Convert 'make -q' flag into '-i' for genVersionHeader.pl
-QUESTION_FLAG := $(if $(findstring q,$(MFLAGS)),-i,)
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
+QUESTION_FLAG := $(if $(findstring q,$(MAKEFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -93,7 +92,7 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
-# Directories for libraries
+#Directories for libraries
 SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
 
 #-------------------------------------------------------

configure/CONFIG_SITE

@@ -161,7 +161,7 @@ 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:=$(shell date +%Y-%m)
+EPICS_SITE_VERSION =
 
 # For GNU compiler, use pipes rather than temporary files for
 #  communication between the various stages of compilation.
@@ -169,10 +169,17 @@ EPICS_SITE_VERSION:=$(shell date +%Y-%m)
 GCC_PIPE = NO
 
 # Set RPATH when linking executables and libraries.
-#  Must be either YES or NO.  If you set this to NO you must also provide a
+#  Must be either YES, NO, or ORIGIN.  If you set this to NO you must also provide a
 #  way for Base executables to find their shared libraries when they are
 #  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
+#  ORIGIN is Linux specific.
 LINKER_USE_RPATH = YES
 
+# Only used when LINKER_USE_RPATH=ORIGIN
+# The build time root of the relocatable tree.
+# Linking to libraries under this root directory will be relative.
+# Linking to libraries outside of this root will be absolute.
+LINKER_ORIGIN_ROOT = $(INSTALL_LOCATION)
+
 # Overrides for the settings above may appear in a CONFIG_SITE.local file
 -include $(CONFIG)/CONFIG_SITE.local

configure/CONFIG_SITE_ENV

@@ -34,9 +34,14 @@
 #	The future dates below assume the rules don't get changed;
 #	see http://www.timeanddate.com/time/dst/2018.html to check.
 #
+#	DST for 2018  US: Mar 11 - Nov 04
+#	              EU: Mar 25 - Oct 28
+EPICS_TIMEZONE = CUS::360:031102:110402
+#EPICS_TIMEZONE = MET::-60:032502:102803
+#
 #	DST for 2019  US: Mar 10 - Nov 03
 #	              EU: Mar 31 - Oct 27
-EPICS_TIMEZONE = CUS::360:031002:110302
+#EPICS_TIMEZONE = CUS::360:031002:110302
 #EPICS_TIMEZONE = MET::-60:033102:102703
 #
 #	DST for 2020  US: Mar 08 - Nov 01
@@ -53,11 +58,6 @@ EPICS_TIMEZONE = CUS::360:031002:110302
 #	              EU: Mar 27 - Oct 30
 #EPICS_TIMEZONE = CUS::360:031302:110602
 #EPICS_TIMEZONE = MET::-60:032702:103003
-#
-#	DST for 2023  US: Mar 13 - Nov 06
-#	              EU: Mar 27 - Oct 30
-#EPICS_TIMEZONE = CUS::360:031202:110502
-#EPICS_TIMEZONE = MET::-60:032602:102903
 
 # EPICS_TS_NTP_INET
 #	NTP time server ip address for VxWorks and RTEMS.

configure/RULES_BUILD

@@ -43,7 +43,6 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
 SCRIPTS += $(SCRIPTS_HOST)
-TARGETS += $(TARGETS_HOST)
 TESTLIBRARY += $(TESTLIBRARY_HOST)
 TESTSCRIPTS += $(TESTSCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
@@ -55,7 +54,6 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
 SCRIPTS += $(SCRIPTS_IOC)
-TARGETS += $(TARGETS_IOC)
 TESTLIBRARY += $(TESTLIBRARY_IOC)
 TESTSCRIPTS += $(TESTSCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
@@ -86,23 +84,6 @@ include $(CONFIG)/RULES_FILE_TYPE
 
 include $(CONFIG)/RULES.Db
 
-#---------------------------------------------------------------
-# Do not build anything if current path matches SKIP_BUILD
-
-ifneq (,$(strip $(SKIP_BUILDS)))
-CURRENT_MODULE=$(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
 
@@ -213,6 +194,13 @@ ifeq ($(EPICS_HOST_ARCH),$(T_A))
 	$(info Warning: RELEASE file consistency checks have been disabled)
 endif
 
+# $(FINAL_DIR) signals eventual install locations to makeRPath script
+$(TESTPRODNAME): FINAL_DIR=.
+$(PRODNAME): FINAL_DIR=$(INSTALL_BIN)
+$(TESTSHRLIBNAME): FINAL_DIR=.
+$(SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
+$(LOADABLE_SHRLIBNAME): FINAL_DIR=$(INSTALL_SHRLIB)
+
 #---------------------------------------------------------------
 #  The order of the following rules is
 #  VERY IMPORTANT !!!!
@@ -379,17 +367,14 @@ ifneq ($(TAPFILES),)
 ifdef RUNTESTS_ENABLED
 	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
 endif
-
-CURRENT_TAPFILES := $(wildcard $(TAPFILES))
-CURRENT_JUNITFILES := $(wildcard $(JUNITFILES))
 endif
 
 clean-tests:
-ifneq ($(CURRENT_TAPFILES),)
-	$(RM) $(CURRENT_TAPFILES)
+ifneq ($(TAPFILES),)
+	$(RM) $(TAPFILES)
 endif
-ifneq ($(CURRENT_JUNITFILES),)
-	$(RM) $(CURRENT_JUNITFILES)
+ifneq ($(JUNITFILES),)
+	$(RM) $(JUNITFILES)
 endif
 
 tapfiles: $(TESTSCRIPTS) $(TAPFILES)

configure/RULES_TOP

@@ -26,10 +26,8 @@ realuninstall: uninstallDirs
 UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
     $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
 ifneq ($(INSTALL_LOCATION),$(TOP))
-ifneq ($(INSTALL_LOCATION),$(EPICS_BASE))
 UNINSTALL_DIRS += $(INSTALL_CONFIG)
 endif
-endif
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 

configure/os/CONFIG.Common.RHEL7-x86_64

@@ -1,4 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-COMMANDLINE_LIBRARY = READLINE

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

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

configure/os/CONFIG.Common.RTEMS

@@ -76,7 +76,7 @@ CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
  $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
  $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
-ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way

configure/os/CONFIG.Common.SL5-x86

@@ -1,6 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86
-
-COMMANDLINE_LIBRARY = READLINE_NCURSES
-
-ARCH_DEP_CFLAGS += -march=i686

configure/os/CONFIG.Common.SL5-x86_64

@@ -1,4 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-COMMANDLINE_LIBRARY = READLINE_NCURSES

configure/os/CONFIG.Common.SL6-x86

@@ -1,9 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86
-
-COMMANDLINE_LIBRARY = READLINE
-
-ARCH_DEP_CFLAGS += -march=i686
-
-# remove warning in anyscalar.h
-ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.SL6-x86_64

@@ -1,7 +0,0 @@
-# Include definitions common to linux pentium targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86_64
-
-COMMANDLINE_LIBRARY = READLINE
-
-# remove warning in anyscalar.h
-ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

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

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

configure/os/CONFIG.Common.T2-ppc604

@@ -1,8 +0,0 @@
-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.UnixCommon

@@ -18,10 +18,8 @@ OBJ = .o
 LIB_PREFIX = lib
 LIB_SUFFIX = .a
 SHRLIB_SUFFIX_BASE = .so
-#SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
-SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
-#LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
-LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(SHRLIB_VERSION))
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)$(addprefix .,$(LOADABLE_SHRLIB_VERSION))
 LOADABLE_SHRLIB_PREFIX = lib
 
 #-------------------------------------------------------

configure/os/CONFIG.Common.V62-ppc604

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

configure/os/CONFIG.Common.V63-ppc603

@@ -1,5 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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.V66-ppc603

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

configure/os/CONFIG.Common.V66-ppc604

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

configure/os/CONFIG.Common.V67-ppc604

@@ -1,5 +0,0 @@
-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>'

configure/os/CONFIG.Common.eldk42-ppc4xxFP

@@ -1,25 +0,0 @@
-# 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
-
-# Some drivers complain
-ARCH_DEP_CFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -1,16 +0,0 @@
-# Virtex FPGA embedded Processor with ELDK 5.1
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-COMMANDLINE_LIBRARY = READLINE
-
-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)

configure/os/CONFIG.Common.eldk52-e500v2

@@ -1,17 +0,0 @@
-# IOxOS IFC1210 with ELDK 5.2
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-COMMANDLINE_LIBRARY = READLINE
-
-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 =

configure/os/CONFIG.Common.eldk53-ppc4xxFP

@@ -1,23 +0,0 @@
-# DeltaTau PowerPMAC with ELDK 5.2
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-COMMANDLINE_LIBRARY = READLINE
-
-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
-
-ARCH_DEP_CPPFLAGS =  -m32 -mcpu=440fp -mhard-float
-ARCH_DEP_CPPFLAGS += --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
-ARCH_DEP_LDFLAGS =   --sysroot=$(SDKTARGETSYSROOT)/$(GNU_ARCH)
-AS=$(GNU_BIN)/$(GNU_TARGET)-as

configure/os/CONFIG.Common.fslqoriq20-e6500_64

@@ -1,25 +0,0 @@
-# IOxOS IFC1211 with Freescale QorIQ 2.0 toolchain
-
-# Include definitions common to all Linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-COMMANDLINE_LIBRARY = READLINE
-
-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
-SDKTARGETSYSROOT = $(SDK_DIR)/sysroots/$(SDK_TARGET)
-GNU_DIR = $(SDK_DIR)/sysroots/$(SDK_HOST_ARCH)/usr
-GNU_BIN = $(GNU_DIR)/bin/$(GNU_TARGET)
-
-ARCH_DEP_CPPFLAGS = --sysroot=$(SDKTARGETSYSROOT)
-ARCH_DEP_CFLAGS = -mcpu=e6500 -m64 -mhard-float
-ARCH_DEP_LDFLAGS = --sysroot=$(SDKTARGETSYSROOT)
-
-# warning -O2 and higher are broken!
-#OPT_CFLAGS_YES = -O1
-#OPT_CXXFLAGS_YES = -O1

configure/os/CONFIG.Common.linux-clang

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

configure/os/CONFIG.Common.linuxCommon

@@ -25,11 +25,13 @@ STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
 # Set runtime path for shared libraries if USE_RPATH=YES and STATIC_BUILD=NO
 SHRLIBDIR_RPATH_LDFLAGS_YES_NO = $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
+SHRLIBDIR_RPATH_LDFLAGS_ORIGIN_NO = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(SHRLIB_DEPLIB_DIRS))
 SHRLIBDIR_LDFLAGS += \
     $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
 # Set runtime path for products if USE_RPATH=YES and STATIC_BUILD=NO
 PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+PRODDIR_RPATH_LDFLAGS_ORIGIN_NO = $(shell $(MAKERPATH) -O '\$$ORIGIN' -F $(FINAL_DIR) -R $(LINKER_ORIGIN_ROOT) $(PROD_DEPLIB_DIRS))
 PRODDIR_LDFLAGS += \
     $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 

configure/os/CONFIG.Common.moxa42-armv6l

@@ -1,19 +0,0 @@
-# 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
-
-# remove warning in anyscalar.h
-ARCH_DEP_CXXFLAGS += -fno-strict-aliasing

configure/os/CONFIG.Common.mvl40-xscale_be

@@ -1,15 +0,0 @@
-# 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
-
-# Cannot build PVA because of missing boost support
-SKIP_BUILDS = pv% normativeTypes

configure/os/CONFIG.Common.raspbian-arm

@@ -1,43 +0,0 @@
-# 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/
-
-COMMANDLINE_LIBRARY = READLINE
-
-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.vxWorksCommon

@@ -63,7 +63,6 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # 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.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -74,17 +73,9 @@ VX_GNU_VERSION_6.6 = 4.1.2
 VX_GNU_VERSION_6.7 = 4.1.2
 VX_GNU_VERSION_6.8 = 4.1.2
 VX_GNU_VERSION_6.9 = 4.3.3
-VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
-VX_GNU_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(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))
 
 #--------------------------------------------------
 # Fix old Linux WIND_HOST_TYPE
@@ -94,21 +85,14 @@ endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
 
-VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
-GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
-TARGET_CPPFLAGS = -isystem $(VX_DIR)/target/h
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
 
 #--------------------------------------------------
 # 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 = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -132,7 +116,7 @@ export TOOL_FAMILY = GNU
 #--------------------------------------------------
 # Operating system flags
 OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
-OP_SYS_CFLAGS += -fno-builtin -fno-strict-aliasing
+OP_SYS_CFLAGS += -fno-builtin
 
 # Fix for vxWorks headers that use macros defined in vxWorks.h but
 # which don't actually include vxWorks.h themselves, for example the
@@ -149,23 +133,12 @@ OPT_CXXFLAGS_YES = -O2
 # code flags
 CODE_CFLAGS =
 #
-# For gcc versions before 3.4 we need this g++ compiler flag
-# However WindRiver says gcc 3.3 does not need it any more
-# which would allow to build vxWorks 6 without this flag.
-# Maybe we can live without it at the penalty of larger code.
-# See vxWorks 5 docs/gnu2.96+ppc/gcc.html
-# chapter 4.5 "Where's the Template?"
-CODE_CXXFLAGS_OLD = -fno-implicit-templates
-CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC))
-
-#--------------------------------------------------
-# 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))
+# For vxWorks versions before 6.3 we need this g++ compiler flag
+CODE_CXXFLAGS_6.0 = -fno-implicit-templates
+CODE_CXXFLAGS_6.1 = -fno-implicit-templates
+CODE_CXXFLAGS_6.2 = -fno-implicit-templates
+CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION))
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # no shared libs for vxWorks
@@ -173,10 +146,8 @@ SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS =
 
 #--------------------------------------------------
-# Don't use gcc 2.x for dependency generation
-
-HDEPENDS_METHOD_2 = MKMF
-HDEPENDS_METHOD = $(firstword $(HDEPENDS_METHOD_$(VX_GNU_MAJOR_VERSION)) COMP)
+# Earlier versions of gcc don't understand -MF
+HDEPENDS_COMPFLAGS = -MM > $@
 
 #--------------------------------------------------
 # osithead use default stack, YES or NO override

configure/os/CONFIG.Common.yocto21-aarch64

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

configure/os/CONFIG.RHEL7-x86_64.Common

@@ -1,3 +0,0 @@
-#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

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

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

@@ -1,16 +0,0 @@
-# "cross compile" for older Linux version
-# Use older compiler and older libraries
-# Used packages:
-# compat-gcc-44-c++-4.4
-# compat-gcc-44-4.4
-# compat-glibc-headers-2.12-4
-# It was neccessary to install 32 bit compatibility libraries manually
-#-------------------------------------------------------
-
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
-CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
-CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
-
-TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
-TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib 
-LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

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

@@ -1,16 +0,0 @@
-# "cross compile" for older Linux version
-# Use older compiler and older libraries
-# Used packages:
-# compat-gcc-44-c++-4.4
-# compat-gcc-44-4.4
-# compat-glibc-headers-2.12-4
-# compat-glibc-2.12-4
-#-------------------------------------------------------
-
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
-CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
-CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
-
-TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
-TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib64
-LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

configure/os/CONFIG.SL5-x86.Common

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

configure/os/CONFIG.SL5-x86.SL5-x86

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

configure/os/CONFIG.SL5-x86_64.Common

@@ -1,3 +0,0 @@
-#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.SL5-x86_64.SL5-x86_64

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

configure/os/CONFIG.SL6-x86.Common

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

configure/os/CONFIG.SL6-x86.SL6-x86

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

configure/os/CONFIG.SL6-x86_64.Common

@@ -1,3 +0,0 @@
-#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.SL6-x86_64.SL6-x86

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

configure/os/CONFIG.SL6-x86_64.SL6-x86_64

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

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -65,7 +65,7 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined dynamic_lookup \
+SHRLIB_LDFLAGS = -dynamiclib -undefined dynamic_lookup \
     -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
     $(addprefix -compatibility_version , $(SHRLIB_VERSION)) \
     $(addprefix -current_version , $(SHRLIB_VERSION))

configure/os/CONFIG.win32-x86.Common

@@ -26,5 +26,3 @@ endif
 # Needed to find dlls for base installed build tools (antelope,eflex,...)
 PATH := $(EPICS_BASE_BIN):$(PATH)
 
-# Silence the tr1 namespace deprecation warnings
-USR_CXXFLAGS_WIN32 += -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING

configure/os/CONFIG_SITE.Common.linux-x86

@@ -54,7 +54,3 @@ OPT_CXXFLAGS_YES += -g
 # Tune GNU compiler output for a specific 32-bit cpu-type
 # (e.g. generic, native, i386, i686, pentium2/3/4, prescott, k6, athlon etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
-
-
-# Developers using a suitable compiler may enable its address sanitizer:
-#ENABLE_ASAN = YES

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -50,7 +50,3 @@ OPT_CXXFLAGS_YES += -g
 # Tune GNU compiler output for a specific 64-bit cpu-type
 # (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.)
 GNU_TUNE_CFLAGS = -mtune=generic
-
-
-# Developers using a suitable compiler may enable its address sanitizer:
-#ENABLE_ASAN = YES

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -21,6 +21,5 @@ VXWORKS_VERSION = 6.9
 # 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)

configure/os/CONFIG_SITE.RHEL7-x86_64.Common

@@ -1,13 +0,0 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
-
-# Build 32 bit version as a cross architecture
-#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86
-
-# Improved error checking with clang
-CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64-clang
-
-# Build for old SL6 64 bit
-CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64
-
-# Build for old SL6 32 bit
-CROSS_COMPILER_TARGET_ARCHS += SL6-x86

configure/os/CONFIG_SITE.SL5-x86.Common

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

configure/os/CONFIG_SITE.SL5-x86_64.Common

@@ -1,3 +0,0 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
-# Build 32 bit version as a cross architecture
-CROSS_COMPILER_TARGET_ARCHS += SL5-x86

configure/os/CONFIG_SITE.SL6-x86.Common

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

configure/os/CONFIG_SITE.SL6-x86_64.Common

@@ -1,7 +0,0 @@
-# Build 32 bit version as a cross architecture
-CROSS_COMPILER_TARGET_ARCHS += SL6-x86
-
-# Improved error checking with clang
-#CROSS_COMPILER_TARGET_ARCHS += SL6-x86_64-clang
-
-include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common

configure/os/CONFIG_SITE.linux-x86.Common

@@ -1,43 +1,9 @@
-INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
-EPICS_SITE_VERSION:=$(shell date +%Y-%m-%d)
+# CONFIG_SITE.linux-x86.Common
+#
+# Site override definitions for linux-x86 host builds
+#-------------------------------------------------------
 
-GNU_HOST_ARCH=i686
-GNU_HOST_OS=linux
-
-# LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
-LD_LIBRARY_PATH=
-
-# vxWorks 5.5 for MVxxxx boards
-CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
-
-# vxWorks 6.7 for MVxxxx boards
-CROSS_COMPILER_TARGET_ARCHS += V67-ppc604
-
-# 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
-# (No PVA because of old compiler)
-CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
-
-# Raspberry Pi
-CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
+# JBA test override values
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167

configure/os/CONFIG_SITE.linux-x86_64.Common

@@ -1,9 +1,9 @@
-include $(CONFIG)/os/CONFIG_SITE.linux-x86.Common
+# CONFIG_SITE.linux-x86_64.Common
+#
+# Site override definitions for linux-x86_64 host builds
+#-------------------------------------------------------
 
-GNU_HOST_ARCH_64=x86_64
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100
 
-# IOxOS IFC1211
-CROSS_COMPILER_TARGET_ARCHS += fslqoriq20-e6500_64
-
-# Zynq
-CROSS_COMPILER_TARGET_ARCHS += yocto21-aarch64

documentation/KnownProblems.html

@@ -4,17 +4,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <title>Known Problems in EPICS 7.0.2</title>
+  <title>Known Problems in EPICS 7.0.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS 7.0.2: Known Problems</h1>
+<h1 style="text-align: center">EPICS 7.0.1: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-7.0.2 tree. Download them, then use the GNU Patch program as
+base-7.0.1 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.2</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.1</b>
 % <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
 <p>The following problems were known by the developers at the time of this

documentation/README.1st

@@ -1,6 +1,6 @@
                            Installation Instructions
 
-                            EPICS Base Release 7.0.2
+                           EPICS Base Release 7.0.1.1
 
    --------------------------------------------------------------------------
 

documentation/README.html

@@ -9,7 +9,7 @@
 <BODY>
 <CENTER>
 <H1>Installation Instructions</H1>
-<H2>EPICS Base Release 7.0.2</H2><BR>
+<H2>EPICS Base Release 7.0.1.1</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</H3>

documentation/RELEASE_NOTES.html

@@ -9,18 +9,14 @@
 <body lang="en">
 
 <p>These release notes describe changes that have been made since the previous
-release of this series of EPICS Base. <b>Note that changes which were merged up
+release of this series of EPICS Base. Note that changes which were merged up
 from commits to new releases in an older Base series are not described at the
 top of this file but have entries that appear lower down, under the series to
-which they were originally committed.</b> Thus it is important to read more than
+which they were originally committed. Thus it is important to read more than
 just the first section to understand everything that has changed in each
 release.</p>
 
-<p>The external PVA submodules each have their own separate set of release notes
-which should also be read to understand what has changed since an earlier
-release.</p>
-
-<h1 align="center">EPICS Release 7.0.2.2</h1>
+<h1 align="center">EPICS Release 7.0.2</h1>
 
 <!-- Insert new items immediately below this template ...
 
@@ -30,64 +26,6 @@ release.</p>
 
 -->
 
-
-<h1 align="center">EPICS Release 7.0.2.1</h1>
-
-<h3>Linking shared libraries on macOS</h3>
-
-<p>The linker flag <tt>-flat_namespace</tt> has been restored for creating
-shared libraries, although not for loadable libraries (bundles). This was
-required for building using the latest versions of Apple XCode.</p>
-
-<h3>Fix DB_LINK loop breaking</h3>
-
-<p>A regression was introduced in 7.0.2 which caused record chains with loops to
-be incorrectly broken. Processing should be skipped when a DB_LINK with Process
-Passive (PP) closes a loop to a synchronous record.</p>
-
-<p>Instead in 7.0.2 the targeted record would be processed if processing began
-with a remote action (or some other caller of <tt>dbPutField()</tt>). This would
-result in the loop running a second time. The loop would be broken on the second
-iteration.</p>
-
-<p><a href="https://bugs.launchpad.net/epics-base/+bug/1809570">See lp:
-#1809570</a></p>
-
-<h3>Old dbStaticLib APIs removed</h3>
-
-<p>Support for some obsolete dbStaticLib Database Configuration Tool (DCT) APIs
-was removed some time ago, but vestiges of them still remained. The following
-routines and macros and have now finally been removed:</p>
-
-<ul>
-<li>int dbGetFieldType(DBENTRY *pdbentry)</li>
-<li>int dbGetLinkType(DBENTRY *pdbentry)</li>
-<li>DCT_STRING</li>
-<li>DCT_INTEGER</li>
-<li>DCT_REAL</li>
-<li>DCT_MENU</li>
-<li>DCT_MENUFORM</li>
-<li>DCT_INLINK</li>
-<li>DCT_OUTLINK</li>
-<li>DCT_FWDLINK</li>
-<li>DCT_NOACCESS</li>
-<li>DCT_LINK_CONSTANT</li>
-<li>DCT_LINK_FORM</li>
-<li>DCT_LINK_PV</li>
-</ul>
-
-<h3>Fix for <tt>dbhcr</tt> before <tt>iocInit</tt></h3>
-
-<p>The <tt>dbhcr</tt> command used to work before <tt>iocInit</tt> as well as
-afterwards. It displays all records that have hardware addresses (VME_IO,
-CAMAC_IO, GPIB_IO, INST_IO etc.) but stopped working if run before iocInit due
-to the rewrite of the link address parser code in dbStaticLib. This release
-fixes that issue, although in some cases the output may be slightly different
-than it used to be.</p>
-
-
-<h1 align="center">EPICS Release 7.0.2</h1>
-
 <h3>Launchpad Bugs</h3>
 
 <p>The list of tracked bugs fixed in this release can be found on the
@@ -170,30 +108,9 @@ code than documentation. Send questions to the tech-talk mailing list and we'll
 be happy to try and answer them!</p>
 
 
-<h2 align="center">Changes between 3.16.1 and 3.16.2</h2>
+<h2 align="center">Changes from the 3.16 branch since 3.16.1</h2>
 
-<p>The list of tracked bugs fixed in this release can be found on the
-<a href="https://launchpad.net/epics-base/+milestone/3.16.2">Launchpad Milestone
-page for EPICS Base 3.16.2</a>.</p>
-
-<h3>Status reporting for the callback and scanOnce task queues</h3>
-
-<p>Two new iocsh commands and some associated underlying APIs have been added to
-show the state of the queues that feed the three callback tasks and the scanOnce
-task, including a high-water mark which can optionally be reset. The new iocsh
-commands are <tt>callbackQueueShow</tt> and <tt>scanOnceQueueShow</tt>; both
-take an optional integer argument which must be non-zero to reset the
-high-water mark.</p>
-
-<h3>Support for event codes greater than or equal to NUM_TIME_EVENTS</h3>
-
-<p>Event numbers greater than or equal to NUM_TIME_EVENTS are now allowed if
-supported by the registered event time provider, which must provide its own
-advancing timestamp validation for such events.</p>
-
-<p>Time events numbered 0 through (NUM_TIME_EVENTS-1) are still validated by
-code in epicsGeneralTime.c that checks for advancing timestamps and enforces
-that restriction.</p>
+<!-- Insert inherited items immediately below here ... -->
 
 <h3>Type-safe Device and Driver Support Tables</h3>
 
@@ -977,46 +894,6 @@ of its CALLBACK objects.</p>
 
 <!-- Insert inherited items immediately below here ... -->
 
-<h3>Perl CA bindings fixed for macOS Mojave</h3>
-
-<p>Apple removed some Perl header files from macOS Mojave that were available
-in their SDK, requiring a change to the include paths used when compiling the
-CA bindings. The new version should build on new and older macOS versions, and
-these changes may also help other targets that have an incomplete installation
-of Perl (the build will continue after printing a warning that the Perl CA
-bindings could not be built).</p>
-
-<h3>Routine <tt>epicsTempName()</tt> removed from libCom</h3>
-
-<p>This routine was a simple wrapper around the C89 function <tt>tmpnam()</tt>
-which is now seen as unsafe and causes warning messages to be generated by
-most modern compilers. The two internal uses of this function have been
-modified to call <tt>epicsTempFile()</tt> instead. We were unable to find any
-published code that used this function, so it was removed immediately instead
-of being deprecated.</p>
-
-<h3>DBD Parsing of Record Types</h3>
-
-<p>The Perl DBD file parser has been made slightly more liberal; the order in
-which DBD files must be parsed is now more flexible, so that a record type
-definition can now be parsed after a device support that referred to that
-record type. A warning message will be displayed when the device support is
-seen, but the subsequent loading of the record type will be accepted without
-triggering an error. See
-<a href="https://bugs.launchpad.net/epics-base/+bug/1801145">Launchpad bug
-#1801145</a>.</p>
-
-<h3>menuScan and several record types documented with POD</h3>
-
-<p>The EPICS Wiki pages describing a number of standard record types has been
-converted into the Perl POD documentation format and added to the DBD files,
-so at build-time an HTML version of these documents is generated and installed
-into the htmls directory. Thanks to Tony Pietryla.</p>
-
-<h3>CA client tools learned <tt>-V</tt> option</h3>
-
-<p>This displays the version numbers of EPICS Base and the CA protocol.</p>
-
 
 <h2 align="center">Changes made between 3.15.5 and 3.15.6</h2>
 

documentation/ReleaseChecklist.html

@@ -37,8 +37,6 @@ that should be performed when creating production releases of EPICS Base.</p>
 
 <h3>The Release Process</h3>
 
-<h4>Full Process</h4>
-
 <p>The version released on the Feature Freeze date is designated the first
 pre-release, <tt>-pre1</tt>. The first release candidate <tt>-rc1</tt> is the
 first version that has undergone testing by the developers and has shown no
@@ -51,12 +49,6 @@ release candidate has been available for 2 weeks without any new problems being
 reported or major changes having to be committed, the final release can be
 made.</p>
 
-<h4>Short Process for Patch Releases</h4>
-
-<p>The Patch Release date and its scope are agreed upon about four weeks
-ahead of time. If no blocking issues are raised, the release is made by the
-release manager.</p>
-
 <h3>Roles</h3>
 
 <p>The following roles are used below:</p>
@@ -256,6 +248,24 @@ release manager.</p>
         </td>
       </tr>
 
+    <tr>
+      <th colspan="3">To Do</th>
+    </tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>Release Manager</td>
+      <td>Discuss and resolve before final release:
+        <ul>
+          <li>Update version numbers in individual
+            <tt>modules/*/configure/*VERSION</tt> files?</li>
+          <li>Unifying module Release Notes for easier publication.</li>
+          <li>Unifying module documentation directories and Doxygen
+            config's.</li>
+          <li>Publishing releases on the new website.</li>
+          </ul>
+        </td>
+      </tr>
+
     <tr>
       <th colspan="3">Release Approval</th>
     </tr>
@@ -272,36 +282,18 @@ release manager.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>
-        <p>For each external submodule, check if the module's release version
-          number (and SHRLIB_VERSION setting) has been updated if appropriate,
-          and that its Release Notes have been updated to cover any changes.
-          Commit any fixes and tag the module if that hasn't already been
-          done.</p>
-        <p>Update all external submodules on the Base-7.0 branch and
-          commit.</p></td>
+      <td>Edit and commit changes to the EPICS version number file
+        configure/CONFIG_BASE_VERSION.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Edit and commit changes to the EPICS Base version number file and
-        the embedded module version files:
-        <ul>
-          <li>configure/CONFIG_BASE_VERSION </li>
-          <li>modules/libcom/configure/CONFIG_LIBCOM_VERSION</li>
-          <li>modules/ca/configure/CONFIG_CA_VERSION</li>
-          <li>modules/database/configure/CONFIG_DATABASE_VERSION</li>
-          </ul></td>
-      </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Release Manager</td>
-      <td>Tag the epics-base module in Git:
+      <td>Tag the module in Git:
         <blockquote><tt>
           cd base-7.0<br />
           git tag -m 'ANJ: Tagged for 7.0.2' R7.0.2</i>
           </tt></blockquote>
-        Don't push the new tag to the Launchpad repository yet.</td>
+        </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -323,28 +315,8 @@ release manager.</p>
       <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
-        least one supported platform. When this succeeds the new git tag can be
-        pushed to the Launchpad repository:
-        <blockquote><tt>
-          git push --follow-tags upstream 7.0
-          </tt></blockquote>
-        </td>
+        least one supported platform</td>
       </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Release Manager</td>
-      <td>Edit and commit changes to the EPICS Base version number file and
-        the embedded module version files:
-        <ul>
-          <li>configure/CONFIG_BASE_VERSION </li>
-          <li>modules/libcom/configure/CONFIG_LIBCOM_VERSION</li>
-          <li>modules/ca/configure/CONFIG_CA_VERSION</li>
-          <li>modules/database/configure/CONFIG_DATABASE_VERSION</li>
-        </ul>
-        Version numbers should be set to the next expected patch release,
-        with a "-DEV" tag added (where applicable).
-      </td>
-    </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
@@ -363,8 +335,8 @@ release manager.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Website Manager</td>
-      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
-        Launchpad milestone for this release version.</td>
+      <td>Copy the tar file and its <tt>.asc</tt> signature file to the Base
+        download area of the website.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>

modules/Makefile

@@ -36,9 +36,6 @@ 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
 
@@ -58,4 +55,4 @@ $(RELEASE_LOCAL):
 	$(ECHO) Creating $@, EPICS_BASE = $(INSTALL_LOCATION_ABS)
 	@echo EPICS_BASE = $(INSTALL_LOCATION_ABS)> $@
 realclean:
-	$(RM) $(wildcard RELEASE.*.local)
+	$(RM) $(RELEASE_LOCAL)

modules/ca/configure/CONFIG_CA_VERSION

@@ -1,4 +1,4 @@
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 13
-EPICS_CA_MAINTENANCE_VERSION = 3
-EPICS_CA_DEVELOPMENT_FLAG = 0
+EPICS_CA_MAINTENANCE_VERSION = 2
+EPICS_CA_DEVELOPMENT_FLAG = 1

modules/ca/src/client/Makefile

@@ -72,7 +72,6 @@ LIBSRCS += comQueSend.cpp
 LIBSRCS += comBuf.cpp
 LIBSRCS += hostNameCache.cpp
 LIBSRCS += msgForMultiplyDefinedPV.cpp
-LIBSRCS_vxWorks += templateInstances.cpp
 
 LIBRARY=ca
 
@@ -126,7 +125,7 @@ EXPANDVARS += EPICS_CA_DEVELOPMENT_FLAG
 EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))")
 
 # shared library ABI version.
-SHRLIB_VERSION = $(EPICS_CA_MAJOR_VERSION).$(EPICS_CA_MINOR_VERSION).$(EPICS_CA_MAINTENANCE_VERSION)
+SHRLIB_VERSION = 4.13.1
 
 include $(TOP)/configure/RULES
 

modules/ca/src/client/templateInstances.cpp

@@ -1,66 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-
-/*  
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, 1986, The Regents of the University of California.
- *                                  
- *           
- *	Author Jeffrey O. Hill
- *	johill@lanl.gov
- *	505 665 1831
- */
-
-#include "cac.h"
-#include "oldAccess.h"
-#include "repeaterClient.h"
-
-template class chronIntIdResTable < nciu >;
-template class chronIntIdResTable < baseNMIU >;
-template class chronIntIdResTable < CASG >;
-template class resTable < nciu, chronIntId >;
-template class resTable < baseNMIU, chronIntId >;
-template class resTable < CASG, chronIntId >;
-template class resTable < bhe, inetAddrID >;
-template class resTable < tcpiiu, caServerID >;
-template class tsFreeList < bhe, 0x100 >;
-template class tsFreeList < tcpiiu, 32, epicsMutexNOOP >;
-template class tsFreeList < netReadNotifyIO, 1024, epicsMutexNOOP >;
-template class tsFreeList < netWriteNotifyIO, 1024, epicsMutexNOOP >;
-template class tsFreeList < netSubscription, 1024, epicsMutexNOOP >;
-template class tsFreeList < CASG, 128, epicsMutexNOOP  >;
-template class tsFreeList < syncGroupReadNotify, 128, epicsMutexNOOP >;
-template class tsFreeList < syncGroupWriteNotify, 128, epicsMutexNOOP >;
-template class tsFreeList < comBuf, 0x20 >;
-template class tsFreeList < getCallback, 1024, epicsMutexNOOP >;
-template class tsFreeList < getCopy, 1024, epicsMutexNOOP >;
-template class tsFreeList < msgForMultiplyDefinedPV, 16 >;
-template class tsFreeList < nciu, 1024, epicsMutexNOOP>;
-template class tsFreeList < oldChannelNotify, 1024, epicsMutexNOOP >;
-template class tsFreeList < oldSubscription, 1024, epicsMutexNOOP >;
-template class tsFreeList < putCallback, 1024, epicsMutexNOOP >;
-template class tsFreeList < repeaterClient, 0x20 >;
-template class epicsSingleton < localHostName >;
-template unsigned comBuf :: push ( const double * pValue, unsigned nElem );
-template unsigned comBuf :: push ( const float * pValue, unsigned nElem );
-template unsigned comBuf :: push ( const int * pValue, unsigned nElem );
-template unsigned comBuf :: push ( const short * pValue, unsigned nElem );
-template comBuf :: popStatus comBuf :: pop ( unsigned int & returnVal );
-template comBuf :: popStatus comBuf :: pop ( unsigned short & returnVal );
-template comBuf :: popStatus comBuf :: pop ( unsigned char & returnVal );
-template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
-    (epicsGuard < epicsMutex > &, syncGroupWriteNotify & );
-template void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO
-    ( epicsGuard < epicsMutex > &, syncGroupReadNotify & );

modules/ca/src/perl/Makefile

@@ -8,18 +8,6 @@
 TOP = ../..
 include $(TOP)/configure/CONFIG
 
-ifdef T_A
-  PERL_VERSION = $(shell $(PERL) ../perlConfig.pl version)
-  PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname)
-  PERL_ARCHPATH := $(PERL_VERSION)/$(PERL_ARCHNAME)
-
-  PERL_ARCHLIB  := $(shell $(PERL) ../perlConfig.pl archlib)
-  PERL_h = $(PERL_ARCHLIB)/CORE/perl.h
-
-  EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils
-  PERLBIN := $(shell $(PERL) ../perlConfig.pl bin)
-  XSUBPP := $(firstword $(wildcard $(PERLBIN)/xsubpp $(EXTUTILS)/xsubpp))
-
 # Special settings for Darwin:
 ifeq ($(OS_CLASS),Darwin)
   # Use hdepends command (not GNU compiler flags)
@@ -30,23 +18,22 @@ ifeq ($(OS_CLASS),Darwin)
   # Perl loadable libraries on Darwin have funny names
   LOADABLE_SHRLIB_PREFIX =
   LOADABLE_SHRLIB_SUFFIX = .$(shell $(PERL) ../perlConfig.pl dlext)
-
-ifeq ($(wildcard $(PERL_h)),)
-  # Perl's headers moved in Mojave
-  SDK_PATH := $(shell xcodebuild -version -sdk macosx Path)
-  PERL_ARCHLIB := $(SDK_PATH)/$(PERL_ARCHLIB)
-endif
 endif
 
-ifeq ($(T_A),$(EPICS_HOST_ARCH))                 # No cross-builds (wrong Perl!)
+ifdef T_A
+  PERL_VERSION = $(shell $(PERL) ../perlConfig.pl version)
+  PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname)
+  PERL_ARCHPATH := $(PERL_VERSION)/$(PERL_ARCHNAME)
+
+  EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils
+  PERLBIN := $(shell $(PERL) ../perlConfig.pl bin)
+  XSUBPP := $(firstword $(wildcard $(PERLBIN)/xsubpp $(EXTUTILS)/xsubpp))
+
 ifeq ($(strip $(XSUBPP)),)
   $(warning Perl's xsubpp program was not found.)
   $(warning The Perl CA module will not be built.)
 else
-ifeq ($(wildcard $(PERL_h)),)
-  $(warning Perl's C header files were not found.)
-  $(warning The Perl CA module will not be built.)
-else
+ifeq ($(T_A),$(EPICS_HOST_ARCH))                 # No cross-builds (wrong Perl!)
 ifeq ($(findstring $(OS_CLASS),WIN32 cygwin32),) # Doesn't build on WIN32
   LOADABLE_LIBRARY_HOST = Cap5
 
@@ -63,11 +50,10 @@ endif
 endif
 endif
 endif
-endif
 
 Cap5_SRCS = Cap5.xs
 Cap5_LIBS = ca Com
-Cap5_INCLUDES = -I$(PERL_ARCHLIB)/CORE
+Cap5_INCLUDES = -I$(shell $(PERL) ../perlConfig.pl archlib)/CORE
 Cap5_CFLAGS = $(shell $(PERL) ../perlConfig.pl ccflags)
 
 CLEANS += Cap5.c

modules/ca/src/tools/caget.c

@@ -34,7 +34,6 @@
 #include <alarm.h>
 #include <cadef.h>
 #include <epicsGetopt.h>
-#include "epicsVersion.h"
 
 #include "tool_lib.h"
 
@@ -56,7 +55,6 @@ static void usage (void)
 {
     fprintf (stderr, "\nUsage: caget [options] <PV name> ...\n\n"
     "  -h: Help: Print this message\n"
-    "  -V: Version: Show EPICS and CA versions\n"
     "Channel Access options:\n"
     "  -w <sec>: Wait time, specifies CA timeout, default is %f second(s)\n"
     "  -c: Asynchronous get (use ca_get_callback and wait for completion)\n"
@@ -391,14 +389,11 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
-    while ((opt = getopt(argc, argv, ":taicnhsSVe:f:g:l:#:d:0:w:p:F:")) != -1) {
+    while ((opt = getopt(argc, argv, ":taicnhsSe:f:g:l:#:d:0:w:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
             usage();
             return 0;
-        case 'V':
-            printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
-            return 0;
         case 't':               /* Terse output mode */
             complainIfNotPlainAndSet(&format, terse);
             break;

modules/ca/src/tools/cainfo.c

@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 #include <epicsStdlib.h>
-#include "epicsVersion.h"
 
 #include <cadef.h>
 #include <epicsGetopt.h>
@@ -37,14 +36,12 @@ void usage (void)
 {
     fprintf (stderr, "\nUsage: cainfo [options] <PV name> ...\n\n"
     "  -h: Help: Print this message\n"
-    "  -V: Version: Show EPICS and CA versions\n"
     "Channel Access options:\n"
     "  -w <sec>:   Wait time, specifies CA timeout, default is %f second(s)\n"
     "  -s <level>: Call ca_client_status with the specified interest level\n"
     "  -p <prio>:  CA priority (0-%u, default 0=lowest)\n"
     "\nExample: cainfo my_channel another_channel\n\n"
              , DEFAULT_TIMEOUT, CA_PRIORITY_MAX);
-    fprintf (stderr, "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
 }
 
 
@@ -140,14 +137,11 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
-    while ((opt = getopt(argc, argv, ":nhVw:s:p:")) != -1) {
+    while ((opt = getopt(argc, argv, ":nhw:s:p:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
             usage();
             return 0;
-        case 'V':
-            printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
-            return 0;
         case 'w':               /* Set CA timeout value */
             if(epicsScanDouble(optarg, &caTimeout) != 1)
             {

modules/ca/src/tools/camonitor.c

@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <epicsStdlib.h>
 #include <string.h>
-#include "epicsVersion.h"
 
 #include <cadef.h>
 #include <epicsGetopt.h>
@@ -45,8 +44,7 @@ void usage (void)
 {
     fprintf (stderr, "\nUsage: camonitor [options] <PV name> ...\n"
     "\n"
-    "  -h:       Help: Print this message\n"
-    "  -V:       Version: Show EPICS and CA versions\n"
+    "  -h:       Help; Print this message\n"
     "Channel Access options:\n"
     "  -w <sec>: Wait time, specifies CA timeout, default is %f second(s)\n"
     "  -m <msk>: Specify CA event mask to use.  <msk> is any combination of\n"
@@ -211,14 +209,11 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
-    while ((opt = getopt(argc, argv, ":nhVm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) {
+    while ((opt = getopt(argc, argv, ":nhm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
             usage();
             return 0;
-        case 'V':
-            printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
-            return 0;
         case 'n':               /* Print ENUM as index numbers */
             enumAsNr=1;
             break;

modules/ca/src/tools/caput.c

@@ -37,7 +37,6 @@
 #include <epicsGetopt.h>
 #include <epicsEvent.h>
 #include <epicsString.h>
-#include "epicsVersion.h"
 
 #include "tool_lib.h"
 
@@ -60,7 +59,6 @@ void usage (void)
     fprintf (stderr, "\nUsage: caput [options] <PV name> <PV value> ...\n"
     "       caput -a [options] <PV name> <no of values> <PV value> ...\n\n"
     "  -h: Help: Print this message\n"
-    "  -V: Version: Show EPICS and CA versions\n"
     "Channel Access options:\n"
     "  -w <sec>:  Wait time, specifies CA timeout, default is %f second(s)\n"
     "  -c: Asynchronous put (use ca_put_callback and wait for completion)\n"
@@ -283,14 +281,11 @@ int main (int argc, char *argv[])
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
     putenv("POSIXLY_CORRECT="); /* Behave correct on GNU getopt systems */
 
-    while ((opt = getopt(argc, argv, ":cnlhatsVS#:w:p:F:")) != -1) {
+    while ((opt = getopt(argc, argv, ":cnlhatsS#:w:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
             usage();
             return 0;
-        case 'V':
-            printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
-            return 0;
         case 'n':               /* Force interpret ENUM as index number */
             enumAsNr = 1;
             enumAsString = 0;

modules/database/configure/CONFIG

@@ -25,7 +25,7 @@ INSTALL_LOCATION = $(TOP)
 BASE_CPPFLAGS += -DUSE_TYPED_RSET
 
 # Shared library ABI version.
-SHRLIB_VERSION = $(EPICS_DATABASE_MAJOR_VERSION).$(EPICS_DATABASE_MINOR_VERSION).$(EPICS_DATABASE_MAINTENANCE_VERSION)
+SHRLIB_VERSION = 3.17.0
 
 # CONFIG_SITE files contain other build configuration settings
 include $(TOP)/configure/CONFIG_SITE

modules/database/configure/CONFIG_DATABASE_VERSION

@@ -1,4 +1,4 @@
 EPICS_DATABASE_MAJOR_VERSION = 3
 EPICS_DATABASE_MINOR_VERSION = 17
-EPICS_DATABASE_MAINTENANCE_VERSION = 3
-EPICS_DATABASE_DEVELOPMENT_FLAG = 0
+EPICS_DATABASE_MAINTENANCE_VERSION = 1
+EPICS_DATABASE_DEVELOPMENT_FLAG = 1

modules/database/src/ioc/Makefile

@@ -25,6 +25,11 @@ INC += databaseVersionNum.h
 
 PROD_LIBS = Com
 
+EPICS_DATABASE_MAJOR_VERSION = 3
+EPICS_DATABASE_MINOR_VERSION = 17
+EPICS_DATABASE_MAINTENANCE_VERSION = 0
+EPICS_DATABASE_DEVELOPMENT_FLAG = 1
+
 include $(IOCDIR)/as/Makefile
 include $(IOCDIR)/bpt/Makefile
 include $(IOCDIR)/db/Makefile

modules/database/src/ioc/db/Makefile

@@ -42,7 +42,6 @@ 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
@@ -62,7 +61,7 @@ DBDINC += menuScan
 DBDINC += dbCommon
 
 dbMenusPod = $(notdir $(wildcard ../db/menu*.dbd.pod))
-HTMLS += $(patsubst %.dbd.pod,%.html,$(dbMenusPod))
+HTMLS += $(patsubst %.dbd.pod,%.html,$(menusPod))
 
 dbCore_SRCS += dbLock.c
 dbCore_SRCS += dbAccess.c
@@ -97,5 +96,4 @@ dbCore_SRCS += chfPlugin.c
 dbCore_SRCS += dbState.c
 dbCore_SRCS += dbUnitTest.c
 dbCore_SRCS += dbServer.c
-dbCore_SRCS_vxWorks += templateInstances.cpp
 

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

@@ -54,7 +54,6 @@ typedef struct cbQueueSet {
     epicsEventId semWakeUp;
     epicsRingPointerId queue;
     int queueOverflow;
-    int queueOverflows;
     int shutdown;
     int threadsConfigured;
     int threadsRunning;
@@ -104,51 +103,6 @@ int callbackSetQueueSize(int size)
     return 0;
 }
 
-int callbackQueueStatus(const int reset, callbackQueueStats *result)
-{
-    int ret;
-    if (!callbackIsInit) return -1;
-    if (result) {
-        int prio;
-        result->size = callbackQueueSize;
-        for(prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
-            epicsRingPointerId qId = callbackQueue[prio].queue;
-            result->numUsed[prio] = epicsRingPointerGetUsed(qId);
-            result->maxUsed[prio] = epicsRingPointerGetHighWaterMark(qId);
-            result->numOverflow[prio] = epicsAtomicGetIntT(&callbackQueue[prio].queueOverflows);
-        }
-        ret = 0;
-    } else {
-        ret = -2;
-    }
-    if (reset) {
-        int prio;
-        for(prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
-            epicsRingPointerResetHighWaterMark(callbackQueue[prio].queue);
-        }
-    }
-    return ret;
-}
-
-void callbackQueueShow(const int reset)
-{
-    callbackQueueStats stats;
-    if (callbackQueueStatus(reset, &stats) == -1) {
-        fprintf(stderr, "Callback system not initialized, yet. Please run "
-            "iocInit before using this command.\n");
-    } else {
-        int prio;
-        printf("PRIORITY  HIGH-WATER MARK  ITEMS IN Q  Q SIZE  %% USED  Q OVERFLOWS\n");
-        for (prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
-            double qusage = 100.0 * stats.numUsed[prio] / stats.size;
-            printf("%8s  %15d  %10d  %6d  %6.1f  %11d\n",
-                   threadNamePrefix[prio], stats.maxUsed[prio],
-                   stats.numUsed[prio], stats.size, qusage,
-                   stats.numOverflow[prio]);
-        }
-    }
-}
-
 int callbackParallelThreads(int count, const char *prio)
 {
     if (callbackIsInit) {
@@ -336,7 +290,6 @@ int callbackRequest(CALLBACK *pcallback)
     if (!pushOK) {
         epicsInterruptContextMessage(fullMessage[priority]);
         mySet->queueOverflow = TRUE;
-        epicsAtomicIncrIntT(&mySet->queueOverflows);
         return S_db_bufFull;
     }
     epicsEventSignal(mySet->semWakeUp);

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

@@ -48,13 +48,6 @@ typedef epicsCallback CALLBACK;
 
 typedef void    (*CALLBACKFUNC)(struct callbackPvt*);
 
-typedef struct callbackQueueStats {
-    int size;
-    int numUsed[NUM_CALLBACK_PRIORITIES];
-    int maxUsed[NUM_CALLBACK_PRIORITIES];
-    int numOverflow[NUM_CALLBACK_PRIORITIES];
-} callbackQueueStats;
-
 #define callbackSetCallback(PFUN, PCALLBACK) \
     ( (PCALLBACK)->callback = (PFUN) )
 #define callbackSetPriority(PRIORITY, PCALLBACK) \
@@ -80,8 +73,6 @@ epicsShareFunc void callbackCancelDelayed(CALLBACK *pcallback);
 epicsShareFunc void callbackRequestProcessCallbackDelayed(
     CALLBACK *pCallback, int Priority, void *pRec, double seconds);
 epicsShareFunc int callbackSetQueueSize(int size);
-epicsShareFunc int callbackQueueStatus(const int reset, callbackQueueStats *result);
-epicsShareFunc void callbackQueueShow(const int reset);
 epicsShareFunc int callbackParallelThreads(int count, const char *prio);
 
 #ifdef __cplusplus

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

@@ -601,31 +601,6 @@ all_done:
     return status;
 }
 
-long dbEntryToAddr(const DBENTRY *pdbentry, DBADDR *paddr)
-{
-    dbFldDes *pflddes = pdbentry->pflddes;
-    short dbfType = pflddes->field_type;
-
-    paddr->precord = pdbentry->precnode->precord;
-    paddr->pfield = pdbentry->pfield;
-    paddr->pfldDes = pflddes;
-    paddr->no_elements = 1;
-    paddr->field_type  = dbfType;
-    paddr->field_size  = pflddes->size;
-    paddr->special     = pflddes->special;
-    paddr->dbr_field_type = mapDBFToDBR[dbfType];
-
-    if (paddr->special == SPC_DBADDR) {
-        const rset *prset = dbGetRset(paddr);
-
-        /* Let record type modify paddr */
-        if (prset && prset->cvt_dbaddr) {
-            return prset->cvt_dbaddr(paddr);
-        }
-    }
-    return 0;
-}
-
 /*
  *  Fill out a database structure (*paddr) for
  *    a record given by the name "pname."
@@ -636,7 +611,9 @@ long dbEntryToAddr(const DBENTRY *pdbentry, DBADDR *paddr)
 long dbNameToAddr(const char *pname, DBADDR *paddr)
 {
     DBENTRY dbEntry;
+    dbFldDes *pflddes;
     long status = 0;
+    short dbfType;
 
     if (!pname || !*pname || !pdbbase)
         return S_db_notFound;
@@ -651,28 +628,46 @@ long dbNameToAddr(const char *pname, DBADDR *paddr)
         status = dbGetAttributePart(&dbEntry, &pname);
     if (status) goto finish;
 
-    status = dbEntryToAddr(&dbEntry, paddr);
-    if (status) goto finish;
+    pflddes = dbEntry.pflddes;
+    dbfType = pflddes->field_type;
+
+    paddr->precord = dbEntry.precnode->precord;
+    paddr->pfield = dbEntry.pfield;
+    paddr->pfldDes = pflddes;
+    paddr->no_elements = 1;
+    paddr->field_type  = dbfType;
+    paddr->field_size  = pflddes->size;
+    paddr->special     = pflddes->special;
+    paddr->dbr_field_type = mapDBFToDBR[dbfType];
+
+    if (paddr->special == SPC_DBADDR) {
+        rset *prset = dbGetRset(paddr);
+
+        /* Let record type modify paddr */
+        if (prset && prset->cvt_dbaddr) {
+            status = prset->cvt_dbaddr(paddr);
+            if (status)
+                goto finish;
+            dbfType = paddr->field_type;
+        }
+    }
 
     /* Handle field modifiers */
     if (*pname++ == '$') {
-        short dbfType = paddr->field_type;
-
         /* Some field types can be accessed as char arrays */
         if (dbfType == DBF_STRING) {
             paddr->no_elements = paddr->field_size;
             paddr->field_type = DBF_CHAR;
             paddr->field_size = 1;
             paddr->dbr_field_type = DBR_CHAR;
-        }
-        else if (dbfType >= DBF_INLINK && dbfType <= DBF_FWDLINK) {
+        } else if (dbfType >= DBF_INLINK && dbfType <= DBF_FWDLINK) {
             /* Clients see a char array, but keep original dbfType */
             paddr->no_elements = PVLINK_STRINGSZ;
             paddr->field_size = 1;
             paddr->dbr_field_type = DBR_CHAR;
-        }
-        else {
+        } else {
             status = S_dbLib_fieldNotFound;
+            goto finish;
         }
     }
 
@@ -684,7 +679,7 @@ finish:
 void dbInitEntryFromAddr(struct dbAddr *paddr, DBENTRY *pdbentry)
 {
     struct dbCommon *prec = paddr->precord;
-    dbCommonPvt *ppvt = dbRec2Pvt(prec);
+    dbCommonPvt *ppvt = CONTAINER(prec, dbCommonPvt, common);
 
     memset((char *)pdbentry,'\0',sizeof(DBENTRY));
 
@@ -698,7 +693,7 @@ void dbInitEntryFromAddr(struct dbAddr *paddr, DBENTRY *pdbentry)
 
 void dbInitEntryFromRecord(struct dbCommon *prec, DBENTRY *pdbentry)
 {
-    dbCommonPvt *ppvt = dbRec2Pvt(prec);
+    dbCommonPvt *ppvt = CONTAINER(prec, dbCommonPvt, common);
 
     memset((char *)pdbentry,'\0',sizeof(DBENTRY));
 

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

@@ -204,8 +204,6 @@ struct dbr_alDouble     {DBRalDouble};
 #define S_db_notInit    (M_dbAccess|67) /*Not initialized*/
 #define S_db_bufFull    (M_dbAccess|68) /*Buffer full*/
 
-struct dbEntry;
-
 epicsShareFunc long dbPutSpecial(struct dbAddr *paddr,int pass);
 epicsShareFunc rset * dbGetRset(const struct dbAddr *paddr);
 epicsShareFunc long dbPutAttribute(
@@ -215,29 +213,8 @@ epicsShareFunc int dbGetFieldIndex(const struct dbAddr *paddr);
 epicsShareFunc long dbScanPassive(
     struct dbCommon *pfrom,struct dbCommon *pto);
 epicsShareFunc long dbProcess(struct dbCommon *precord);
-epicsShareFunc long dbNameToAddr(const char *pname, struct dbAddr *paddr);
-
-/** Initialize DBADDR from a dbEntry
- * Also handles SPC_DBADDR processing. This is really an internal
- * routine for use by dbNameToAddr() and dbChannelCreate().
- */
-epicsShareFunc long dbEntryToAddr(const struct dbEntry *pdbentry,
-    struct dbAddr *paddr);
-
-/** Initialize DBENTRY from a valid dbAddr*
- * Constant time equivalent of dbInitEntry() then dbFindRecord(),
- * and finally dbFollowAlias().
- */
-epicsShareFunc void dbInitEntryFromAddr(struct dbAddr *paddr,
-    struct dbEntry *pdbentry);
-
-/** Initialize DBENTRY from a valid record (dbCommon*)
- * Constant time equivalent of dbInitEntry() then dbFindRecord(),
- * and finally dbFollowAlias() when no field is specified.
- */
-epicsShareFunc void dbInitEntryFromRecord(struct dbCommon *prec,
-    struct dbEntry *pdbentry);
-
+epicsShareFunc long dbNameToAddr(
+    const char *pname,struct dbAddr *);
 epicsShareFunc devSup* dbDTYPtoDevSup(dbRecordType *prdes, int dtyp);
 epicsShareFunc devSup* dbDSETtoDevSup(dbRecordType *prdes, struct dset *pdset);
 epicsShareFunc long dbGetField(

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

@@ -703,12 +703,7 @@ static long doLocked(struct link *plink, dbLinkUserCallback rtn, void *priv)
     caLink *pca;
     long status;
 
-    assert(plink);
-    if (plink->type != CA_LINK) return -1;
-    pca = (caLink *)plink->value.pv_link.pvt;
-    assert(pca);
-    epicsMutexMustLock(pca->lock);
-    assert(pca->plink);
+    pcaGetCheck
     status = rtn(plink, priv);
     epicsMutexUnlock(pca->lock);
     return status;

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

@@ -20,7 +20,6 @@
 #include "cantProceed.h"
 #include "epicsAssert.h"
 #include "epicsString.h"
-#include "epicsStdio.h"
 #include "errlog.h"
 #include "freeList.h"
 #include "gpHash.h"
@@ -473,7 +472,9 @@ dbChannel * dbChannelCreate(const char *name)
     dbChannel *chan = NULL;
     char *cname;
     dbAddr *paddr;
+    dbFldDes *pflddes;
     long status;
+    short dbfType;
 
     if (!name || !*name || !pdbbase)
         return NULL;
@@ -496,14 +497,32 @@ dbChannel * dbChannelCreate(const char *name)
     ellInit(&chan->post_chain);
 
     paddr = &chan->addr;
-    status = dbEntryToAddr(&dbEntry, paddr);
-    if (status)
-        goto finish;
+    pflddes = dbEntry.pflddes;
+    dbfType = pflddes->field_type;
+
+    paddr->precord = dbEntry.precnode->precord;
+    paddr->pfield = dbEntry.pfield;
+    paddr->pfldDes = pflddes;
+    paddr->no_elements = 1;
+    paddr->field_type = dbfType;
+    paddr->field_size = pflddes->size;
+    paddr->special = pflddes->special;
+    paddr->dbr_field_type = mapDBFToDBR[dbfType];
+
+    if (paddr->special == SPC_DBADDR) {
+        rset *prset = dbGetRset(paddr);
+
+        /* Let record type modify paddr */
+        if (prset && prset->cvt_dbaddr) {
+            status = prset->cvt_dbaddr(paddr);
+            if (status)
+                goto finish;
+            dbfType = paddr->field_type;
+        }
+    }
 
     /* Handle field modifiers */
     if (*pname) {
-        short dbfType = paddr->field_type;
-
         if (*pname == '$') {
             /* Some field types can be accessed as char arrays */
             if (dbfType == DBF_STRING) {
@@ -511,14 +530,12 @@ dbChannel * dbChannelCreate(const char *name)
                 paddr->field_type = DBF_CHAR;
                 paddr->field_size = 1;
                 paddr->dbr_field_type = DBR_CHAR;
-            }
-            else if (dbfType >= DBF_INLINK && dbfType <= DBF_FWDLINK) {
+            } else if (dbfType >= DBF_INLINK && dbfType <= DBF_FWDLINK) {
                 /* Clients see a char array, but keep original dbfType */
                 paddr->no_elements = PVLINK_STRINGSZ;
                 paddr->field_size = 1;
                 paddr->dbr_field_type = DBR_CHAR;
-            }
-            else {
+            } else {
                 status = S_dbLib_fieldNotFound;
                 goto finish;
             }

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

@@ -1,27 +1,14 @@
 #ifndef DBCOMMONPVT_H
 #define DBCOMMONPVT_H
 
-#include <compilerDependencies.h>
-#include <dbDefs.h>
 #include "dbCommon.h"
 
-struct epicsThreadOSD;
-
 /** Base internal additional information for every record
  */
 typedef struct dbCommonPvt {
     struct dbRecordNode *recnode;
 
-    /* Thread which is currently processing this record */
-    struct epicsThreadOSD* procThread;
-
     struct dbCommon common;
 } dbCommonPvt;
 
-static EPICS_ALWAYS_INLINE
-dbCommonPvt* dbRec2Pvt(struct dbCommon *prec)
-{
-    return CONTAINER(prec, dbCommonPvt, common);
-}
-
 #endif // DBCOMMONPVT_H

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

@@ -56,7 +56,7 @@
 #include "dbAddr.h"
 #include "dbBase.h"
 #include "dbBkpt.h"
-#include "dbCommonPvt.h"
+#include "dbCommon.h"
 #include "dbConvertFast.h"
 #include "dbConvert.h"
 #include "db_field_log.h"
@@ -386,11 +386,8 @@ static long processTarget(dbCommon *psrc, dbCommon *pdst)
 {
     char context[40] = "";
     int trace = dbAccessDebugPUTF && *dbLockSetAddrTrace(psrc);
-    int claim_src = dbRec2Pvt(psrc)->procThread==NULL;
-    int claim_dst = psrc!=pdst && dbRec2Pvt(pdst)->procThread==NULL;
     long status;
     epicsUInt8 pact = psrc->pact;
-    epicsThreadId self = epicsThreadGetIdSelf();
 
     psrc->pact = TRUE;
 
@@ -409,11 +406,14 @@ static long processTarget(dbCommon *psrc, dbCommon *pdst)
             printf("%s: '%s' -> '%s' with PUTF=%u\n",
                 context, psrc->name, pdst->name, psrc->putf);
 
+        if (pdst->putf)
+            errlogPrintf("Warning: '%s.PUTF' found true with PACT false\n",
+                pdst->name);
+
         pdst->putf = psrc->putf;
     }
-    else if (psrc->putf && claim_dst) {
-        /* The dst record is busy (awaiting async reprocessing),
-         * not being processed recursively by us, and
+    else if (psrc->putf) {
+        /* The dst record is busy (awaiting async reprocessing) and
          * we were originally triggered by a call to dbPutField(),
          * so we mark the dst record for reprocessing once the async
          * completion is over.
@@ -426,43 +426,17 @@ static long processTarget(dbCommon *psrc, dbCommon *pdst)
         pdst->rpro = TRUE;
     }
     else {
-        /* The dst record is busy, but either is being processed recursively,
-         * or wasn't triggered by a call to dbPutField(). Do nothing.
+        /* The dst record is busy, but we weren't triggered by a call
+         * to dbPutField(). Do nothing.
          */
         if (trace)
             printf("%s: '%s' -> Active '%s', done\n",
                 context, psrc->name, pdst->name);
     }
 
-    if(claim_src) {
-        dbRec2Pvt(psrc)->procThread = self;
-    }
-    if(claim_dst) {
-        dbRec2Pvt(pdst)->procThread = self;
-    }
-
-    if(dbRec2Pvt(psrc)->procThread!=self ||
-       dbRec2Pvt(pdst)->procThread!=self) {
-        errlogPrintf("Logic Error: processTarget 1 from %p, %s(%p) -> %s(%p)\n",
-                     self, psrc->name, dbRec2Pvt(psrc), pdst->name, dbRec2Pvt(pdst));
-    }
-
     status = dbProcess(pdst);
 
     psrc->pact = pact;
 
-    if(dbRec2Pvt(psrc)->procThread!=self ||
-       dbRec2Pvt(pdst)->procThread!=self) {
-        errlogPrintf("Logic Error: processTarget 2 from %p, %s(%p) -> %s(%p)\n",
-                     self, psrc->name, dbRec2Pvt(psrc), pdst->name, dbRec2Pvt(pdst));
-    }
-
-    if(claim_src) {
-        dbRec2Pvt(psrc)->procThread = NULL;
-    }
-    if(claim_dst) {
-        dbRec2Pvt(pdst)->procThread = NULL;
-    }
-
     return status;
 }

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

@@ -296,17 +296,6 @@ static void scanOnceSetQueueSizeCallFunc(const iocshArgBuf *args)
     scanOnceSetQueueSize(args[0].ival);
 }
 
-/* scanOnceQueueShow */
-static const iocshArg scanOnceQueueShowArg0 = { "reset",iocshArgInt};
-static const iocshArg * const scanOnceQueueShowArgs[1] =
-    {&scanOnceQueueShowArg0};
-static const iocshFuncDef scanOnceQueueShowFuncDef =
-    {"scanOnceQueueShow",1,scanOnceQueueShowArgs};
-static void scanOnceQueueShowCallFunc(const iocshArgBuf *args)
-{
-    scanOnceQueueShow(args[0].ival);
-}
-
 /* scanppl */
 static const iocshArg scanpplArg0 = { "rate",iocshArgDouble};
 static const iocshArg * const scanpplArgs[1] = {&scanpplArg0};
@@ -346,17 +335,6 @@ static void callbackSetQueueSizeCallFunc(const iocshArgBuf *args)
     callbackSetQueueSize(args[0].ival);
 }
 
-/* callbackQueueShow */
-static const iocshArg callbackQueueShowArg0 = { "reset", iocshArgInt};
-static const iocshArg * const callbackQueueShowArgs[1] =
-    {&callbackQueueShowArg0};
-static const iocshFuncDef callbackQueueShowFuncDef =
-    {"callbackQueueShow",1,callbackQueueShowArgs};
-static void callbackQueueShowCallFunc(const iocshArgBuf *args)
-{
-    callbackQueueShow(args[0].ival);
-}
-
 /* callbackParallelThreads */
 static const iocshArg callbackParallelThreadsArg0 = { "no of threads", iocshArgInt};
 static const iocshArg callbackParallelThreadsArg1 = { "priority", iocshArgString};
@@ -463,14 +441,12 @@ void dbIocRegister(void)
     iocshRegister(&dbLockShowLockedFuncDef,dbLockShowLockedCallFunc);
 
     iocshRegister(&scanOnceSetQueueSizeFuncDef,scanOnceSetQueueSizeCallFunc);
-    iocshRegister(&scanOnceQueueShowFuncDef,scanOnceQueueShowCallFunc);
     iocshRegister(&scanpplFuncDef,scanpplCallFunc);
     iocshRegister(&scanpelFuncDef,scanpelCallFunc);
     iocshRegister(&postEventFuncDef,postEventCallFunc);
     iocshRegister(&scanpiolFuncDef,scanpiolCallFunc);
 
     iocshRegister(&callbackSetQueueSizeFuncDef,callbackSetQueueSizeCallFunc);
-    iocshRegister(&callbackQueueShowFuncDef,callbackQueueShowCallFunc);
     iocshRegister(&callbackParallelThreadsFuncDef,callbackParallelThreadsCallFunc);
 
     /* Needed before callback system is initialized */

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

@@ -86,6 +86,12 @@ typedef struct notifyGlobal {
 
 static notifyGlobal *pnotifyGlobal = 0;
 
+/*Local routines*/
+static void notifyInit(processNotify *ppn);
+static void notifyCleanup(processNotify *ppn);
+static void restartCheck(processNotifyRecord *ppnr);
+static void callDone(dbCommon *precord,processNotify *ppn);
+static void processNotifyCommon(processNotify *ppn,dbCommon *precord);
 static void notifyCallback(CALLBACK *pcallback);
 
 #define ellSafeAdd(list,listnode) \
@@ -204,7 +210,7 @@ static void callDone(dbCommon *precord, processNotify *ppn)
     return;
 }
 
-static void processNotifyCommon(processNotify *ppn, dbCommon *precord, int first)
+static void processNotifyCommon(processNotify *ppn,dbCommon *precord)
 {
     notifyPvt *pnotifyPvt = (notifyPvt *) ppn->pnotifyPvt;
     int didPut = 0;
@@ -250,9 +256,6 @@ static void processNotifyCommon(processNotify *ppn, dbCommon *precord, int first
             doProcess = 1;
 
     if (doProcess) {
-        if (first) {
-            precord->putf = TRUE;
-        }
         ppn->wasProcessed = 1;
         precord->ppn = ppn;
         ellSafeAdd(&pnotifyPvt->waitList, &precord->ppnr->waitNode);
@@ -295,7 +298,7 @@ static void notifyCallback(CALLBACK *pcallback)
         return;
     }
     if(pnotifyPvt->state == notifyRestartCallbackRequested) {
-        processNotifyCommon(ppn, precord, 0);
+        processNotifyCommon(ppn, precord);
         return;
     }
     /* All done. Clean up and call userCallback */
@@ -379,7 +382,7 @@ void dbProcessNotify(processNotify *ppn)
         precord->ppnr->precord = precord;
         ellInit(&precord->ppnr->restartList);
     }
-    processNotifyCommon(ppn, precord, 1);
+    processNotifyCommon(ppn, precord);
 }
 
 void dbNotifyCancel(processNotify *ppn)
@@ -579,7 +582,7 @@ static void tpnThread(void *pvt)
     processNotify *ppn = (processNotify *) ptpnInfo->ppn;
 
     dbProcessNotify(ppn);
-    epicsEventMustWait(ptpnInfo->callbackDone);
+    epicsEventWait(ptpnInfo->callbackDone);
     dbNotifyCancel(ppn);
     epicsEventDestroy(ptpnInfo->callbackDone);
     dbChannelDelete(ppn->chan);

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

@@ -24,7 +24,6 @@
 #include "cantProceed.h"
 #include "dbDefs.h"
 #include "ellLib.h"
-#include "epicsAtomic.h"
 #include "epicsEvent.h"
 #include "epicsMutex.h"
 #include "epicsPrint.h"
@@ -64,7 +63,6 @@ static volatile enum ctl scanCtl;
 static int onceQueueSize = 1000;
 static epicsEventId onceSem;
 static epicsRingBytesId onceQ;
-static int onceQOverruns = 0;
 static epicsThreadId onceTaskId;
 static void *exitOnce;
 
@@ -678,7 +676,6 @@ int scanOnceCallback(struct dbCommon *precord, once_complete cb, void *usr)
     if (!pushOK) {
         if (newOverflow) errlogPrintf("scanOnce: Ring buffer overflow\n");
         newOverflow = FALSE;
-        epicsAtomicIncrIntT(&onceQOverruns);
     } else {
         newOverflow = TRUE;
     }
@@ -725,40 +722,6 @@ int scanOnceSetQueueSize(int size)
     return 0;
 }
 
-int scanOnceQueueStatus(const int reset, scanOnceQueueStats *result)
-{
-    int ret;
-    if (!onceQ) return -1;
-    if (result) {
-        result->size = epicsRingBytesSize(onceQ) / sizeof(onceEntry);
-        result->numUsed = epicsRingBytesUsedBytes(onceQ) / sizeof(onceEntry);
-        result->maxUsed = epicsRingBytesHighWaterMark(onceQ) / sizeof(onceEntry);
-        result->numOverflow = epicsAtomicGetIntT(&onceQOverruns);
-        ret = 0;
-    } else {
-        ret = -2;
-    }
-    if (reset) {
-        epicsRingBytesResetHighWaterMark(onceQ);
-    }
-    return ret;
-}
-
-void scanOnceQueueShow(const int reset)
-{
-    scanOnceQueueStats stats;
-    if (scanOnceQueueStatus(reset, &stats) == -1) {
-        fprintf(stderr, "scanOnce system not initialized, yet. Please run "
-            "iocInit before using this command.\n");
-    } else {
-        double qusage = 100.0 * stats.numUsed / stats.size;
-        printf("PRIORITY  HIGH-WATER MARK  ITEMS IN Q  Q SIZE  %% USED  Q OVERFLOWS\n");
-        printf("%8s  %15d  %10d  %6d  %6.1f  %11d\n", "scanOnce", stats.maxUsed,
-               stats.numUsed, stats.size, qusage,
-               epicsAtomicGetIntT(&onceQOverruns));
-    }
-}
-
 static void initOnce(void)
 {
     if ((onceQ = epicsRingBytesLockedCreate(sizeof(onceEntry)*onceQueueSize)) == NULL) {

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

@@ -42,13 +42,6 @@ struct dbCommon;
 typedef void (*io_scan_complete)(void *usr, IOSCANPVT, int prio);
 typedef void (*once_complete)(void *usr, struct dbCommon*);
 
-typedef struct scanOnceQueueStats {
-    int size;
-    int numUsed;
-    int maxUsed;
-    int numOverflow;
-} scanOnceQueueStats;
-
 epicsShareFunc long scanInit(void);
 epicsShareFunc void scanRun(void);
 epicsShareFunc void scanPause(void);
@@ -64,8 +57,6 @@ epicsShareFunc double scanPeriod(int scan);
 epicsShareFunc int scanOnce(struct dbCommon *);
 epicsShareFunc int scanOnceCallback(struct dbCommon *, once_complete cb, void *usr);
 epicsShareFunc int scanOnceSetQueueSize(int size);
-epicsShareFunc int scanOnceQueueStatus(const int reset, scanOnceQueueStats *result);
-epicsShareFunc void scanOnceQueueShow(const int reset);
 
 /*print periodic lists*/
 epicsShareFunc int scanppl(double rate);

modules/database/src/ioc/db/menuScan.dbd

@@ -1,48 +1,11 @@
 #*************************************************************************
-# Copyright (c) 2018 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
-
-=head1 Menu menuScan
-
-This menu is used for the C<SCAN> field of all record types.
-
-The set of periodic scan rates may be modified for an individual IOC by
-copying the F<menuScan.dbd> file from Base into the IOC's source
-directory and changing it to contain the desired scan rates.
-
-The scan periods are extracted from the choice strings at runtime, which
-must be expressed as a number with any of the following units appended:
-
-=over 4
-
- second
- seconds
- minute
- minutes
- hour
- hours
- Hertz
- Hz
-
-=back
-
-At IOC start-up a separate scan thread will be created for each period,
-with thread priority increasing further down the list, so faster periods
-should appear after slower ones.
-
-Scan rates that cannot be achieved will generate a warning message from
-the C<iocInit> command.
-
-
-=menu menuScan
-
-=cut
-
 menu(menuScan) {
 	choice(menuScanPassive,"Passive")
 	choice(menuScanEvent,"Event")

modules/database/src/ioc/db/templateInstances.cpp

@@ -1,9 +0,0 @@
-#include "dbCAC.h"
-#include "dbChannelIO.h"
-#include "dbPutNotifyBlocker.h"
-
-template class tsFreeList < dbSubscriptionIO, 256, epicsMutexNOOP >;
-template class tsFreeList < dbChannelIO, 256, epicsMutexNOOP >;
-template class tsFreeList < dbPutNotifyBlocker, 64, epicsMutexNOOP >;
-template class resTable < dbBaseIO, chronIntId >;
-template class chronIntIdResTable < dbBaseIO >;

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

@@ -434,10 +434,6 @@ static void dbMenuHead(char *name)
     dbMenu		*pdbMenu;
     GPHENTRY		*pgphentry;
 
-    if (!*name) {
-        yyerrorAbort("dbMenuHead: Menu name can't be empty");
-        return;
-    }
     pgphentry = gphFind(pdbbase->pgpHash,name,&pdbbase->menuList);
     if(pgphentry) {
 	duplicate = TRUE;
@@ -451,10 +447,6 @@ static void dbMenuHead(char *name)
 
 static void dbMenuChoice(char *name,char *value)
 {
-    if (!*name) {
-        yyerror("dbMenuChoice: Menu choice name can't be empty");
-        return;
-    }
     if(duplicate) return;
     allocTemp(epicsStrDup(name));
     allocTemp(epicsStrDup(value));
@@ -502,10 +494,6 @@ static void dbRecordtypeHead(char *name)
     dbRecordType		*pdbRecordType;
     GPHENTRY		*pgphentry;
 
-    if (!*name) {
-        yyerrorAbort("dbRecordtypeHead: Recordtype name can't be empty");
-        return;
-    }
     pgphentry = gphFind(pdbbase->pgpHash,name,&pdbbase->recordTypeList);
     if(pgphentry) {
 	duplicate = TRUE;
@@ -524,10 +512,6 @@ static void dbRecordtypeFieldHead(char *name,char *type)
     dbFldDes		*pdbFldDes;
     int			i;
 
-    if (!*name) {
-        yyerrorAbort("dbRecordtypeFieldHead: Field name can't be empty");
-        return;
-    }
     if(duplicate) return;
     pdbFldDes = dbCalloc(1,sizeof(dbFldDes));
     allocTemp(pdbFldDes);
@@ -596,7 +580,7 @@ static void dbRecordtypeFieldItem(char *name,char *value)
         if(sscanf(value,"%hd",&pdbFldDes->special)==1) {
             return;
         }
-        yyerror("Illegal 'special' value.");
+        yyerror("Illegal special value.");
         return;
     }
     if(strcmp(name,"pp")==0) {
@@ -605,13 +589,13 @@ static void dbRecordtypeFieldItem(char *name,char *value)
         } else if((strcmp(value,"NO")==0) || (strcmp(value,"FALSE")==0)) {
             pdbFldDes->process_passive = FALSE;
         } else {
-            yyerror("Illegal 'pp' value, must be YES/NO/TRUE/FALSE");
+            yyerror("Illegal value. Must be NO or YES");
         }
         return;
     }
     if(strcmp(name,"interest")==0) {
         if(sscanf(value,"%hd",&pdbFldDes->interest)!=1)
-            yyerror("Illegal 'interest' value, must be integer");
+            yyerror("Illegal value. Must be integer");
         return;
     }
     if(strcmp(name,"base")==0) {
@@ -620,13 +604,13 @@ static void dbRecordtypeFieldItem(char *name,char *value)
         } else if(strcmp(value,"HEX")==0) {
             pdbFldDes->base = CT_HEX;
         } else {
-            yyerror("Illegal 'base' value, must be DECIMAL/HEX");
+            yyerror("Illegal value. Must be CT_DECIMAL or CT_HEX");
         }
         return;
     }
     if(strcmp(name,"size")==0) {
         if(sscanf(value,"%hd",&pdbFldDes->size)!=1)
-            yyerror("Illegal 'size' value, must be integer");
+            yyerror("Illegal value. Must be integer");
         return;
     }
     if(strcmp(name,"extra")==0) {
@@ -818,10 +802,6 @@ static void dbDriver(char *name)
     drvSup	*pdrvSup;
     GPHENTRY	*pgphentry;
 
-    if (!*name) {
-        yyerrorAbort("dbDriver: Driver name can't be empty");
-        return;
-    }
     pgphentry = gphFind(pdbbase->pgpHash,name,&pdbbase->drvList);
     if(pgphentry) {
 	return;
@@ -861,10 +841,6 @@ static void dbRegistrar(char *name)
     dbText	*ptext;
     GPHENTRY	*pgphentry;
 
-    if (!*name) {
-        yyerrorAbort("dbRegistrar: Registrar name can't be empty");
-        return;
-    }
     pgphentry = gphFind(pdbbase->pgpHash,name,&pdbbase->registrarList);
     if(pgphentry) {
 	return;
@@ -884,10 +860,6 @@ static void dbFunction(char *name)
     dbText     *ptext;
     GPHENTRY   *pgphentry;
 
-    if (!*name) {
-        yyerrorAbort("dbFunction: Function name can't be empty");
-        return;
-    }
     pgphentry = gphFind(pdbbase->pgpHash,name,&pdbbase->functionList);
     if(pgphentry) {
        return;
@@ -907,10 +879,6 @@ static void dbVariable(char *name, char *type)
     dbVariableDef	*pvar;
     GPHENTRY	*pgphentry;
 
-    if (!*name) {
-        yyerrorAbort("dbVariable: Variable name can't be empty");
-        return;
-    }
     pgphentry = gphFind(pdbbase->pgpHash,name,&pdbbase->variableList);
     if(pgphentry) {
 	return;
@@ -931,10 +899,6 @@ static void dbBreakHead(char *name)
     brkTable	*pbrkTable;
     GPHENTRY	*pgphentry;
 
-    if (!*name) {
-        yyerrorAbort("dbBreakHead: Breaktable name can't be empty");
-        return;
-    }
     pgphentry = gphFind(pdbbase->pgpHash,name,&pdbbase->bptList);
     if(pgphentry) {
 	duplicate = TRUE;
@@ -1037,10 +1001,6 @@ static void dbRecordHead(char *recordType, char *name, int visible)
     DBENTRY *pdbentry;
     long status;
 
-    if (!*name) {
-        yyerrorAbort("dbRecordHead: Record name can't be empty");
-        return;
-    }
     badch = strpbrk(name, " \"'.$");
     if (badch) {
         epicsPrintf("Bad character '%c' in record name \"%s\"\n",
@@ -1148,10 +1108,6 @@ static void dbRecordInfo(char *name, char *value)
     tempListNode *ptempListNode;
     long status;
 
-    if (!*name) {
-        yyerrorAbort("dbRecordInfo: Info item name can't be empty");
-        return;
-    }
     if (duplicate) return;
     ptempListNode = (tempListNode *)ellFirst(&tempList);
     pdbentry = ptempListNode->item;
@@ -1176,10 +1132,6 @@ static void dbRecordAlias(char *name)
     tempListNode *ptempListNode;
     long status;
 
-    if (!*name) {
-        yyerrorAbort("dbRecordAlias: Alias name can't be empty");
-        return;
-    }
     if (duplicate) return;
     ptempListNode = (tempListNode *)ellFirst(&tempList);
     pdbentry = ptempListNode->item;
@@ -1197,10 +1149,6 @@ static void dbAlias(char *name, char *alias)
     DBENTRY dbEntry;
     DBENTRY *pdbEntry = &dbEntry;
 
-    if (!*alias) {
-        yyerrorAbort("dbAlias: Alias name can't be empty");
-        return;
-    }
     dbInitEntry(pdbbase, pdbEntry);
     if (dbFindRecord(pdbEntry, name)) {
         epicsPrintf("Alias \"%s\" refers to unknown record \"%s\"\n",

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

@@ -79,6 +79,16 @@ epicsShareDef maplinkType pamaplinkType[LINK_NTYPES] = {
 	{"VXI_IO",VXI_IO}
 };
 
+static int mapDBFtoDCT[DBF_NOACCESS+1] = {
+	DCT_STRING,
+	DCT_INTEGER,DCT_INTEGER,DCT_INTEGER,DCT_INTEGER,DCT_INTEGER,DCT_INTEGER,
+	DCT_REAL,DCT_REAL,
+	DCT_INTEGER,
+	DCT_MENU,
+	DCT_MENUFORM,
+	DCT_INLINK,DCT_OUTLINK,DCT_FWDLINK,
+	DCT_NOACCESS};
+
 /*forward references for private routines*/
 static void dbMsgPrint(DBENTRY *pdbentry, const char *fmt, ...)
     EPICS_PRINTF_STYLE(2,3);
@@ -156,6 +166,38 @@ void dbFreePath(DBBASE *pdbbase)
 }
 
 
+static void entryErrMessage(DBENTRY *pdbentry,long status,char *mess)
+{
+    char		message[200];
+    char		*pmessage=&message[0];
+    dbRecordNode	*precnode = pdbentry->precnode;
+    dbFldDes 		*pflddes = pdbentry->pflddes;
+    char		*pname = NULL;
+
+    *pmessage=0;
+    if(pdbentry->precordType) pname = pdbentry->precordType->name;
+    if(pname) {
+	strcat(pmessage,"RecordType:");
+	strcat(pmessage,pname);
+    }
+    if(precnode){
+        if (dbIsAlias(pdbentry))
+            strcat(pmessage," Record Alias:");
+        else
+            strcat(pmessage," Record:");
+	strcat(pmessage,(char *)precnode->precord);
+    }
+    if(pflddes) {
+	char *pstr=pflddes->name;
+
+	strcat(pmessage," Field:");
+	strcat(pmessage,pstr);
+    }
+    strcat(pmessage,"\n");
+    strcat(pmessage,mess);
+    errMessage(status,pmessage);
+}
+
 static void zeroDbentry(DBENTRY *pdbentry)
 {
     /*NOTE that pdbbase and message MUST NOT be set to NULL*/
@@ -1356,6 +1398,19 @@ long dbNextField(DBENTRY *pdbentry,int dctonly)
     }
 }
 
+int dbGetFieldType(DBENTRY *pdbentry)
+{
+    dbFldDes  	*pflddes = pdbentry->pflddes;
+    long		status;
+
+    if(!pflddes){
+	status = S_dbLib_flddesNotFound;
+	entryErrMessage(pdbentry,status,"dbGetFieldType");
+	return(status);
+    }
+    return(mapDBFtoDCT[pflddes->field_type]);
+}
+
 int dbGetNFields(DBENTRY *pdbentry,int dctonly)
 {
     dbRecordType		*precordType = pdbentry->precordType;
@@ -3161,21 +3216,48 @@ int  dbGetNLinks(DBENTRY *pdbentry)
     return((int)precordType->no_links);
 }
 
-long  dbGetLinkField(DBENTRY *pdbentry, int index)
+long  dbGetLinkField(DBENTRY *pdbentry,int index)
 {
-    dbRecordType *precordType = pdbentry->precordType;
-    dbFldDes *pflddes;
-
-    if (!precordType)
-        return S_dbLib_recordTypeNotFound;
-
-    if (index < 0 || index >= precordType->no_links)
-        return S_dbLib_badLink;
+    dbRecordType	*precordType = pdbentry->precordType;
+    dbFldDes	*pflddes;
 
+    if(!precordType) return(S_dbLib_recordTypeNotFound);
+    if(index<0 || index>=precordType->no_links) return(S_dbLib_badLink);
     pdbentry->indfield = precordType->link_ind[index];
     pdbentry->pflddes = pflddes = precordType->papFldDes[pdbentry->indfield];
     dbGetFieldAddress(pdbentry);
-    return 0;
+    return(0);
+}
+
+int  dbGetLinkType(DBENTRY *pdbentry)
+{
+    dbFldDes	*pflddes;
+    DBLINK	*plink;
+    int		field_type;
+
+    dbGetFieldAddress(pdbentry);
+    pflddes = pdbentry->pflddes;
+    if(!pflddes) return(-1);
+    plink = (DBLINK *)pdbentry->pfield;
+    if(!plink) return(-1);
+    field_type = pflddes->field_type;
+    switch (field_type) {
+    case DBF_INLINK:
+    case DBF_OUTLINK:
+    case DBF_FWDLINK:
+	switch(plink->type) {
+	case CONSTANT:
+	    return(DCT_LINK_CONSTANT);
+	case PV_LINK:
+        case PN_LINK:
+	case DB_LINK:
+	case CA_LINK:
+	    return(DCT_LINK_PV);
+	default:
+	    return(DCT_LINK_FORM);
+	}
+    }
+    return(-1);
 }
 
 void  dbDumpPath(DBBASE *pdbbase)
@@ -3474,110 +3556,68 @@ void  dbDumpBreaktable(DBBASE *pdbbase,const char *name)
     return;
 }
 
-static char *bus[LINK_NTYPES] = {
-    "",     /* CONSTANT */
-    NULL,   /* PV_LINK */
-    "VME",
-    "CAMAC",
-    "AB",
-    "GPIB",
-    "BITBUS",
-    NULL,   /* MACRO_LINK */
-    NULL,   /* JSON_LINK */
-    NULL,   /* PN_LINK */
-    NULL,   /* DB_LINK */
-    NULL,   /* CA_LINK */
-    "INST",
-    "BBGPIB",
-    "VXI"
-};
-void  dbReportDeviceConfig(dbBase *pdbbase, FILE *report)
+static char *bus[VXI_IO+1] = {"","","VME","CAMAC","AB",
+	"GPIB","BITBUS","","","","","","INST","BBGPIB","VXI"};
+void  dbReportDeviceConfig(dbBase *pdbbase,FILE *report)
 {
-    DBENTRY dbentry, *pdbentry = &dbentry;
-    long status;
-    FILE *stream = report ? report : stdout;
+    DBENTRY	dbentry;
+    DBENTRY	*pdbentry=&dbentry;
+    long	status;
+    char	linkValue[messagesize];
+    char	dtypValue[50];
+    char	cvtValue[40];
+    int		ilink,nlinks;
+    struct link	*plink;
+    int         linkType;
+    FILE        *stream = (report==0) ? stdout : report;
 
-    if (!pdbbase) {
-        fprintf(stderr, "dbReportDeviceConfig: pdbbase not specified\n");
-        return;
+    if(!pdbbase) {
+	fprintf(stderr,"pdbbase not specified\n");
+	return;
     }
-
     dbInitEntry(pdbbase,pdbentry);
     status = dbFirstRecordType(pdbentry);
-    while (!status) {
-        const int nlinks = dbGetNLinks(pdbentry);
-
-        status = dbFirstRecord(pdbentry);
-        while (!status) {
-            int ilink;
-
-            for (ilink=0; ilink<nlinks; ilink++) {
-                char linkValue[messagesize];
-                char dtypValue[50];
-                char cvtValue[40];
-                struct link *plink;
-                int linkType;
-
-                status = dbGetLinkField(pdbentry, ilink);
-                if (status)
-                    continue;
-
-                plink = pdbentry->pfield;
-                linkType = plink->type;
-                if (plink->text) {  /* Not yet parsed */
-                    dbLinkInfo linfo;
-
-                    if (dbParseLink(plink->text, pdbentry->pflddes->field_type, &linfo))
-                        continue;
-
-                    linkType = linfo.ltype;
-                    if (linkType && bus[linkType])
-                        strncpy(linkValue, plink->text, messagesize-1);
-
-                    dbFreeLinkInfo(&linfo);
-                }
-                else {
-                    strncpy(linkValue, dbGetString(pdbentry), messagesize-1);
-                }
-
-                if (!linkType || !bus[linkType])
-                    continue;
-                linkValue[messagesize-1] = '\0';
-
-                status = dbFindField(pdbentry, "DTYP");
-                if (status)
-                    break;  /* Next record type */
-
-                strcpy(dtypValue, dbGetString(pdbentry));
-                status = dbFindField(pdbentry, "LINR");
-                if (status) {
-                    cvtValue[0] = 0;
-                }
-                else {
-                    if (strcmp(dbGetString(pdbentry), "LINEAR") != 0) {
-                        cvtValue[0] = 0;
-                    }
-                    else {
-                        strcpy(cvtValue,"cvt(");
-                        status = dbFindField(pdbentry, "EGUL");
-                        if (!status)
-                            strcat(cvtValue, dbGetString(pdbentry));
-                        status = dbFindField(pdbentry, "EGUF");
-                        if (!status) {
-                            strcat(cvtValue, ",");
-                            strcat(cvtValue, dbGetString(pdbentry));
-                        }
-                        strcat(cvtValue, ")");
-                    }
-                }
-                fprintf(stream,"%-8s %-20s %-20s %-20s %-s\n",
-                        bus[linkType], linkValue, dtypValue,
-                        dbGetRecordName(pdbentry), cvtValue);
-                break;
-            }
-            status = dbNextRecord(pdbentry);
-        }
-        status = dbNextRecordType(pdbentry);
+    while(!status) {
+	status = dbFirstRecord(pdbentry);
+	while(!status) {
+	    nlinks = dbGetNLinks(pdbentry);
+	    for(ilink=0; ilink<nlinks; ilink++) {
+		status = dbGetLinkField(pdbentry,ilink);
+		if(status || dbGetLinkType(pdbentry)!=DCT_LINK_FORM) continue;
+		plink = pdbentry->pfield;
+		linkType = plink->type;
+		if(bus[linkType][0]==0) continue;
+		strncpy(linkValue, dbGetString(pdbentry), NELEMENTS(linkValue)-1);
+		linkValue[NELEMENTS(linkValue)-1] = '\0';
+		status = dbFindField(pdbentry,"DTYP");
+		if(status) break;
+		strcpy(dtypValue,dbGetString(pdbentry));
+		status = dbFindField(pdbentry,"LINR");
+		if(status) {
+		    cvtValue[0] = 0;
+		} else {
+		    if(strcmp(dbGetString(pdbentry),"LINEAR")!=0) {
+			cvtValue[0] = 0;
+		    } else {
+			strcpy(cvtValue,"cvt(");
+			status = dbFindField(pdbentry,"EGUL");
+			if(!status) strcat(cvtValue,dbGetString(pdbentry));
+			status = dbFindField(pdbentry,"EGUF");
+			if(!status) {
+			    strcat(cvtValue,",");
+			    strcat(cvtValue,dbGetString(pdbentry));
+			}
+			strcat(cvtValue,")");
+		    }
+		}
+		fprintf(stream,"%-8s %-20s %-20s %-20s %-s\n",
+			bus[linkType],linkValue,dtypValue,
+			dbGetRecordName(pdbentry),cvtValue);
+		break;
+	    }
+	    status = dbNextRecord(pdbentry);
+	}
+	status = dbNextRecordType(pdbentry);
     }
     dbFinishEntry(pdbentry);
     finishOutstream(stream);

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

@@ -28,9 +28,25 @@
 extern "C" {
 #endif
 
+/*Field types as seen by static database access clients*/
+#define DCT_STRING      0
+#define DCT_INTEGER     1
+#define DCT_REAL        2
+#define DCT_MENU        3
+#define DCT_MENUFORM    4
+#define DCT_INLINK      5
+#define DCT_OUTLINK     6
+#define DCT_FWDLINK     7
+#define DCT_NOACCESS    8
+
+/*Link types as seen by static database access clients*/
+#define DCT_LINK_CONSTANT       0
+#define DCT_LINK_FORM           1
+#define DCT_LINK_PV             2
+
 typedef dbBase DBBASE;
 
-typedef struct dbEntry {
+typedef struct{
     DBBASE       *pdbbase;
     dbRecordType *precordType;
     dbFldDes     *pflddes;
@@ -41,6 +57,9 @@ typedef struct dbEntry {
     short        indfield;
 } DBENTRY;
 
+struct dbAddr;
+struct dbCommon;
+
 /* Static database access routines*/
 epicsShareFunc DBBASE * dbAllocBase(void);
 epicsShareFunc void dbFreeBase(DBBASE *pdbbase);
@@ -49,6 +68,18 @@ epicsShareFunc void dbFreeEntry(DBENTRY *pdbentry);
 epicsShareFunc void dbInitEntry(DBBASE *pdbbase,
     DBENTRY *pdbentry);
 
+/** Initialize DBENTRY from a valid dbAddr*.
+ * Constant time equivalent of dbInitEntry() then dbFindRecord(),
+ * and finally dbFollowAlias()
+ */
+epicsShareFunc void dbInitEntryFromAddr(struct dbAddr *paddr, DBENTRY *pdbentry);
+
+/** Initialize DBENTRY from a valid record (dbCommon*).
+ * Constant time equivalent of dbInitEntry() then dbFindRecord(),
+ * and finally dbFollowAlias() when no field is specified.
+ */
+epicsShareFunc void dbInitEntryFromRecord(struct dbCommon *prec, DBENTRY *pdbentry);
+
 epicsShareFunc void dbFinishEntry(DBENTRY *pdbentry);
 epicsShareFunc DBENTRY * dbCopyEntry(DBENTRY *pdbentry);
 epicsShareFunc void dbCopyEntryContents(DBENTRY *pfrom,
@@ -108,6 +139,7 @@ epicsShareFunc long dbGetAttributePart(DBENTRY *pdbentry,
 
 epicsShareFunc long dbFirstField(DBENTRY *pdbentry, int dctonly);
 epicsShareFunc long dbNextField(DBENTRY *pdbentry, int dctonly);
+epicsShareFunc int  dbGetFieldType(DBENTRY *pdbentry);
 epicsShareFunc int  dbGetNFields(DBENTRY *pdbentry, int dctonly);
 epicsShareFunc char * dbGetFieldName(DBENTRY *pdbentry);
 epicsShareFunc char * dbGetDefault(DBENTRY *pdbentry);
@@ -199,6 +231,7 @@ epicsShareFunc linkSup * dbFindLinkSup(dbBase *pdbbase,
 
 epicsShareFunc int  dbGetNLinks(DBENTRY *pdbentry);
 epicsShareFunc long dbGetLinkField(DBENTRY *pdbentry, int index);
+epicsShareFunc int  dbGetLinkType(DBENTRY *pdbentry);
 
 /* Dump routines */
 epicsShareFunc void dbDumpPath(DBBASE *pdbbase);