Reset version snapshot after tagging

Add proper equals() method for DBD::Recfield and DBD::Recordtype.
In Parser::parse_recordtype() check for and re-use a declaration
(i.e. an empty recordtype object) when parsing a later definition
of the same recordtype.

.gitignore

@@ -6,7 +6,9 @@
 /html/
 /include/
 /templates/
+/configure/*.local
 O.*/
 /QtC-*
 *.orig
 *.log
+.*.swp

.travis.yml

@@ -11,8 +11,8 @@ env:
   - CMPLR=clang STATIC=YES
   - WINE=32 TEST=NO STATIC=YES
   - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=NO
-  - RTEMS=4.9 TEST=NO
+  - RTEMS=4.10 TEST=YES
+  - RTEMS=4.9 TEST=YES
 addons:
   apt:
     packages:
@@ -25,8 +25,8 @@ addons:
     - flex
     - texinfo
     - install-info
+    - qemu-system-x86
 cache:
   directories:
    - $HOME/.cache
-install: sh ci/travis-prepare.sh </dev/null
 script: sh ci/travis-build.sh </dev/null

README

@@ -20,5 +20,5 @@ Additional information about EPICS including mailing list
 archives and subscription instructions, documentation and
 training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
-	http://www.aps.anl.gov/epics/
+	https://epics.anl.gov/
 

appveyor.yml

@@ -40,11 +40,12 @@ configuration:
 # Environment variables: compiler toolchain
 environment:
   matrix:
-  - TOOLCHAIN: 9.0
   - TOOLCHAIN: 10.0
   - TOOLCHAIN: 11.0
   - TOOLCHAIN: 12.0
   - TOOLCHAIN: 14.0
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    TOOLCHAIN: 2017
   - TOOLCHAIN: cygwin
   - TOOLCHAIN: mingw
 
@@ -57,8 +58,6 @@ platform:
 matrix:
   exclude:
   # VS Express installs don't have the 64 bit compiler
-  - platform: x64
-    TOOLCHAIN: 9.0
   - platform: x64
     TOOLCHAIN: 10.0
 

ci/appveyor-make.bat

@@ -1,6 +1,6 @@
 :: Universal build script for AppVeyor (https://ci.appveyor.com/)
 :: Environment:
-::     TOOLCHAIN      -  toolchain version   [9.0/10.0/11.0/12.0/14.0/cygwin/mingw]
+::     TOOLCHAIN      -  toolchain version   [10.0/11.0/12.0/14.0/2017/cygwin/mingw]
 ::     CONFIGURATION  -  determines EPICS build   [dynamic/static]
 ::     PLATFORM       -  architecture   [x86/x64]
 ::
@@ -57,10 +57,22 @@ if "%TOOLCHAIN%"=="mingw" (
 )
 
 set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio %TOOLCHAIN%"
+if not exist "%VSINSTALL%\" set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio\%TOOLCHAIN%\Community"
+if not exist "%VSINSTALL%\" goto MSMissing
+
 set "MAKE=C:\tools\make"
 
+echo [INFO] APPVEYOR_BUILD_WORKER_IMAGE=%APPVEYOR_BUILD_WORKER_IMAGE%
+
 if "%OS%"=="64BIT" (
     set EPICS_HOST_ARCH=windows-x64%ST%
+    :: VS 2017
+    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat" (
+        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars64.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
     if exist "%VSINSTALL%\VC\vcvarsall.bat" (
         call "%VSINSTALL%\VC\vcvarsall.bat" amd64
         where cl
@@ -79,12 +91,19 @@ if "%OS%"=="64BIT" (
     )
 ) else (
     set EPICS_HOST_ARCH=win32-x86%ST%
+    :: VS 2017
+    if exist "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat" (
+        call "%VSINSTALL%\VC\Auxiliary\Build\vcvars32.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
     if exist "%VSINSTALL%\VC\vcvarsall.bat" (
         call "%VSINSTALL%\VC\vcvarsall.bat" x86
         where cl
         if !ERRORLEVEL! NEQ 0 goto MSMissing
         goto MSFound
-    )    
+    )
     if exist "%VSINSTALL%\VC\bin\vcvars32.bat" (
         call "%VSINSTALL%\VC\bin\vcvars32.bat"
         where cl
@@ -112,5 +131,7 @@ cl
 echo [INFO] EPICS_HOST_ARCH: %EPICS_HOST_ARCH%
 echo [INFO] Make version
 %MAKE% --version
+echo [INFO] Perl version
+perl --version
 
 %MAKE% %MAKEARGS% %*

ci/appveyor-prepare.bat

@@ -65,6 +65,6 @@ if "%TOOLCHAIN%"=="mingw" (
 )
 
 echo [INFO] Installing Make 4.1
-@powershell -Command "(new-object net.webclient).DownloadFile('https://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip', 'C:\tools\make-4.1.zip')"
+curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
 cd \tools
 "C:\Program Files\7-Zip\7z" e make-4.1.zip

ci/travis-build.sh

@@ -6,18 +6,9 @@ die() {
   exit 1
 }
 
-ticker() {
-  while true
-  do
-    sleep 60
-    date -R
-    [ -r "$1" ] && tail -n10 "$1"
-  done
-}
-
 CACHEKEY=1
 
-EPICS_HOST_ARCH=`sh startup/EpicsHostArch`
+EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
 
 [ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD"
 
@@ -62,23 +53,22 @@ if [ -n "$RTEMS" ]
 then
   echo "Cross RTEMS${RTEMS} for pc386"
   install -d /home/travis/.cache
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
-  | tar -C /home/travis/.cache -xj
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
+  | tar -C / -xmj
 
   sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' configure/os/CONFIG_SITE.Common.RTEMS
   cat << EOF >> configure/os/CONFIG_SITE.Common.RTEMS
 RTEMS_VERSION=$RTEMS
-RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
+RTEMS_BASE=/home/travis/.rtems
 EOF
   cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
+CROSS_COMPILER_RUNTEST_ARCHS += RTEMS-pc386-qemu
 EOF
 
   # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
   echo -n "Using QEMU: "
   type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
 fi
 
 make -j2 $EXTRA
@@ -86,5 +76,5 @@ make -j2 $EXTRA
 if [ "$TEST" != "NO" ]
 then
    make tapfiles
-   find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f
+   make -s test-results
 fi

ci/travis-prepare.sh

@@ -1,40 +0,0 @@
-#!/bin/sh
-set -e -x
-
-die() {
-  echo "$1" >&2
-  exit 1
-}
-
-CURDIR="$PWD"
-
-QDIR="$HOME/.cache/qemu"
-
-if [ -n "$RTEMS" -a "$TEST" = "YES" ]
-then
-  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
-  cd "$HOME/.build/qemu"
-
-  HEAD=`git log -n1 --pretty=format:%H`
-  echo "HEAD revision $HEAD"
-
-  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
-  echo "Cached revision $BUILT"
-
-  if [ "$HEAD" != "$BUILT" ]
-  then
-    echo "Building QEMU"
-    git submodule --quiet update --init
-
-    install -d "$HOME/.build/qemu/build"
-    cd         "$HOME/.build/qemu/build"
-
-    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
-    make -j2
-    make install
-
-    echo "$HEAD" > "$HOME/.cache/qemu/built"
-  fi
-fi
-
-cd "$CURDIR"

configure/CONFIG

@@ -20,11 +20,15 @@ else
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-ifeq ($(origin EPICS_HOST_ARCH), undefined)
-  # NB: We use a simply expanded variable here for performance:
-  EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
-endif
 #
+ifeq ($(origin EPICS_HOST_ARCH), undefined)
+  # Bootstrapping ...
+  EHA := $(firstword $(wildcard $(EPICS_BASE)/lib/perl/EpicsHostArch.pl \
+        $(TOP)/src/tools/EpicsHostArch.pl))
+  # NB: We use a simply expanded variable here for performance:
+  export EPICS_HOST_ARCH := $(shell perl $(EHA))
+  EHA :=
+endif
 
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
@@ -73,17 +77,17 @@ ifdef T_A
   #
   -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
+  #  Site specific target and host-target definitions and overrides
+  #
+  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
+  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
   #  RELEASE file specific definitions
   #
   ifneq ($(CONFIG),$(TOP)/configure)
     -include $(CONFIG)/CONFIG_APP_INCLUDE
   endif
 
-  #  Site specific target and host-target definitions
-  #
-  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
-  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
 endif # ifdef T_A
 
 

configure/CONFIG.CrossCommon

@@ -17,14 +17,14 @@ BUILD_CLASS = CROSS
 #   ifdef CROSS    looks better than  ifeq ($(BUILD_CLASS),CROSS)
 CROSS = YES
 
-GNU_TARGET_INCLUDE_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/include)
-GNU_TARGET_LIB_DIR = $(GNU_TARGET:%= $(GNU_DIR)/%/lib)
+GNU_TARGET_INCLUDE_DIR = $(wildcard $(GNU_TARGET:%=$(GNU_DIR)/%/include))
+GNU_TARGET_LIB_DIR = $(wildcard $(GNU_TARGET:%=$(GNU_DIR)/%/lib))
 
-CROSS_INCLUDES = $(addprefix -I,$(GNU_TARGET_INCLUDE_DIR))
-CROSS_LDFLAGS = $(addprefix -L,$(GNU_TARGET_LIB_DIR))
+CROSS_INCLUDES = $(GNU_TARGET_INCLUDE_DIR:%=-I%)
+CROSS_LDFLAGS = $(GNU_TARGET_LIB_DIR:%=-L%)
 
-CMPLR_PREFIX_CROSS=$(addsuffix -,$(GNU_TARGET))
-CMPLR_PREFIX=$(CMPLR_PREFIX_$(BUILD_CLASS))
+CMPLR_PREFIX_CROSS = $(addsuffix -,$(GNU_TARGET))
+CMPLR_PREFIX = $(CMPLR_PREFIX_$(BUILD_CLASS))
 
 # Cross builds usually use the gnu compiler
 include $(CONFIG)/CONFIG.gnuCommon

configure/CONFIG_BASE

@@ -66,7 +66,8 @@ DBTOMENUH                  = $(PERL) $(TOOLS)/dbdToMenuH.pl
 REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
 CONVERTRELEASE             = $(PERL) $(call FIND_TOOL,convertRelease.pl)
 FULLPATHNAME               = $(PERL) $(TOOLS)/fullPathName.pl
-GENVERSIONHEADER           = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG)
+TAPTOJUNIT                 = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
+GENVERSIONHEADER           = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
 #---------------------------------------------------------------
 # tools for installing libraries and products

configure/CONFIG_BASE_VERSION

@@ -38,19 +38,19 @@ EPICS_VERSION = 3
 EPICS_REVISION = 16
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 1
+EPICS_MODIFICATION = 2
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
 EPICS_PATCH_LEVEL = 0
 
 # This will end in -DEV between official releases
-#EPICS_DEV_SNAPSHOT=-DEV
+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
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV

configure/CONFIG_COMMON

@@ -76,10 +76,14 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Make echo output - suppress echoing if make's '-s' flag is set
+# Silencing the build - suppress messages during 'make -s'
 NOP = :
-ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
-QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
+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,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -89,7 +93,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

@@ -117,11 +117,10 @@ CROSS_COMPILER_TARGET_ARCHS=
 #  configure/os/CONFIG_SITE.<host>.Common files instead.
 CROSS_COMPILER_HOST_ARCHS=
 
-#  The 'make runtests' and 'make tapfiles' build targets normally only run
+#  The 'runtests', 'tapfiles' and 'junitfiles' make targets normally only run
 #  self-tests for the EPICS_HOST_ARCH architecture. If the host can execute
 #  the self-test programs for any other cross-built architectures such as
-#  a -debug architecture, those architectures can be named here.
-#
+#  a -debug architecture, those architectures must be named in this variable:
 CROSS_COMPILER_RUNTEST_ARCHS=
 
 # Build shared libraries (DLLs on Windows).
@@ -175,3 +174,5 @@ GCC_PIPE = NO
 #  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
 LINKER_USE_RPATH = YES
 
+# Overrides for the settings above may appear in a CONFIG_SITE.local file
+-include $(CONFIG)/CONFIG_SITE.local

configure/CONFIG_SITE_ENV

@@ -13,7 +13,7 @@
 #
 #	CONFIG_SITE_ENV - EPICS Environment Parameter Site configuration file
 #
-# This file is read by the script base/src/libCom/env/bldEnvdata.pl
+# This file is read by the script base/src/libCom/env/bldEnvData.pl
 # Variable definitions must take the form
 #	VAR = VALUE
 # or
@@ -26,31 +26,42 @@
 
 # Time service:
 # EPICS_TIMEZONE
-#	local timezone info for vxWorks and RTEMS IOCs.  The format is
-#	    <name>::<minutesWest>:<start daylight>:<end daylight>
-#	where the start and end are mmddhh - that is month,day,hour
-#	e.g. for ANL in 2016: EPICS_TIMEZONE=CST/CDT::360:031302:110602
+#	Local timezone info for vxWorks and RTEMS.  The format is
+#	    <name>::<minutesWest>:<startDST>:<endDST>
+#	where <name> is only used by strftime() for %Z conversions,
+#	and <startDST> and <endDST> are mmddhh - that is month,day,hour
+#	e.g. for ANL in 2018: EPICS_TIMEZONE=CUS::360:031102:110402
+#	The future dates below assume the rules don't get changed;
+#	see http://www.timeanddate.com/time/dst/2018.html to check.
 #
-#	DST for 2016  US: Mar 13 - Nov 06
-#	              EU: Mar 27 - Oct 30
-#	DST for 2017  US: Mar 12 - Nov 05
-#	              EU: Mar 26 - Oct 29
 #	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 = MET::-60:033102:102703
+#
 #	DST for 2020  US: Mar 08 - Nov 01
 #	              EU: Mar 29 - Oct 25
+#EPICS_TIMEZONE = CUS::360:030802:110102
+#EPICS_TIMEZONE = MET::-60:032902:102503
+#
 #	DST for 2021  US: Mar 14 - Nov 07
 #	              EU: Mar 28 - Oct 31
-#	(see: http://www.timeanddate.com/time/dst/2016.html etc. )
+#EPICS_TIMEZONE = CUS::360:031402:110702
+#EPICS_TIMEZONE = MET::-60:032802:103103
 #
-# These values are for 2016:
-EPICS_TIMEZONE=CST/CDT::360:031302:110602
-#EPICS_TIMEZONE=CET/CEST::-60:032702:103002
+#	DST for 2022  US: Mar 13 - Nov 06
+#	              EU: Mar 27 - Oct 30
+#EPICS_TIMEZONE = CUS::360:031302:110602
+#EPICS_TIMEZONE = MET::-60:032702:103003
 
 # EPICS_TS_NTP_INET
-#	NTP time server ip address.  Uses boot host if not set.
+#	NTP time server ip address for VxWorks and RTEMS.
+#	IOC will use its boot host if this is not set.
 EPICS_TS_NTP_INET=
 
 # IOC Shell:

configure/RELEASE

@@ -1,19 +1,20 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2012 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-# RELEASE: Define location of external EPICS products
 
+#
+# RELEASE: Define the location of external EPICS products
+#
+
+# The version of this file in Base should normally be empty.
+#
 # Define INSTALL_LOCATION in CONFIG_SITE
 
-# VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon
-# RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS
-
 # NB: Settings in RELEASE files can be overridden in files named
 #   RELEASE.$(EPICS_HOST_ARCH).Common
 #   RELEASE.Common.$(T_A)

configure/RULES

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 ifndef T_A

configure/RULES.Db

@@ -4,9 +4,10 @@
 # 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. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#RULES.Db
+
+# RULES.Db
 
 # Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions
@@ -154,7 +155,7 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles
+ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
 actionArchTargets = $(foreach action, $(ACTIONS), \
     $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))

configure/RULES.ioc

@@ -4,9 +4,10 @@
 # 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.
+# in the file LICENSE that is included with this distribution. 
 #*************************************************************************
-#RULES.ioc
+
+# RULES.ioc
 
 include $(CONFIG)/RULES_DIRS
 

configure/RULES_ARCHS

@@ -14,7 +14,7 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles
+ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
 actionArchTargets = $(foreach action, $(ACTIONS), \
     $(addprefix $(action)$(DIVIDER), $(BUILD_ARCHS)))
@@ -90,6 +90,4 @@ realclean:
 .PHONY : $(BUILD_ARCHS) rebuild archsCommonClean
 .PHONY : $(ACTIONS) clean realclean archclean host all
 
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER
+include $(CONFIG)/RULES_COMMON

configure/RULES_BUILD

@@ -6,11 +6,12 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+
+# RULES_BUILD
+
+# Rules for making things specified in a Makefile
 #
-#	Rules for making things specified in Makefile
-#
-#	we are in O.$(T_A), but most sources are elsewhere
-#
+# CWD is O.$(T_A), but most sources are elsewhere
 
 ifndef BASE_RULES_BUILD
 BASE_RULES_BUILD=1
@@ -25,7 +26,6 @@ vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.pl $(USR_VPATH) $(ALL_SRC_DIRS)
 
 #---------------------------------------------------------------
 
@@ -43,6 +43,7 @@ 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)
@@ -54,6 +55,7 @@ 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)
@@ -80,9 +82,9 @@ else
 host:
 endif
 
--include $(CONFIG)/RULES_FILE_TYPE
+include $(CONFIG)/RULES_FILE_TYPE
 
--include $(CONFIG)/RULES.Db
+include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
@@ -103,6 +105,7 @@ endif
 #   Products and Object libraries
 #
 PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
+TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
 #   Test specifications and test result files
@@ -115,6 +118,7 @@ endif
 ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
 RUNTESTS_ENABLED = YES
 TAPFILES += $(TESTSCRIPTS:.t=.tap)
+JUNITFILES += $(TAPFILES:.tap=.xml)
 endif
 
 #---------------------------------------------------------------
@@ -140,7 +144,7 @@ rebuild: clean install
 
 build: inc
 
-build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
 inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
@@ -158,20 +162,21 @@ clean: build_clean
 
 build_clean:
 	$(ECHO) "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \
+	@$(RM) *.i *$(OBJ) *.a \
 	$(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \
 	$(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME) \
 	$(LOADABLE_SHRLIBNAME) \
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
-	$(TESTSCRIPTS) $(TAPFILES)
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTPRODTARGETS) \
+	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
 
-$(DIRECTORY_TARGETS) :
-	$(MKDIR) $@
+# Sort mkdir targets to remove duplicates & make parents first
+$(DIRECTORY_TARGETS):
+	$(MKDIR) $(sort $@)
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -183,7 +188,7 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	$(CONVERTRELEASE) checkRelease
+	+$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
@@ -254,15 +259,13 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
 
-# must be a seperate rule since when not using '-d' the
+# must be a separate rule since when not using '-d' the
 # prefix for .h will be different then .c
 %.h : %.c %.y
 
 %.c: %.l
-	@$(RM) $*.yy.c
-	$(LEX) $(LEXOPT) -t $< > $*.yy.c
 	@$(RM) $@
-	$(MV) $*.yy.c $@
+	$(LEX) $(LEXOPT) -o$@ $<
 
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -321,6 +324,10 @@ $(MUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
+$(TESTMUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
+	@$(RM) $@
+	$(MUNCH_CMD)
+
 #---------------------------------------------------------------
 # GeSys modules for RTEMS
 $(MODNAME): %$(MODEXT): %$(EXE)
@@ -344,7 +351,26 @@ testspec: $(TESTSCRIPTS)
 	$(if $(TESTFILES), @echo Files: $(TESTFILES) >> $@)
 	$(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
 
+test-results: tapfiles
+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)
+endif
+ifneq ($(CURRENT_JUNITFILES),)
+	$(RM) $(CURRENT_JUNITFILES)
+endif
+
 tapfiles: $(TESTSCRIPTS) $(TAPFILES)
+junitfiles: $(JUNITFILES)
 
 # A .tap file is the output from running the associated test script
 %.tap: %.t
@@ -352,6 +378,9 @@ ifdef RUNTESTS_ENABLED
 	-$(PERL) $< -tap > $@
 endif
 
+%.xml: %.tap
+	$(TAPTOJUNIT) --puretap --output $@ --input $< $*
+
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
 	@$(RM) $@
@@ -361,7 +390,7 @@ endif
 # Generate a perl program to exec the real test binary.
 %.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
-	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<
 
 #---------------------------------------------------------------
 # Generate header with version number from VCS
@@ -498,13 +527,18 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
--include $(CONFIG)/RULES_EXPAND
+include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
-.PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease FORCE
+.PHONY: runtests tapfiles clean-tests test-results junitfiles
+.PHONY: checkRelease warnRelease noCheckRelease FORCE
 
+include $(CONFIG)/RULES_COMMON
+
+else
+    $(warning RULES_BUILD included more than once. \
+        Use 'make show-makefiles' to work out why.)
 endif # BASE_RULES_BUILD
-#	EOF RULES_BUILD

configure/RULES_COMMON

@@ -0,0 +1,35 @@
+#*************************************************************************
+# Copyright (c) 2018 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# These rules show the set of Makefiles, config files and
+# rules files loaded by GNUmake.
+
+# Protect against filenames containing colons (Windows)
+SAFE_MAKEFILES = $(subst :,__colon__,$(MAKEFILE_LIST))
+SHOW_MAKEFILES = $(SAFE_MAKEFILES:%=show-makefile.%)
+show-makefiles: $(SHOW_MAKEFILES)
+
+# The sort prevents warnings about duplicate targets:
+$(sort $(SHOW_MAKEFILES)): show-makefile.%:
+	@echo "    $(subst __colon__,:,$(@:show-makefile.%=%))"
+
+.PHONY: show-makefiles show-makefile.%
+
+# These rules support printing a Makefile variable values.
+# Many variables are only set inside an O.<arch> build directory.
+#   make PRINT.T_A
+
+PRINT_Var = $(@:PRINT.%=%)
+PRINT.%:
+	@echo $(PRINT_Var) = '$($(PRINT_Var))'
+
+.PHONY: PRINT PRINT.%
+
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_DIRS

@@ -9,7 +9,7 @@
 
 ARCHS += $(BUILD_ARCHS)
 ACTIONS += inc build install buildInstall clean realclean archclean
-ACTIONS += runtests tapfiles
+ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
 dirActionArchTargets = $(foreach dir, $(DIRS), \
     $(foreach action, $(ACTIONS), \
@@ -92,7 +92,4 @@ $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)
 
-
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER
+include $(CONFIG)/RULES_COMMON

configure/RULES_EXPAND

@@ -1,4 +1,13 @@
-# <top>/configure/RULES_EXPAND
+#*************************************************************************
+# Copyright (c) 2011 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 the file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+# RULES_EXPAND
 
 vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 

configure/RULES_FILE_TYPE

@@ -7,9 +7,11 @@
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files
+# Include <top>/configure/RULES_BUILD from tops defined in RELEASE* files,
+# excluding EPICS_BASE
 #
-RELEASE_RULES_BUILDS = $(foreach top, $(RELEASE_TOPS), \
+RELEASE_RULES_BUILDS = $(foreach top, \
+    $(filter-out EPICS_BASE, $(RELEASE_TOPS)), \
     $(wildcard $($(top))/configure/RULES_BUILD))
 ifneq ($(RELEASE_RULES_BUILDS),)
   include $(RELEASE_RULES_BUILDS)
@@ -23,7 +25,7 @@ ifneq ($(RELEASE_CFG_RULES),)
   include $(RELEASE_CFG_RULES)
 endif
 
-# If this is not BASE then include <TOP>/configure/RULES_BUILD
+# If this is not BASE then include <top>/configure/RULES_BUILD
 #
 ifeq ($(wildcard $(TOP)/configure/CONFIG_BASE_VERSION),)
 TOP_RULES_BUILDS = $(wildcard $(TOP)/configure/RULES_BUILD)
@@ -67,7 +69,3 @@ file_type_clean:
 	@$(RM) $(foreach type, $(FILE_TYPE), $($(type)))
 
 .PHONY : file_type_clean
-
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER

configure/RULES_OCTAVE

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution. 
 #*************************************************************************
 
 # Octave definitions and rules

configure/RULES_TARGET

@@ -1,18 +1,13 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 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 Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#
-#  RULES_TARGET
-#
-#  This file is to be maintained by the community.
-#
-#-----------------------------------------------------------------------
+
+# RULES_TARGET
 
 define TARGET_template
 $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
@@ -38,6 +33,17 @@ $(foreach target, $(PROD) $(TESTPROD), \
 
 #-----------------------------------------------------------------------
 
+# These must be done before PROD2_template
+define TESTLIBRARY_template
+$(1)_DIR = .
+TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+endef
+
+$(foreach target, $(TESTLIBRARY), \
+    $(eval $(call TESTLIBRARY_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
 define TARGET2_template
 $(1)_LDLIBS += $$($(1)_LIBS)
 $(1)_LDLIBS += $$(if $$(strip $$($(1)_LIBS_$(OS_CLASS))), \
@@ -123,16 +129,6 @@ $(foreach target, $(LIBRARY), \
 
 #-----------------------------------------------------------------------
 
-define LIBRARY3_template
-$(1)_DIR = .
-TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
-endef
-
-$(foreach target, $(TESTLIBRARY), \
-    $(eval $(call LIBRARY3_template,$(strip $(target)))))
-
-#-----------------------------------------------------------------------
-
 define LOADABLE_LIBRARY_template
 LOADABLE_BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
 

configure/RULES_TOP

@@ -57,6 +57,7 @@ help:
 	@echo "                      Cannot be used within an O.<arch> dir"
 	@echo "     rebuild        - Same as clean install"
 	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
+	@echo "     runtests       - Run self-tests, summarize results"
 	@echo "\"Partial\" build targets supported by Makefiles:"
 	@echo "     host           - Builds and installs $(EPICS_HOST_ARCH) only."
 	@echo "     inc$(DIVIDER)<arch>     - Installs <arch> only header files."

configure/os/CONFIG.Common.RTEMS

@@ -27,9 +27,13 @@ ifneq ($(CONFIG),$(TOP)/configure)
 -include $(TOP)/configure/CONFIG_SITE.Common.RTEMS
 endif
 
+#--------------------------------------------------
+# Set RTEMS_BSP from T_A if not already done
+RTEMS_BSP ?= $(subst RTEMS-,,$(T_A))
+
 #-------------------------------------------------------
 # Pick up the RTEMS tool/path definitions from the RTEMS BSP directory.
-include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(subst RTEMS-,,$(T_A))/Makefile.inc
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(RTEMS_BSP)/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(CONFIG.CC)
 
@@ -72,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,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way
@@ -136,6 +140,13 @@ MOD_LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
 LINK.mod = $(CCC) -o $@ $(PRODDIR_LDFLAGS) $(MOD_LDFLAGS)
 LINK.mod += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(MOD_LDLIBS)
 
+#--------------------------------------------------
+# Here munching means creating a bootable object binary
+ifdef MUNCH_SUFFIX
+  MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+  TESTMUNCHNAME = $(TESTPRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+endif
+
 #--------------------------------------------------
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES

configure/os/CONFIG.Common.RTEMS-at91rm9200ek

@@ -9,5 +9,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=arm
+RTEMS_BSP = at91rm9200ek
+RTEMS_TARGET_CPU = arm
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = beatnik
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
@@ -15,7 +16,6 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-gen68360

@@ -5,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=m68k
+RTEMS_BSP = gen68360
+RTEMS_TARGET_CPU = m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mcp750

@@ -5,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=ppc
+RTEMS_BSP = mcp750
+RTEMS_TARGET_CPU = ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme167

@@ -5,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=m68k
+RTEMS_BSP = mvme167
+RTEMS_TARGET_CPU = m68k
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme2100
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
@@ -13,7 +14,6 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -1,13 +1,13 @@
 #
 # Author: Matt Rippa
 #
+RTEMS_BSP = mvme2700
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 ARCH_DEP_CFLAGS += -DNVRAM_INDIRECT
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme3100
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
@@ -15,7 +16,6 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme5500
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
@@ -16,7 +17,6 @@ ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-pc386

@@ -5,15 +5,15 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=i386
+RTEMS_BSP = pc386
+RTEMS_TARGET_CPU = i386
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
-	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
+	$(RM) $*.bin
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $*.bin
 	$(BIN2BOOT) $@ 0x00097E00 \
-		$(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 temp.bin 0x00100000 0
-	rm -f temp.bin
+	    $(PROJECT_RELEASE)/lib/start16.bin 0x00097C00 0 $*.bin 0x00100000 0
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-pc386-qemu

@@ -0,0 +1,11 @@
+# CONFIG.Common.RTEMS-pc386-qemu
+#
+# Definitions for the RTEMS-pc386-qemu target
+# Site-specific overrides go in CONFIG_SITE.Common.RTEMS-pc386-qemu
+#
+#-------------------------------------------------------
+
+# Include definitions from RTEMS-pc386
+include $(CONFIG)/os/CONFIG.Common.RTEMS-pc386
+
+RTEMS_QEMU_FIXUPS = YES

configure/os/CONFIG.Common.RTEMS-psim

@@ -5,5 +5,6 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=ppc
+RTEMS_BSP = psim
+RTEMS_TARGET_CPU = ppc
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -5,11 +5,11 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
+RTEMS_BSP = uC5282
 RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
 endef

configure/os/CONFIG.Common.linux-xscale_be

@@ -15,5 +15,14 @@ ARCH_CLASS = xscale
 ifeq ($(BUILD_CLASS),CROSS)
     VALID_BUILDS = Ioc
     GNU_TARGET = xscale_be
-    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
+    CMPLR_PREFIX = $(GNU_TARGET:%=%-)
+
+    # Configure for readline if requested
+    OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include)
+    READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib)
+    RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib)
+    RUNTIME_LDFLAGS += \
+        $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+    SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS)
+    PRODDIR_LDFLAGS += $(READLINE_LDFLAGS)
 endif

configure/os/CONFIG.Common.linuxCommon

@@ -23,13 +23,15 @@ STATIC_LDFLAGS_YES= -Wl,-Bstatic
 STATIC_LDFLAGS_NO=
 STATIC_LDLIBS_YES= -Wl,-Bdynamic
 
-# Set runtime path for shared libraries
-SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath,%)
-SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+# 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_LDFLAGS += \
+    $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
-# Set runtime path for products
-PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
-PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
+# Set runtime path for products if USE_RPATH=YES and STATIC_BUILD=NO
+PRODDIR_RPATH_LDFLAGS_YES_NO = $(PROD_DEPLIB_DIRS:%=-Wl,-rpath,%)
+PRODDIR_LDFLAGS += \
+    $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
 
 # Link libraries controlled by COMMANDLINE_LIBRARY
 # The newest Linux versions only need readline, older ones need both

configure/os/CONFIG.Common.vxWorksCommon

@@ -95,20 +95,10 @@ GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
 GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
 
 #--------------------------------------------------
-# Wind River moved nm out of GNU_BIN in some versions
+# This finds nm on any supported VxWorks version
 
-WORKBENCH_BIN = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin
-UTILITIES_BIN = $(WIND_BASE)/utilities-$(UTILITIES_VERSION)/$(WIND_HOST_TYPE)/bin
-
-NM_DIR_6.4 = $(WORKBENCH_BIN)
-NM_DIR_6.5 = $(WORKBENCH_BIN)
-NM_DIR_6.6 = $(WORKBENCH_BIN)
-NM_DIR_6.7 = $(GNU_BIN)
-NM_DIR_6.8 = $(UTILITIES_BIN)
-NM_DIR_6.9 = $(UTILITIES_BIN)
-NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN))
-
-NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NMPROG = $(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NM = $(firstword $(wildcard $(WIND_BASE)/*/$(WIND_HOST_TYPE)/bin/$(NMPROG)))
 
 #--------------------------------------------------
 # A linker script is essential for munching from vxWorks 6.6 onwards
@@ -119,6 +109,7 @@ MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION))
 #--------------------------------------------------
 # These are required by some of the Wind River tools
 export WIND_BASE
+export WIND_HOME = $(WIND_BASE)
 export WIND_HOST_TYPE
 export TOOL_FAMILY = GNU
 
@@ -155,8 +146,10 @@ SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS =
 
 #--------------------------------------------------
-# Earlier versions of gcc don't understand -MF
-HDEPENDS_COMPFLAGS = -MM > $@
+# Don't use gcc 2.x for dependency generation
+
+HDEPENDS_METHOD_2 = MKMF
+HDEPENDS_METHOD = $(firstword $(HDEPENDS_METHOD_$(VX_GNU_MAJOR_VERSION)) COMP)
 
 #--------------------------------------------------
 # osithead use default stack, YES or NO override
@@ -164,6 +157,8 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 
 #--------------------------------------------------
 # Link definitions
+CROSS_LDFLAGS =
+#
 LINK.cpp = $(LD) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
 LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
 
@@ -177,6 +172,10 @@ COMPILE.ctdt = $(CC) -c $(CPPFLAGS) $(CFLAGS_ctdt) $(INCLUDES) $(SOURCE_FLAG)
 VXCPPFLAGS = $(filter-out $(OP_SYS_INCLUDE_CPPFLAGS),$(CPPFLAGS))
 PREPROCESS.cpp = $(CPP) $(VXCPPFLAGS) $(INCLUDES) $< > $@
 
+#--------------------------------------------------
+# Use LEDLIB for command-line editing
+COMMANDLINE_LIBRARY = LEDLIB
+
 #--------------------------------------------------
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.Common.vxWorksCommon

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -65,14 +65,14 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
+SHRLIB_LDFLAGS = -dynamiclib -undefined dynamic_lookup \
     -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
     $(addprefix -compatibility_version , $(SHRLIB_VERSION)) \
     $(addprefix -current_version , $(SHRLIB_VERSION))
 SHRLIB_SUFFIX_BASE = .dylib
 SHRLIB_SUFFIX = $(addprefix ., $(SHRLIB_VERSION))$(SHRLIB_SUFFIX_BASE)
 
-LOADABLE_SHRLIB_LDFLAGS = -bundle -flat_namespace -undefined suppress
+LOADABLE_SHRLIB_LDFLAGS = -bundle -undefined dynamic_lookup
 
 #
 # Position-independent code is the default on Darwin.

configure/os/CONFIG.linux-x86.linux-arm

@@ -11,19 +11,14 @@ GNU_TARGET = arm-linux
 CMPLR_SUFFIX =
 CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
 
-# Provide a link-time path for shared libraries
-SHRLIBDIR_RPATH_LDFLAGS_YES += $(SHRLIB_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-SHRLIBDIR_LDFLAGS += $(SHRLIBDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-# Provide a link-time path for products
-PRODDIR_RPATH_LDFLAGS_YES += $(PROD_DEPLIB_DIRS:%=-Wl,-rpath-link,%)
-PRODDIR_LDFLAGS += $(PRODDIR_RPATH_LDFLAGS_$(LINKER_USE_RPATH))
-
-# Provide a link-time path for readline 
-RUNTIME_LDFLAGS_READLINE_YES = -Wl,-rpath-link,$(GNU_DIR)/lib
-RUNTIME_LDFLAGS_READLINE = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-RUNTIME_LDFLAGS_READLINE_CURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
-RUNTIME_LDFLAGS_READLINE_NCURSES = $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH))
+# Provide a link-time path for readline if needed
+OP_SYS_INCLUDES += $(READLINE_DIR:%=-I%/include)
+READLINE_LDFLAGS = $(READLINE_DIR:%=-L%/lib)
+RUNTIME_LDFLAGS_READLINE_YES_NO = $(READLINE_DIR:%=-Wl,-rpath,%/lib)
+RUNTIME_LDFLAGS += \
+    $(RUNTIME_LDFLAGS_READLINE_$(LINKER_USE_RPATH)_$(STATIC_BUILD))
+SHRLIBDIR_LDFLAGS += $(READLINE_LDFLAGS)
+PRODDIR_LDFLAGS += $(READLINE_LDFLAGS)
 
 # Library flags
 STATIC_LDFLAGS_YES= -Wl,-Bstatic

configure/os/CONFIG.win32-x86.win32-x86

@@ -79,16 +79,20 @@ CPP = cl -nologo -C -E
 
 # Configure OS vendor C++ compiler
 #
-# __STDC__=0 gives us both:
-# 1) define STDC for code (pretend ANSI conformance)
-# 2) set it to 0 to use MS C "extensions" (open for _open etc.)
-# because MS uses:   if __STDC__ ... disable many nice things
-#
 # -EHsc - generate code for exceptions
 # -GR - generate code for run time type identification
 #
 CCC = cl -EHsc -GR
-CODE_CPPFLAGS += -nologo -D__STDC__=0
+
+# Other compiler flags, used for CPP, C and C++
+#
+# -FC - Show absolute path of source file in diagnostics
+# -D__STDC__=0 gives us both:
+#   1) define STDC for code (pretend ANSI conformance)
+#   2) set it to 0 to use MS C "extensions" (open for _open etc.)
+#   because MS uses:   if __STDC__ ... disable many nice things
+#
+CODE_CPPFLAGS += -nologo -FC -D__STDC__=0
 CODE_CPPFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 
 
@@ -136,6 +140,16 @@ STATIC_LDLIBS_NO=
 STATIC_LDFLAGS=
 RANLIB=
 
+#
+# option needed for parallel builds with Visual Studio 2015 onward
+#
+# -FS Force Synchronous PDB Writes
+ifneq ($(VisualStudioVersion),)
+  OPT_CXXFLAGS_NO += -FS
+  OPT_CFLAGS_NO += -FS
+endif
+
+
 #
 # add -profile here to run the ms profiler
 # -LTCG whole program optimization

configure/os/CONFIG_SITE.Common.RTEMS-pc386

@@ -1,3 +0,0 @@
-#
-# Site-specific overrides for RTEMS-pc386 target
-#

configure/os/CONFIG_SITE.Common.RTEMS-pc386-qemu

@@ -0,0 +1,9 @@
+# CONFIG_SITE.Common.RTEMS-pc386-qemu
+#
+# Site-specific overrides for the RTEMS-pc386-qemu target
+#
+
+# If you're building this architecture you _probably_ want to
+# run the tests for it under QEMU, but if not you can turn
+# them off here by commenting out this line:
+CROSS_COMPILER_RUNTEST_ARCHS += RTEMS-pc386-qemu

configure/os/CONFIG_SITE.Common.linux-xscale_be

@@ -1,10 +1,4 @@
 # CONFIG_SITE.Common.linux-xscale_be
 #
-# Site specific definitions for linux-xscale_be target builds.
+# Site specific definitions for all linux-xscale_be target builds.
 #-------------------------------------------------------
-
-# Set GNU_DIR to point to directory containing the tool-chain
-
-# APS:
-GNU_DIR = /usr/local/vw/xscale_be
-

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -20,18 +20,6 @@ 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 = /ade/vxWorks/$(VXWORKS_VERSION)
-
-
-# WorkBench Version number, if you're using vxWorks 6.x
-
-#WORKBENCH_VERSION = 2.6
-#WORKBENCH_VERSION = 3.0
-#WORKBENCH_VERSION = 3.2
-WORKBENCH_VERSION = 3.3
-
-
-# Utilities Version number, required from vxWorks 6.8 and later
-
-UTILITIES_VERSION = 1.0

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

@@ -7,8 +7,25 @@
 GNU_TARGET = arm-xilinx-linux-gnueabi
 
 # Set GNU tools install path
-# This is the install path at APS:
+# Examples are installations at the APS:
 GNU_DIR = /usr/local/vw/zynq-2011.09
+#GNU_DIR = /usr/local/Xilinx/SDK/2016.3/gnu/arm/lin
+#GNU_DIR = /APSshare/XilinxSDK/2015.4/gnu/arm/lin
+
+# If cross-building shared libraries and the paths on the target machine are
+# different than on the build host, you should uncomment the lines below to
+# disable putting runtime library paths in products and shared libraries.
+# You will also need to provide another way for programs to find their shared
+# libraries at runtime, such as by setting LD_LIBRARY_PATH or by using
+# mechanisms related to /etc/ld.so.conf
+#SHRLIBDIR_RPATH_LDFLAGS_YES_NO =
+#PRODDIR_RPATH_LDFLAGS_YES_NO =
+# Note: It may be simpler to just set STATIC_BUILD=YES here and not
+# try to use shared libraries at all in these circumstances.
+
+# To use libreadline, point this to its install prefix
+#READLINE_DIR = $(GNU_DIR)
+#READLINE_DIR = /tools/cross/linux-x86.linux-arm/readline
+# See CONFIG_SITE.Common.linux-arm for other COMMANDLINE_LIBRARY values
+#COMMANDLINE_LIBRARY = READLINE
 
-# With a Xilinx SDK, it'll be something like
-#GNU_DIR = /usr/local/zynq/Xilinx/SDK/2015.4/gnu/arm/lin

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

@@ -0,0 +1,11 @@
+# CONFIG_SITE.linux-x86.linux-xscale_be
+#
+# Site specific definitions for linux-x86 host - linux-xscale_be targets
+#-------------------------------------------------------
+
+# Set GNU_DIR to point to directory containing the tool-chain
+GNU_DIR = /usr/local/vw/xscale_be
+
+# If readline is available, configure it
+READLINE_DIR = $(GNU_DIR)/target/usr
+COMMANDLINE_LIBRARY = READLINE

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

@@ -0,0 +1,7 @@
+# CONFIG_SITE.linux-x86_64.linux-xscale_be
+#
+# Site specific settings for linux-x86_64 host - linux-xscale_be target
+#-------------------------------------------------------
+
+# Inherit setting from linux-x86
+include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-xscale_be

documentation/KnownProblems.html

@@ -4,7 +4,7 @@
 <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 R3.16.1</title>
+  <title>Known Problems in Base-3.16.1</title>
 </head>
 
 <body>
@@ -15,7 +15,7 @@ base-3.16.1 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
 <blockquote><pre>% <b>cd <i>/path/to/</i>base-3.16.1</b>
-% <b>patch -p0 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
+% <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
 release:</p>
@@ -23,7 +23,8 @@ release:</p>
 <ul>
 
 <!-- Items added after release should be formatted thusly:
-  <li>YYYY-MM-DD: Description of problem
+  <li>YYYY-MM-DD: Description of problem.
+    <a href="fix.patch">This patch</a> fixes the problem.
     ...</li>
 -->
 

documentation/README.1st

@@ -6,19 +6,19 @@
 
   Table of Contents
 
-     *<EFBFBD>What is EPICS base?
-     *<EFBFBD>What is new in this release?
-     *<EFBFBD>Copyright
-     *<EFBFBD>Supported platforms
-     *<EFBFBD>Supported compilers
-     *<EFBFBD>Software requirements
-     *<EFBFBD>Host system storage requirements
-     *<EFBFBD>Documentation
-     *<EFBFBD>Directory Structure
-     *<EFBFBD>Build related components
-     *<EFBFBD>Building EPICS base (Unix and Win32)
-     *<EFBFBD>Example application and extension
-     *<EFBFBD>Multiple host platforms
+     * What is EPICS base?
+     * What is new in this release?
+     * Copyright
+     * Supported platforms
+     * Supported compilers
+     * Software requirements
+     * Host system storage requirements
+     * Documentation
+     * Directory Structure
+     * Build related components
+     * Building EPICS base (Unix and Win32)
+     * Example application and extension
+     * Multiple host platforms
 
    --------------------------------------------------------------------------
 
@@ -67,8 +67,9 @@
   Software requirements
 
      GNU make
-     You must use GNU make, gnumake, for any EPICS builds. Set your path so
-     that a gnumake version 3.81 or later is available.
+     You must use the GNU version of make for EPICS builds, and we now
+     recommend version 4.1 or later (version 3.82 may work on Linux, but
+     doesn't on Windows).
 
      Perl
      You must have Perl version 5.8.1 or later installed. The EPICS
@@ -99,20 +100,17 @@
 
      RTEMS
      For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or
-     later.
+     4.10. The newer 4.11 or 5.x releases are not supported yet.
 
-     GNU readline or Tecla library
-     GNU readline and Tecla libraries can be used by the IOC shell to provide
-     command line editing and command line history recall and edit. GNU
-     readline (or Tecla library) must be installed on your target system when
-     COMMANDLINE_LIBRARY is set to READLINE (or TECLA) for that target. EPICS
-     (EPICS shell) is the default specified in CONFIG_COMMON. A READLINE
-     override is defined for linux-x86 in the EPICS distribution. Comment out
-     COMMANDLINE_LIBRARY=READLINE in
-     configure/os/CONFIG_SITE.Common.linux-x86 if readline is not installed
-     on linux-x86. Command-line editing and history will then be those
-     supplied by the os. On vxWorks the ledLib command-line input library is
-     used instead.
+     Command-line editing libraries
+     GNU readline or other OS-specific libraries can be used by the IOC shell
+     to provide command line editing and history recall. The default setting
+     is different for each OS. On Linux the default is to use READLINE since
+     most distributions include it. On MacOS the default is also READLINE
+     since Apple provides a compatible library, although it isn't GNU. On
+     RTEMS we support GNU readline and Tecla, although the default is to use
+     neither since these have to be added to the RTEMS installation
+     separately. On vxWorks we support the built-in ledLib library.
 
   Host system storage requirements
 
@@ -166,12 +164,11 @@
 
     base/startup directory - contains scripts to set environment and path
 
-         EpicsHostArch       C shell script to set EPICS_HOST_ARCH env variable
-         EpicsHostArch.pl    Perl script to set EPICS_HOST_ARCH env variable
-         Site.profile        bourne shell script to set path and env variables
-         Site.cshrc          c shell script to set path and env variables
-         cygwin.bat          WIN32 bat file to set cygwin path and env variables
-         win32.bat           WIN32 bat file to set path and env variables
+         EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
+         unix.csh            C shell script to set path and env variables
+         unix.sh             Bourne shell script to set path and env variables
+         win32.bat           Bat file example to configure win32-x86 target
+         windows.bat         Bat file example to configure windows-x64 target
 
     base/configure directory - contains build definitions and rules
 

documentation/README.darwin.html

@@ -21,7 +21,7 @@ of my Bash login script (~/.bash_login):
 #
 EPICS_BASE="${HOME}/src/EPICS/base"
 EPICS_EXTENSIONS="${HOME}/src/EPICS/extensions"
-<strong>.</strong> "${EPICS_BASE}"/startup/Site.profile
+<strong>.</strong> "${EPICS_BASE}"/startup/unix.sh
 </pre>
 </li>
 <li>

documentation/README.html

@@ -72,8 +72,8 @@
 <H3><A NAME="0_0_6"> Software requirements</A></H3>
 
 <BLOCKQUOTE><B>GNU make</B><BR>
- You must use GNU make, gnumake, for any EPICS builds. Set your path
- so that a gnumake version 3.81 or later is available.
+ You must use the GNU version of make for EPICS builds, and we now recommend
+ version 4.1 or later (version 3.82 may work on Linux, but doesn't on Windows).
 
 <P><B>Perl</B><BR>
  You must have Perl version 5.8.1 or later installed. The EPICS configuration
@@ -98,25 +98,25 @@
  base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
  target-specific overrides.</P>
 
-<P>Consult the <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
+<P>Consult the <a href="https://epics.anl.gov/base/vxWorks6.php">vxWorks
  6.x</a> EPICS web pages and the vxWorks documentation for information
  about configuring your vxWorks operating system for use with EPICS.</P>
 
 <P><B>RTEMS</B><BR>
- For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or later.</P>
+ For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or 4.10. The
+ newer 4.11 or 5.x releases are not supported yet.</P>
+
+<P><B>Command-line editing libraries</B><BR>
+
+ GNU readline or other OS-specific libraries can be used by the IOC shell to
+ provide command line editing and history recall. The default setting is
+ different for each OS. On Linux the default is to use READLINE since most
+ distributions include it. On MacOS the default is also READLINE since Apple
+ provides a compatible library, although it isn't GNU. On RTEMS we support GNU
+ readline and Tecla, although the default is to use neither since these have to
+ be added to the RTEMS installation separately. On vxWorks we support the
+ built-in ledLib library.</P>
 
-<P><B>GNU readline or Tecla library</B><BR>
- GNU readline and Tecla libraries can be used by the IOC shell to
- provide command line editing and command line history recall and edit.
- GNU readline (or Tecla library) must be installed on your target system
- when COMMANDLINE_LIBRARY is set to READLINE (or TECLA) for that target.
- EPICS (EPICS shell) is the default specified in CONFIG_COMMON. A
- READLINE override is defined for linux-x86 in the EPICS distribution.
- Comment out COMMANDLINE_LIBRARY=READLINE in
- configure/os/CONFIG_SITE.Common.linux-x86 if readline is not installed
- on linux-x86. Command-line editing and history will then be those
- supplied by the os. On vxWorks the ledLib command-line input library is
- used instead.</P>
 </BLOCKQUOTE>
 
 <H3><A NAME="0_0_7"> Host system storage requirements</A></H3>
@@ -128,7 +128,7 @@
 
 <H3><A NAME="0_0_8"> Documentation</A></H3>
 <BLOCKQUOTE>EPICS documentation is available through the
- <a href="http://www.aps.anl.gov/epics/">EPICS website</a> at Argonne.
+ <a href="https://epics.anl.gov/">EPICS website</a> at Argonne.
  <P>Release specific documentation can also be found in the base/documentation
  directory of the distribution.</BLOCKQUOTE>
 
@@ -176,12 +176,11 @@
 
 <H4>base/startup directory - contains scripts to set environment and path</H4>
 <PRE>
-        EpicsHostArch       C shell script to set EPICS_HOST_ARCH env variable
-        EpicsHostArch.pl    Perl script to set EPICS_HOST_ARCH env variable
-        Site.profile        bourne shell script to set path and env variables
-        Site.cshrc          c shell script to set path and env variables
-        cygwin.bat          WIN32 bat file to set cygwin path and env variables
-        win32.bat           WIN32 bat file to set path and env variables
+        EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
+        unix.csh            C shell script to set path and env variables
+        unix.sh             Bourne shell script to set path and env variables
+        win32.bat           Bat file example to configure win32-x86 target
+        windows.bat         Bat file example to configure windows-x64 target
 </PRE>
 
 <H4>base/configure directory - contains build definitions and rules</H4>

documentation/RELEASE_NOTES.html

@@ -3,16 +3,14 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-  <title>EPICS Base R3.16.1 Release Notes</title>
+  <title>EPICS Base R3.16.2 Release Notes</title>
 </head>
 
 <body lang="en">
-<h1 align="center">EPICS Base Release 3.16.1</h1>
+<h1 align="center">EPICS Base Release 3.16.2</h1>
 
-<p style="color:red">This version of EPICS Base has not been released yet.</p>
+<h2 align="center">Changes made between 3.16.1 and 3.16.2</h2>
 
-
-<h2 align="center">Changes made on the 3.16 branch since 3.16.0.1</h2>
 <!-- Insert new items immediately below this template ...
 
 <h3>Title...</h3>
@@ -21,6 +19,228 @@
 
 -->
 
+<h3>Launchpad Bugs</h3>
+
+<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>
+
+<h3>Type-safe Device and Driver Support Tables</h3>
+
+<p>Type-safe versions of the device and driver support structures <tt>dset</tt>
+and <tt>drvet</tt> have been added to the devSup.h and drvSup.h headers
+respectively. The original structure definitions have not been changed so
+existing support modules will still build normally, but older modules can be
+modified and new code written to be compatible with both.</p>
+
+<p>The old structure definitions will be replaced by the new ones if the macros
+<tt>USE_TYPED_DSET</tt> and/or <tt>USE_TYPED_DRVET</tt> are defined when the
+appropriate header is included. The best place to define these is in the
+Makefile, as with the <tt>USE_TYPED_RSET</tt> macro that was introduced in
+Base-3.16.1 and described below. See the comments in devSup.h for a brief usage
+example, or look at <a href="https://github.com/epics-modules/ipac/commit/a7e0ff4089b9aa39108bc8569e95ba7fcf07cee9">
+this commit</a> to the ipac module to see a module conversion.</p>
+
+<p>A helper function <tt>DBLINK* dbGetDevLink(dbCommon *prec)</tt> has also been
+added to devSup.h which fetches a pointer to the INP or OUT field of the
+record.</p>
+
+<h3>RTEMS build configuration update, running tests under QEMU</h3>
+
+<p>This release includes the ability to run the EPICS unit tests built for a
+special version of the RTEMS-pc386 target architecture on systems that have an
+appropriate QEMU emulator installed (<tt>qemu-system-i386</tt>). It is also now
+possible to create sub-architectures of RTEMS targets, whereas previously the
+EPICS target architecture name had to be <tt>RTEMS-$(RTEMS_BSP)</tt>.</p>
+
+<p>The new target <tt>RTEMS-pc386-qemu</tt> builds binaries that can be run in
+the <tt>qemu-system-i386</tt> PC System emulator. This target is a derivative of
+the original <tt>RTEMS-pc386</tt> target but with additional software to build
+an in-memory file-system, and some minor modifications to allow the unit tests
+to work properly under QEMU. When this target is enabled, building any of the
+make targets that cause the built-in self-tests to be run (such as
+<tt>make&nbsp;runtests</tt>) will also run the tests for RTEMS using QEMU.</p>
+
+<p>To allow the new 3-component RTEMS target name, the EPICS build system for
+RTEMS was modified to allow a <tt>configure/os/CONFIG.Common.&lt;arch&gt;</tt>
+file to set the <tt>RTEMS_BSP</tt> variable to inform the build what RTEMS BSP
+to use. Previously this was inferred from the value of the <tt>T_A</tt> make
+variable, but that prevents having multiple EPICS targets that build against the
+same BSP. All the included RTEMS target configuration files have been updated;
+build configuration files for out-of-tree RTEMS targets will continue to work as
+the original rules are used to set <tt>RTEMS_BSP</tt> if it hasn't been set when
+needed.</p>
+
+<h3>Link type enhancements</h3>
+
+<p>This release adds three new link types: "state", "debug" and "trace". The
+"state" link type gets and puts boolean values from/to the dbState library that
+was added in the 3.15.1 release. The "debug" link type sets the
+<code>jlink::debug</code> flag in its child link, while the "trace" link type
+also causes the arguments and return values for all calls to the child link's
+jlif and lset routines to be printed on stdout. The debug flag can no longer be
+set using an info tag. The addition of the "trace" link type has allowed over
+200 lines of conditional diagnostic printf() calls to be removed from the other
+link types.</p>
+
+<p>The "calc" link type can now be used for output links as well as input links.
+This allows modification of the output value and even combining it with values
+from other input links. See the separate JSON Link types document for
+details.</p>
+
+<p>A new <code>start_child()</code> method was added to the end of the jlif
+interface table.</p>
+
+<p>The <code>lset</code> methods have now been properly documented in the
+dbLink.h header file using Doxygen annotations, although we do not run Doxygen
+on the source tree yet to generate API documentation.</p>
+
+<p>Link types that utilize child links must now indicate whether the child will
+be used for input, output or forward linking by the return value from its
+<code>parse_start_map()</code> method. The <code>jlif_key_result</code> enum now
+contains 3 values <code>jlif_key_child_inlink</code>,
+<code>jlif_key_child_outlink</code> and <code>jlif_key_child_fwdlink</code>
+instead of the single <code>jlif_key_child_link</code> that was previously used
+for this.</p>
+
+<h3>GNUmake targets for debugging</h3>
+
+<p>Some additional build rules have been added to help debug configuration
+problems with the build system. Run <tt>make show-makefiles</tt> to get a sorted
+list of all the files that the build system includes when building in the
+current directory.</p>
+
+<p>A new pattern rule for <tt>PRINT.%</tt> can be used to show the value of any
+GNUmake variable for the current build directory (make sure you are in the right
+directory though, many variables are only set when inside the
+<tt>O.<i>arch</i></tt> build directory). For example <tt>make PRINT.T_A</tt>
+will display the build target architecture name from inside a
+<tt>O.<i>arch</i></tt> directory but the variable will be empty from an
+application top or src directory. <tt>make PRINT.EPICS_BASE</tt> will show the
+path to Base from any EPICS application directory though.</p>
+
+<h3>Propagate PUTF across Asynchronous record processing</h3>
+
+<p>The IOC contains a mechanism involving the PUTF and RPRO fields of each
+record to ensure that if a record is busy when it receives a put to one of its
+fields, the record will be processed again to ensure that the new field value
+has been correctly acted on. Until now that mechanism only worked if the put was
+to the asynchronous record itself, so puts that were chained from some other
+record via a DB link did not cause reprocessing.</p>
+
+<p>In this release the mechanism has been extended to propagate the PUTF state
+across DB links until all downstream records have been reprocessed. Some
+additional information about the record state can be shown by setting the TPRO
+field of an upstream record, and even more trace data is displayed if the
+debugging variable <tt>dbAccessDebugPUTF</tt> is set in addition to TPRO.</p>
+
+<h3>Finding info fields</h3>
+
+<p>A new iocsh command <code>dbli</code> lists the info fields defined in the
+database, and can take a glob pattern to limit output to specific info names.
+The newly added dbStaticLib function <code>dbNextMatchingInfo()</code> iterates
+through the info fields defined in the current record, and is used to implement
+the new command.</p>
+
+<h3>Output from <tt>dbpr</tt> command enhanced</h3>
+
+<p>The "DataBase Print Record" command <tt>dbpr</tt> now generates slightly
+better output, with more field types having their own display methods. This
+release also includes additional protection against buffer overflows while
+printing long links in <tt>dbpr</tt>, and corrects the output of long strings
+from the <tt>dbgf</tt> command.</p>
+
+<h3>Record types mbbiDirect and mbboDirect upgraded to 32 bit</h3>
+
+<p>The VAL fields and related fields of these records are now <tt>DBF_LONG</tt>.
+(Not <tt>DBF_ULONG</tt> in order to prevent Channel Access from promoting them
+to <tt>DBF_DOUBLE</tt>.) Additional bit fields <tt>B10</tt>...<tt>B1F</tt> have
+been added.</p>
+
+<p>Device support that accesses <tt>VAL</tt> or the bit fields directly (most
+don't) and aims for compatibility with old and new versions of these records
+should use at least 32 bit integer types to avoid bit loss. The number of bit
+fields can be calculated using <code>8&nbsp;*&nbsp;sizeof(prec->val)</code>
+which is correct in both versions.</p>
+
+<h3>Restore use of ledlib for VxWorks command editing</h3>
+
+<p>The epicsReadline refactoring work described below unfortunately disabled the
+VxWorks implementation of the osdReadline.c API that uses ledlib for command
+editing and history. This functionality has now been restored, see Launchpad
+<a href="https://bugs.launchpad.net/bugs/1741578">bug #1741578</a>.</p>
+
+<h3>Constant link types</h3>
+
+<p>Constant links can now hold 64-bit integer values, either as scalars or
+arrays. Only base 10 is supported by the JSON parser though, the JSON standard
+doesn't allow for hexadecimal numbers.</p>
+
+<h3>Upgraded the YAJL JSON Library</h3>
+
+<p>The third-party YAJL library that has been included in libCom for several
+years has been upgraded to version 2.1.0 and several bugs fixed. This has an
+updated API, requiring any code that uses it to parse its own JSON files to be
+modified to match. The changes are mainly that it uses <tt>size_t</tt> instead
+<tt>unsigned int</tt> for string lengths, but it also uses <tt>long long</tt>
+instead of <tt>long</tt> for JSON integer values, which was the main motivation
+for the upgrade.</p>
+
+<p>The self-tests that YAJL comes with have been imported and are now run as an
+EPICS Unit Test program, and the JSON syntax accepted by the parser was extended
+to permit trailing commas in both arrays and maps. The difference between the
+old and new YAJL APIs can be detected at compile time by looking for the macro
+<tt>EPICS_YAJL_VERSION</tt> which is defined in the yajl_common.h header file
+along with a brief description of the API changes.</p>
+
+<h3>Timestamp support for the calc link type</h3>
+
+<p>A new optional parameter can be given when specifying a calc JSON link. The
+<tt>time</tt> parameter is a string containing a single letter <tt>A..L</tt>
+that selects one of the input links to be used for the timestamp of calculation
+if requested. The timestamp will be fetched atomically with the value from the
+chosen input link (providing that input link type supports the readLocked()
+method).</p>
+
+<h3>Silence errors from puts to constant link types</h3>
+
+<p>A soft channel output record with the OUT link unset uses the CONSTANT link
+type. The new link type code was causing some soft channel device supports to
+return an error status from the write method of that link type, which would
+cause a ca_put() operation to such a record to generate an exception. This has
+been silenced by giving the constant link types a dummy putValue method. A new
+test program has been added to prevent regressions of this behaviour.</p>
+
+<h3>RSRV expanding large buffer causes crash</h3>
+
+<p>In the 3.16.1 release a crash can occur in the IOC's RSRV server when a large
+array is made even larger; the previous array buffer was not being released
+correctly. See Launchpad
+<a href="https://bugs.launchpad.net/epics-base/+bug/1706703">bug
+#1706703</a>.</p>
+
+
+<h2 align="center">Changes made between 3.16.0.1 and 3.16.1</h2>
+
 <h3>IOC Database Support for 64-bit integers</h3>
 
 <p>The IOC now supports the 64-bit integer field types <tt>DBF_INT64</tt> and
@@ -52,6 +272,27 @@ preprocessor macro):</p>
 #endif
 </pre></blockquote>
 
+<p>If the code uses the old db_access.h types (probably because it's calling
+Channel Access APIs) then it will have to test against the EPICS version number
+instead, like this:</p>
+
+<blockquote><pre>
+#include &lt;epicsVersion.h&gt;
+
+#ifndef VERSION_INT
+#  define VERSION_INT(V,R,M,P) ( ((V)&lt;&lt;24) | ((R)&lt;&lt;16) | ((M)&lt;&lt;8) | (P))
+#endif
+#ifndef EPICS_VERSION_INT
+#  define EPICS_VERSION_INT VERSION_INT(EPICS_VERSION, EPICS_REVISION, EPICS_MODIFICATION, EPICS_PATCH_LEVEL)
+#endif
+
+#if EPICS_VERSION_INT &gt;= VERSION_INT(3,16,1,0)
+    /* Code where Base has INT64 support */
+#else
+    /* Code for older versions */
+#endif
+</pre></blockquote>
+
 <p>Channel Access does not (and probably never will) directly support 64-bit
 integer types, so the new field types are presented to the CA server as
 <tt>DBF_DOUBLE</tt> values. This means that field values larger than 2^52
@@ -219,15 +460,15 @@ to implement the link APIs, so will work properly after these conversions:</p>
 link type, i.e. change this code:
 
 <pre>
-    if (prec->siml.type == CONSTANT) {
-        recGblInitConstantLink(&amp;prec->siml, DBF_USHORT, &amp;prec->simm);
+    if (prec-&gt;siml.type == CONSTANT) {
+        recGblInitConstantLink(&amp;prec-&gt;siml, DBF_USHORT, &amp;prec-&gt;simm);
     }
 </pre>
 
 into this:
 
 <pre>
-    recGblInitConstantLink(&amp;prec->siml, DBF_USHORT, &amp;prec->simm);
+    recGblInitConstantLink(&amp;prec-&gt;siml, DBF_USHORT, &amp;prec-&gt;simm);
 </pre>
 
 Note that <tt>recGblInitConstantLink()</tt> still returns TRUE if the field was
@@ -240,20 +481,20 @@ or undefined links, FALSE for links whose <tt>dbGetLink()</tt> routine may
 return different values on different calls. For example this:
 
 <pre>
-    if (prec->dol.type != CONSTANT)
+    if (prec-&gt;dol.type != CONSTANT)
 </pre>
 
 should become this:
 
 <pre>
-    if (!dbLinkIsConstant(&amp;prec->dol))
+    if (!dbLinkIsConstant(&amp;prec-&gt;dol))
 </pre>
 
 When the converted software is also required to build against older versions of
 Base, this macro definition may be useful:
 
 <pre>
-#define dbLinkIsConstant(lnk) ((lnk)->type == CONSTANT)
+#define dbLinkIsConstant(lnk) ((lnk)-&gt;type == CONSTANT)
 </pre>
 </li>
 
@@ -261,7 +502,7 @@ Base, this macro definition may be useful:
 link has been resolved as a CA link using code such as
 
 <pre>
-    if (prec->inp.type == CA_LINK)
+    if (prec-&gt;inp.type == CA_LINK)
 </pre>
 
 will still compile and run, but will only work properly with the old CA link
@@ -271,7 +512,7 @@ examine or modify data inside the link. After conversion the above line would
 probably become:
 
 <pre>
-    if (dbLinkIsVolatile(&amp;prec->inp))
+    if (dbLinkIsVolatile(&amp;prec-&gt;inp))
 </pre>
 
 A volatile link is one like a Channel Access link which may disconnect and
@@ -281,7 +522,7 @@ same state they started in. For compatibility when building against older
 versions of Base, this macro definition may be useful:
 
 <pre>
-#define dbLinkIsVolatile(lnk) ((lnk)->type == CA_LINK)
+#define dbLinkIsVolatile(lnk) ((lnk)-&gt;type == CA_LINK)
 </pre>
 </li>
 
@@ -581,14 +822,229 @@ the stdout stream, making it hard to parse.</p>
 callback.h header and removed the need for dbScan.c to reach into the internals
 of its CALLBACK objects.</p>
 
-
-<h2 align="center">Changes from the 3.15 branch since 3.15.5</h2>
+<h2 align="center">Changes from the 3.15 branch since 3.15.6</h2>
 
 <!-- Insert inherited items immediately below here ... -->
 
-<h2 align="center">Changes from the 3.14 branch since 3.15.5</h2>
 
-<!-- Insert inherited items immediately below here ... -->
+<h2 align="center">Changes made between 3.15.5 and 3.15.6</h2>
+
+<h3>Unsetting environment variables</h3>
+
+<p>The new command <code>epicsEnvUnset <i>varname</i></code> can be used to
+unset an environment variable.</p>
+
+<h3>Warning indicators in msi (and macLib) output</h3>
+
+<p>The libCom macro expansion library has been modified so that when the
+SUPPRESS_WARNINGS flag is set it will no longer include any <tt>,undefined</tt>
+or <tt>,recursive</tt> indicators in its output when undefined or recursive
+macros are encountered. These indicators were harmless when the output was fed
+into an IOC along with a definition for the macro, but when the <tt>msi</tt>
+tool was used to generate other kinds of files they caused problems. If the
+<tt>msi -V</tt> flag is used the markers will still be present in the output
+whenever the appropriate condition is seen.</p>
+
+<h3>Improvements to msi</h3>
+
+<p>In addition to fixing its response to discovering parsing errors in its
+substitution input file (reported as Launchpad
+<a href="https://bugs.launchpad.net/epics-base/+bug/1503661">bug #1503661</a>)
+so it now deletes the incomplete output file, the msi program has been cleaned
+up a little bit internally.</p>
+
+<h3>All array records now post monitors on their array-length fields</h3>
+
+<p>The waveform record has been posting monitors on its NORD field since Base
+3.15.0.1; we finally got around to doing the equivalent in all the other
+built-in record types, which even required modifying device support in some
+cases. This fixes <a href="https://bugs.launchpad.net/epics-base/+bug/1730727">
+Launchpad bug #1730727</a>.</p>
+
+<h3>HOWTO: Converting Wiki Record Reference to POD</h3>
+
+<p>Some documentation has been added to the <tt>dbdToHtml.pl</tt> script
+explaining how Perl POD (Plain Old Documentation) markup can be added to
+<tt>.dbd</tt> files to generate HTML documentation for the record types. To see
+these instructions, run <tt>perl&nbsp;bin/&lt;host&gt;/dbdToHtml.pl&nbsp;-H</tt>
+or <tt>perldoc&nbsp;bin/&lt;host&gt;/dbdToHtml.pl</tt>.</p>
+
+<h3>Fix problem with numeric soft events</h3>
+
+<p>Changing from numeric to named soft events introduced an incompatibility
+when a numeric event 1-255 is converted from a DOUBLE, e.g. from a calc record.
+The <tt>post_event()</tt> API is not marked deprecated any more.
+
+<p>Also <code>scanpel</code> has been modified to accept a glob pattern for
+event name filtering and to show events with no connected records as well.</p>
+
+<h3>Add osiSockOptMcastLoop_t and osiSockTest</h3>
+
+<p>Added a new OS-independent typedef for multicast socket options, and a test
+file to check their correct operation.<p>
+
+<h3>Support for CONFIG_SITE.local in Base</h3>
+
+<p>This feature is mostly meant for use by developers; configuration
+settings that would normally appear in Base/configure/CONFIG_SITE can now
+be put in a locally created base/configure/CONFIG_SITE.local file instead
+of having go modify or replace the original. A new .gitignore pattern
+tells git to ignore all configure/*.local files.</p>
+
+
+<h2 align="center">Changes from the 3.14 branch between 3.15.5 and 3.15.6</h2>
+
+<h3>Fix broken <tt>EPICS_IOC_LOG_FILE_LIMIT=0</tt> setting</h3>
+
+<p>The Application Developers' Guide says this is allowed and disables the
+limit on the log-file, but it hasn't actually worked for some time (if ever).
+Note that the iocLogServer will be removed from newer Base release sometime
+soon as its functionality can be implemented by other dedicated log servers
+such as logstash or syslog-ng.</p>
+
+<p>Fixes <a href="https://bugs.launchpad.net/bugs/1786858">lp:1786858</a>
+and part of <a href="https://bugs.launchpad.net/bugs/1786966">lp:1786966</a>.
+</p>
+
+<h3>Cleanup of startup directory</h3>
+
+<p>The files in the startup directory have not been maintained in recent years
+and have grown crufty (technical term). This release includes the following
+updates to these files:</p>
+
+<ul>
+
+<li>The Perl <tt>EpicsHostArch.pl</tt> script has been rewritten, and support
+for a few previously missing host architectures has been added to it.</li>
+
+<li>The <tt>EpicsHostArch.pl</tt> script has also been moved into the standard
+<tt>src/tools</tt> directory, from where it will be installed into
+<tt>lib/perl</tt>. In this new location it is no longer executable, so it must
+be run by the <tt>perl</tt> executable.</li>
+
+<li>The build system has been adjusted to look for <tt>EpicsHostArch.pl</tt> in
+both places if the <tt>EPICS_HOST_ARCH</tt> environment variable has not been
+set at build-time.</li>
+
+<li>Sites that used the original Perl script to set <tt>EPICS_HOST_ARCH</tt> as
+part of their standard environment will need to adjust their scripts when they
+upgrade to this release.</li>
+
+<li>The <tt>EpicsHostArch</tt> shell script has been replaced with a wrapper
+routine that calls the Perl <tt>EpicsHostArch.pl</tt> script. Sites that rely on
+this script to set <tt>EPICS_HOST_ARCH</tt> should consider switching to the
+Perl script instead.</li>
+
+<li>The <tt>Site.cshrc</tt> and <tt>Site.profile</tt> files have been renamed to
+<tt>unix.csh</tt> and <tt>unix.sh</tt>, respectively.</li>
+
+<li>The existing <tt>win32.bat</tt> file has been cleaned up and a new
+<tt>windows.bat</tt> file added for 64-bit targets. The contents of these files
+should be seen as examples, don't uncomment or install parts for software that
+you don't explicitly know that you need.</li>
+
+</ul>
+
+<h3>Recent Apple XCode Build Issues</h3>
+
+<p>The latest version of XCode will not compile calls to <tt>system()</tt> or
+<tt>clock_settime()</tt> for iOS targets. There were several places in Base
+where these were being compiled, although there were probably never called. The
+code has now been modified to permit iOS builds to complete again.</p>
+
+<h3>Prevent illegal alarm severities</h3>
+
+<p>A check has been added to <tt>recGblResetAlarms()</tt> that prevents records
+from getting an alarm severity higher than INVALID_ALARM. It is still possible
+for a field like HSV to get set to a value that is not a legal alarm severity,
+but the core IOC code should never copy such a value into a record's SEVR or
+ACKS fields. With this fix the record's alarm severity will be limited to
+INVALID_ALARM.</p>
+
+<h3>Fixes for Launchpad bugs</h3>
+
+<p>The following launchpad bugs have fixes included:</p>
+
+<ul>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1786320">
+    lp: #1786320</a>, dbCa subscribes twice to ENUM</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/541221">
+    lp: #541221</a>, 'assert (pca->pgetNative)' failed in ../dbCa.c</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1747091">
+    lp: #1747091</a>, epicsTimeGetEvent() / generalTime bug</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1743076">
+    lp: #1743076</a>, Segfault in ca_attach_context() during exits</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1751380">
+    lp: #1751380</a>, Deadlock in ca_clear_subscription()</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1597809">
+    lp: #1597809</a>, Setting NAME field in DB file may break IOC</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1770292">
+    lp: #1770292</a>, get_alarm_double() inconsistent across record types</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1771298">
+    lp: #1771298</a>, Conversion of NaN to integer relies on undefined
+    behavior</li>
+</ul>
+
+<h3>Updated VxWorks Timezone settings</h3>
+
+<p>Removed the settings for 2017; fixed the hour of the change for MET.</p>
+
+<h3>Fixed camonitor server side relative timestamps bug</h3>
+
+<p>Initialize the first time-stamp from the first monitor, not the client-side
+current time in this configuration.</p>
+
+<h3>Build changes for MSVC</h3>
+
+<p>Windows builds using Visual Studio 2015 and later now use the <tt>-FS</tt>
+compiler option to allow parallel builds to work properly.</p>
+
+<p>We now give the <tt>-FC</tt> option to tell the compiler to print absolute
+paths for source files in diagnostic messages.</p>
+
+<h3>Extend maximum Posix epicsEventWaitWithTimeout() delay</h3>
+
+<p>The Posix implementation of epicsEventWaitWithTimeout() was limiting the
+timeout delay to at most 60 minutes (3600.0 seconds). This has been changed to
+10 years; significantly longer maximum delays cause problems on systems where
+<tt>time_t</tt> is still a signed 32-bit integer so cannot represent absolute
+time-stamps after 2038-01-19. Our assumption is that such 32-bit systems will
+have been retired before the year 2028, but some additional tests have been
+added to the epicsTimeTest program to detect and fail if this assumption is
+violated.</p>
+
+<h3>New test-related make targets</h3>
+
+<p>This release adds several new make targets intended for use by developers
+and Continuous Integration systems which simplify the task of running the
+built-in self-test programs and viewing the results. Since these targets are
+intended for limited use they can have requirements for the build host which
+go beyond the standard minimum set needed to build and run Base.</p>
+
+<blockquote>
+
+<h4><tt>test-results</tt> &mdash; Summarize test results</h4>
+
+<p>The new make target <tt>test-results</tt> will run the self-tests if
+necessary to generate a TAP file for each test, then summarizes the TAP output
+files in each test directory in turn, displaying the details of any failures.
+This step uses the program <q>prove</q> which comes with Perl, but also needs
+<q>cat</q> to be provided in the default search path so will not work on most
+Windows systems.</p>
+
+<h4><tt>junitfiles</tt> &mdash; Convert test results to JUnit XML Format</h4>
+
+<p>The new make target <tt>junitfiles</tt> will run the self-tests if necessary
+and then convert the TAP output files into the more commonly-supported JUnit
+XML format. The program that performs this conversion needs the Perl module
+<q><tt>XML::Generator</tt></q> to have been installed.</p>
+
+<h4><tt>clean-tests</tt> &mdash; Delete test result files</h4>
+
+<p>The new make target <tt>clean-tests</tt> removes any test result files from
+previous test runs. It cleans both TAP and JUnit XML files.</p>
+
+</blockquote>
 
 <h3>Fix DNS related crash on exit</h3>
 

documentation/ReleaseChecklist.html

@@ -131,7 +131,7 @@ the final release version.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Tag the module in Git using these tag conventions:
+      <td>Tag the module in Git, using these tag conventions:
         <ul>
           <li>
             <tt>R3.16.1-pre<i>n</i></tt>
@@ -141,7 +141,7 @@ the final release version.</p>
             <tt>R3.16.1-rc<i>n</i></tt>
             &mdash; release candidate tag
             </li>
-        </ul>
+          </ul>
         <blockquote><tt>
           cd base-3.16<br />
           git tag -m 'ANJ: Tagged for 3.16.1-rc1' R3.16.1-rc1
@@ -157,8 +157,8 @@ the final release version.</p>
         <blockquote><tt>
           cd base-3.16<br />
           git archive
-            --prefix=base-3.16.1-rc1
-            --output=base-3.16.1-rc1.tar.gz
+            --prefix=base-3.16.1-rc1/
+            --output=../base-3.16.1-rc1.tar.gz
             R3.16.1-rc1
             configure documentation LICENSE Makefile README src startup
           </tt></blockquote>
@@ -289,8 +289,8 @@ the final release version.</p>
         <blockquote><tt>
           cd base-3.16<br />
           git archive
-            --prefix=base-3.16.1
-            --output=base-3.16.1.tar.gz
+            --prefix=base-3.16.1/
+            --output=../base-3.16.1.tar.gz
             R3.16.1
             configure documentation LICENSE Makefile README src startup
           </tt></blockquote>

src/Makefile

@@ -4,7 +4,7 @@
 # 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 the file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 TOP = ..
@@ -72,9 +72,11 @@ std_DEPEND_DIRS = ioc libCom/RTEMS
 DIRS += std/filters/test
 std/filters/test_DEPEND_DIRS = std
 
+DIRS += std/link/test
+std/link/test_DEPEND_DIRS = std
+
 DIRS += std/rec/test
 std/rec/test_DEPEND_DIRS = std
 
 
 include $(TOP)/configure/RULES_DIRS
-

src/ca/client/CAref.html

@@ -316,7 +316,7 @@ is used.</p>
     </tr>
     <tr>
       <td>EPICS_CA_AUTO_ARRAY_BYTES</td>
-      <td>i &gt;= YES</td>
+      <td>{YES, NO}</td>
       <td>YES</td>
     </tr>
     <tr>
@@ -756,6 +756,12 @@ in the variable EPICS_TS_MIN_WEST.</p>
 
 <h3><a name="Configurin1">Configuring the Maximum Array Size</a></h3>
 
+<p>From version R3.16.1, the default setting of EPICS_CA_AUTO_ARRAY_BYTES=YES
+will cause the software to ignore EPICS_CA_MAX_ARRAY_BYTES and attempt to
+allocate network buffer space as needed by the particular client connection
+using malloc. Setting EPICS_CA_AUTO_ARRAY_BYTES=NO will configure the software
+to respect the EPICS_CA_MAX_ARRAY_BYTES setting as described below instead.</p>
+
 <p>Starting with version R3.14 the environment variable
 EPICS_CA_MAX_ARRAY_BYTES determines the size of the largest array that may pass
 through CA. Prior to this version only arrays smaller than 16k bytes could be
@@ -764,11 +770,6 @@ buffers that are used for ordinary communication. If EPICS_CA_MAX_ARRAY_BYTES
 is larger than 16384 then a second free list of larger data buffers is
 established and used only after a client send its first large array request.</p>
 
-<p>Beginning with R3.16.1, EPICS_CA_AUTO_ARRAY_BYTES=YES (the default) will ignore
-EPICS_CA_MAX_ARRAY_BYTES and attempt to allocate sufficient buffer space
-as needed.  Setting EPICS_CA_AUTO_ARRAY_BYTES=NO will continue to respect
-EPICS_CA_MAX_ARRAY_BYTES.</p>
-
 <p>The CA client library uses EPICS_CA_MAX_ARRAY_BYTES to determines the
 maximum array that it will send or receive. Likewise, the CA server uses
 EPICS_CA_MAX_ARRAY_BYTES to determine the maximum array that it may send or
@@ -783,11 +784,7 @@ array larger than EPICS_CA_MAX_ARRAY_BYTES it will return ECA_TOLARGE.</p>
 by multiplying the number of elements by the size of a single element, but
 neglect to add additional bytes for the compound data types (for example
 DBR_GR_DOUBLE) commonly used by the more sophisticated client side
-applications. <em>Based on this confusion, one could arrive at the conclusion
-that EPICS_CA_MAX_ARRAY_BYTES might have been better named
-EPICS_CA_MAX_DATUM_BYTES, or that the software should be changed internally to
-round the users request up by the size of the maximum scalar datum (nothing has
-been done to address this issue so far).</em></p>
+applications.</p>
 
 <h3><a name="Configurin2">Configuring a CA Server</a></h3>
 
@@ -1024,7 +1021,7 @@ d:/user/epics/base-3.15/lib/win32-x86/Com.lib</code></p>
 <h2><a name="CommandUtils">Command Line Utilities</a></h2>
 
 <h3><a name="acctst">acctst</a></h3>
-<pre>acctst &lt;PV name&gt; [progress logging level] [channel duplication count] 
+<pre>acctst &lt;PV name&gt; [progress logging level] [channel duplication count]
                  [test repetition count] [enable preemptive callback]</pre>
 
 <h4>Description</h4>
@@ -2094,7 +2091,7 @@ example, be beneficial when tuning an archiver installation.</p>
 <p>Significant performance gains can be realized when the CA client library
 doesn't wait for a response to return from the server after each request. All
 requests which require interaction with a CA server are accumulated (buffered)
-and not forwarded to the IOC until one of <code>ca_flush_io()</code>, 
+and not forwarded to the IOC until one of <code>ca_flush_io()</code>,
 <code>ca_pend_io()</code>, <code>ca_pend_event()</code>, or
 <code>ca_sg_block()</code> are called allowing several operations to be
 efficiently sent over the network together. Any process variable values written
@@ -2118,16 +2115,16 @@ shouldn't test the success of a CA function call by checking to see if the
 returned value is zero as is the UNIX convention. Below are several methods to
 test CA function returns. See <a href="#ca_signal"><code>ca_signal()</code> and
 <code>SEVCHK()</code></a> for more information on this topic.</p>
-<pre>status = ca_XXXX(); 
-SEVCHK( status, "ca_XXXX() returned failure status"); 
+<pre>status = ca_XXXX();
+SEVCHK( status, "ca_XXXX() returned failure status");
 
-if ( status &amp; CA_M_SUCCESS ) { 
-        printf ( "The requested ca_XXXX() operation didn't complete successfully"); 
-} 
+if ( status &amp; CA_M_SUCCESS ) {
+        printf ( "The requested ca_XXXX() operation didn't complete successfully");
+}
 
-if ( status != ECA_NORMAL ) { 
+if ( status != ECA_NORMAL ) {
         printf("The requested ca_XXXX() operation didn't complete successfully because \"%s\"\n",
-                ca_message ( status ) ); 
+                ca_message ( status ) );
 }</pre>
 
 <h3><a name="Channel">Channel Access Data Types</a></h3>
@@ -2300,7 +2297,7 @@ int main ( int argc, char ** argv )
     unsigned nBytes;
     unsigned elementCount;
     char timeString[32];
-    unsigned i;    
+    unsigned i;
     chid chan;
     double sum;
     int status;
@@ -2343,7 +2340,7 @@ int main ( int argc, char ** argv )
     epicsTimeToStrftime ( timeString, sizeof ( timeString ),
         "%a %b %d %Y %H:%M:%S.%f", &amp; pTD-&gt;stamp );
 
-    printf ( "The sum of elements in %s at %s was %f\n", 
+    printf ( "The sum of elements in %s at %s was %f\n",
         argv[1], timeString, sum );
 
     ca_clear_channel ( chan );
@@ -2374,7 +2371,7 @@ executing within the user's callback function.</p>
 <pre>typedef struct event_handler_args {
     void            *usr;   /* user argument supplied with request */
     chanId          chid;   /* channel id */
-    long            type;   /* the type of the item returned */ 
+    long            type;   /* the type of the item returned */
     long            count;  /* the element count of the item returned */
     const void      *dbr;   /* a pointer to the item returned */
     int             status; /* ECA_XXX status of the requested op from the server */
@@ -2397,7 +2394,7 @@ attached to the request, an exception handler is executed in the client. The
 default exception handler prints a message on the console and exits if the
 exception condition is severe. Certain internal exceptions within the CA client
 library, and failures detected by the SEVCHK macro may also cause the exception
-handler to be invoked. To modify this behavior see 
+handler to be invoked. To modify this behavior see
 <code><a href="#ca_add_exception_event">ca_add_exception_event</a>()</code>.</p>
 
 <h3><a name="Server">Server and Client Share the Same Address Space on The Same
@@ -2689,6 +2686,14 @@ automatically released by the system when the process exits and
 vxWorks or RTEMS no cleanup occurs unless the application calls
 <code>ca_context_destroy()</code>.</p>
 
+<p>Note: This operation blocks until any user callbacks for any channel
+created in the current context have run to completion. If callbacks take a
+lock (mutex) then it is the user's responsibility to ensure that this lock
+is not held when <code>ca_clear_context()</code> is called, otherwise a
+deadlock may ensue. (See also
+<code><a href="#ca_clear_channel">ca_clear_channel</a>()</code> and
+<code><a href="#ca_clear_event">ca_clear_subscription</a>()</code>.)</p>
+
 <h4>Returns</h4>
 
 <p>ECA_NORMAL - Normal successful completion</p>
@@ -2761,7 +2766,7 @@ time.</p>
 </dl>
 <dl>
   <dt><code>USERFUNC</code></dt>
-    <dd>Optional address of the user's callback function to be run when the
+    <dd>Optional pointer to the user's callback function to be run when the
       connection state changes. Casual users of channel access may decide to
       set this field to null or 0 if they do not need to have a callback
       function run in response to each connection state change event.
@@ -2834,6 +2839,12 @@ efficiently sent over the network in one message.</p>
 clearing a channel does shutdown and reclaim any channel state change event
 subscriptions (monitors) registered with the channel.</p>
 
+<p>Note: This operation blocks until any user callbacks for this channel
+have run to completion. If callbacks take a lock (mutex) then it is the
+user's responsibility to ensure that this lock is not held when
+<code>ca_clear_channel()</code> is called, otherwise a deadlock may ensue.
+(See also <code><a href="#ca_clear_event">ca_clear_subscription</a>()</code>.)</p>
+
 <h4>Arguments</h4>
 <dl>
   <dt><code>CHID</code></dt>
@@ -2848,16 +2859,16 @@ subscriptions (monitors) registered with the channel.</p>
 
 <h3><code><a name="ca_put">ca_put()</a></code></h3>
 <pre>#include &lt;cadef.h&gt;
-int ca_put ( chtype TYPE, 
-        chid CHID, void *PVALUE ); 
-int ca_array_put ( chtype TYPE, unsigned long COUNT, 
+int ca_put ( chtype TYPE,
+        chid CHID, void *PVALUE );
+int ca_array_put ( chtype TYPE, unsigned long COUNT,
         chid CHID, const void *PVALUE);
 typedef void ( caEventCallBackFunc ) (struct event_handler_args);
-int ca_put_callback ( chtype TYPE, 
-        chid CHID, const void *PVALUE, 
-        caEventCallBackFunc PFUNC, void *USERARG ); 
-int ca_array_put_callback ( chtype TYPE, unsigned long COUNT, 
-        chid CHID, const void *PVALUE, 
+int ca_put_callback ( chtype TYPE,
+        chid CHID, const void *PVALUE,
+        caEventCallBackFunc PFUNC, void *USERARG );
+int ca_array_put_callback ( chtype TYPE, unsigned long COUNT,
+        chid CHID, const void *PVALUE,
         caEventCallBackFunc PFUNC, void *USERARG );</pre>
 
 <h4>Description</h4>
@@ -2936,7 +2947,7 @@ but they do not cause the record to be processed.</p>
 </dl>
 <dl>
   <dt><code>PFUNC</code></dt>
-    <dd>address of <a href="#User">user supplied callback function</a> to be
+    <dd>Pointer to a <a href="#User">user supplied callback function</a> to be
       run when the requested operation completes</dd>
 </dl>
 <dl>
@@ -3044,7 +3055,7 @@ when a CA get request is initiated.</p>
 </dl>
 <dl>
   <dt><code>USERFUNC</code></dt>
-    <dd>Address of <a href="#User">user supplied callback function</a> to be
+    <dd>Pointer to a <a href="#User">user supplied callback function</a> to be
       run when the requested operation completes.</dd>
 </dl>
 <dl>
@@ -3084,7 +3095,7 @@ when a CA get request is initiated.</p>
 typedef void ( caEventCallBackFunc ) (struct event_handler_args);
 int ca_create_subscription ( chtype TYPE, unsigned long COUNT,
         chid CHID, unsigned long MASK,
-        caEventCallBackFunc USERFUNC, void *USERARG, 
+        caEventCallBackFunc USERFUNC, void *USERARG,
         evid *PEVID );</pre>
 
 <h4>Description</h4>
@@ -3145,8 +3156,8 @@ indicating the current state of the channel.</p>
     <dd>channel identifier</dd>
 </dl>
 <dl>
-  <dt><code>USRERFUNC</code></dt>
-    <dd>The address of <a href="#User">user supplied callback function</a> to
+  <dt><code>USERFUNC</code></dt>
+    <dd>Pointer to a <a href="#User">user supplied callback function</a> to
       be invoked with each subscription update.</dd>
 </dl>
 <dl>
@@ -3168,7 +3179,7 @@ indicating the current state of the channel.</p>
   <dt><code>MASK</code></dt>
     <dd>A mask with bits set for each of the event trigger types requested. The
       event trigger mask must be a <em>bitwise or</em> of one or more of the
-      following constants. 
+      following constants.
       <ul>
         <li>DBE_VALUE - Trigger events when the channel value exceeds the
           monitor dead band</li>
@@ -3215,6 +3226,13 @@ and not forwarded to the server until one of <code>ca_flush_io()</code>, <code>c
 <code>ca_pend_event()</code>, or <code>ca_sg_block()</code> are called. This allows several requests to be
 efficiently sent together in one message.</p>
 
+<p>Note: This operation blocks until any user callbacks for this channel
+have run to completion. If callbacks take a lock (mutex) then it is the
+user's responsibility to ensure that this lock is not held when
+<code>ca_clear_subscription()</code> is called, otherwise a deadlock may
+ensue. (See also <code><a
+href="#ca_clear_channel">ca_clear_channel</a>()</code>.)</p>
+
 <h4>Arguments</h4>
 <dl>
   <dt>EVID</dt>
@@ -3379,7 +3397,7 @@ becomes full.</p>
 
 <h3><code><a name="ca_signal">ca_signal()</a></code></h3>
 <pre>#include &lt;cadef.h&gt;
-int ca_signal ( long CA_STATUS, const char * CONTEXT_STRING ); 
+int ca_signal ( long CA_STATUS, const char * CONTEXT_STRING );
 void SEVCHK( CA_STATUS, CONTEXT_STRING );</pre>
 
 <h4>Description</h4>
@@ -3396,7 +3414,7 @@ recommended error handler for simple applications which do not wish to write
 code testing the status returned from each channel access call.</p>
 
 <h4>Examples</h4>
-<pre>status = ca_context_create (...); 
+<pre>status = ca_context_create (...);
 SEVCHK ( status, "Unable to create a CA client context" );</pre>
 
 <p>If the application only wishes to print the message associated with an error
@@ -3420,7 +3438,7 @@ this purpose.</p>
 
 <h3><code><a
 name="ca_add_exception_event">ca_add_exception_event()</a></code></h3>
-<pre>#include &lt;cadef.h&gt; 
+<pre>#include &lt;cadef.h&gt;
 typedef void (*pCallback) ( struct exception_handler_args HANDLERARGS );
 int ca_add_exception_event ( pCallback  USERFUNC, void *USERARG );</pre>
 
@@ -3444,7 +3462,7 @@ field should not be used.</p>
 <h4>Arguments</h4>
 <dl>
   <dt><code>USERFUNC</code></dt>
-    <dd>Address of user callback function to be executed when an exceptions
+    <dd>Pointer to a user callback function to be executed when exceptions
       occur. Passing a null value causes the default exception handler to be
       reinstalled. The following structure is passed by value to the user's
       callback function. Currently, the <code>op</code> field can be one of
@@ -3579,7 +3597,7 @@ default handler uses fprintf to send messages to 'stderr'.</p>
 <h4>Arguments</h4>
 <dl>
   <dt><code>PFUNC</code></dt>
-    <dd>The address of a user supplied callback handler to be invoked when CA
+    <dd>A pointer to a user supplied callback handler to be invoked when CA
       prints diagnostic messages. Installing a null pointer will cause the
       default callback handler to be reinstalled.</dd>
 </dl>
@@ -3627,9 +3645,9 @@ specified channel.</p>
 </dl>
 <dl>
   <dt><code>PFUNC</code></dt>
-    <dd>Address of user supplied callback function. A null pointer uninstalls
+    <dd>Pointer to a user supplied callback function. A null pointer uninstalls
       the current handler. The following arguments are passed <em>by value</em>
-      to the supplied callback handler. 
+      to the supplied callback handler.
       <pre>typedef struct ca_access_rights {
     unsigned    read_access:1;
     unsigned    write_access:1;
@@ -3969,8 +3987,8 @@ type.</p>
 prints diagnostics to standard out.</p>
 
 <h4>Examples</h4>
-<pre>void ca_test_event (); 
-status = ca_create_subscription ( type, chid, ca_test_event, NULL, NULL ); 
+<pre>void ca_test_event ();
+status = ca_create_subscription ( type, chid, ca_test_event, NULL, NULL );
 SEVCHK ( status, .... );</pre>
 
 <h4>See Also</h4>
@@ -4004,8 +4022,8 @@ outstanding within them at any given time.</p>
 </dl>
 
 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
-status = ca_sg_create ( &amp;gid ); 
+<pre>CA_SYNC_GID gid;
+status = ca_sg_create ( &amp;gid );
 SEVCHK ( status, Sync group create failed );</pre>
 
 <h4>Returns</h4>
@@ -4043,8 +4061,8 @@ int ca_sg_delete ( CA_SYNC_GID GID );</pre>
 </dl>
 
 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
-status = ca_sg_delete ( gid ); 
+<pre>CA_SYNC_GID gid;
+status = ca_sg_delete ( gid );
 SEVCHK ( status, Sync group delete failed );</pre>
 
 <h4>Returns</h4>
@@ -4155,7 +4173,7 @@ will not block unless additional subsequent requests are made.</p>
 </dl>
 
 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
+<pre>CA_SYNC_GID gid;
 status = ca_sg_reset(gid);</pre>
 
 <h4>Returns</h4>
@@ -4168,7 +4186,7 @@ status = ca_sg_reset(gid);</pre>
 <pre>#include &lt;cadef.h&gt;
 int ca_sg_put ( CA_SYNC_GID GID, chtype TYPE,
         chid CHID, void *PVALUE );
-int ca_sg_array_put ( CA_SYNC_GID GID, chtype TYPE, 
+int ca_sg_array_put ( CA_SYNC_GID GID, chtype TYPE,
         unsigned long COUNT, chid CHID, void *PVALUE );</pre>
 
 <p>Write a value, or array of values, to a channel and increment the outstanding
@@ -4309,7 +4327,7 @@ reissued.</p>
 
 <h3><code><a name="ca_client_status">ca_client_status()</a></code></h3>
 <pre>int ca_client_status ( unsigned level );
-int ca_context_status ( struct ca_client_context *CONTEXT, 
+int ca_context_status ( struct ca_client_context *CONTEXT,
        unsigned LEVEL );</pre>
 
 <h4>Description</h4>

src/ca/client/access.cpp

@@ -127,21 +127,10 @@ const char * ca_message_text []
 
 static epicsThreadOnceId caClientContextIdOnce = EPICS_THREAD_ONCE_INIT;
 
-extern "C" void ca_client_exit_handler (void *)
-{
-    if ( caClientContextId ) {
-        epicsThreadPrivateDelete ( caClientContextId );
-        caClientContextId = 0;
-    }
-}
-
 // runs once only for each process
 extern "C" void ca_init_client_context ( void * )
 {
     caClientContextId = epicsThreadPrivateCreate ();
-    if ( caClientContextId ) {
-        epicsAtExit ( ca_client_exit_handler,0 );
-    }
 }
 
 /*

src/ca/client/oldChannelNotify.cpp

@@ -390,7 +390,7 @@ int epicsShareAPI ca_array_get_callback ( chtype type,
     {
         caStatus = ECA_ALLOCMEM;
     }
-    catch ( cacChannel::msgBodyCacheTooSmall ) {
+    catch ( cacChannel::msgBodyCacheTooSmall & ) {
         caStatus = ECA_TOLARGE;
     }
     catch ( ... )

src/ca/client/perl/CA.pm

@@ -652,7 +652,7 @@ not follow this pattern, but are still printable strings.
 
 =item [1] R3.15 Channel Access Reference Manual by Jeffrey O. Hill
 
-L<http://www.aps.anl.gov/epics/base/R3-15/2-docs/CAref.html>
+L<https://epics.anl.gov/base/R3-15/5-docs/CAref.html>
 
 =back
 

src/ca/client/perl/Makefile

@@ -58,7 +58,7 @@ Cap5_LIBS = ca Com
 Cap5_INCLUDES = -I$(shell $(PERL) ../perlConfig.pl archlib)/CORE
 Cap5_CFLAGS = $(shell $(PERL) ../perlConfig.pl ccflags)
 
-CLEANS += Cap5.c pod2htmd.tmp pod2htmi.tmp
+CLEANS += Cap5.c
 
 include $(TOP)/configure/RULES
 

src/ca/client/perl/caget.pl

@@ -140,6 +140,10 @@ sub display {
             printf "    Lo ctrl limit:    %g\n", $data->{lower_ctrl_limit};
             printf "    Hi ctrl limit:    %g\n", $data->{upper_ctrl_limit};
         }
+        if (exists $data->{ackt}) {
+            printf "    Ack transients:   %s\n", $data->{ackt} ? 'YES' : 'NO';
+            printf "    Ack severity:     %s\n", $data->{acks};
+        }
     } else {
         my $value = format_number($data, $type);
         if ($opt_t) {

src/ca/client/tools/caget.c

@@ -34,6 +34,7 @@
 #include <alarm.h>
 #include <cadef.h>
 #include <epicsGetopt.h>
+#include "epicsVersion.h"
 
 #include "tool_lib.h"
 
@@ -55,6 +56,7 @@ 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"
@@ -389,11 +391,14 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
-    while ((opt = getopt(argc, argv, ":taicnhsSe:f:g:l:#:d:0:w:p:F:")) != -1) {
+    while ((opt = getopt(argc, argv, ":taicnhsSVe: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;

src/ca/client/tools/cainfo.c

@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 #include <epicsStdlib.h>
+#include "epicsVersion.h"
 
 #include <cadef.h>
 #include <epicsGetopt.h>
@@ -36,12 +37,14 @@ 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() );
 }
 
 
@@ -137,11 +140,14 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
-    while ((opt = getopt(argc, argv, ":nhw:s:p:")) != -1) {
+    while ((opt = getopt(argc, argv, ":nhVw: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)
             {

src/ca/client/tools/camonitor.c

@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <epicsStdlib.h>
 #include <string.h>
+#include "epicsVersion.h"
 
 #include <cadef.h>
 #include <epicsGetopt.h>
@@ -44,7 +45,8 @@ void usage (void)
 {
     fprintf (stderr, "\nUsage: camonitor [options] <PV name> ...\n"
     "\n"
-    "  -h:       Help; Print this message\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"
     "  -m <msk>: Specify CA event mask to use.  <msk> is any combination of\n"
@@ -209,11 +211,14 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
-    while ((opt = getopt(argc, argv, ":nhm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) {
+    while ((opt = getopt(argc, argv, ":nhVm: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;

src/ca/client/tools/caput.c

@@ -8,7 +8,7 @@
 * Copyright (c) 2002 Berliner Elektronenspeicherringgesellschaft fuer
 *     Synchrotronstrahlung.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*
@@ -37,6 +37,7 @@
 #include <epicsGetopt.h>
 #include <epicsEvent.h>
 #include <epicsString.h>
+#include "epicsVersion.h"
 
 #include "tool_lib.h"
 
@@ -59,6 +60,7 @@ 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"
@@ -281,11 +283,14 @@ 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, ":cnlhatsS#:w:p:F:")) != -1) {
+    while ((opt = getopt(argc, argv, ":cnlhatsVS#: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;
@@ -419,7 +424,7 @@ int main (int argc, char *argv[])
         if (argc > optind+1) {
             for (i = optind + 1; i < argc; i++) {
                 strcat(cbuf, " ");
-                strcat(cbuf, argv[i]); 
+                strcat(cbuf, argv[i]);
             }
         }
 
@@ -530,6 +535,11 @@ int main (int argc, char *argv[])
         /* Use standard put with defined timeout */
         result = ca_array_put (dbrType, count, pvs[0].chid, pbuf);
     }
+    if (result != ECA_NORMAL) {
+        fprintf(stderr, "Error from put operation: %s\n", ca_message(result));
+        return 1;
+    }
+
     result = ca_pend_io(caTimeout);
     if (result == ECA_TIMEOUT) {
         fprintf(stderr, "Write operation timed out: Data was not written.\n");
@@ -545,7 +555,7 @@ int main (int argc, char *argv[])
     }
 
     if (result != ECA_NORMAL) {
-        fprintf(stderr, "Error occured writing data.\n");
+        fprintf(stderr, "Error occured writing data: %s\n", ca_message(result));
         return 1;
     }
 

src/ca/client/tools/tool_lib.c

@@ -79,14 +79,14 @@ static void sprint_long (char *ret, dbr_long_t val, IntFormatT outType)
     }
     else {
         const char *fmt[4] = { /* Order must match the enum IntFormatT */
-            "%ld"   /* dec */,
-            "0"     /* bin, val is 0 */,
-            "0o%lo" /* oct */,
-            "0x%lX" /* hex */
+            "%d"   /* dec */,
+            "0"    /* bin and val is 0 */,
+            "0o%o" /* oct */,
+            "0x%X" /* hex */
         };
 
-        /* Formats have long modifier, pass value as a long */
-        sprintf(ret, fmt[outType], (long) val);
+        /* dbr_long_t is actually an int on all supported platforms */
+        sprintf(ret, fmt[outType], (int) val);
     }
 }
 
@@ -414,6 +414,12 @@ char *dbr2str (const void *value, unsigned type)
     ptsNewS = &((struct TYPE *)value)->stamp;                           \
     ptsNewC = &tsNow;                                                   \
                                                                         \
+    if (!tsInitS)                                                       \
+    {                                                                   \
+        tsFirst = *ptsNewS;                                             \
+        tsInitS = 1;                                                    \
+    }                                                                   \
+                                                                        \
     switch (tsType) {                                                   \
     case relative:                                                      \
         ptsRefC = &tsStart;                                             \
@@ -506,12 +512,6 @@ void print_time_val_sts (pv* pv, unsigned long reqElems)
     epicsTimeGetCurrent(&tsNow);
     epicsTimeToStrftime(timeText, TIMETEXTLEN, timeFormatStr, &tsNow);
 
-    if (!tsInitS)
-    {
-        tsFirst = tsNow;
-        tsInitS = 1;
-    }
-
     if (pv->nElems <= 1 && fieldSeparator == ' ') printf("%-30s", pv->name);
     else                                            printf("%s", pv->name);
     printf("%c", fieldSeparator);

src/ca/client/udpiiu.cpp

@@ -180,7 +180,7 @@ udpiiu::udpiiu (
 
 #ifdef IP_ADD_MEMBERSHIP
     {
-        int flag = 1;
+        osiSockOptMcastLoop_t flag = 1;
         if ( setsockopt ( this->sock, IPPROTO_IP, IP_MULTICAST_LOOP,
                           (char *) &flag, sizeof ( flag ) ) == -1 ) {
             char sockErrBuf[64];
@@ -193,7 +193,7 @@ udpiiu::udpiiu (
 
 #ifdef IP_MULTICAST_TTL
     {
-        int ttl;
+        osiSockOptMcastTTL_t ttl;
         long val;
         if(envGetLongConfigParam(&EPICS_CA_MCAST_TTL, &val))
             val =1;

src/ca/legacy/gdd/Makefile

@@ -68,6 +68,7 @@ CLEANS += $(COMMON_DIR)/aitConvertGenerated.cc
 
 USR_CXXFLAGS_Linux = -fno-strict-aliasing
 USR_CXXFLAGS_RTEMS = -fno-strict-aliasing
+USR_CXXFLAGS_vxWorks = -fno-strict-aliasing
 
 ifeq ($(T_A),$(EPICS_HOST_ARCH))
   # genApps and aitGen are needed to finish libgdd

src/ca/legacy/pcas/build/Makefile

@@ -72,11 +72,14 @@ LIBSRCS += casDGIntfIO.cc
 LIBSRCS += casStreamIO.cc
 LIBSRCS += ipIgnoreEntry.cc
 
+USR_CXXFLAGS_Linux = -fno-strict-aliasing
+USR_CXXFLAGS_RTEMS = -fno-strict-aliasing
+USR_CXXFLAGS_vxWorks = -fno-strict-aliasing
+
 # There is a bug in some vxWorks compilers that these work around:
-ifeq ($(VX_GNU_VERSION), 4.1.2)
-  casStreamOS_CXXFLAGS_vxWorks-ppc604_altivec = -O0
-  casStreamOS_CXXFLAGS_vxWorks-ppc604_long = -O0
-  casStreamOS_CXXFLAGS_vxWorks-ppc604 = -O0
+ifeq ($(VXWORKS_VERSION)$(filter -mcpu=604,$(ARCH_DEP_CFLAGS)), 6.6-mcpu=604)
+  casDGIntfOS_CXXFLAGS = -fno-inline
+  casStreamOS_CXXFLAGS = -fno-inline
 endif
 
 LIBRARY = cas

src/ca/legacy/pcas/generic/casDGClient.cc

@@ -665,6 +665,11 @@ caStatus casDGClient::processDG ()
         if ( status != S_cas_success ) {
             break;
         }
+
+        if ( this->in.bytesPresent () > 0 && dgInBytesConsumed == 0 && status == S_cas_success ) {
+            this->in.removeMsg ( this->in.bytesPresent() );
+        }
+
     }
     return status;
 }

src/ca/legacy/pcas/generic/casPVI.cc

@@ -4,7 +4,7 @@
 * 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. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *      Author  Jeffrey O. Hill
@@ -26,33 +26,39 @@
 #include "casAsyncIOI.h"
 #include "casMonitor.h"
 
-casPVI::casPVI ( casPV & intf ) : 
-	pCAS ( NULL ), pPV ( & intf ), nMonAttached ( 0u ), 
+
+// Use casErrMessage instead of errMessage to show PV name
+#define casErrMessage(S, PM) \
+         errPrintf(S, __FILE__, __LINE__, ", %s, %s", getName(), PM)
+
+casPVI::casPVI ( casPV & intf ) :
+	pCAS ( NULL ), pPV ( & intf ), nMonAttached ( 0u ),
         nIOAttached ( 0u ), deletePending ( false ) {}
 
 casPVI::~casPVI ()
 {
-	//
-	// all channels should have been destroyed 
-    // (otherwise the server tool is yanking the 
+    //
+    // all channels should have been destroyed
+    // (otherwise the server tool is yanking the
     // PV out from under the server)
-	//
-	casVerify ( this->chanList.count() == 0u );
+    //
+    casVerify ( this->chanList.count() == 0u );
 
-	//
-	// all outstanding IO should have been deleted
-	// when we destroyed the channels
-	//
-	casVerify ( this->nIOAttached == 0u );
+    //
+    // all outstanding IO should have been deleted
+    // when we destroyed the channels
+    //
+    casVerify ( this->nIOAttached == 0u );
     if ( this->nIOAttached ) {
-        errlogPrintf ( "The number of IO objected attached is %u\n", this->nIOAttached );
+        errlogPrintf ( "%u IO objects still attached in destructor\n",
+            this->nIOAttached );
     }
 
-	//
-	// all monitors should have been deleted
-	// when we destroyed the channels
-	//
-	casVerify ( this->nMonAttached == 0u );
+    //
+    // all monitors should have been deleted
+    // when we destroyed the channels
+    //
+    casVerify ( this->nMonAttached == 0u );
 
     {
         epicsGuard < epicsMutex > guard ( this->mutex );
@@ -139,26 +145,26 @@ caStatus casPVI::attachToServer ( caServerI & cas )
 caStatus casPVI::updateEnumStringTable ( casCtx & ctxIn )
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
-    
+
     //
     // create a gdd with the "enum string table" application type
     //
     //	gddArray(int app, aitEnum prim, int dimen, ...);
     gdd * pTmp = new gddScalar ( gddAppType_enums );
     if ( pTmp == NULL ) {
-        errMessage ( S_cas_noMemory, 
+        casErrMessage ( S_cas_noMemory,
             "unable to create gdd for read of application type \"enums\" string"
             " conversion table for enumerated PV" );
         return S_cas_noMemory;
     }
 
-    caStatus status = convertContainerMemberToAtomic ( *pTmp, 
+    caStatus status = convertContainerMemberToAtomic ( *pTmp,
          gddAppType_enums, MAX_ENUM_STATES );
     if ( status != S_cas_success ) {
         pTmp->unreference ();
-        errMessage ( status, 
-            "unable to to config gdd for read of application type \"enums\" string"
-            " conversion table for enumerated PV");
+        casErrMessage ( status,
+            "unable to config gdd for read of application type \"enums\" string"
+            " conversion table for enumerated PV" );
         return status;
     }
 
@@ -169,12 +175,11 @@ caStatus casPVI::updateEnumStringTable ( casCtx & ctxIn )
     if ( status == S_cas_success ) {
         updateEnumStringTableAsyncCompletion ( *pTmp );
 	}
-    else if ( status != S_casApp_asyncCompletion && 
+    else if ( status != S_casApp_asyncCompletion &&
                 status != S_casApp_postponeAsyncIO ) {
-        errPrintf ( status, __FILE__, __LINE__,
-            "- unable to read application type \"enums\" "
-            " (string conversion table) from enumerated native type PV \"%s\"", 
-            this->getName() );
+        casErrMessage ( status,
+            "unable to read application type \"enums\" "
+            " (string conversion table) from enumerated native type PV" );
     }
 
     pTmp->unreference ();
@@ -185,40 +190,39 @@ caStatus casPVI::updateEnumStringTable ( casCtx & ctxIn )
 void casPVI::updateEnumStringTableAsyncCompletion ( const gdd & resp )
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
-    
+
     if ( resp.isContainer() ) {
-        errMessage ( S_cas_badType, 
-            "application type \"enums\" string conversion table for"
-            " enumerated PV was a container (expected vector of strings)" );
+        casErrMessage ( S_cas_badType,
+            "Invalid \"enums\" string conversion table for"
+            " enumerated PV (container instead of vector of strings)" );
         return;
     }
-    
+
     if  ( resp.dimension() == 0 ) {
         if ( resp.primitiveType() == aitEnumString ) {
             aitString *pStr = (aitString *) resp.dataVoid ();
             if ( ! this->enumStrTbl.setString ( 0, pStr->string() ) ) {
-                errMessage ( S_cas_noMemory, 
+                casErrMessage ( S_cas_noMemory,
                     "no memory to set enumerated PV string cache" );
             }
         }
         else if ( resp.primitiveType() == aitEnumFixedString ) {
             aitFixedString *pStr = (aitFixedString *) resp.dataVoid ();
             if ( ! this->enumStrTbl.setString ( 0, pStr->fixed_string ) ) {
-                errMessage ( S_cas_noMemory, 
+                casErrMessage ( S_cas_noMemory,
                     "no memory to set enumerated PV string cache" );
             }
         }
         else {
-            errPrintf ( S_cas_badType, __FILE__, __LINE__,
+            casErrMessage ( S_cas_badType,
                 "application type \"enums\" string conversion"
-                " table for enumerated PV \"%s\" isnt a string type?",
-                getName() );
+                " table for enumerated PV isnt a string type?" );
         }
     }
     else if ( resp.dimension() == 1 ) {
         gddStatus gdd_status;
         aitIndex index, first, count;
-        
+
         gdd_status = resp.getBound ( 0, first, count );
         assert ( gdd_status == 0 );
 
@@ -232,7 +236,7 @@ void casPVI::updateEnumStringTableAsyncCompletion ( const gdd & resp )
             aitString *pStr = (aitString *) resp.dataVoid ();
             for ( index = 0; index<count; index++ ) {
                 if ( ! this->enumStrTbl.setString ( index, pStr[index].string() ) ) {
-                    errMessage ( S_cas_noMemory, 
+                    casErrMessage ( S_cas_noMemory,
                         "no memory to set enumerated PV string cache" );
                 }
             }
@@ -241,19 +245,18 @@ void casPVI::updateEnumStringTableAsyncCompletion ( const gdd & resp )
             aitFixedString *pStr = (aitFixedString *) resp.dataVoid ();
             for ( index = 0; index < count; index++ ) {
                 if ( ! this->enumStrTbl.setString ( index, pStr[index].fixed_string ) ) {
-                    errMessage ( S_cas_noMemory, 
+                    casErrMessage ( S_cas_noMemory,
                         "no memory to set enumerated PV string cache" );
                 }
             }
         }
         else {
-            errMessage ( S_cas_badType, 
-                "application type \"enums\" string conversion"
-                " table for enumerated PV isnt a string type?" );
+            casErrMessage( S_cas_badType,
+                "bad \"enums\" string conversion table for enumerated PV" );
         }
     }
     else {
-        errMessage ( S_cas_badType, 
+        casErrMessage ( S_cas_badType,
             "application type \"enums\" string conversion table"
             " for enumerated PV was multi-dimensional"
             " (expected vector of strings)" );
@@ -287,7 +290,7 @@ void casPVI::postEvent ( const casEventMask & select, const gdd & event )
 	}
 }
 
-caStatus casPVI::installMonitor ( 
+caStatus casPVI::installMonitor (
     casMonitor & mon, tsDLList < casMonitor > & monitorList )
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
@@ -303,14 +306,14 @@ caStatus casPVI::installMonitor (
     }
 }
 
-casMonitor * casPVI::removeMonitor ( 
+casMonitor * casPVI::removeMonitor (
     tsDLList < casMonitor > & list, ca_uint32_t clientIdIn )
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
     casMonitor * pMon = 0;
 	//
 	// (it is reasonable to do a linear search here because
-	// sane clients will require only one or two monitors 
+	// sane clients will require only one or two monitors
 	// per channel)
 	//
 	tsDLIter < casMonitor > iter = list.firstIter ();
@@ -359,9 +362,9 @@ void casPVI::installChannel ( chanIntfForPV & chan )
     epicsGuard < epicsMutex > guard ( this->mutex );
 	this->chanList.add ( chan );
 }
- 
-void casPVI::removeChannel ( 
-    chanIntfForPV & chan, tsDLList < casMonitor > & src, 
+
+void casPVI::removeChannel (
+    chanIntfForPV & chan, tsDLList < casMonitor > & src,
     tsDLList < casMonitor > & dest )
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
@@ -380,8 +383,8 @@ void casPVI::clearOutstandingReads ( tsDLList < casAsyncIOI > & ioList )
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
 
-    // cancel any pending asynchronous IO 
-	tsDLIter < casAsyncIOI > iterIO = 
+    // cancel any pending asynchronous IO
+	tsDLIter < casAsyncIOI > iterIO =
         ioList.firstIter ();
 	while ( iterIO.valid () ) {
 		tsDLIter < casAsyncIOI > tmp = iterIO;
@@ -407,7 +410,7 @@ void casPVI::destroyAllIO ( tsDLList < casAsyncIOI > & ioList )
 	}
 }
 
-void casPVI::installIO ( 
+void casPVI::installIO (
     tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
@@ -416,7 +419,7 @@ void casPVI::installIO (
     this->nIOAttached++;
 }
 
-void casPVI::uninstallIO ( 
+void casPVI::uninstallIO (
     tsDLList < casAsyncIOI > & ioList, casAsyncIOI & io )
 {
     {
@@ -517,8 +520,8 @@ aitEnum casPVI::bestExternalType () const
     }
 }
 
-// CA only does 1D arrays for now 
-aitIndex casPVI::nativeCount () 
+// CA only does 1D arrays for now
+aitIndex casPVI::nativeCount ()
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
     if ( this->pPV ) {
@@ -542,4 +545,3 @@ const char * casPVI::getName () const
         return "<disconnected>";
     }
 }
-

src/ca/legacy/pcas/generic/casStrmClient.cc

@@ -540,8 +540,20 @@ caStatus casStrmClient::readResponse ( epicsGuard < casClientMutex > & guard,
             pChan->getCID(), status, ECA_GETFAIL );
     }
 
+    aitUint32 elementCount = 0;
+    if (desc.isContainer()) {
+        aitUint32 index;
+        int gdds = gddApplicationTypeTable::app_table.mapAppToIndex
+            ( desc.applicationType(), gddAppType_value, index );
+        if ( gdds ) {
+            return S_cas_badType;
+        }
+        elementCount = desc.getDD(index)->getDataSizeElements();
+    } else {
+        elementCount = desc.getDataSizeElements();
+    }
     ca_uint32_t count = (msg.m_count == 0) ?
-                            (ca_uint32_t)desc.getDataSizeElements() :
+                            (ca_uint32_t)elementCount :
                              msg.m_count;
 
     void * pPayload;
@@ -669,8 +681,20 @@ caStatus casStrmClient::readNotifyResponse ( epicsGuard < casClientMutex > & gua
         return ecaStatus;
     }
 
+    aitUint32 elementCount = 0;
+    if (desc.isContainer()) {
+        aitUint32 index;
+        int gdds = gddApplicationTypeTable::app_table.mapAppToIndex
+            ( desc.applicationType(), gddAppType_value, index );
+        if ( gdds ) {
+            return S_cas_badType;
+        }
+        elementCount = desc.getDD(index)->getDataSizeElements();
+    } else {
+        elementCount = desc.getDataSizeElements();
+    }
     ca_uint32_t count = (msg.m_count == 0) ?
-                            (ca_uint32_t)desc.getDataSizeElements() :
+                            (ca_uint32_t)elementCount :
                              msg.m_count;
 
     void *pPayload;
@@ -1377,7 +1401,7 @@ caStatus casStrmClient :: searchAction ( epicsGuard < casClientMutex > & guard )
 
     if ( pChanName[0] == '\0' ) {
         caServerI::dumpMsg ( this->pHostName, "?", mp, this->ctx.getData(), 
-            "zero length PV name in UDP search request?\n" );
+            "zero length PV name in TCP search request?\n" );
         return S_cas_success;
     }
 
@@ -1387,7 +1411,7 @@ caStatus casStrmClient :: searchAction ( epicsGuard < casClientMutex > & guard )
     for ( unsigned i = mp->m_postsize-1; pChanName[i] != '\0'; i-- ) {
         if ( i <= 1 ) {
             caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), 
-                "unterminated PV name in UDP search request?\n" );
+                "unterminated PV name in TCP search request?\n" );
             return S_cas_success;
         }
     }

src/ioc/as/Makefile

@@ -23,4 +23,4 @@ dbCore_SRCS += asIocRegister.c
 
 PROD_HOST += ascheck
 ascheck_SRCS = ascheck.c
-ascheck_LIBS = dbCore ca
+ascheck_LIBS = dbCore ca Com

src/ioc/db/Makefile

@@ -62,7 +62,7 @@ DBDINC += menuScan
 DBDINC += dbCommon
 
 dbMenusPod = $(notdir $(wildcard ../db/menu*.dbd.pod))
-HTMLS += $(patsubst %.dbd.pod,%.html,$(menusPod))
+HTMLS += $(patsubst %.dbd.pod,%.html,$(dbMenusPod))
 
 dbCore_SRCS += dbLock.c
 dbCore_SRCS += dbAccess.c

src/ioc/db/callback.c

@@ -45,6 +45,7 @@
 #include "epicsExport.h"
 #include "link.h"
 #include "recSup.h"
+#include "dbUnitTest.h" /* for testSyncCallback() */
 
 
 static int callbackQueueSize = 2000;
@@ -53,6 +54,7 @@ typedef struct cbQueueSet {
     epicsEventId semWakeUp;
     epicsRingPointerId queue;
     int queueOverflow;
+    int queueOverflows;
     int shutdown;
     int threadsConfigured;
     int threadsRunning;
@@ -80,6 +82,10 @@ static int callbackIsInit;
 static char *threadNamePrefix[NUM_CALLBACK_PRIORITIES] = {
     "cbLow", "cbMedium", "cbHigh"
 };
+#define FULL_MSG(name) "callbackRequest: " name " ring buffer full\n"
+static char *fullMessage[NUM_CALLBACK_PRIORITIES] = {
+    FULL_MSG("cbLow"), FULL_MSG("cbMedium"), FULL_MSG("cbHigh")
+};
 static unsigned int threadPriority[NUM_CALLBACK_PRIORITIES] = {
     epicsThreadPriorityScanLow - 1,
     epicsThreadPriorityScanLow + 4,
@@ -98,6 +104,51 @@ 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) {
@@ -283,12 +334,9 @@ int callbackRequest(CALLBACK *pcallback)
     pushOK = epicsRingPointerPush(mySet->queue, pcallback);
 
     if (!pushOK) {
-        char msg[48] = "callbackRequest: ";
-
-        strcat(msg, threadNamePrefix[priority]);
-        strcat(msg, " ring buffer full\n");
-        epicsInterruptContextMessage(msg);
+        epicsInterruptContextMessage(fullMessage[priority]);
         mySet->queueOverflow = TRUE;
+        epicsAtomicIncrIntT(&mySet->queueOverflows);
         return S_db_bufFull;
     }
     epicsEventSignal(mySet->semWakeUp);
@@ -352,3 +400,86 @@ void callbackRequestProcessCallbackDelayed(CALLBACK *pcallback,
     callbackSetProcess(pcallback, Priority, pRec);
     callbackRequestDelayed(pcallback, seconds);
 }
+
+/* Sync. process of testSyncCallback()
+ *
+ * 1. For each priority, make a call to callbackRequest() for each worker.
+ * 2. Wait until all callbacks are concurrently being executed
+ * 3. Last worker to begin executing signals success and begins waking up other workers
+ * 4. Last worker to wake signals testSyncCallback() to complete
+ */
+typedef struct {
+    epicsEventId wait_phase2, wait_phase4;
+    int nphase2, nphase3;
+    epicsCallback cb;
+} sync_helper;
+
+static void sync_callback(epicsCallback *cb)
+{
+    sync_helper *helper;
+    callbackGetUser(helper, cb);
+
+    testGlobalLock();
+
+    assert(helper->nphase2 > 0);
+    if(--helper->nphase2!=0) {
+        /* we are _not_ the last to start. */
+        testGlobalUnlock();
+        epicsEventMustWait(helper->wait_phase2);
+        testGlobalLock();
+    }
+
+    /* we are either the last to start, or have been
+     * woken by the same and must pass the wakeup along
+     */
+    epicsEventMustTrigger(helper->wait_phase2);
+
+    assert(helper->nphase2 == 0);
+    assert(helper->nphase3 > 0);
+
+    if(--helper->nphase3==0) {
+        /* we are the last to wake up.  wake up testSyncCallback() */
+        epicsEventMustTrigger(helper->wait_phase4);
+    }
+
+    testGlobalUnlock();
+}
+
+void testSyncCallback(void)
+{
+    sync_helper helper[NUM_CALLBACK_PRIORITIES];
+    unsigned i;
+
+    testDiag("Begin testSyncCallback()");
+
+    for(i=0; i<NUM_CALLBACK_PRIORITIES; i++) {
+        helper[i].wait_phase2 = epicsEventMustCreate(epicsEventEmpty);
+        helper[i].wait_phase4 = epicsEventMustCreate(epicsEventEmpty);
+
+        /* no real need to lock here, but do so anyway so that valgrind can establish
+         * the locking requirements for sync_helper.
+         */
+        testGlobalLock();
+        helper[i].nphase2 = helper[i].nphase3 = callbackQueue[i].threadsRunning;
+        testGlobalUnlock();
+
+        callbackSetUser(&helper[i], &helper[i].cb);
+        callbackSetPriority(i, &helper[i].cb);
+        callbackSetCallback(sync_callback, &helper[i].cb);
+
+        callbackRequest(&helper[i].cb);
+    }
+
+    for(i=0; i<NUM_CALLBACK_PRIORITIES; i++) {
+        epicsEventMustWait(helper[i].wait_phase4);
+    }
+
+    for(i=0; i<NUM_CALLBACK_PRIORITIES; i++) {
+        testGlobalLock();
+        epicsEventDestroy(helper[i].wait_phase2);
+        epicsEventDestroy(helper[i].wait_phase4);
+        testGlobalUnlock();
+    }
+
+    testDiag("Complete testSyncCallback()");
+}

src/ioc/db/callback.h

@@ -42,10 +42,19 @@ typedef struct callbackPvt {
 	int		priority;
 	void		*user; /*for use by callback user*/
         void            *timer; /*for use by callback itself*/
-}CALLBACK;
+}epicsCallback;
+
+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) \
@@ -71,6 +80,8 @@ 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

src/ioc/db/dbAccess.c

@@ -34,7 +34,7 @@
 #include "errlog.h"
 #include "errMdef.h"
 
-#define epicsExportSharedSymbols
+#include "epicsExport.h" /* #define epicsExportSharedSymbols */
 #include "caeventmask.h"
 #include "callback.h"
 #include "dbAccessDefs.h"
@@ -65,6 +65,9 @@
 epicsShareDef struct dbBase *pdbbase = 0;
 epicsShareDef volatile int interruptAccept=FALSE;
 
+epicsShareDef int dbAccessDebugPUTF = 0;
+epicsExportAddress(int, dbAccessDebugPUTF);
+
 /* Hook Routines */
 
 epicsShareDef DB_LOAD_RECORDS_HOOK_ROUTINE dbLoadRecordsHook = NULL;
@@ -293,10 +296,14 @@ static void get_alarm(DBADDR *paddr, char **ppbuffer,
     if (*options & DBR_AL_LONG) {
         struct dbr_alLong *pal = (struct dbr_alLong*) pbuffer;
 
-        pal->upper_alarm_limit   = (epicsInt32) ald.upper_alarm_limit;
-        pal->upper_warning_limit = (epicsInt32) ald.upper_warning_limit;
-        pal->lower_warning_limit = (epicsInt32) ald.lower_warning_limit;
-        pal->lower_alarm_limit   = (epicsInt32) ald.lower_alarm_limit;
+        pal->upper_alarm_limit   = finite(ald.upper_alarm_limit) ?
+            (epicsInt32) ald.upper_alarm_limit : 0;
+        pal->upper_warning_limit = finite(ald.upper_warning_limit) ?
+            (epicsInt32) ald.upper_warning_limit : 0;
+        pal->lower_warning_limit = finite(ald.lower_warning_limit) ?
+            (epicsInt32) ald.lower_warning_limit : 0;
+        pal->lower_alarm_limit   = finite(ald.lower_alarm_limit) ?
+            (epicsInt32) ald.lower_alarm_limit : 0;
 
         if (no_data)
             *options ^= DBR_AL_LONG; /*Turn off option*/
@@ -442,22 +449,6 @@ int dbGetFieldIndex(const struct dbAddr *paddr)
     return paddr->pfldDes->indRecordType;
 }
 
-/*
- *  Process a record if its scan field is passive.
- *     Will notify if processing is complete by callback.
- *       (only if you are interested in completion)
- */
-long dbScanPassive(dbCommon *pfrom, dbCommon *pto)
-{
-    /* if not passive just return success */
-    if (pto->scan != 0)
-        return 0;
-
-    if (pfrom && pfrom->ppn)
-        dbNotifyAdd(pfrom,pto);
-    return dbProcess(pto);
-}
-
 /*
  *   Process the record.
  *     1.  Check for breakpoints.
@@ -523,7 +514,8 @@ long dbProcess(dbCommon *precord)
         unsigned short monitor_mask;
 
         if (*ptrace)
-            printf("%s: Active %s\n", context, precord->name);
+            printf("%s: dbProcess of Active '%s' with RPRO=%d\n",
+                context, precord->name, precord->rpro);
 
         /* raise scan alarm after MAX_LOCK times */
         if ((precord->stat == SCAN_ALARM) ||
@@ -552,7 +544,8 @@ long dbProcess(dbCommon *precord)
     /* if disabled check disable alarm severity and return success */
     if (precord->disa == precord->disv) {
         if (*ptrace)
-            printf("%s: Disabled %s\n", context, precord->name);
+            printf("%s: dbProcess of Disabled '%s'\n",
+                context, precord->name);
 
         /*take care of caching and notifyCompletion*/
         precord->rpro = FALSE;
@@ -589,7 +582,7 @@ long dbProcess(dbCommon *precord)
     }
 
     if (*ptrace)
-        printf("%s: Process %s\n", context, precord->name);
+        printf("%s: dbProcess of '%s'\n", context, precord->name);
 
     /* process record */
     status = prset->process(precord);
@@ -709,6 +702,18 @@ void dbInitEntryFromRecord(struct dbCommon *prec, DBENTRY *pdbentry)
     pdbentry->precnode = ppvt->recnode;
 }
 
+struct link* dbGetDevLink(struct dbCommon* prec)
+{
+    DBLINK *plink = 0;
+    DBENTRY entry;
+    dbInitEntryFromRecord(prec, &entry);
+    if(dbFindField(&entry, "INP")==0 || dbFindField(&entry, "OUT")==0) {
+        plink = (DBLINK*)entry.pfield;
+    }
+    dbFinishEntry(&entry);
+    return plink;
+}
+
 long dbValueSize(short dbr_type)
 {
     /* sizes for value associated with each DBR request type */
@@ -1036,7 +1041,7 @@ static long dbPutFieldLink(DBADDR *paddr,
         return S_db_badDbrtype;
     }
 
-    status = dbParseLink(pstring, pfldDes->field_type, &link_info, 0);
+    status = dbParseLink(pstring, pfldDes->field_type, &link_info);
     if (status)
         return status;
 
@@ -1209,8 +1214,8 @@ long dbPutField(DBADDR *paddr, short dbrType,
              precord->scan == 0 &&
              dbrType < DBR_PUT_ACKT)) {
             if (precord->pact) {
-                if (precord->tpro)
-                    printf("%s: Active %s\n",
+                if (dbAccessDebugPUTF && precord->tpro)
+                    printf("%s: dbPutField to Active '%s', setting RPRO=1\n",
                         epicsThreadGetNameSelf(), precord->name);
                 precord->rpro = TRUE;
             } else {
@@ -1343,4 +1348,3 @@ done:
     paddr->pfield = pfieldsave;
     return status;
 }
-

src/ioc/db/dbAccessDefs.h

@@ -34,6 +34,7 @@ extern "C" {
 
 epicsShareExtern struct dbBase *pdbbase;
 epicsShareExtern volatile int interruptAccept;
+epicsShareExtern int dbAccessDebugPUTF;
 
 /*  The database field and request types are defined in dbFldTypes.h*/
 /* Data Base Request Options	*/

src/ioc/db/dbBkpt.c

@@ -410,7 +410,7 @@ long dbd(const char *record_name)
 
   precord = addr.precord;
 
-  if (! precord->bkpt & BKPT_ON_MASK) {
+  if (!(precord->bkpt & BKPT_ON_MASK)) {
       printf("   BKPT> No breakpoint set in this record\n");
       return(S_db_bkptNotSet);
   }

src/ioc/db/dbCa.c

@@ -703,7 +703,12 @@ static long doLocked(struct link *plink, dbLinkUserCallback rtn, void *priv)
     caLink *pca;
     long status;
 
-    pcaGetCheck
+    assert(plink);
+    if (plink->type != CA_LINK) return -1;
+    pca = (caLink *)plink->value.pv_link.pvt;
+    assert(pca);
+    epicsMutexMustLock(pca->lock);
+    assert(pca->plink);
     status = rtn(plink, priv);
     epicsMutexUnlock(pca->lock);
     return status;
@@ -784,11 +789,16 @@ static void connectionCallback(struct connection_handler_args arg)
     if (pca->gotFirstConnection) {
         if (pca->nelements != ca_element_count(arg.chid) ||
             pca->dbrType != ca_field_type(arg.chid)) {
-            /* BUG: We have no way to clear any old subscription with the
-             *      originally chosen data type/size.  That will continue
-             *      to send us data and will result in an assert() fail.
-             */
-            /* Let next dbCaGetLink and/or dbCaPutLink determine options */
+            /* Size or type changed, clear everything and let the next call
+               to dbCaGetLink() and/or dbCaPutLink() reset everything */
+            if (pca->evidNative) {
+                ca_clear_event(pca->evidNative);
+                pca->evidNative = 0;
+            }
+            if (pca->evidString) {
+                ca_clear_event(pca->evidString);
+                pca->evidString = 0;
+            }
             plink->value.pv_link.pvlMask &=
                 ~(pvlOptInpNative | pvlOptInpString |
                   pvlOptOutNative | pvlOptOutString);
@@ -837,6 +847,7 @@ static void eventCallback(struct event_handler_args arg)
     struct dbr_time_double *pdbr_time_double;
     dbCaCallback monitor = 0;
     void *userPvt = 0;
+    int doScan = 1;
 
     assert(pca);
     epicsMutexMustLock(pca->lock);
@@ -867,10 +878,13 @@ static void eventCallback(struct event_handler_args arg)
         memcpy(pca->pgetString, dbr_value_ptr(arg.dbr, arg.type), size);
         pca->gotInString = TRUE;
     } else switch (arg.type){
+    case DBR_TIME_ENUM:
+        /* Disable the record scan if we also have a string monitor */
+        doScan = !(plink->value.pv_link.pvlMask & pvlOptInpString);
+        /* fall through */
     case DBR_TIME_STRING: 
     case DBR_TIME_SHORT: 
     case DBR_TIME_FLOAT:
-    case DBR_TIME_ENUM:
     case DBR_TIME_CHAR:
     case DBR_TIME_LONG:
     case DBR_TIME_DOUBLE:
@@ -888,7 +902,7 @@ static void eventCallback(struct event_handler_args arg)
     pca->sevr = pdbr_time_double->severity;
     pca->stat = pdbr_time_double->status;
     memcpy(&pca->timeStamp, &pdbr_time_double->stamp, sizeof(epicsTimeStamp));
-    if (precord) {
+    if (doScan && precord) {
         struct pv_link *ppv_link = &plink->value.pv_link;
 
         if ((ppv_link->pvlMask & pvlOptCP) ||
@@ -1149,7 +1163,8 @@ static void dbCaTask(void *arg)
                 status = ca_add_array_event(
                     dbf_type_to_DBR_TIME(ca_field_type(pca->chid)),
                     0, /* dynamic size */
-                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0, 0);
+                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
+                    &pca->evidNative);
                 if (status != ECA_NORMAL) {
                     errlogPrintf("dbCaTask ca_add_array_event %s\n",
                         ca_message(status));
@@ -1161,7 +1176,8 @@ static void dbCaTask(void *arg)
                 pca->pgetString = dbCalloc(1, MAX_STRING_SIZE);
                 epicsMutexUnlock(pca->lock);
                 status = ca_add_array_event(DBR_TIME_STRING, 1,
-                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0, 0);
+                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
+                    &pca->evidString);
                 if (status != ECA_NORMAL) {
                     errlogPrintf("dbCaTask ca_add_array_event %s\n",
                         ca_message(status));

src/ioc/db/dbCaPvt.h

@@ -80,6 +80,8 @@ typedef struct caLink
     char		*pgetString;
     void		*pputNative;
     char		*pputString;
+    evid		evidNative;
+    evid		evidString;
     char		gotInNative;
     char		gotInString;
     char		gotOutNative;

src/ioc/db/dbChannel.c

@@ -20,6 +20,7 @@
 #include "cantProceed.h"
 #include "epicsAssert.h"
 #include "epicsString.h"
+#include "epicsStdio.h"
 #include "errlog.h"
 #include "freeList.h"
 #include "gpHash.h"
@@ -107,7 +108,7 @@ static int chf_boolean(void * ctx, int boolVal)
     return result;
 }
 
-static int chf_integer(void * ctx, long integerVal)
+static int chf_integer(void * ctx, long long integerVal)
 {
     parseContext *parser = (parseContext *) ctx;
     chFilter *filter = parser->filter;
@@ -132,7 +133,7 @@ static int chf_double(void * ctx, double doubleVal)
 }
 
 static int chf_string(void * ctx, const unsigned char * stringVal,
-        unsigned int stringLen)
+        size_t stringLen)
 {
     parseContext *parser = (parseContext *) ctx;
     chFilter *filter = parser->filter;
@@ -159,7 +160,7 @@ static int chf_start_map(void * ctx)
 }
 
 static int chf_map_key(void * ctx, const unsigned char * key,
-        unsigned int stringLen)
+        size_t stringLen)
 {
     parseContext *parser = (parseContext *) ctx;
     chFilter *filter = parser->filter;
@@ -243,15 +244,12 @@ static const yajl_callbacks chf_callbacks =
     { chf_null, chf_boolean, chf_integer, chf_double, NULL, chf_string,
       chf_start_map, chf_map_key, chf_end_map, chf_start_array, chf_end_array };
 
-static const yajl_parser_config chf_config =
-    { 0, 1 }; /* allowComments = NO , checkUTF8 = YES */
-
-static void * chf_malloc(void *ctx, unsigned int sz)
+static void * chf_malloc(void *ctx, size_t sz)
 {
     return malloc(sz);
 }
 
-static void * chf_realloc(void *ctx, void *ptr, unsigned int sz)
+static void * chf_realloc(void *ctx, void *ptr, size_t sz)
 {
     return realloc(ptr, sz);
 }
@@ -261,36 +259,38 @@ static void chf_free(void *ctx, void *ptr)
     free(ptr);
 }
 
-static const yajl_alloc_funcs chf_alloc =
+static yajl_alloc_funcs chf_alloc =
     { chf_malloc, chf_realloc, chf_free };
 
 static long chf_parse(dbChannel *chan, const char **pjson)
 {
     parseContext parser =
         { chan, NULL, 0 };
-    yajl_handle yh = yajl_alloc(&chf_callbacks, &chf_config, &chf_alloc, &parser);
+    yajl_handle yh = yajl_alloc(&chf_callbacks, &chf_alloc, &parser);
     const char *json = *pjson;
-    size_t jlen = strlen(json);
+    size_t jlen = strlen(json), ylen;
     yajl_status ys;
     long status;
 
     if (!yh)
         return S_db_noMemory;
 
-    ys = yajl_parse(yh, (const unsigned char *) json, (unsigned int) jlen);
-    if (ys == yajl_status_insufficient_data)
-        ys = yajl_parse_complete(yh);
+    ys = yajl_parse(yh, (const unsigned char *) json, jlen);
+    ylen = yajl_get_bytes_consumed(yh);
+
+    if (ys == yajl_status_ok)
+        ys = yajl_complete_parse(yh);
 
     switch (ys) {
     case yajl_status_ok:
+        *pjson += ylen;
         status = 0;
-        *pjson += yajl_get_bytes_consumed(yh);
         break;
 
     case yajl_status_error: {
         unsigned char *err;
 
-        err = yajl_get_error(yh, 1, (const unsigned char *) json, (unsigned int) jlen);
+        err = yajl_get_error(yh, 1, (const unsigned char *) json, jlen);
         printf("dbChannelCreate: %s\n", err);
         yajl_free_error(yh, err);
     } /* fall through */

src/ioc/db/dbConstLink.c

@@ -16,18 +16,121 @@
 #include <string.h>
 
 #include "dbDefs.h"
+#include "epicsStdlib.h"
 
 #define epicsExportSharedSymbols
 #include "dbAccessDefs.h"
 #include "dbAddr.h"
 #include "dbCommon.h"
 #include "dbConstLink.h"
-#include "dbConvertFast.h"
 #include "dbConvertJSON.h"
 #include "dbFldTypes.h"
 #include "dbLink.h"
 #include "link.h"
 
+/**************************** Convert functions ****************************/
+
+/* The difference between these and dbFastConvert is that constants
+ * may contain hex numbers, whereas database conversions can't.
+ */
+
+/* Copy to STRING */
+static long cvt_st_st(const char *from, void *pfield, const dbAddr *paddr)
+{
+    char *to = pfield;
+    size_t size;
+
+    if (paddr && paddr->field_size < MAX_STRING_SIZE) {
+        size = paddr->field_size - 1;
+    } else {
+        size = MAX_STRING_SIZE - 1;
+    }
+    strncpy(to, from, size);
+    to[size] = 0;
+    return 0;
+}
+
+/* Most integer conversions are identical */
+#define cvt_st_int(TYPE) static long \
+cvt_st_ ## TYPE(const char *from, void *pfield, const dbAddr *paddr) { \
+    epics##TYPE *to = pfield; \
+    char *end; \
+\
+    if (*from == 0) { \
+        *to = 0; \
+        return 0; \
+    } \
+    return epicsParse##TYPE(from, to, 0, &end); \
+}
+
+/* Instanciate for CHAR, UCHAR, SHORT, USHORT and LONG */
+cvt_st_int(Int8)
+cvt_st_int(UInt8)
+cvt_st_int(Int16)
+cvt_st_int(UInt16)
+cvt_st_int(Int32)
+
+/* Conversion for ULONG is different... */
+static long cvt_st_UInt32(const char *from, void *pfield, const dbAddr *paddr)
+{
+    epicsUInt32 *to = pfield;
+    char *end;
+    long status;
+
+    if (*from == 0) {
+       *to = 0;
+       return 0;
+    }
+    status = epicsParseUInt32(from, to, 0, &end);
+    if (status == S_stdlib_noConversion ||
+        (!status && (*end == '.' || *end == 'e' || *end == 'E'))) {
+        /*
+         * Convert via double so numbers like 1.0e3 convert properly.
+         * db_access pretends ULONG fields are DOUBLE.
+         */
+        double dval;
+
+        status = epicsParseFloat64(from, &dval, &end);
+        if (!status &&
+            dval >=0 &&
+            dval <= ULONG_MAX)
+            *to = dval;
+    }
+    return status;
+}
+
+/* Instanciate for INT64 and UINT64 */
+cvt_st_int(Int64)
+cvt_st_int(UInt64)
+
+
+/* Float conversions are identical */
+#define cvt_st_float(TYPE) static long \
+cvt_st_ ## TYPE(const char *from, void *pfield, const dbAddr *paddr) { \
+    epics##TYPE *to = pfield; \
+    char *end; \
+\
+    if (*from == 0) { \
+        *to = 0; \
+        return 0; \
+    } \
+    return epicsParse##TYPE(from, to, &end); \
+}
+
+/* Instanciate for FLOAT32 and FLOAT64 */
+cvt_st_float(Float32)
+cvt_st_float(Float64)
+
+
+static long (*convert[DBF_DOUBLE+1])(const char *, void *, const dbAddr *) = {
+    cvt_st_st,
+    cvt_st_Int8,    cvt_st_UInt8,
+    cvt_st_Int16,   cvt_st_UInt16,
+    cvt_st_Int32,   cvt_st_UInt32,
+    cvt_st_Int64,   cvt_st_UInt64,
+    cvt_st_Float32, cvt_st_Float64
+};
+
 /***************************** Constant Links *****************************/
 
 /* Forward definition */
@@ -65,8 +168,7 @@ static long dbConstLoadScalar(struct link *plink, short dbrType, void *pbuffer)
         return dbPutConvertJSON(pstr, dbrType, pbuffer, &nReq);
     }
 
-    return dbFastPutConvertRoutine[DBR_STRING][dbrType]
-            (pstr, pbuffer, NULL);
+    return convert[dbrType](pstr, pbuffer, NULL);
 }
 
 static long dbConstLoadLS(struct link *plink, char *pbuffer, epicsUInt32 size,
@@ -109,6 +211,12 @@ static long dbConstGetValue(struct link *plink, short dbrType, void *pbuffer,
     return 0;
 }
 
+static long dbConstPutValue(struct link *plink, short dbrType,
+            const void *pbuffer, long nRequest)
+{
+    return 0;
+}
+
 static lset dbConst_lset = {
     1, 0, /* Constant, not Volatile */
     NULL, NULL,
@@ -121,6 +229,6 @@ static lset dbConst_lset = {
     NULL, NULL, NULL,
     NULL, NULL,
     NULL, NULL,
-    NULL, NULL,
+    dbConstPutValue, NULL,
     NULL, NULL
 };

src/ioc/db/dbConvertJSON.c

@@ -37,20 +37,20 @@ static int dbcj_boolean(void *ctx, int val) {
     return 0;    /* Illegal */
 }
 
-static int dbcj_integer(void *ctx, long num) {
+static int dbcj_integer(void *ctx, long long num) {
     parseContext *parser = (parseContext *) ctx;
-    epicsInt32 val32 = num;
-    FASTCONVERT conv = dbFastPutConvertRoutine[DBF_LONG][parser->dbrType];
+    epicsInt64 val64 = num;
+    FASTCONVERT conv = dbFastPutConvertRoutine[DBF_INT64][parser->dbrType];
 
     if (parser->elems > 0) {
-        conv(&val32, parser->pdest, NULL);
+        conv(&val64, parser->pdest, NULL);
         parser->pdest += parser->dbrSize;
         parser->elems--;
     }
     return 1;
 }
 
-static int dblsj_integer(void *ctx, long num) {
+static int dblsj_integer(void *ctx, long long num) {
     return 0;    /* Illegal */
 }
 
@@ -70,7 +70,7 @@ static int dblsj_double(void *ctx, double num) {
     return 0;    /* Illegal */
 }
 
-static int dbcj_string(void *ctx, const unsigned char *val, unsigned int len) {
+static int dbcj_string(void *ctx, const unsigned char *val, size_t len) {
     parseContext *parser = (parseContext *) ctx;
     char *pdest = parser->pdest;
 
@@ -93,7 +93,7 @@ static int dbcj_string(void *ctx, const unsigned char *val, unsigned int len) {
     return 1;
 }
 
-static int dblsj_string(void *ctx, const unsigned char *val, unsigned int len) {
+static int dblsj_string(void *ctx, const unsigned char *val, size_t len) {
     parseContext *parser = (parseContext *) ctx;
     char *pdest = parser->pdest;
 
@@ -118,7 +118,7 @@ static int dbcj_start_map(void *ctx) {
     return 0;    /* Illegal */
 }
 
-static int dbcj_map_key(void *ctx, const unsigned char *key, unsigned int len) {
+static int dbcj_map_key(void *ctx, const unsigned char *key, size_t len) {
     return 0;    /* Illegal */
 }
 
@@ -149,9 +149,6 @@ static yajl_callbacks dbcj_callbacks = {
     dbcj_start_array, dbcj_end_array
 };
 
-static const yajl_parser_config dbcj_config =
-    { 0, 0 }; /* allowComments = NO, checkUTF8 = NO */
-
 long dbPutConvertJSON(const char *json, short dbrType,
     void *pdest, long *pnRequest)
 {
@@ -169,13 +166,13 @@ long dbPutConvertJSON(const char *json, short dbrType,
     parser->elems = *pnRequest;
 
     yajl_set_default_alloc_funcs(&dbcj_alloc);
-    yh = yajl_alloc(&dbcj_callbacks, &dbcj_config, &dbcj_alloc, parser);
+    yh = yajl_alloc(&dbcj_callbacks, &dbcj_alloc, parser);
     if (!yh)
         return S_db_noMemory;
 
-    ys = yajl_parse(yh, (const unsigned char *) json, (unsigned int) jlen);
-    if (ys == yajl_status_insufficient_data)
-        ys = yajl_parse_complete(yh);
+    ys = yajl_parse(yh, (const unsigned char *) json, jlen);
+    if (ys == yajl_status_ok)
+        ys = yajl_complete_parse(yh);
 
     switch (ys) {
     case yajl_status_ok:
@@ -185,7 +182,7 @@ long dbPutConvertJSON(const char *json, short dbrType,
 
     case yajl_status_error: {
         unsigned char *err = yajl_get_error(yh, 1,
-            (const unsigned char *) json, (unsigned int) jlen);
+            (const unsigned char *) json, jlen);
         fprintf(stderr, "dbConvertJSON: %s\n", err);
         yajl_free_error(yh, err);
         }
@@ -227,13 +224,11 @@ long dbLSConvertJSON(const char *json, char *pdest, epicsUInt32 size,
     parser->elems = 1;
 
     yajl_set_default_alloc_funcs(&dbcj_alloc);
-    yh = yajl_alloc(&dblsj_callbacks, &dbcj_config, &dbcj_alloc, parser);
+    yh = yajl_alloc(&dblsj_callbacks, &dbcj_alloc, parser);
     if (!yh)
         return S_db_noMemory;
 
-    ys = yajl_parse(yh, (const unsigned char *) json, (unsigned int) jlen);
-    if (ys == yajl_status_insufficient_data)
-        ys = yajl_parse_complete(yh);
+    ys = yajl_parse(yh, (const unsigned char *) json, jlen);
 
     switch (ys) {
     case yajl_status_ok:
@@ -243,7 +238,7 @@ long dbLSConvertJSON(const char *json, char *pdest, epicsUInt32 size,
 
     case yajl_status_error: {
         unsigned char *err = yajl_get_error(yh, 1,
-            (const unsigned char *) json, (unsigned int) jlen);
+            (const unsigned char *) json, jlen);
         fprintf(stderr, "dbLoadLS_JSON: %s\n", err);
         yajl_free_error(yh, err);
         }

src/ioc/db/dbDbLink.c

@@ -12,6 +12,29 @@
  *      Current Author: Andrew Johnson
  */
 
+/* The PUTF and RPRO fields in dbCommon are flags that indicate when a record
+ * is being processed as a result of an external put (i.e. some server process
+ * calling dbPutField()), ensuring that the record and its successors will
+ * eventually get processed even if they happen to be busy at the time of the
+ * put. From Base-3.16.2 and 7.0.2 the code ensures that all records downstream
+ * from the original are processed even if a busy asynchronous device appears
+ * in the processing chain (this breaks the chain in older versions).
+ *
+ * PUTF - This field is set in dbPutField() prior to it calling dbProcess().
+ *        It is normally cleared at the end of processing in recGblFwdLink().
+ *        It may also be cleared in dbProcess() if DISA==DISV (scan disabled),
+ *        or by the processTarget() function below.
+ *
+ * If PUTF is TRUE before a call to dbProcess(prec), then after it returns
+ * either PACT is TRUE, or PUTF will be FALSE.
+ *
+ * RPRO - This field is set by dbPutField() or by the processTarget() function
+ *        below when a record to be processed is found to be busy (PACT==1).
+ *        It is normally cleared in recGblFwdLink() when the record is queued
+ *        for re-processing, or in dbProcess() if DISA==DISV (scan disabled).
+ */
+
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -43,17 +66,22 @@
 #include "dbNotify.h"
 #include "dbScan.h"
 #include "dbStaticLib.h"
+#include "dbServer.h"
 #include "devSup.h"
 #include "link.h"
 #include "recGbl.h"
 #include "recSup.h"
 #include "special.h"
+#include "dbDbLink.h"
+
 
 /***************************** Database Links *****************************/
 
-/* Forward definition */
+/* Forward definitions */
 static lset dbDb_lset;
 
+static long processTarget(dbCommon *psrc, dbCommon *pdst);
+
 long dbDbInitLink(struct link *plink, short dbfType)
 {
     DBADDR dbaddr;
@@ -138,11 +166,7 @@ static long dbDbGetValue(struct link *plink, short dbrType, void *pbuffer,
 
     /* scan passive records if link is process passive  */
     if (ppv_link->pvlMask & pvlOptPP) {
-        unsigned char pact = precord->pact;
-
-        precord->pact = TRUE;
         status = dbScanPassive(precord, paddr->precord);
-        precord->pact = pact;
         if (status)
             return status;
     }
@@ -167,7 +191,7 @@ static long dbDbGetValue(struct link *plink, short dbrType, void *pbuffer,
         ppv_link->lastGetdbrType = dbrType;
     }
 
-    if (!status)
+    if (!status && precord != paddr->precord)
         recGblInheritSevr(plink->value.pv_link.pvlMask & pvlOptMsMode,
             plink->precord, paddr->precord->stat, paddr->precord->sevr);
     return status;
@@ -311,22 +335,10 @@ static long dbDbPutValue(struct link *plink, short dbrType,
         return status;
 
     if (paddr->pfield == (void *) &pdest->proc ||
-            (ppv_link->pvlMask & pvlOptPP && pdest->scan == 0)) {
-        /* if dbPutField caused asyn record to process */
-        /* ask for reprocessing*/
-        if (pdest->putf) {
-            pdest->rpro = TRUE;
-        } else { /* process dest record with source's PACT true */
-            unsigned char pact;
-
-            if (psrce && psrce->ppn)
-                dbNotifyAdd(psrce, pdest);
-            pact = psrce->pact;
-            psrce->pact = TRUE;
-            status = dbProcess(pdest);
-            psrce->pact = pact;
-        }
+        (ppv_link->pvlMask & pvlOptPP && pdest->scan == 0)) {
+        status = processTarget(psrce, pdest);
     }
+
     return status;
 }
 
@@ -356,3 +368,75 @@ static lset dbDb_lset = {
     dbDbPutValue, NULL,
     dbDbScanFwdLink, doLocked
 };
+
+
+/*
+ *  Process a record if its scan field is passive.
+ */
+long dbScanPassive(dbCommon *pfrom, dbCommon *pto)
+{
+    /* if not passive we're done */
+    if (pto->scan != 0)
+        return 0;
+
+    return processTarget(pfrom, pto);
+}
+
+static long processTarget(dbCommon *psrc, dbCommon *pdst)
+{
+    char context[40] = "";
+    int trace = dbAccessDebugPUTF && *dbLockSetAddrTrace(psrc);
+    long status;
+    epicsUInt8 pact = psrc->pact;
+
+    psrc->pact = TRUE;
+
+    if (psrc && psrc->ppn)
+        dbNotifyAdd(psrc, pdst);
+
+    if (trace && dbServerClient(context, sizeof(context))) {
+        /* No client, use thread name */
+        strncpy(context, epicsThreadGetNameSelf(), sizeof(context));
+        context[sizeof(context) - 1] = 0;
+    }
+
+    if (!pdst->pact) {
+        /* Normal propagation of PUTF from src to dst */
+        if (trace)
+            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) {
+        /* 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.
+         */
+        if (trace)
+            printf("%s: '%s' -> Active '%s', setting RPRO=1\n",
+                context, psrc->name, pdst->name);
+
+        pdst->putf = FALSE;
+        pdst->rpro = TRUE;
+    }
+    else {
+        /* 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);
+    }
+
+    status = dbProcess(pdst);
+
+    psrc->pact = pact;
+
+    return status;
+}

src/ioc/db/dbEvent.c

@@ -117,6 +117,8 @@ static char *EVENT_PEND_NAME = "eventTask";
 
 static struct evSubscrip canceledEvent;
 
+static epicsMutexId stopSync;
+
 static unsigned short ringSpace ( const struct event_que *pevq )
 {
     if ( pevq->evque[pevq->putix] == EVENTQEMPTY ) {
@@ -258,6 +260,10 @@ dbEventCtx db_init_events (void)
 {
     struct event_user * evUser;
 
+    if (!stopSync) {
+        stopSync = epicsMutexMustCreate();
+    }
+
     if (!dbevEventUserFreeList) {
         freeListInitPvt(&dbevEventUserFreeList,
             sizeof(struct event_user),8);
@@ -324,19 +330,20 @@ fail:
 
 epicsShareFunc void db_cleanup_events(void)
 {
-    freeListCleanup(dbevEventUserFreeList);
+    if(dbevEventUserFreeList) freeListCleanup(dbevEventUserFreeList);
     dbevEventUserFreeList = NULL;
 
-    freeListCleanup(dbevEventQueueFreeList);
+    if(dbevEventQueueFreeList) freeListCleanup(dbevEventQueueFreeList);
     dbevEventQueueFreeList = NULL;
 
-    freeListCleanup(dbevEventSubscriptionFreeList);
+    if(dbevEventSubscriptionFreeList) freeListCleanup(dbevEventSubscriptionFreeList);
     dbevEventSubscriptionFreeList = NULL;
 
-    freeListCleanup(dbevFieldLogFreeList);
+    if(dbevFieldLogFreeList) freeListCleanup(dbevFieldLogFreeList);
     dbevFieldLogFreeList = NULL;
 }
 
+    /* intentionally leak stopSync to avoid possible shutdown races */
 /*
  *  DB_CLOSE_EVENTS()
  *
@@ -372,11 +379,15 @@ void db_close_events (dbEventCtx ctx)
 
     epicsMutexUnlock ( evUser->lock );
 
+    epicsMutexMustLock (stopSync);
+
     epicsEventDestroy(evUser->pexitsem);
     epicsEventDestroy(evUser->ppendsem);
     epicsEventDestroy(evUser->pflush_sem);
     epicsMutexDestroy(evUser->lock);
 
+    epicsMutexUnlock (stopSync);
+
     freeListFree(dbevEventUserFreeList, evUser);
 }
 
@@ -1059,8 +1070,15 @@ static void event_task (void *pParm)
 
     taskwdRemove(epicsThreadGetIdSelf());
 
+    /* use stopSync to ensure pexitsem is not destroy'd
+     * until epicsEventSignal() has returned.
+     */
+    epicsMutexMustLock (stopSync);
+
     epicsEventSignal(evUser->pexitsem);
 
+    epicsMutexUnlock(stopSync);
+
     return;
 }
 

src/ioc/db/dbFastLinkConv.c

@@ -920,18 +920,14 @@ static long cvt_q_q(
      epicsInt64 *from,
      epicsInt64 *to,
      const dbAddr *paddr)
- {
-
-  *to=*from; return(0); }
+ { *to=*from; return(0); }
 
 /* Convert Int64 to UInt64 */
 static long cvt_q_uq(
      epicsInt64 *from,
      epicsUInt64 *to,
      const dbAddr *paddr)
- {
-
-  *to=*from; return(0); }
+ { *to=*from; return(0); }
 
 /* Convert Int64 to Float */
 static long cvt_q_f(
@@ -949,7 +945,7 @@ static long cvt_q_d(
 
 /* Convert Int64 to Enumerated */
 static long cvt_q_e(
-     epicsInt32 *from,
+     epicsInt64 *from,
      epicsEnum16 *to,
      const dbAddr *paddr)
  { *to=*from; return(0); }

src/ioc/db/dbIocRegister.c

@@ -152,6 +152,12 @@ static const iocshArg * const dbnrArgs[1] = {&dbnrArg0};
 static const iocshFuncDef dbnrFuncDef = {"dbnr",1,dbnrArgs};
 static void dbnrCallFunc(const iocshArgBuf *args) { dbnr(args[0].ival);}
 
+/* dbli */
+static const iocshArg dbliArg0 = { "pattern",iocshArgString};
+static const iocshArg * const dbliArgs[1] = {&dbliArg0};
+static const iocshFuncDef dbliFuncDef = {"dbli",1,dbliArgs};
+static void dbliCallFunc(const iocshArgBuf *args) { dbli(args[0].sval);}
+
 /* dbla */
 static const iocshArg dblaArg0 = { "pattern",iocshArgString};
 static const iocshArg * const dblaArgs[1] = {&dblaArg0};
@@ -290,6 +296,17 @@ 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};
@@ -329,6 +346,17 @@ 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};
@@ -415,6 +443,7 @@ void dbIocRegister(void)
     iocshRegister(&dblFuncDef,dblCallFunc);
     iocshRegister(&dbnrFuncDef,dbnrCallFunc);
     iocshRegister(&dblaFuncDef,dblaCallFunc);
+    iocshRegister(&dbliFuncDef,dbliCallFunc);
     iocshRegister(&dbgrepFuncDef,dbgrepCallFunc);
     iocshRegister(&dbgfFuncDef,dbgfCallFunc);
     iocshRegister(&dbpfFuncDef,dbpfCallFunc);
@@ -434,12 +463,14 @@ 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 */

src/ioc/db/dbJLink.c

@@ -2,7 +2,7 @@
 * Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne
 *     National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /* dbJLink.c */
 
@@ -25,19 +25,33 @@
 #include "dbLock.h"
 #include "dbStaticLib.h"
 #include "link.h"
+#include "epicsExport.h"
 
-#define IFDEBUG(n) if(parser->parse_debug)
+epicsShareDef int dbJLinkDebug = 0;
+epicsExportAddress(int, dbJLinkDebug);
+
+#define IFDEBUG(n) if (dbJLinkDebug >= (n))
 
 typedef struct parseContext {
     jlink *pjlink;
     jlink *product;
     short dbfType;
     short jsonDepth;
-    unsigned key_is_link:1;
-    unsigned parse_debug:1;
-    unsigned lset_debug:1;
 } parseContext;
 
+epicsShareDef const char *jlif_result_name[2] = {
+    "jlif_stop",
+    "jlif_continue",
+};
+
+epicsShareDef const char *jlif_key_result_name[5] = {
+    "jlif_key_stop",
+    "jlif_key_continue",
+    "jlif_key_child_inlink",
+    "jlif_key_child_outlink",
+    "jlif_key_child_fwdlink"
+};
+
 #define CALL_OR_STOP(routine) !(routine) ? jlif_stop : (routine)
 
 static int dbjl_return(parseContext *parser, jlif_result result) {
@@ -45,8 +59,8 @@ static int dbjl_return(parseContext *parser, jlif_result result) {
 
     IFDEBUG(10) {
         printf("dbjl_return(%s@%p, %d)\t", pjlink ? pjlink->pif->name : "", pjlink, result);
-        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
+        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
     }
 
     if (result == jlif_stop && pjlink) {
@@ -59,6 +73,9 @@ static int dbjl_return(parseContext *parser, jlif_result result) {
         pjlink->pif->free_jlink(pjlink);
     }
 
+    IFDEBUG(10)
+        printf("    returning %d %s\n", result,
+            result == jlif_stop ? "*** STOP ***" : "Continue");
     return result;
 }
 
@@ -68,8 +85,8 @@ static int dbjl_value(parseContext *parser, jlif_result result) {
 
     IFDEBUG(10) {
         printf("dbjl_value(%s@%p, %d)\t", pjlink ? pjlink->pif->name : "", pjlink, result);
-        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
+        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
     }
 
     if (result == jlif_stop || pjlink->parseDepth > 0)
@@ -81,7 +98,6 @@ static int dbjl_value(parseContext *parser, jlif_result result) {
     } else if (parent->pif->end_child) {
         parent->pif->end_child(parent, pjlink);
     }
-    pjlink->debug = 0;
 
     parser->pjlink = parent;
 
@@ -112,12 +128,12 @@ static int dbjl_boolean(void *ctx, int val) {
         CALL_OR_STOP(pjlink->pif->parse_boolean)(pjlink, val));
 }
 
-static int dbjl_integer(void *ctx, long num) {
+static int dbjl_integer(void *ctx, long long num) {
     parseContext *parser = (parseContext *) ctx;
     jlink *pjlink = parser->pjlink;
 
     IFDEBUG(10)
-        printf("dbjl_integer(%s@%p, %ld)\n",
+        printf("dbjl_integer(%s@%p, %lld)\n",
             pjlink->pif->name, pjlink, num);
 
     assert(pjlink);
@@ -138,13 +154,13 @@ static int dbjl_double(void *ctx, double num) {
         CALL_OR_STOP(pjlink->pif->parse_double)(pjlink, num));
 }
 
-static int dbjl_string(void *ctx, const unsigned char *val, unsigned len) {
+static int dbjl_string(void *ctx, const unsigned char *val, size_t len) {
     parseContext *parser = (parseContext *) ctx;
     jlink *pjlink = parser->pjlink;
 
     IFDEBUG(10)
         printf("dbjl_string(%s@%p, \"%.*s\")\n",
-            pjlink->pif->name, pjlink, len, val);
+            pjlink->pif->name, pjlink, (int) len, val);
 
     assert(pjlink);
     return dbjl_value(parser,
@@ -159,29 +175,46 @@ static int dbjl_start_map(void *ctx) {
     if (!pjlink) {
         IFDEBUG(10) {
             printf("dbjl_start_map(NULL)\t");
-            printf("    jsonDepth=%d, parseDepth=00, key_is_link=%d\n",
-                parser->jsonDepth, parser->key_is_link);
+            printf("    jsonDepth=%d, parseDepth=00, dbfType=%d\n",
+                parser->jsonDepth, parser->dbfType);
         }
 
         assert(parser->jsonDepth == 0);
         parser->jsonDepth++;
-        parser->key_is_link = 1;
         return jlif_continue; /* Opening '{' */
     }
 
     IFDEBUG(10) {
         printf("dbjl_start_map(%s@%p)\t", pjlink ? pjlink->pif->name : "", pjlink);
-        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
+        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
     }
 
     pjlink->parseDepth++;
     parser->jsonDepth++;
 
     result = CALL_OR_STOP(pjlink->pif->parse_start_map)(pjlink);
-    if (result == jlif_key_child_link) {
-        parser->key_is_link = 1;
+    switch (result) {
+    case jlif_key_child_inlink:
+        parser->dbfType = DBF_INLINK;
         result = jlif_continue;
+        break;
+    case jlif_key_child_outlink:
+        parser->dbfType = DBF_OUTLINK;
+        result = jlif_continue;
+        break;
+    case jlif_key_child_fwdlink:
+        parser->dbfType = DBF_FWDLINK;
+        result = jlif_continue;
+        break;
+    case jlif_key_stop:
+    case jlif_key_continue:
+        break;
+    default:
+        errlogPrintf("dbJLinkInit: Bad return %d from '%s'::parse_start_map()\n",
+            result, pjlink->pif->name);
+        result = jlif_stop;
+        break;
     }
 
     IFDEBUG(10)
@@ -190,25 +223,26 @@ static int dbjl_start_map(void *ctx) {
     return dbjl_return(parser, result);
 }
 
-static int dbjl_map_key(void *ctx, const unsigned char *key, unsigned len) {
+static int dbjl_map_key(void *ctx, const unsigned char *key, size_t len) {
     parseContext *parser = (parseContext *) ctx;
     jlink *pjlink = parser->pjlink;
     char *link_name;
     linkSup *linkSup;
     jlif *pjlif;
+    jlink *child;
 
-    if (!parser->key_is_link) {
+    if (parser->dbfType == 0) {
         if (!pjlink) {
             errlogPrintf("dbJLinkInit: Illegal second link key '%.*s'\n",
-                len, key);
+                (int) len, key);
             return dbjl_return(parser, jlif_stop);
         }
 
         IFDEBUG(10) {
             printf("dbjl_map_key(%s@%p, \"%.*s\")\t",
-                pjlink->pif->name, pjlink, len, key);
-            printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
-                parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
+                pjlink->pif->name, pjlink, (int) len, key);
+            printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
+                parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
         }
 
         assert(pjlink->parseDepth > 0);
@@ -218,9 +252,9 @@ static int dbjl_map_key(void *ctx, const unsigned char *key, unsigned len) {
     }
 
     IFDEBUG(10) {
-        printf("dbjl_map_key(NULL, \"%.*s\")\t", len, key);
-        printf("    jsonDepth=%d, parseDepth=00, key_is_link=%d\n",
-            parser->jsonDepth, parser->key_is_link);
+        printf("dbjl_map_key(NULL, \"%.*s\")\t", (int) len, key);
+        printf("    jsonDepth=%d, parseDepth=00, dbfType=%d\n",
+            parser->jsonDepth, parser->dbfType);
     }
 
     link_name = dbmfStrndup((const char *) key, len);
@@ -241,27 +275,35 @@ static int dbjl_map_key(void *ctx, const unsigned char *key, unsigned len) {
         return dbjl_return(parser, jlif_stop);
     }
 
-    dbmfFree(link_name);
-
-    pjlink = pjlif->alloc_jlink(parser->dbfType);
-    if (!pjlink) {
-        errlogPrintf("dbJLinkInit: Out of memory\n");
+    child = pjlif->alloc_jlink(parser->dbfType);
+    if (!child) {
+        errlogPrintf("dbJLinkInit: Link type '%s' allocation failed. \n",
+            link_name);
+        dbmfFree(link_name);
         return dbjl_return(parser, jlif_stop);
     }
-    pjlink->pif = pjlif;
-    pjlink->parent = NULL;
-    pjlink->parseDepth = 0;
-    pjlink->debug = !!parser->lset_debug;
+
+    child->pif = pjlif;
+    child->parseDepth = 0;
+    child->debug = 0;
 
     if (parser->pjlink) {
         /* We're starting a child link, save its parent */
-        pjlink->parent = parser->pjlink;
+        child->parent = pjlink;
+
+        if (pjlink->pif->start_child)
+            pjlink->pif->start_child(pjlink, child);
     }
-    parser->pjlink = pjlink;
-    parser->key_is_link = 0;
+    else
+        child->parent = NULL;
+
+    parser->pjlink = child;
+    parser->dbfType = 0;
+
+    dbmfFree(link_name);
 
     IFDEBUG(8)
-        printf("dbjl_map_key: New %s@%p\n", pjlink ? pjlink->pif->name : "", pjlink);
+        printf("dbjl_map_key: New %s@%p\n", child ? child->pif->name : "", child);
 
     return jlif_continue;
 }
@@ -274,9 +316,9 @@ static int dbjl_end_map(void *ctx) {
     IFDEBUG(10) {
         printf("dbjl_end_map(%s@%p)\t",
             pjlink ? pjlink->pif->name : "NULL", pjlink);
-        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
+        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
             parser->jsonDepth, pjlink ? pjlink->parseDepth : 0,
-            parser->key_is_link);
+            parser->dbfType);
     }
 
     parser->jsonDepth--;
@@ -298,8 +340,8 @@ static int dbjl_start_array(void *ctx) {
 
     IFDEBUG(10) {
         printf("dbjl_start_array(%s@%p)\t", pjlink ? pjlink->pif->name : "", pjlink);
-        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
+        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
     }
 
     assert(pjlink);
@@ -316,8 +358,8 @@ static int dbjl_end_array(void *ctx) {
 
     IFDEBUG(10) {
         printf("dbjl_end_array(%s@%p)\t", pjlink ? pjlink->pif->name : "", pjlink);
-        printf("    jsonDepth=%d, parseDepth=%d, key_is_link=%d\n",
-            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->key_is_link);
+        printf("    jsonDepth=%d, parseDepth=%d, dbfType=%d\n",
+            parser->jsonDepth, pjlink ? pjlink->parseDepth : 0, parser->dbfType);
     }
 
     assert(pjlink);
@@ -334,11 +376,8 @@ static yajl_callbacks dbjl_callbacks = {
     dbjl_start_map, dbjl_map_key, dbjl_end_map, dbjl_start_array, dbjl_end_array
 };
 
-static const yajl_parser_config dbjl_config =
-    { 0, 0 }; /* allowComments = NO, checkUTF8 = NO */
-
 long dbJLinkParse(const char *json, size_t jlen, short dbfType,
-    jlink **ppjlink, unsigned opts)
+    jlink **ppjlink)
 {
     parseContext context, *parser = &context;
     yajl_alloc_funcs dbjl_allocs;
@@ -350,26 +389,29 @@ long dbJLinkParse(const char *json, size_t jlen, short dbfType,
     parser->product = NULL;
     parser->dbfType = dbfType;
     parser->jsonDepth = 0;
-    parser->key_is_link = 0;
-    parser->parse_debug = !!(opts&LINK_DEBUG_JPARSE);
-    parser->lset_debug = !!(opts&LINK_DEBUG_LSET);
 
     IFDEBUG(10)
         printf("dbJLinkInit(\"%.*s\", %d, %p)\n",
             (int) jlen, json, dbfType, ppjlink);
 
     IFDEBUG(10)
-        printf("dbJLinkInit: jsonDepth=%d, key_is_link=%d\n",
-            parser->jsonDepth, parser->key_is_link);
+        printf("dbJLinkInit: jsonDepth=%d, dbfType=%d\n",
+            parser->jsonDepth, parser->dbfType);
 
     yajl_set_default_alloc_funcs(&dbjl_allocs);
-    yh = yajl_alloc(&dbjl_callbacks, &dbjl_config, &dbjl_allocs, parser);
+    yh = yajl_alloc(&dbjl_callbacks, &dbjl_allocs, parser);
     if (!yh)
         return S_db_noMemory;
 
-    ys = yajl_parse(yh, (const unsigned char *) json, (unsigned) jlen);
-    if (ys == yajl_status_insufficient_data)
-        ys = yajl_parse_complete(yh);
+    ys = yajl_parse(yh, (const unsigned char *) json, jlen);
+    IFDEBUG(10)
+        printf("dbJLinkInit: yajl_parse() returned %d\n", ys);
+
+    if (ys == yajl_status_ok) {
+        ys = yajl_complete_parse(yh);
+        IFDEBUG(10)
+            printf("dbJLinkInit: yajl_complete_parse() returned %d\n", ys);
+    }
 
     switch (ys) {
         unsigned char *err;
@@ -381,28 +423,38 @@ long dbJLinkParse(const char *json, size_t jlen, short dbfType,
         break;
 
     case yajl_status_error:
-        err = yajl_get_error(yh, 1, (const unsigned char *) json, (unsigned) jlen);
+        IFDEBUG(10)
+            printf("    jsonDepth=%d, product=%p, pjlink=%p\n",
+                parser->jsonDepth, parser->product, parser->pjlink);
+        err = yajl_get_error(yh, 1, (const unsigned char *) json, jlen);
         errlogPrintf("dbJLinkInit: %s\n", err);
         yajl_free_error(yh, err);
         dbJLinkFree(parser->pjlink);
+        dbJLinkFree(parser->product);
         /* fall through */
     default:
         status = S_db_badField;
     }
 
     yajl_free(yh);
+
+    IFDEBUG(10)
+        printf("dbJLinkInit: returning status=0x%lx\n\n",
+            status);
+
     return status;
 }
 
 long dbJLinkInit(struct link *plink)
 {
-    jlink *pjlink;
-
     assert(plink);
-    pjlink = plink->value.json.jlink;
 
-    if (pjlink)
-        plink->lset = pjlink->pif->get_lset(pjlink);
+    if (plink->type == JSON_LINK) {
+        jlink *pjlink = plink->value.json.jlink;
+
+        if (pjlink)
+            plink->lset = pjlink->pif->get_lset(pjlink);
+    }
 
     dbLinkOpen(plink);
     return 0;

src/ioc/db/dbJLink.h

@@ -2,7 +2,7 @@
 * Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne
 *     National Laboratory.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /* dbJLink.h */
 
@@ -21,12 +21,16 @@ typedef enum {
     jlif_continue = 1
 } jlif_result;
 
+epicsShareExtern const char *jlif_result_name[2];
+
 typedef enum {
     jlif_key_stop = jlif_stop,
     jlif_key_continue = jlif_continue,
-    jlif_key_child_link
+    jlif_key_child_inlink, jlif_key_child_outlink, jlif_key_child_fwdlink
 } jlif_key_result;
 
+epicsShareExtern const char *jlif_key_result_name[5];
+
 struct link;
 struct lset;
 struct jlif;
@@ -35,7 +39,7 @@ typedef struct jlink {
     struct jlif *pif;       /* Link methods */
     struct jlink *parent;   /* NULL for top-level links */
     int parseDepth;         /* Used by parser, unused afterwards */
-    unsigned debug:1;       /* set by caller of jlif operations to request debug output to console */
+    unsigned debug:1;       /* Set to request debug output to console */
     /* Link types extend or embed this structure for private storage */
 } jlink;
 
@@ -72,8 +76,9 @@ typedef struct jlif {
         /* Optional, parser saw a string value */
 
     jlif_key_result (*parse_start_map)(jlink *);
-        /* Optional, parser saw an open-brace '{'. Return jlif_key_child_link
-         * to expect a child link next (extra key/value pairs may follow).
+        /* Optional, parser saw an open-brace '{'. Return jlif_key_child_inlink,
+         * jlif_key_child_outlink, or jlif_key_child_fwdlink to expect a child
+         * link next (extra key/value pairs may follow)
          */
 
     jlif_result (*parse_map_key)(jlink *, const char *key, size_t len);
@@ -90,7 +95,8 @@ typedef struct jlif {
 
     void (*end_child)(jlink *parent, jlink *child);
         /* Optional, called with pointer to the new child link after
-         * parse_start_map() returned jlif_key_child_link */
+         * the child link has finished parsing successfully
+         */
 
     struct lset* (*get_lset)(const jlink *);
         /* Required, return lset for this link instance */
@@ -98,7 +104,7 @@ typedef struct jlif {
     void (*report)(const jlink *, int level, int indent);
         /* Optional, print status information about this link instance, then
          * if (level > 0) print a link identifier (at indent+2) and call
-         *     dbJLinkReport(child, level-1, indent+4) 
+         *     dbJLinkReport(child, level-1, indent+4)
          * for each child.
          */
 
@@ -107,13 +113,19 @@ typedef struct jlif {
          * Stop immediately and return status if non-zero.
          */
 
+     void (*start_child)(jlink *parent, jlink *child);
+         /* Optional, called with pointer to the new child link after
+          * parse_start_map() returned a jlif_key_child_link value and
+          * the child link has been allocated (but not parsed yet)
+          */
+
     /* Link types must NOT extend this table with their own routines,
      * this space is reserved for extensions to the jlink interface.
      */
 } jlif;
 
 epicsShareFunc long dbJLinkParse(const char *json, size_t len, short dbfType,
-    jlink **ppjlink, unsigned opts);
+    jlink **ppjlink);
 epicsShareFunc long dbJLinkInit(struct link *plink);
 
 epicsShareFunc void dbJLinkFree(jlink *);
@@ -130,4 +142,3 @@ epicsShareFunc long dbJLinkMapAll(char *recname, jlink_map_fn rtn, void *ctx);
 #endif
 
 #endif /* INC_dbJLink_H */
-

src/ioc/db/dbLink.c

@@ -49,7 +49,7 @@
 #include "special.h"
 
 /* How to identify links in error messages */
-static const char * link_field_name(const struct link *plink)
+const char * dbLinkFieldName(const struct link *plink)
 {
     const struct dbCommon *precord = plink->precord;
     const dbRecordType *pdbRecordType = precord->rdes;
@@ -66,6 +66,26 @@ static const char * link_field_name(const struct link *plink)
     return "????";
 }
 
+/* Special TSEL handler for PV links */
+/* FIXME: Generalize for new link types... */
+static void TSEL_modified(struct link *plink)
+{
+    struct pv_link *ppv_link;
+    char *pfieldname;
+
+    if (plink->type != PV_LINK) {
+        errlogPrintf("dbLink::TSEL_modified called for non PV_LINK\n");
+        return;
+    }
+    /* If pvname contains .TIME truncate it to point to VAL instead */
+    ppv_link = &plink->value.pv_link;
+    pfieldname = strstr(ppv_link->pvname, ".TIME");
+    if (pfieldname) {
+        *pfieldname = 0;
+        plink->flags |= DBLINK_FLAG_TSELisTIME;
+    }
+}
+
 
 /***************************** Generic Link API *****************************/
 
@@ -73,6 +93,12 @@ void dbInitLink(struct link *plink, short dbfType)
 {
     struct dbCommon *precord = plink->precord;
 
+    /* Only initialize link once */
+    if (plink->flags & DBLINK_FLAG_INITIALIZED)
+        return;
+    else
+        plink->flags |= DBLINK_FLAG_INITIALIZED;
+
     if (plink->type == CONSTANT) {
         dbConstInitLink(plink);
         return;
@@ -87,7 +113,7 @@ void dbInitLink(struct link *plink, short dbfType)
         return;
 
     if (plink == &precord->tsel)
-        recGblTSELwasModified(plink);
+        TSEL_modified(plink);
 
     if (!(plink->value.pv_link.pvlMask & (pvlOptCA | pvlOptCP | pvlOptCPP))) {
         /* Make it a DB link if possible */
@@ -110,7 +136,7 @@ void dbInitLink(struct link *plink, short dbfType)
             errlogPrintf("Forward-link uses Channel Access "
                 "without pointing to PROC field\n"
                 "    %s.%s => %s\n",
-                precord->name, link_field_name(plink),
+                precord->name, dbLinkFieldName(plink),
                 plink->value.pv_link.pvname);
         }
     }
@@ -121,6 +147,9 @@ void dbAddLink(struct dbLocker *locker, struct link *plink, short dbfType,
 {
     struct dbCommon *precord = plink->precord;
 
+    /* Clear old TSELisTIME flag */
+    plink->flags &= ~DBLINK_FLAG_TSELisTIME;
+
     if (plink->type == CONSTANT) {
         dbConstAddLink(plink);
         return;
@@ -139,7 +168,7 @@ void dbAddLink(struct dbLocker *locker, struct link *plink, short dbfType,
         return;
 
     if (plink == &precord->tsel)
-        recGblTSELwasModified(plink);
+        TSEL_modified(plink);
 
     if (ptarget) {
         /* It's a DB link */
@@ -236,8 +265,19 @@ int dbIsLinkConnected(const struct link *plink)
 {
     lset *plset = plink->lset;
 
-    if (!plset || !plset->isConnected)
+    if (!plset)
         return FALSE;
+    if (!plset->isVolatile)
+        return TRUE;
+
+    if (!plset->isConnected) {
+        struct dbCommon *precord = plink->precord;
+
+        errlogPrintf("dbLink: Link type for '%s.%s' is volatile but has no"
+            " lset::isConnected() method\n",
+            precord->name, dbLinkFieldName(plink));
+        return FALSE;
+    }
 
     return plset->isConnected(plink);
 }
@@ -464,4 +504,3 @@ long dbPutLinkLS(struct link *plink, char *pbuffer, epicsUInt32 len)
 
     return dbPutLink(plink, DBR_STRING, pbuffer, 1);
 }
-

src/ioc/db/dbLink.h

@@ -27,60 +27,345 @@ extern "C" {
 
 struct dbLocker;
 
+/** @file   dbLink.h
+ * @brief   Link Support API
+ *
+ * Link support run-time API, all link types provide an lset which is used by
+ * the IOC database to control and operate the link. This file also declares the
+ * dbLink routines that IOC, record and device code can call to perform link
+ * operations.
+ */
+
+/** @brief  callback routine for locked link operations
+ *
+ * Called by the lset::doLocked method to permit multiple link operations
+ * while the link instance is locked.
+ *
+ * @param   plink   the link
+ * @param   priv    context for the callback routine
+ */
 typedef long (*dbLinkUserCallback)(struct link *plink, void *priv);
 
+/** @brief  Link Support Entry Table
+ *
+ * This structure provides information about and methods for an individual link
+ * type. A pointer to this structure is included in every link's lset field, and
+ * is used to perform operations on the link. For JSON links the pointer is
+ * obtained by calling pjlink->pif->get_lset() at link initialization time,
+ * immediately before calling dbLinkOpen() to activate the link.
+ */
 typedef struct lset {
     /* Characteristics of the link type */
+
+    /** @brief  link constancy
+     *
+     * 1 means this is a constant link type whose value doesn't change.
+     * The link's value will be obtained using one of the methods loadScalar,
+     * loadLS or loadArray.
+     */
     const unsigned isConstant:1;
+
+    /** @brief  link volatility
+     *
+     * 0 means the link is always connected.
+     */
     const unsigned isVolatile:1;
 
-    /* Activation */
+    /** @brief  activate link
+     *
+     * Optional, called whenever a JSON link is initialized or added at runtime.
+     *
+     * @param   plink   the link
+     */
     void (*openLink)(struct link *plink);
 
-    /* Destructor */
+    /** @brief  deactivate link
+     *
+     * Optional, called whenever a link address is changed at runtime, or the
+     * IOC is shutting down.
+     *
+     * @param   locker
+     * @param   plink   the link
+     */
     void (*removeLink)(struct dbLocker *locker, struct link *plink);
 
-    /* Const init, data type hinting */
+    /* Constant link initialization and data type hinting */
+
+    /** @brief  load constant scalar from link type
+     *
+     * Usually called during IOC initialization, constant link types must copy a
+     * scalar value of the indicated data type to the buffer provided and return
+     * 0. A non-constant link type can use this method call as an early hint
+     * that subsequent calls to dbGetLink() will request scalar data of the
+     * indicated type, although the type might change.
+     *
+     * @param   plink   the link
+     * @param   dbrType data type code
+     * @param   pbuffer where to put the value
+     * @returns 0 if a value was loaded, non-zero otherwise
+     */
     long (*loadScalar)(struct link *plink, short dbrType, void *pbuffer);
+
+    /** @brief  load constant long string from link type
+     *
+     * Usually called during IOC initialization, constant link types must copy a
+     * nil-terminated string up to size characters long to the buffer provided,
+     * and write the length of that string to the plen location. A non-constant
+     * link type can use this as an early hint that subsequent calls to
+     * dbGetLink() will request long string data, although this might change.
+     *
+     * @param   plink   the link
+     * @param   pbuffer where to put the string
+     * @param   size    length of pbuffer in chars
+     * @param   plen    set to number of chars written
+     * @returns status value
+     */
     long (*loadLS)(struct link *plink, char *pbuffer, epicsUInt32 size,
             epicsUInt32 *plen);
+
+    /** @brief  load constant array from link type
+     *
+     * Usually called during IOC initialization, constant link types must copy
+     * an array value of the indicated data type to the buffer provided, update
+     * the pnRequest location to indicate how many elements were loaded, and
+     * return 0. A non-constant link type can use this method call as an early
+     * hint that subsequent calls to dbGetLink() will request array data of the
+     * indicated type and max size, although the request might change.
+     *
+     * @param   plink       the link
+     * @param   dbrType     data type code
+     * @param   pbuffer     where to put the value
+     * @param   pnRequest   Max elements on entry, actual on exit
+     * @returns 0 if elements were loaded, non-zero otherwise
+     */
     long (*loadArray)(struct link *plink, short dbrType, void *pbuffer,
             long *pnRequest);
 
     /* Metadata */
+
+    /** @brief  return link connection status
+     *
+     * Return an indication whether this link is connected or not. This routine
+     * is polled by the calcout and some external record types. Not required for
+     * non-volatile link types, which are by definition always connected.
+     *
+     * @param   plink   the link
+     * @returns 1 if connected, 0 if disconnected
+     */
     int (*isConnected)(const struct link *plink);
+
+    /** @brief  get data type of link destination
+     *
+     * Called on both input and output links by long string support code to
+     * decide whether to use DBR_CHAR/DBR_UCHAR or DBR_STRING for a subsequent
+     * dbPutLink() or dbGetLink() call. Optional, but if not provided long
+     * strings cannot be transported over this link type, and no warning or
+     * error will appear to explain why. Not required for constant link types.
+     *
+     * @param   plink   the link
+     * @returns DBF_* type code, or -1 on error/disconnected link
+     */
     int (*getDBFtype)(const struct link *plink);
-    long (*getElements)(const struct link *plink, long *nelements);
 
     /* Get data */
+
+    /** @brief  get array size of an input link
+     *
+     * Called on input links by the compress record type for memory allocation
+     * purposes, before using the dbGetLink() routine to fetch the actual
+     * array data.
+     *
+     * @param   plink       the link
+     * @param   pnElements  where to put the answer
+     * @returns status value
+     */
+    long (*getElements)(const struct link *plink, long *pnElements);
+
+    /** @brief  get value from an input link
+     *
+     * Called to fetch data from the link, which must be converted into the
+     * given data type and placed in the buffer indicated. The actual number of
+     * elements retrieved should be updated in the pnRequest location. If this
+     * method returns an error status value, the link's record will be placed
+     * into an Invalid severity / Link Alarm state by the dbGetLink() routine
+     * that calls this method.
+     *
+     * @param   plink       the link
+     * @param   dbrType     data type code
+     * @param   pbuffer     where to put the value
+     * @param   pnRequest   max elements on entry, actual on exit
+     * @returns status value
+     */
     long (*getValue)(struct link *plink, short dbrType, void *pbuffer,
             long *pnRequest);
+
+    /** @brief  get the control range for an output link
+     *
+     * Called to fetch the control range for the link target, as a pair of
+     * double values for the lowest and highest values that the target will
+     * accept. This method is not used at all by the IOC or built-in record
+     * types, although external record types may require it.
+     *
+     * @param   plink   the link
+     * @param   lo      lowest accepted value
+     * @param   hi      highest accepted value
+     * @returns status value
+     */
     long (*getControlLimits)(const struct link *plink, double *lo, double *hi);
+
+    /** @brief  get the display range from an input link
+     *
+     * Called to fetch the display range for an input link target, as a pair of
+     * double values for the lowest and highest values that the PV expects to
+     * return. This method is used by several built-in record types to obtain
+     * the display range for their generic input links.
+     *
+     * @param   plink   the link
+     * @param   lo      lowest accepted value
+     * @param   hi      highest accepted value
+     * @returns status value
+     */
     long (*getGraphicLimits)(const struct link *plink, double *lo, double *hi);
+
+    /** @brief  get the alarm limits from an input link
+     *
+     * Called to fetch the alarm limits for an input link target, as four
+     * double values for the warning and alarm levels that the PV checks its
+     * value against. This method is used by several built-in record types to
+     * obtain the alarm limits for their generic input links.
+     *
+     * @param   plink   the link
+     * @param   lolo    low alarm value
+     * @param   lo      low warning value
+     * @param   hi      high warning value
+     * @param   hihi    high alarm value
+     * @returns status value
+     */
     long (*getAlarmLimits)(const struct link *plink, double *lolo, double *lo,
             double *hi, double *hihi);
+
+    /** @brief  get the precision from an input link
+     *
+     * Called to fetch the precision for an input link target. This method is
+     * used by several built-in record types to obtain the precision for their
+     * generic input links.
+     *
+     * @param   plink       the link
+     * @param   precision   where to put the answer
+     * @returns status value
+     */
     long (*getPrecision)(const struct link *plink, short *precision);
+
+    /** @brief  get the units string from an input link
+     *
+     * Called to fetch the units string for an input link target. This method is
+     * used by several built-in record types to obtain the units string for
+     * their generic input links.
+     *
+     * @param   plink       the link
+     * @param   units       where to put the answer
+     * @param   unitsSize   buffer size for the answer
+     * @returns status value
+     */
     long (*getUnits)(const struct link *plink, char *units, int unitsSize);
+
+    /** @brief  get the alarm condition from an input link
+     *
+     * Called to fetch the alarm status and severity for an input link target.
+     * Either status or severity pointers may be NULL when that value is not
+     * needed by the calling code. This method is used by several built-in
+     * record types to obtain the alarm condition for their generic input links.
+     *
+     * @param   plink       the link
+     * @param   status      where to put the alarm status (or NULL)
+     * @param   severity    where to put the severity (or NULL)
+     * @returns status value
+     */
     long (*getAlarm)(const struct link *plink, epicsEnum16 *status,
             epicsEnum16 *severity);
+
+    /** @brief  get the time-stamp from an input link
+     *
+     * Called to fetch the time-stamp for an input link target. This method is
+     * used by many built-in device supports to obtain the precision for their
+     * generic input links.
+     *
+     * @param   plink   the link
+     * @param   pstamp  where to put the answer
+     * @returns status value
+     */
     long (*getTimeStamp)(const struct link *plink, epicsTimeStamp *pstamp);
 
     /* Put data */
+
+    /** @brief  put a value to an output link
+     *
+     * Called to send nRequest elements of type dbrType found at pbuffer to an
+     * output link target.
+     *
+     * @param   plink       the link
+     * @param   dbrType     data type code
+     * @param   pbuffer     where to put the value
+     * @param   nRequest    number of elements to send
+     * @returns status value
+     */
     long (*putValue)(struct link *plink, short dbrType,
             const void *pbuffer, long nRequest);
+
+    /** @brief  put a value to an output link with asynchronous completion
+     *
+     * Called to send nRequest elements of type dbrType found at pbuffer to an
+     * output link target. If the return status is zero, the link type will
+     * later indicate the put has completed by calling dbLinkAsyncComplete()
+     * from a background thread, which will be used to continue the record
+     * process operation from where it left off.
+     *
+     * @param   plink       the link
+     * @param   dbrType     data type code
+     * @param   pbuffer     where to put the value
+     * @param   nRequest    number of elements to send
+     * @returns status value
+     */
     long (*putAsync)(struct link *plink, short dbrType,
             const void *pbuffer, long nRequest);
 
     /* Process */
+
+    /** @brief  trigger processing of a forward link
+     *
+     * Called to trigger processing of the record pointed to by a forward link.
+     * This routine is optional, but if not provided no warning message will be
+     * shown when called by dbScanFwdLink(). JSON link types that do not support
+     * this operation should return NULL from their jlif::alloc_jlink() method
+     * if it gets called with a dbfType of DBF_FWDLINK.
+     *
+     * @param   plink       the link
+     */
     void (*scanForward)(struct link *plink);
 
     /* Atomicity */
+
+    /** @brief  execute a callback routine with link locked
+     *
+     * Called on an input link when multiple link attributes need to be fetched
+     * in an atomic fashion. The link type must call the callback routine and
+     * prevent any background I/O from updating any cached link data until that
+     * routine returns. This method is used by most input device support to
+     * fetch the timestamp along with the value when the record's TSE field is
+     * set to epicsTimeEventDeviceTime.
+     *
+     * @param   plink   the link
+     * @param   rtn     routine to execute
+     * @returns status value
+     */
     long (*doLocked)(struct link *plink, dbLinkUserCallback rtn, void *priv);
 } lset;
 
 #define dbGetSevr(link, sevr) \
     dbGetAlarm(link, NULL, sevr)
 
+epicsShareFunc const char * dbLinkFieldName(const struct link *plink);
+
 epicsShareFunc void dbInitLink(struct link *plink, short dbfType);
 epicsShareFunc void dbAddLink(struct dbLocker *locker, struct link *plink,
         short dbfType, DBADDR *ptarget);
@@ -97,9 +382,10 @@ epicsShareFunc long dbLoadLink(struct link *plink, short dbrType,
 epicsShareFunc long dbLoadLinkArray(struct link *, short dbrType, void *pbuffer,
         long *pnRequest);
 
-epicsShareFunc long dbGetNelements(const struct link *plink, long *nelements);
+epicsShareFunc long dbGetNelements(const struct link *plink, long *pnElements);
 epicsShareFunc int dbIsLinkConnected(const struct link *plink); /* 0 or 1 */
 epicsShareFunc int dbGetLinkDBFtype(const struct link *plink);
+
 epicsShareFunc long dbGetLink(struct link *, short dbrType, void *pbuffer,
         long *options, long *nRequest);
 epicsShareFunc long dbGetControlLimits(const struct link *plink, double *low,

src/ioc/db/dbLock.c

@@ -565,12 +565,10 @@ void dbLockCleanupRecords(dbBase *pdbbase)
 
     forEachRecord(NULL, pdbbase, &freeLockRecord);
     if(ellCount(&lockSetsActive)) {
-        errlogMessage("Warning: dbLockCleanupRecords() leaking lockSets\n");
+        printf("Warning: dbLockCleanupRecords() leaking lockSets\n");
         dblsr(NULL,2);
     }
 
-    assert(ellCount(&lockSetsActive)==0);
-
 #ifndef LOCKSET_NOFREE
     while((cur=ellGet(&lockSetsFree))!=NULL) {
         lockSet *ls = (lockSet*)cur;