Set version to 3.16.2-rc1

Especially the responses in 'make --question' mode.

.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

@@ -2,14 +2,14 @@
 EPICS Base - the central core of a control system toolkit
 ---------------------------------------------------------
 
-Copyright (c) 1991-2003 The University of Chicago, as Operator
-of Argonne National Laboratory.
+Copyright UChicago Argonne LLC, as Operator of Argonne
+National Laboratory.
 Copyright (c) 1991-2003 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 the
-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.
 
 ---------------------------------------------------------
 

ci/travis-build.sh

@@ -6,15 +6,6 @@ die() {
   exit 1
 }
 
-ticker() {
-  while true
-  do
-    sleep 60
-    date -R
-    [ -r "$1" ] && tail -n10 "$1"
-  done
-}
-
 CACHEKEY=1
 
 EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
@@ -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

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_BASE

@@ -3,13 +3,12 @@
 #     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
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
 #---------------------------------------------------------------
-# Epics base directories
+# EPICS Base directories
 
 EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
 EPICS_BASE_HOST_LIB = $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)
@@ -19,12 +18,12 @@ ifdef T_A
 endif
 
 #---------------------------------------------------------------
-# Epics base Ioc libraries 
+# EPICS Base Ioc libraries 
 
 EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com 
 
 #---------------------------------------------------------------
-# Epics base Host libraries 
+# EPICS Base Host libraries 
 
 EPICS_BASE_HOST_LIBS += cas gdd
 EPICS_BASE_HOST_LIBS += ca Com
@@ -37,17 +36,16 @@ ifdef BASE_TOP
   SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
   # Windows only allows 2 levels of version numbering
   PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
+  BASE_CPPFLAGS += -DUSE_TYPED_RSET
 endif # BASE_TOP
 
 #---------------------------------------------------------------
 # Base c preprocessor flags
 
-BASE_CPPFLAGS = 
-
 # osithread default stack
 OSITHREAD_USE_DEFAULT_STACK = NO
 OSITHREAD_DEFAULT_STACK_FLAGS_YES = -DOSITHREAD_USE_DEFAULT_STACK
-OSITHREAD_DEFAULT_STACK_FLAGS_NO =
+
 BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
 
 #---------------------------------------------------------------
@@ -59,7 +57,7 @@ TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
 FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
 
 #---------------------------------------------------------------
-# Epics base build tools and tool flags
+# EPICS Base build tools and tool flags
 
 MAKEBPT                    = $(TOOLS)/makeBpt$(HOSTEXE)
 DBEXPAND                   = $(PERL) $(TOOLS)/dbdExpand.pl
@@ -69,11 +67,11 @@ REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
 CONVERTRELEASE             = $(PERL) $(call FIND_TOOL,convertRelease.pl)
 FULLPATHNAME               = $(PERL) $(TOOLS)/fullPathName.pl
 TAPTOJUNIT                 = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
+GENVERSIONHEADER           = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
-#-------------------------------------------------------
+#---------------------------------------------------------------
 # tools for installing libraries and products
-INSTALL_QUIETLY := $(if $(findstring s,$(MAKEFLAGS)),-q,)
-INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(INSTALL_QUIETLY)
+INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
@@ -83,7 +81,7 @@ MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
 REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
 
 #---------------------------------------------------------------
-# private versions of lex/yacc from EPICS
+# Our versions of lex (flex) and yacc (antelope)
 EYACC = $(TOOLS)/antelope$(HOSTEXE)
 ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
 
@@ -91,28 +89,6 @@ YACC  = $(EYACC)
 LEX   = $(ELEX)
 
 #---------------------------------------------------------------
-# Our use of msi is incompatible with older versions
+# The 3.15 version of msi supports new options
 
 MSI3_15 = $(EPICS_BASE_HOST_BIN)/msi
-
-#---------------------------------------------------------------
-# External tools and tool flags - must be in path or defined in application
-
-ADL2DL ?= adl2dl
-
-# sch2edif compiler and flags
-SCH2EDIF = sch2edif
-SCH2EDIF_PATH =
-SCH2EDIF_SYSFLAGS = -n -ap -p.+..+$(SCH2EDIF_PATH)+$(CAPFAST_TEMPLATES)/sym+
-SCH2EDIF_FLAGS =
- 
-# e2db and flags
-#    - again there is an assumption where edb.def is installed.
-E2DB ?= e2db
-E2DB_SYSFLAGS = -ate -d $(CAPFAST_TEMPLATES)/edb.def
-E2DB_FLAGS =
-
-DBST ?= dbst
-
-
-

configure/CONFIG_BASE_VERSION

@@ -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.
 #*************************************************************************
 #
 #  EPICS Version information
@@ -15,19 +15,30 @@
 # EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
 # version number to be included in the reported version string.
 
-# In 3.15 we still define BASE_3_14 so "ifdef BASE_3_14" means
-# 3.14 or later, but "ifeq ($(BASE_3_14),YES)" means 3.14 only.
+# We define BASE_3_14 and BASE_3_15 as NO and BASE_3_16 as YES, so
+#   ifdef BASE_3_14
+#       true for 3.14 or later
+#   ifdef BASE_3_15
+#       true for 3.15 or later
+#   ifeq ($(BASE_3_14),YES)
+#       true for 3.14.x only
+#   ifeq ($(BASE_3_15),YES)
+#       true for 3.15 only
+#   ifeq ($(BASE_3_16),YES)
+#       true for 3.16 only.
+
 BASE_3_14 = NO
-BASE_3_15 = YES
+BASE_3_15 = NO
+BASE_3_16 = YES
 
 # EPICS_VERSION must be a number >0 and <256
 EPICS_VERSION = 3
 
 # EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 15
+EPICS_REVISION = 16
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 6
+EPICS_MODIFICATION = 2
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
@@ -39,11 +50,11 @@ EPICS_PATCH_LEVEL = 0
 #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
-EPICS_DEV_SNAPSHOT=
+#EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -38,10 +38,6 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD
 
-#-------------------------------------------------------
-# dbst based database optimization default
-DB_OPT = NO
-
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
@@ -83,6 +79,8 @@ IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 # Make echo output - suppress echoing if make's '-s' flag is set
 NOP = :
 ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
+QUESTION_FLAG := $(if $(findstring q,$(MAKEFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -332,6 +330,14 @@ COMPILE.cpp = $(CCC) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
 # C preprocessor command
 PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
 
+#--------------------------------------------------
+# genVersion header defaults
+
+# C macro name
+GENVERSIONMACRO = VCSVERSION
+# C macro default value (empty to use date+time)
+GENVERSIONDEFAULT =
+
 #--------------------------------------------------
 # Header dependency file generation
 

configure/CONFIG_ENV

@@ -35,8 +35,10 @@ EPICS_CA_CONN_TMO=30.0
 EPICS_CA_REPEATER_PORT=5065
 EPICS_CA_SERVER_PORT=5064
 EPICS_CA_MAX_ARRAY_BYTES=16384
+EPICS_CA_AUTO_ARRAY_BYTES=YES
 EPICS_CA_BEACON_PERIOD=15.0
 EPICS_CA_MAX_SEARCH_PERIOD=300.0
+EPICS_CA_MCAST_TTL=1
 EPICS_CAS_BEACON_PERIOD=
 EPICS_CAS_BEACON_PORT=
 EPICS_CAS_AUTO_BEACON_ADDR_LIST=""

configure/CONFIG_SITE_ENV

@@ -69,8 +69,11 @@ EPICS_TS_NTP_INET=
 #	Prompt string
 # IOCSH_HISTSIZE
 #	Number of lines of command history to keep.
+# IOCSH_HISTEDIT_DISABLE
+# 	Prevents use of readline or equivalent if defined.
 IOCSH_PS1="epics> "
 IOCSH_HISTSIZE=50
+IOCSH_HISTEDIT_DISABLE=
 
 # Log Server:
 # EPICS_IOC_LOG_INET 

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,14 +4,17 @@
 # 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
 
-# Set db substitutions file suffix
+# RULES.Db
+
+# Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions
+TEMPL_SUFFIX ?= .template
 
-#####################################################  vpath
+#---------------------------------------------------------------
+# vpath
 
 vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
@@ -19,12 +22,13 @@ vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %.vdb $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %$(SUBST_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
-vpath %.template $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
+vpath %$(TEMPL_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath bpt%.data $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath %.acf $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 vpath %.acs $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
 
-##################################################### dbflags dbdflags
+#---------------------------------------------------------------
+# dbflags dbdflags
 
 DBD_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DBD) $(RELEASE_DBD_DIRS)
 DB_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DB) $(RELEASE_DB_DIRS)
@@ -33,13 +37,15 @@ DBDFLAGS = $(USR_DBDFLAGS) $(CMD_DBDFLAGS) $(addprefix -I,$(DBD_SEARCH_DIRS))
 DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) $(CMD_DBFLAGS) $(addprefix -I,$(DB_SEARCH_DIRS))
 REGRDDFLAGS = $(DBDFLAGS) $($*_REGRDDFLAGS) $(USR_REGRDDFLAGS) $(CMD_REGRDDFLAGS)
 
-##################################################### Targets
+#---------------------------------------------------------------
+# Targets
 
 # ---------------------------------------------------
 # To allow os specific dbd files AND have the -j option work properly,
 
-CROSS_TARGET_OS_TYPES = $(sort $(foreach target,  \
-    $(EPICS_HOST_ARCH) $(CROSS_COMPILER_TARGET_ARCHS),$(firstword $(subst -, ,$(target)))))
+CROSS_TARGET_OS_TYPES = $(sort $(foreach target, \
+    $(EPICS_HOST_ARCH) $(CROSS_COMPILER_TARGET_ARCHS), \
+    $(firstword $(subst -, ,$(target)))))
 DBD += $(foreach type, $(CROSS_TARGET_OS_TYPES), $(DBD_$(type)))
 
 # Users add os specific dbd files to a Makefile as follows
@@ -86,31 +92,28 @@ SOURCE_DB_bbb = $(foreach dir, $(GENERIC_SRC_DIRS), $(SOURCE_DB_aaa)  )
 SOURCE_DB_aaa = $(addsuffix /$(file), $(dir) )
 
 COMMONS = $(COMMON_DIR)/*.dbd $(COMMON_DIR)/*.db $(COMMON_DIR)/*.h \
-          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*.template
+          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*$(TEMPL_SUFFIX)
 
 # Remove trailing numbers (to 99) on stem
-TEMPLATE1=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
-          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
-          $*))))))))))
-TEMPLATE2=$(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%,$(patsubst %4,%, \
-          $(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%,$(patsubst %8,%,$(patsubst %9,%, \
-          $(TEMPLATE1)))))))))))
-TEMPLATE3=$(addsuffix .template,$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME=$(firstword $(wildcard $($*_TEMPLATE) $(addprefix ../,$($*_TEMPLATE)) ../$*.template $(TEMPLATE3) ../template))
-
-# dbst based database optimization
-ifeq '$(DB_OPT)' 'YES'
-RAW=.raw
-DBS = $(filter %.db,$(DB)) $(addsuffix $(RAW),$(filter %.db,$(DB)))
-COMMON_DBS = $(addprefix $(COMMON_DIR)/,$(DBS))
-endif
+TEMPLATE1 = $(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%, \
+            $(patsubst %4,%,$(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%, \
+            $(patsubst %8,%,$(patsubst %9,%,$*))))))))))
+TEMPLATE2 = $(patsubst %0,%,$(patsubst %1,%,$(patsubst %2,%,$(patsubst %3,%, \
+            $(patsubst %4,%,$(patsubst %5,%,$(patsubst %6,%,$(patsubst %7,%, \
+            $(patsubst %8,%,$(patsubst %9,%,$(TEMPLATE1)))))))))))
+TEMPLATE3 = $(addsuffix $(TEMPL_SUFFIX),$(addprefix ../,$(TEMPLATE2)))
+TEMPLATE_FILENAME = $(firstword $(wildcard $($*_TEMPLATE) \
+            $(addprefix ../,$($*_TEMPLATE)) ../$*$(TEMPL_SUFFIX) $(TEMPLATE3) \
+            ../template))
 
 INSTALL_DB_INSTALLS = $(addprefix $(INSTALL_DB)/,$(notdir $(DB_INSTALLS)))
 INSTALL_DBD_INSTALLS = $(addprefix $(INSTALL_DBD)/,$(notdir $(DBD_INSTALLS)))
 
 COMMONDEP_TARGET = $(COMMON_DIR)/$(basename $@)
 
-#####################################################  acf files
+#---------------------------------------------------------------
+# acf files
+
 # An access security configuration file, *.acf, can be created from
 # an *.acs file (has format of acf file plus #include "filename" lines)
 
@@ -123,7 +126,8 @@ ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\
 ACFDEPENDS_CMD = $(MKMF) -m $@ $(ACF_INCLUDES) $(COMMONDEP_TARGET) $<
 ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@
 
-#####################################################  dependancies
+#---------------------------------------------------------------
+# dependencies
 
 HINC += $(addsuffix .h,$(DBDINC_NAME))
 COMMON_DBDINC += $(addprefix $(COMMON_DIR)/,$(HINC))
@@ -133,12 +137,12 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) \
                     $(patsubst $(COMMON_DIR)/%,%, \
                     $(filter-out $(COMMON_DIR)/bpt%.dbd,$(COMMON_DBDS))))
 
-##################################################### 
+#---------------------------------------------------------------
 
 ifndef T_A
 
 DEP = .d
-TEMPLATE3+=$(addsuffix .template, $(TEMPLATE2))
+TEMPLATE3 += $(addsuffix $(TEMPL_SUFFIX), $(TEMPLATE2))
 
 COMMON_DIR = .
 INSTALL_DBDS =
@@ -153,18 +157,13 @@ ACTIONS += install
 ACTIONS += buildInstall
 ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
-actionArchTargets = $(foreach x, $(ACTIONS),\ $(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))
+cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 
-cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 -include $(TOP)/configure/CONFIG_APP_INCLUDE
 
 all: install
-ifeq ($(EPICS_HOST_ARCH),$T_A)
-host: install
-else
-# Do nothing
-host:
-endif
 
 install: buildInstall
 
@@ -172,20 +171,30 @@ buildInstall : build
 
 rebuild: clean install
 
-.PHONY: all host $(ACTIONS)
+.PHONY: all $(ACTIONS)
 
 $(actionArchTargets) $(BUILD_ARCHS): install
 $(cleanArchTargets): clean
 
 .PHONY: $(BUILD_ARCHS) $(actionArchTargets) $(cleanArchTargets)
 
-endif # T_A defined
+else
+  # T_A is defined
+  ifeq ($(EPICS_HOST_ARCH),$(T_A))
+    host: install
+  else
+    host:
+  endif
+
+  .PHONY: host
+endif # T_A
 
 ifneq (,$(strip $(DBDDEPENDS_FILES)))
 -include $(DBDDEPENDS_FILES)
 endif
 
-#####################################################  build dependancies, clean rule
+#---------------------------------------------------------------
+# build dependancies, clean rule
 
 inc : $(COMMON_INC) $(INSTALL_INC)
 
@@ -205,7 +214,8 @@ db_clean :
 
 realclean: clean
 
-##################################################### Dependency files
+#---------------------------------------------------------------
+# Dependency files
 
 %Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@
@@ -256,19 +266,19 @@ menu%.h$(DEP): ../menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%.db$(RAW)$(DEP): %$(SUBST_SUFFIX)
+%.db$(DEP): %$(SUBST_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@
 
-%.db$(RAW)$(DEP): ../%$(SUBST_SUFFIX)
+%.db$(DEP): ../%$(SUBST_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@
 
-%.db$(RAW)$(DEP): %.template
+%.db$(DEP): %$(TEMPL_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 
-%.db$(RAW)$(DEP): ../%.template
+%.db$(DEP): ../%$(TEMPL_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 
@@ -282,14 +292,8 @@ menu%.h$(DEP): ../menu%.dbd
 
 .PRECIOUS: %$(DEP)
 
-##################################################### CapFast filter
-
-$(COMMON_DIR)/%.edf: ../%.sch $(DEPSCHS) 
-	@$(RM) $@
-	@if [ ! -f cad.rc -a -r ../cad.rc ] ; then ln -s ../cad.rc ; fi
-	$(SCH2EDIF) $(SCH2EDIF_SYSFLAGS) $(SCH2EDIF_FLAGS) -o $@  $<
-
-##################################################### Substitution files
+#---------------------------------------------------------------
+# Substitution files
 
 #  WARNING: CREATESUBSTITUTIONS script needs output dir on command line
 
@@ -310,25 +314,21 @@ $(INSTALL_DB)/%$(SUBST_SUFFIX): ../%$(SUBST_SUFFIX)
 
 .PRECIOUS: $(COMMON_DIR)/%$(SUBST_SUFFIX)
 
-##################################################### Template files
+#---------------------------------------------------------------
+# Template files
 
-$(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf 
-	@$(RM) $@
-	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $@.VAR $<
-	@$(REPLACEVAR) < $@.VAR > $@
-	@$(RM) $@.VAR
-
-$(INSTALL_DB)/%.template: %.template
+$(INSTALL_DB)/%$(TEMPL_SUFFIX): %$(TEMPL_SUFFIX)
 	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_DB)/%.template: ../%.template
+$(INSTALL_DB)/%$(TEMPL_SUFFIX): ../%$(TEMPL_SUFFIX)
 	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-.PRECIOUS: $(COMMON_DIR)/%.template
+.PRECIOUS: $(COMMON_DIR)/%$(TEMPL_SUFFIX)
 
-##################################################### INC files
+#---------------------------------------------------------------
+# INC files
 
 $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 	@$(RM) $(notdir $@)
@@ -362,7 +362,8 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 
 .PRECIOUS: $(COMMON_DIR)/%.h
 
-##################################################### DBD files
+#---------------------------------------------------------------
+# DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
@@ -425,7 +426,8 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%.dbd
 
-##################################################### HTML files
+#---------------------------------------------------------------
+# HTML files
 
 $(COMMON_DIR)/%.html: %.dbd.pod $(TOOLS)/dbdToHtml.pl
 	@$(RM) $(notdir $@)
@@ -444,37 +446,44 @@ $(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
 
 $(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
+	@$(MKDIR) $(dir $@)
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.html: ../%.pl $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 .PRECIOUS: $(COMMON_DIR)/%.html %.html
 
-##################################################### DB files
+#---------------------------------------------------------------
+# DB files
 
-$(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf 
+$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf 
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $*.VAR $<
 	@$(REPLACEVAR) < $*.VAR > $@
 	@$(RM) $*.VAR
 
-$(COMMON_DIR)/%.db$(RAW): %$(SUBST_SUFFIX)
+$(COMMON_DIR)/%.db: %$(SUBST_SUFFIX)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) -S$< $(TEMPLATE_FILENAME)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): ../%$(SUBST_SUFFIX)
+$(COMMON_DIR)/%.db: ../%$(SUBST_SUFFIX)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) -S$< $(TEMPLATE_FILENAME)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): %.template
+$(COMMON_DIR)/%.db: %$(TEMPL_SUFFIX)
 	$(ECHO) "Inflating database from $<"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db$(RAW): ../%.template
+$(COMMON_DIR)/%.db: ../%$(TEMPL_SUFFIX)
 	$(ECHO) "Inflating database from $<"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) $<
@@ -492,22 +501,6 @@ $(COMMON_DIR)/%.acf: ../%.acs
 
 .PRECIOUS: $(COMMON_DIR)/%.acf
 
-# dbst based database optimization
-ifeq '$(DB_OPT)' 'YES'
-
-$(COMMON_DIR)/%.db$(RAW): ../%.db
-	@$(RM) $@
-	$(CP) $< $@
-
-$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.db$(RAW)
-	$(ECHO) "Optimizing database $@"
-	@$(RM) $@
-	$(DBST) . $< -d > $@
-
-.PRECIOUS: $(COMMON_DIR)/%.db
-.PRECIOUS: $(DB:%=$(COMMON_DIR)/%$(RAW))
-else
-
 $(INSTALL_DB)/%: %
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -515,7 +508,6 @@ $(INSTALL_DB)/%: %
 $(INSTALL_DB)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-endif
 
 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
 	$(ECHO) "Installing created db file $@"
@@ -531,8 +523,8 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 .PRECIOUS: $(COMMON_DIR)/%.edf
 .PRECIOUS: $(COMMON_DBS)
 
-##################################################### register record,device,driver support
-
+#---------------------------------------------------------------
+# register record,device,driver support
 
 %_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd
 	@$(RM) $@
@@ -548,4 +540,3 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 
-##################################################### END OF FILE

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

@@ -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
@@ -79,9 +80,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
@@ -185,7 +186,7 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	$(CONVERTRELEASE) checkRelease
+	+$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
@@ -384,7 +385,15 @@ 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
+
+ifneq ($(GENVERSION),)
+$(COMMON_DIR)/$(GENVERSION): FORCE
+	$(GENVERSIONHEADER) -t $(TOP) -N $(GENVERSIONMACRO) -V "$(GENVERSIONDEFAULT)" $@
+endif
 
 #---------------------------------------------------------------
 # Install rules for BIN_INSTALLS and LIB_INSTALLS
@@ -513,14 +522,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 clean-tests test-results junitfiles
-.PHONY: checkRelease warnRelease noCheckRelease
+.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

@@ -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))), \

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)
 

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

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

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -1,6 +1,7 @@
 #
 # Author: Matt Rippa
 #
+RTEMS_BSP = mvme2700
 RTEMS_TARGET_CPU = powerpc
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 ARCH_DEP_CFLAGS += -DHAVE_PPCBUG

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

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

configure/os/CONFIG.Common.RTEMS-pc386

@@ -5,14 +5,15 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
-RTEMS_TARGET_CPU=i386
+RTEMS_BSP = pc386
+RTEMS_TARGET_CPU = i386
 
 MUNCH_SUFFIX = .boot
 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,6 +5,7 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
+RTEMS_BSP = uC5282
 RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 

configure/os/CONFIG.Common.vxWorksCommon

@@ -1,7 +1,7 @@
 # CONFIG.Common.vxWorksCommon
 #
 # Definitions for vxWorks target archs
-# Sites may override these definitions in CONFIG_SITE.Common.vxWorksCommon
+# Override these definitions in CONFIG_SITE.Common.vxWorksCommon
 # or CONFIG_SITE.<host>.vxWorksCommon
 #-------------------------------------------------------
 
@@ -63,8 +63,6 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
-VX_GNU_VERSION_5.4 = 2.95
-VX_GNU_VERSION_5.5 = 2.96
 VX_GNU_VERSION_6.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -80,30 +78,21 @@ VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
 
 #--------------------------------------------------
-# Fix WIND_BASE for vxWorks 6.x on linux
-# NB: We know the value of WIND_HOST_TYPE here, but not VXWORKS_VERSION
+# Fix old Linux WIND_HOST_TYPE
 ifeq ($(WIND_HOST_TYPE),x86-linux)
-  WIND_HOST_TYPE_5 = x86-linux
-  WIND_HOST_TYPE_6 = x86-linux2
-  WIND_HOST_TYPE = $(WIND_HOST_TYPE_$(VXWORKS_MAJOR_VERSION))
+  WIND_HOST_TYPE = x86-linux2
 endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
 
-VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
-GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -113,9 +102,7 @@ NM = $(firstword $(wildcard $(WIND_BASE)/*/$(WIND_HOST_TYPE)/bin/$(NMPROG)))
 
 #--------------------------------------------------
 # A linker script is essential for munching from vxWorks 6.6 onwards
-# (i.e. with versions that use gcc 4.1.2 or later).  It can be used
-# with any vxWorks 5 or 6 version, but apparently should not be used
-# when compiling for 68K (which isn't supported in vxWorks 6 anyway)
+# (i.e. with versions that use gcc 4.1.2 or later).
 MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT
 MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION))
 
@@ -131,11 +118,10 @@ export TOOL_FAMILY = GNU
 OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
 OP_SYS_CFLAGS += -fno-builtin
 
-# Fix for vxWorks 5 headers that use macros defined in vxWorks.h but
+# Fix for vxWorks headers that use macros defined in vxWorks.h but
 # which don't actually include vxWorks.h themselves, for example the
 # target/h/sys/stat.h file which uses ULONG.  This also stops dbDefs.h
-# from defining the OFFSET macro, which generates lots of warnings in
-# both vxWorks 5 and 6.
+# from defining the OFFSET macro, which generates lots of warnings.
 OP_SYS_INCLUDE_CPPFLAGS += -include $(VX_DIR)/target/h/vxWorks.h
 
 #--------------------------------------------------
@@ -148,7 +134,6 @@ OPT_CXXFLAGS_YES = -O2
 CODE_CFLAGS =
 #
 # For vxWorks versions before 6.3 we need this g++ compiler flag
-CODE_CXXFLAGS_5 = -fno-implicit-templates
 CODE_CXXFLAGS_6.0 = -fno-implicit-templates
 CODE_CXXFLAGS_6.1 = -fno-implicit-templates
 CODE_CXXFLAGS_6.2 = -fno-implicit-templates
@@ -185,6 +170,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.UnixCommon.Common

@@ -8,7 +8,7 @@
 CP = cp
 MV = mv
 RM = rm -f
-MKDIR = mkdir
+MKDIR = mkdir -p
 RMDIR = rm -rf
 CAT = cat
 

configure/os/CONFIG.linux-386.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-486.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-586.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-686.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-x86.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

configure/os/CONFIG.linux-x86_64.Common

@@ -7,4 +7,4 @@
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
 
-WIND_HOST_TYPE = x86-linux
+WIND_HOST_TYPE = x86-linux2

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.vxWorksCommon

@@ -1,21 +1,13 @@
 # CONFIG_SITE.Common.vxWorksCommon
 #
 # Site specific definitions for vxWorks target builds.
-# Only the local epics system manager should modify this file
 
 # Compiler options can vary with the vxWorks version number, so we
-# need to know that.  However don't include any third-level digits
-# (e.g. the .2 in 5.5.2) because we don't need them.
+# need to know that.  Do not include any third-level digits.
 
-# Note: vxWorks 5.4.x (Tornado 2.0.x) is not supported
+# Note: vxWorks 5.4.x and 5.5.x (Tornado 2.x) are not supported.
+# VxWorks 6.0 through 6.5 use older, untested versions of GCC.
 
-#VXWORKS_VERSION = 5.5
-#VXWORKS_VERSION = 6.0
-#VXWORKS_VERSION = 6.1
-#VXWORKS_VERSION = 6.2
-#VXWORKS_VERSION = 6.3
-#VXWORKS_VERSION = 6.4
-#VXWORKS_VERSION = 6.5
 #VXWORKS_VERSION = 6.6
 #VXWORKS_VERSION = 6.7
 #VXWORKS_VERSION = 6.8
@@ -27,7 +19,6 @@ VXWORKS_VERSION = 6.9
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
 # WIND_BASE is where you installed the Wind River software.
-# Under vxWorks 6.x this is *not* the same as the old VX_DIR setting
 
 #WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
 WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)

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

@@ -14,10 +14,10 @@
 #GNU_DIR = /usr/local
 
 # Different distribution cross-build packages use different prefixes:
-# Ubuntu:
-#CMPLR_PREFIX = i686-w64-mingw32-
-# RHEL:
-CMPLR_PREFIX = i686-pc-mingw32-
+# Ubuntu, RHEL7:
+CMPLR_PREFIX = i686-w64-mingw32-
+# RHEL6:
+#CMPLR_PREFIX = i686-pc-mingw32-
 # Debian?
 #CMPLR_PREFIX = i586-mingw32msvc-
 

documentation/KnownProblems.html

@@ -4,25 +4,37 @@
 <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.15.6</title>
+  <title>Known Problems in Base-3.16.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS Base R3.15.6: Known Problems</h1>
+<h1 style="text-align: center">EPICS Base R3.16.1: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-3.15.6 tree. Download them, then use the GNU Patch program as
+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.15.6</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.16.1</b>
 % <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
-<p>The following significant problems have been reported with this
-version of EPICS Base:</p>
+<p>The following problems were known by the developers at the time of this
+release:</p>
 
 <ul>
 
-  <li>None known as yet.</li>
+<!-- Items added after release should be formatted thusly:
+  <li>YYYY-MM-DD: Description of problem.
+    <a href="fix.patch">This patch</a> fixes the problem.
+    ...</li>
+-->
+
+  <li>IOCs running on some versions of Cygwin may display warnings at iocInit
+    about duplicate EPICS CA Address list entries. These warnings might be due
+    to a bug in Cygwin; they are benign and can be ignored.</li>
+
+  <li>64-bit Windows builds of the CAS library may not work with some compilers.
+    The code in <tt>src/legacy/gdd</tt> is incompatible with the LLP64 model
+    that Windows uses for its 64-bit ABI.</li>
 
 </ul>
 

documentation/README.1st

@@ -1,24 +1,24 @@
                            Installation Instructions
 
-                           EPICS Base Release 3.15.6
+                           EPICS Base Release 3.16.1
 
    --------------------------------------------------------------------------
 
   Table of Contents
 
-     * 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
+     * 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
@@ -85,34 +86,31 @@
      as processes on the host platform.
 
      vxWorks
-     You must have vxWorks 5.5.x or 6.x installed if any of your target
-     systems are vxWorks systems; the C++ compiler for vxWorks 5.4 is now too
-     old to support. The vxWorks installation provides the cross-compiler and
-     header files needed to build for these targets. The absolute path to and
-     the version number of the vxWorks installation must be set in the
+     You must have vxWorks 6 installed if any of your target systems are
+     vxWorks systems; the C++ compilers for vxWorks 5.x are now too old to
+     support. The vxWorks installation provides the cross-compiler and header
+     files needed to build for these targets. The absolute path to and the
+     version number of the vxWorks installation must be set in the
      base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
      target-specific overrides.
 
-     Consult the vxWorks 5.x or vxWorks 6.x EPICS web pages about and the
-     vxWorks documentation for information about configuring your vxWorks
-     operating system for use with EPICS.
+     Consult the vxWorks 6.x EPICS web pages and the vxWorks documentation
+     for information about configuring your vxWorks operating system for use
+     with EPICS.
 
      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
 

documentation/README.html

@@ -9,7 +9,7 @@
 <BODY>
 <CENTER>
 <H1>Installation Instructions</H1>
-<H2>EPICS Base Release 3.15.6</H2><BR>
+<H2>EPICS Base Release 3.16.1</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</H3>
@@ -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
@@ -90,34 +90,33 @@
  as processes on the host platform.</P>
 
 <P><B>vxWorks</B><BR>
- You must have vxWorks 5.5.x or 6.x installed if any of your target systems are
- vxWorks systems; the C++ compiler for vxWorks 5.4 is now too old to support.
- The vxWorks installation provides the cross-compiler and header files needed to
+ You must have vxWorks 6 installed if any of your target systems are vxWorks
+ systems; the C++ compilers for vxWorks 5.x are now too old to support. The
+ vxWorks installation provides the cross-compiler and header files needed to
  build for these targets. The absolute path to and the version number of the
  vxWorks installation must be set in the
  base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
  target-specific overrides.</P>
 
-<P>Consult the <a href="https://epics.anl.gov/base/tornado.php">vxWorks
- 5.x</a> or <a href="https://epics.anl.gov/base/vxWorks6.php">vxWorks
- 6.x</a> EPICS web pages about and the vxWorks documentation for information
+<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>
@@ -190,12 +189,12 @@
         CONFIG.CrossCommon    Cross build definitions
         CONFIG.gnuCommon      Gnu compiler build definitions for all archs
         CONFIG_ADDONS         Definitions for &lt;osclass&gt; and DEFAULT options
-        CONFIG_APP_INCLUDE    
+        CONFIG_APP_INCLUDE
         CONFIG_BASE           EPICS base tool and location definitions
         CONFIG_BASE_VERSION   Definitions for EPICS base version number
         CONFIG_COMMON         Definitions common to all builds
         CONFIG_ENV            Definitions of EPICS environment variables
-        CONFIG_FILE_TYPE      
+        CONFIG_FILE_TYPE
         CONFIG_SITE           Site specific make definitions
         CONFIG_SITE_ENV       Site defaults for EPICS environment variables
         MAKEFILE              Installs CONFIG* RULES* creates
@@ -206,9 +205,9 @@
         RULES_ARCHS           Definitions and rules for building architectures
         RULES_BUILD           Build and install rules and definitions
         RULES_DIRS            Definitions and rules for building subdirectories
-        RULES_EXPAND          
-        RULES_FILE_TYPE       
-        RULES_TARGET          
+        RULES_EXPAND
+        RULES_FILE_TYPE
+        RULES_TARGET
         RULES_TOP             Rules specific to a &lt;top&gt; dir (uninstall and tar)
         Sample.Makefile       Sample makefile with comments
 </PRE>
@@ -340,7 +339,7 @@ Files in the base/startup directory have been provided to
 <H3><A NAME="0_0_13"> Example application and extension</A></H3>
 <BLOCKQUOTE>A perl tool, makeBaseApp.pl is included in the distribution
  file. This script will create a sample application that can be built
- and then executed to try out this release of base. 
+ and then executed to try out this release of base.
 
 <P>
  Instructions for building and executing the 3.15 example application
@@ -350,8 +349,8 @@ Files in the base/startup directory have been provided to
  create and build an example application in a user created &lt;top&gt;
  directory. It also explains how to run the example application on a
  vxWorks ioc or as a process on the host system.
- By running the example application as a host-based IOC, you will be 
- able to quickly implement a complete EPICS system and be able to run channel 
+ By running the example application as a host-based IOC, you will be
+ able to quickly implement a complete EPICS system and be able to run channel
  access clients on the host system.
 
 <P>

documentation/ReleaseChecklist.html

@@ -33,29 +33,27 @@
 <h1>EPICS Base Release Procedures &amp; Checklist</h1>
 
 <p>This document describes the procedures and provides a checklist of tasks
-that should be performed when creating new releases of EPICS Base.</p>
+that should be performed when creating production releases of EPICS Base.</p>
 
 <h3>The Release Process</h3>
 
 <p>The version released on the Feature Freeze date is designated the first
-pre-release, <tt>-pre1</tt>. The first Release Candidate <tt>-rc1</tt> is the
+pre-release, <tt>-pre1</tt>. The first release candidate <tt>-rc1</tt> is the
 first version that has undergone widespread testing and which has no known
 problems in it that are slated to be fixed in this release. New versions should
-be made at 2-weekly intervals during the testing and debugging period, and will
-be designated as either pre-release versions or Release Candidates by the
-Release Manager. After a Release Candidate has been available to the whole
+be made at about weekly intervals during the testing and debugging period, and
+will be designated as either pre-release or release candidate versions by the
+Release Manager. After a release candidate has been available to the whole
 community for testing for at least a week without any additional problems being
 reported or significant changes being committed, the branch can be designated as
 the final release version.</p>
 
 <h3>Roles</h3>
 
-<p>The following roles are required. The individuals named here have have been
-responsible for these tasks in the past and are expected to continue in the
-relevent roles unless the Release Manager designates otherwise:</p>
+<p>The following roles are used below:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong> (Ralph Lange)</dt>
+  <dt><strong>Release Manager</strong> ()</dt>
     <dd>Responsible for managing and tagging the release</dd>
   <dt><strong>Platform Developers</strong> (optional)</dt>
     <dd>Responsible for individual operating system platforms</dd>
@@ -136,33 +134,37 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>Tag the module in Git, using these tag conventions:
         <ul>
           <li>
-            <tt>R3.15.6-pre1</tt>
+            <tt>R3.16.1-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R3.15.6-rc1</tt>
+            <tt>R3.16.1-rc<i>n</i></tt>
             &mdash; release candidate tag
             </li>
-        </ul>
+          </ul>
         <blockquote><tt>
-          cd base-3.15<br />
-          git tag -m 'RL: Tagged for 3.15.6-rc1' R3.15.6-rc1
+          cd base-3.16<br />
+          git tag -m 'ANJ: Tagged for 3.16.1-rc1' R3.16.1-rc1
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Export the tagged version into a tarfile. The <tt>make-tar.sh</tt>
-        script generates a gzipped tarfile directly from the tag, excluding the
-        files and directories that are only used for continuous integration:
+      <td>Export the tagged version into a tarfile. This command generates a
+        gzipped tarfile directly from the repository, excluding those files and
+        directories needed only for continuous integration:
         <blockquote><tt>
-          cd base-3.15<br />
-          git archive --prefix=base-3.15.6-rc1/ --output=base-3.15.6-rc1.tar.gz R3.15.6-rc1 configure documentation LICENSE Makefile README src startup
+          cd base-3.16<br />
+          git archive
+            --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>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-3.15.6-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-3.16.1-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -256,7 +258,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>&nbsp;</td>
       <td>Release Manager</td>
       <td>Obtain a positive <q>Ok to release</q> from all platform developers
-        once a Release Candidate version has gone a whole week without any
+        once a release candidate version has gone a whole week without any
         issues being reported.</td>
       </tr>
     <tr>
@@ -273,23 +275,28 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>Release Manager</td>
       <td>Tag the module in Git:
         <blockquote><tt>
-          cd base-3.15<br />
-          git tag -m 'RL: Tagged for 3.15.6' R3.15.6
+          cd base-3.16<br />
+          git tag -m 'ANJ: Tagged for 3.16.1' R3.16.1</i>
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Export the tagged version into a tarfile. Note that this command
-        generates a gzipped tarfile directly from the repository:
+      <td>Export the tagged version into a tarfile. This command generates a
+        gzipped tarfile directly from the repository, excluding those files and
+        directories needed only for continuous integration:
         <blockquote><tt>
-          cd base-3.15<br />
-          git archive --prefix=base-3.15.6/ --output=base-3.15.6.tar.gz R3.15.6 configure documentation LICENSE Makefile README src startup
+          cd base-3.16<br />
+          git archive
+            --prefix=base-3.16.1/
+            --output=../base-3.16.1.tar.gz
+            R3.16.1
+            configure documentation LICENSE Makefile README src startup
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-3.15.6.tar.gz
+          gpg --armor --sign --detach-sig base-3.16.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>

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

@@ -314,11 +314,21 @@ is used.</p>
       <td>i &gt;= 16384</td>
       <td>16384</td>
     </tr>
+    <tr>
+      <td>EPICS_CA_AUTO_ARRAY_BYTES</td>
+      <td>{YES, NO}</td>
+      <td>YES</td>
+    </tr>
     <tr>
       <td>EPICS_CA_MAX_SEARCH_PERIOD</td>
       <td>r &gt; 60 seconds</td>
       <td>300</td>
     </tr>
+    <tr>
+      <td>EPICS_CA_MCAST_TTL</td>
+      <td>r &gt; 1</td>
+      <td>1</td>
+    </tr>
     <tr>
       <td>EPICS_TS_MIN_WEST</td>
       <td>-720 &lt; i &lt;720 minutes</td>
@@ -746,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
@@ -768,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>
 

src/ca/client/Makefile

@@ -69,7 +69,6 @@ LIBSRCS += comQueSend.cpp
 LIBSRCS += comBuf.cpp
 LIBSRCS += hostNameCache.cpp
 LIBSRCS += msgForMultiplyDefinedPV.cpp
-LIBSRCS_vxWorks += templateInstances.cpp
 
 LIBRARY=ca
 

src/ca/client/autoPtrDestroy.h

@@ -1,94 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-
-/*  
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, The Regents of the University of California.
- *                                  
- *           
- *	Author Jeffrey O. Hill
- *	johill@lanl.gov
- *	505 665 1831
- */
-
-#ifndef autoPtrDestroyh
-#define autoPtrDestroyh
-
-template < class T >
-class autoPtrDestroy {
-public:
-    autoPtrDestroy ( T * );
-    ~autoPtrDestroy ();
-    T & operator * () const;
-    T * operator -> () const;
-    autoPtrDestroy<T> & operator = ( T * );
-    T * get () const;
-    T * release ();
-private:
-    T * p;
-    // not implemented
-    autoPtrDestroy<T> & operator = ( const autoPtrDestroy<T> & );
-    autoPtrDestroy ( const autoPtrDestroy<T> & );
-};
-
-template < class T >
-inline autoPtrDestroy<T>::autoPtrDestroy ( T *pIn ) :
-    p ( pIn ) {}
-
-template < class T >
-inline autoPtrDestroy<T>::~autoPtrDestroy ()
-{
-    if ( this->p ) {
-        this->p->destroy ();
-    }
-}
-
-template < class T >
-inline T & autoPtrDestroy<T>::operator * () const
-{
-    return * this->p;
-}
-
-template < class T >
-inline T * autoPtrDestroy<T>::operator -> () const
-{
-    return this->p;
-}
-
-template < class T >
-inline autoPtrDestroy<T> & autoPtrDestroy<T>::operator = ( T * pIn )
-{
-    if ( this->p ) {
-        this->p->destroy ();
-    }
-    this->p = pIn;
-    return *this;
-}
-
-template < class T >
-inline T * autoPtrDestroy<T>::get () const
-{
-    return this->p;
-}
-
-template < class T >
-inline T * autoPtrDestroy<T>::release ()
-{
-    T *pTmp = this->p;
-    this->p = 0;
-    return pTmp;
-}
-
-#endif // #ifdef autoPtrDestroyh

src/ca/client/caProto.h

@@ -28,7 +28,8 @@
 #define CA_VERSION_STRING( MINOR_REVISION ) \
 ( capStrOfX ( CA_MAJOR_PROTOCOL_REVISION ) "." capStrOfX ( MINOR_REVISION ) )
 #define CA_UKN_MINOR_VERSION    0u /* unknown minor version */
-#if CA_MAJOR_PROTOCOL_REVISION == 4u
+#define CA_MINIMUM_SUPPORTED_VERSION 4u
+#   define CA_VSUPPORTED(MINOR) ((MINOR)>=CA_MINIMUM_SUPPORTED_VERSION)
 #   define CA_V41(MINOR) ((MINOR)>=1u) 
 #   define CA_V42(MINOR) ((MINOR)>=2u)
 #   define CA_V43(MINOR) ((MINOR)>=3u)
@@ -42,35 +43,6 @@
 #   define CA_V411(MINOR) ((MINOR)>=11u)  /* sequence numbers in UDP version command */
 #   define CA_V412(MINOR) ((MINOR)>=12u)  /* TCP-based search requests */
 #   define CA_V413(MINOR) ((MINOR)>=13u)  /* Allow zero length in requests. */
-#elif CA_MAJOR_PROTOCOL_REVISION > 4u
-#   define CA_V41(MINOR) ( 1u )
-#   define CA_V42(MINOR) ( 1u )
-#   define CA_V43(MINOR) ( 1u )
-#   define CA_V44(MINOR) ( 1u )
-#   define CA_V45(MINOR) ( 1u )
-#   define CA_V46(MINOR) ( 1u )
-#   define CA_V47(MINOR) ( 1u )
-#   define CA_V48(MINOR) ( 1u )
-#   define CA_V49(MINOR) ( 1u )
-#   define CA_V410(MINOR) ( 1u )
-#   define CA_V411(MINOR) ( 1u )
-#   define CA_V412(MINOR) ( 1u )
-#   define CA_V413(MINOR) ( 1u )
-#else
-#   define CA_V41(MINOR) ( 0u )
-#   define CA_V42(MINOR) ( 0u )
-#   define CA_V43(MINOR) ( 0u )
-#   define CA_V44(MINOR) ( 0u )
-#   define CA_V45(MINOR) ( 0u )
-#   define CA_V46(MINOR) ( 0u )
-#   define CA_V47(MINOR) ( 0u )
-#   define CA_V48(MINOR) ( 0u )
-#   define CA_V49(MINOR) ( 0u )
-#   define CA_V410(MINOR) ( 0u )
-#   define CA_V411(MINOR) ( 0u )
-#   define CA_V412(MINOR) ( 0u )
-#   define CA_V413(MINOR) ( 0u )
-#endif
 
 /*
  * These port numbers are only used if the CA repeater and 

src/ca/client/ca_client_context.cpp

@@ -159,7 +159,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
         this->localPort = htons ( tmpAddr.ia.sin_port );
     }
 
-    epics_auto_ptr < CallbackGuard > pCBGuard;
+    std::auto_ptr < CallbackGuard > pCBGuard;
     if ( ! enablePreemptiveCallback ) {
         pCBGuard.reset ( new CallbackGuard ( this->cbMutex ) );
     }

src/ca/client/cac.cpp

@@ -32,6 +32,7 @@
 #include "envDefs.h"
 #include "locationException.h"
 #include "errlog.h"
+#include "epicsExport.h"
 
 #define epicsExportSharedSymbols
 #include "addrList.h"
@@ -218,9 +219,15 @@ cac::cac (
             throw std::bad_alloc ();
         }
 
-        freeListInitPvt ( &this->tcpLargeRecvBufFreeList, this->maxRecvBytesTCP, 1 );
-        if ( ! this->tcpLargeRecvBufFreeList ) {
-            throw std::bad_alloc ();
+        int autoMaxBytes;
+        if(envGetBoolConfigParam(&EPICS_CA_AUTO_ARRAY_BYTES, &autoMaxBytes))
+            autoMaxBytes = 1;
+
+        if(!autoMaxBytes) {
+            freeListInitPvt ( &this->tcpLargeRecvBufFreeList, this->maxRecvBytesTCP, 1 );
+            if ( ! this->tcpLargeRecvBufFreeList ) {
+                throw std::bad_alloc ();
+            }
         }
         unsigned bufsPerArray = this->maxRecvBytesTCP / comBuf::capacityBytes ();
         if ( bufsPerArray > 1u ) {
@@ -231,9 +238,7 @@ cac::cac (
     catch ( ... ) {
         osiSockRelease ();
         delete [] this->pUserName;
-        if ( this->tcpSmallRecvBufFreeList ) {
-            freeListCleanup ( this->tcpSmallRecvBufFreeList );
-        }
+        freeListCleanup ( this->tcpSmallRecvBufFreeList );
         if ( this->tcpLargeRecvBufFreeList ) {
             freeListCleanup ( this->tcpLargeRecvBufFreeList );
         }
@@ -260,9 +265,14 @@ cac::cac (
         tcpiiu * piiu = NULL;
         SearchDestTCP * pdst = new SearchDestTCP ( *this, pNode->addr );
         this->registerSearchDest ( guard, * pdst );
+        /* Initially assume that servers listed in EPICS_CA_NAME_SERVERS support at least minor
+         * version 11.  This causes tcpiiu to send the user and host name authentication
+         * messages.  When the actual Version message is received from the server it will
+         * be overwrite this assumption.
+         */
         bool newIIU = findOrCreateVirtCircuit (
             guard, pNode->addr, cacChannel::priorityDefault,
-            piiu, CA_UKN_MINOR_VERSION, pdst );
+            piiu, 11, pdst );
         free ( pNode );
         if ( newIIU ) {
             piiu->start ( guard );
@@ -318,7 +328,9 @@ cac::~cac ()
     }
 
     freeListCleanup ( this->tcpSmallRecvBufFreeList );
-    freeListCleanup ( this->tcpLargeRecvBufFreeList );
+    if ( this->tcpLargeRecvBufFreeList ) {
+        freeListCleanup ( this->tcpLargeRecvBufFreeList );
+    }
 
     delete [] this->pUserName;
 

src/ca/client/cac.h

@@ -51,6 +51,7 @@
 class netWriteNotifyIO;
 class netReadNotifyIO;
 class netSubscription;
+class tcpiiu;
 
 // used to control access to cac's recycle routines which
 // should only be indirectly invoked by CAC when its lock
@@ -193,12 +194,6 @@ public:
         const char *pformat, va_list args ) const;
     double connectionTimeout ( epicsGuard < epicsMutex > & );
 
-    // buffer management
-    char * allocateSmallBufferTCP ();
-    void releaseSmallBufferTCP ( char * );
-    unsigned largeBufferSizeTCP () const;
-    char * allocateLargeBufferTCP ();
-    void releaseLargeBufferTCP ( char * );
     unsigned maxContiguousFrames ( epicsGuard < epicsMutex > & ) const;
 
     // misc
@@ -355,6 +350,8 @@ private:
 
 	cac ( const cac & );
 	cac & operator = ( const cac & );
+
+    friend class tcpiiu;
 };
 
 inline const char * cac::userNamePointer () const
@@ -385,35 +382,6 @@ inline void cac::attachToClientCtx ()
     this->notify.attachToClientCtx ();
 }
 
-inline char * cac::allocateSmallBufferTCP ()
-{
-    // this locks internally
-    return ( char * ) freeListMalloc ( this->tcpSmallRecvBufFreeList );
-}
-
-inline void cac::releaseSmallBufferTCP ( char *pBuf )
-{
-    // this locks internally
-    freeListFree ( this->tcpSmallRecvBufFreeList, pBuf );
-}
-
-inline unsigned cac::largeBufferSizeTCP () const
-{
-    return this->maxRecvBytesTCP;
-}
-
-inline char * cac::allocateLargeBufferTCP ()
-{
-    // this locks internally
-    return ( char * ) freeListMalloc ( this->tcpLargeRecvBufFreeList );
-}
-
-inline void cac::releaseLargeBufferTCP ( char *pBuf )
-{
-    // this locks internally
-    freeListFree ( this->tcpLargeRecvBufFreeList, pBuf );
-}
-
 inline unsigned cac::beaconAnomaliesSinceProgramStart (
     epicsGuard < epicsMutex > & guard ) const
 {

src/ca/client/nciu.h

@@ -58,6 +58,7 @@ protected:
     channelNode ();
     bool isInstalledInServer ( epicsGuard < epicsMutex > & ) const;
     bool isConnected ( epicsGuard < epicsMutex > & ) const;
+public:
     static unsigned getMaxSearchTimerCount ();
 private:
     enum channelState {

src/ca/client/oldAccess.h

@@ -26,13 +26,14 @@
 #ifndef oldAccessh
 #define oldAccessh
 
+#include <memory>
+
 #ifdef epicsExportSharedSymbols
 #   define oldAccessh_restore_epicsExportSharedSymbols
 #   undef epicsExportSharedSymbols
 #endif
 
 #include "tsFreeList.h"
-#include "epicsMemory.h"
 #include "compilerDependencies.h"
 #include "osiSock.h"
 
@@ -402,8 +403,8 @@ private:
     epicsEvent ioDone;
     epicsEvent callbackThreadActivityComplete;
     epicsThreadId createdByThread;
-    epics_auto_ptr < CallbackGuard > pCallbackGuard;
-    epics_auto_ptr < cacContext > pServiceContext;
+    std::auto_ptr < CallbackGuard > pCallbackGuard;
+    std::auto_ptr < cacContext > pServiceContext;
     caExceptionHandler * ca_exception_func;
     void * ca_exception_arg;
     caPrintfFunc * pVPrintfFunc;

src/ca/client/repeaterSubscribeTimer.cpp

@@ -66,6 +66,8 @@ void repeaterSubscribeTimer::shutdown (
 epicsTimerNotify::expireStatus repeaterSubscribeTimer::
     expire ( const epicsTime & /* currentTime */ )
 {
+    epicsGuard < epicsMutex > guard ( this->stateMutex );
+    
     static const unsigned nTriesToMsg = 50;
     if ( this->attempts > nTriesToMsg && ! this->once ) {
         callbackManager mgr ( this->ctxNotify, this->cbMutex );
@@ -92,12 +94,15 @@ epicsTimerNotify::expireStatus repeaterSubscribeTimer::
 
 void repeaterSubscribeTimer::show ( unsigned /* level */ ) const
 {
+    epicsGuard < epicsMutex > guard ( this->stateMutex );
+    
     ::printf ( "repeater subscribe timer: attempts=%u registered=%u once=%u\n",
         this->attempts, this->registered, this->once );
 }
 
 void repeaterSubscribeTimer::confirmNotify ()
 {
+    epicsGuard < epicsMutex > guard ( this->stateMutex );
     this->registered = true;
 }
 

src/ca/client/repeaterSubscribeTimer.h

@@ -70,6 +70,7 @@ private:
     repeaterTimerNotify & iiu;
     epicsMutex & cbMutex;
     cacContextNotify & ctxNotify;
+    mutable epicsMutex stateMutex;
     unsigned attempts;
     bool registered;
     bool once;

src/ca/client/searchTimer.cpp

@@ -24,7 +24,6 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#include "tsMinMax.h"
 #include "envDefs.h"
 
 #define epicsExportSharedSymbols

src/ca/client/tcpiiu.cpp

@@ -26,6 +26,9 @@
 
 #include <stdexcept>
 #include <string>
+
+#include <stdlib.h>
+
 #include "errlog.h"
 
 #define epicsExportSharedSymbols
@@ -687,7 +690,7 @@ tcpiiu::tcpiiu (
     curDataBytes ( 0ul ),
     comBufMemMgr ( comBufMemMgrIn ),
     cacRef ( cac ),
-    pCurData ( cac.allocateSmallBufferTCP () ),
+    pCurData ( (char*) freeListMalloc(this->cacRef.tcpSmallRecvBufFreeList) ),
     pSearchDest ( pSearchDestIn ),
     mutex ( mutexIn ),
     cbMutex ( cbMutexIn ),
@@ -711,9 +714,12 @@ tcpiiu::tcpiiu (
     socketHasBeenClosed ( false ),
     unresponsiveCircuit ( false )
 {
+    if(!pCurData)
+        throw std::bad_alloc();
+
     this->sock = epicsSocketCreate ( AF_INET, SOCK_STREAM, IPPROTO_TCP );
     if ( this->sock == INVALID_SOCKET ) {
-        cac.releaseSmallBufferTCP ( this->pCurData );
+        freeListFree(this->cacRef.tcpSmallRecvBufFreeList, this->pCurData);
         char sockErrBuf[64];
         epicsSocketConvertErrnoToString ( 
             sockErrBuf, sizeof ( sockErrBuf ) );
@@ -1023,11 +1029,14 @@ tcpiiu :: ~tcpiiu ()
 
     // free message body cache
     if ( this->pCurData ) {
-        if ( this->curDataMax == MAX_TCP ) {
-            this->cacRef.releaseSmallBufferTCP ( this->pCurData );
+        if ( this->curDataMax <= MAX_TCP ) {
+            freeListFree(this->cacRef.tcpSmallRecvBufFreeList, this->pCurData);
+        }
+        else if ( this->cacRef.tcpLargeRecvBufFreeList ) {
+            freeListFree(this->cacRef.tcpLargeRecvBufFreeList, this->pCurData);
         }
         else {
-            this->cacRef.releaseLargeBufferTCP ( this->pCurData );
+            free ( this->pCurData );
         }
     }
 }
@@ -1197,18 +1206,46 @@ bool tcpiiu::processIncoming (
         // make sure we have a large enough message body cache
         //
         if ( this->curMsg.m_postsize > this->curDataMax ) {
-            if ( this->curDataMax == MAX_TCP && 
-                    this->cacRef.largeBufferSizeTCP() >= this->curMsg.m_postsize ) {
-                char * pBuf = this->cacRef.allocateLargeBufferTCP ();
-                if ( pBuf ) {
-                    this->cacRef.releaseSmallBufferTCP ( this->pCurData );
-                    this->pCurData = pBuf;
-                    this->curDataMax = this->cacRef.largeBufferSizeTCP ();
+            assert (this->curMsg.m_postsize > MAX_TCP);
+
+            char * newbuf = NULL;
+            arrayElementCount newsize;
+
+            if ( !this->cacRef.tcpLargeRecvBufFreeList ) {
+                // round size up to multiple of 4K
+                newsize = ((this->curMsg.m_postsize-1)|0xfff)+1;
+
+                if ( this->curDataMax <= MAX_TCP ) {
+                    // small -> large
+                    newbuf = (char*)malloc(newsize);
+
+                } else {
+                    // expand large to larger
+                    newbuf = (char*)realloc(this->pCurData, newsize);
                 }
-                else {
-                    this->printFormated ( mgr.cbGuard,
-                        "CAC: not enough memory for message body cache (ignoring response message)\n");
+
+            } else if ( this->curMsg.m_postsize <= this->cacRef.maxRecvBytesTCP ) {
+                newbuf = (char*) freeListMalloc(this->cacRef.tcpLargeRecvBufFreeList);
+                newsize = this->cacRef.maxRecvBytesTCP;
+
+            }
+
+            if ( newbuf) {
+                if (this->curDataMax <= MAX_TCP) {
+                    freeListFree(this->cacRef.tcpSmallRecvBufFreeList, this->pCurData );
+
+                } else if (this->cacRef.tcpLargeRecvBufFreeList) {
+                    freeListFree(this->cacRef.tcpLargeRecvBufFreeList, this->pCurData );
+
+                } else {
+                    // called realloc()
                 }
+                this->pCurData = newbuf;
+                this->curDataMax = newsize;
+
+            } else {
+                this->printFormated ( mgr.cbGuard,
+                    "CAC: not enough memory for message body cache (ignoring response message)\n");
             }
         }
 
@@ -1426,7 +1463,7 @@ void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard,
     }
     arrayElementCount maxBytes;
     if ( CA_V49 ( this->minorProtocolVersion ) ) {
-        maxBytes = this->cacRef.largeBufferSizeTCP ();
+        maxBytes = 0xfffffff0;
     }
     else {
         maxBytes = MAX_TCP;
@@ -1537,7 +1574,7 @@ void tcpiiu::subscriptionRequest (
         guard, CA_V413(this->minorProtocolVersion) );
     arrayElementCount maxBytes;
     if ( CA_V49 ( this->minorProtocolVersion ) ) {
-        maxBytes = this->cacRef.largeBufferSizeTCP ();
+        maxBytes = 0xfffffff0;
     }
     else {
         maxBytes = MAX_TCP;
@@ -1584,7 +1621,7 @@ void tcpiiu::subscriptionUpdateRequest (
         guard, CA_V413(this->minorProtocolVersion) );
     arrayElementCount maxBytes;
     if ( CA_V49 ( this->minorProtocolVersion ) ) {
-        maxBytes = this->cacRef.largeBufferSizeTCP ();
+        maxBytes = 0xfffffff0;
     }
     else {
         maxBytes = MAX_TCP;

src/ca/client/templateInstances.cpp

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

src/ca/client/udpiiu.cpp

@@ -64,6 +64,52 @@ const udpiiu::pProtoStubUDP udpiiu::udpJumpTableCAC [] =
     &udpiiu::repeaterAckAction,
 };
 
+
+static
+double getMaxPeriod()
+{
+    double maxPeriod = maxSearchPeriodDefault;
+
+    if ( envGetConfigParamPtr ( & EPICS_CA_MAX_SEARCH_PERIOD ) ) {
+        long longStatus = envGetDoubleConfigParam (
+            & EPICS_CA_MAX_SEARCH_PERIOD, & maxPeriod );
+        if ( ! longStatus ) {
+            if ( maxPeriod < maxSearchPeriodLowerLimit ) {
+                epicsPrintf ( "\"%s\" out of range (low)\n",
+                                EPICS_CA_MAX_SEARCH_PERIOD.name );
+                maxPeriod = maxSearchPeriodLowerLimit;
+                epicsPrintf ( "Setting \"%s\" = %f seconds\n",
+                    EPICS_CA_MAX_SEARCH_PERIOD.name, maxPeriod );
+            }
+        }
+        else {
+            epicsPrintf ( "EPICS \"%s\" wasnt a real number\n",
+                            EPICS_CA_MAX_SEARCH_PERIOD.name );
+            epicsPrintf ( "Setting \"%s\" = %f seconds\n",
+                EPICS_CA_MAX_SEARCH_PERIOD.name, maxPeriod );
+        }
+    }
+
+    return maxPeriod;
+}
+
+static
+unsigned getNTimers(double maxPeriod)
+{
+    unsigned nTimers = static_cast < unsigned > ( 1.0 + log ( maxPeriod / minRoundTripEstimate ) / log ( 2.0 ) );
+
+    if ( nTimers > channelNode::getMaxSearchTimerCount () ) {
+        nTimers = channelNode::getMaxSearchTimerCount ();
+        epicsPrintf ( "\"%s\" out of range (high)\n",
+                        EPICS_CA_MAX_SEARCH_PERIOD.name );
+        epicsPrintf ( "Setting \"%s\" = %f seconds\n",
+            EPICS_CA_MAX_SEARCH_PERIOD.name,
+            (1<<(nTimers-1)) * minRoundTripEstimate );
+    }
+
+    return nTimers;
+}
+
 //
 // udpiiu::udpiiu ()
 //
@@ -85,14 +131,15 @@ udpiiu::udpiiu (
     repeaterSubscribeTmr (
         m_repeaterTimerNotify, timerQueue, cbMutexIn, ctxNotifyIn ),
     govTmr ( *this, timerQueue, cacMutexIn ),
-    maxPeriod ( maxSearchPeriodDefault ),
+    maxPeriod ( getMaxPeriod() ),
     rtteMean ( minRoundTripEstimate ),
     rtteMeanDev ( 0 ),
     cacRef ( cac ),
     cbMutex ( cbMutexIn ),
     cacMutex ( cacMutexIn ),
+    nTimers ( getNTimers(maxPeriod) ),
+    ppSearchTmr ( nTimers ),
     nBytesInXmitBuf ( 0 ),
-    nTimers ( 0 ),
     beaconAnomalyTimerIndex ( 0 ),
     sequenceNumber ( 0 ),
     lastReceivedSeqNo ( 0 ),
@@ -104,45 +151,13 @@ udpiiu::udpiiu (
     lastReceivedSeqNoIsValid ( false )
 {
     cacGuard.assertIdenticalMutex ( cacMutex );
-    
-    if ( envGetConfigParamPtr ( & EPICS_CA_MAX_SEARCH_PERIOD ) ) {
-        long longStatus = envGetDoubleConfigParam ( 
-            & EPICS_CA_MAX_SEARCH_PERIOD, & this->maxPeriod );
-        if ( ! longStatus ) {
-            if ( this->maxPeriod < maxSearchPeriodLowerLimit ) {
-                epicsPrintf ( "\"%s\" out of range (low)\n",
-                                EPICS_CA_MAX_SEARCH_PERIOD.name );
-                this->maxPeriod = maxSearchPeriodLowerLimit;
-                epicsPrintf ( "Setting \"%s\" = %f seconds\n",
-                    EPICS_CA_MAX_SEARCH_PERIOD.name, this->maxPeriod );
-            }
-        }
-        else {
-            epicsPrintf ( "EPICS \"%s\" wasnt a real number\n",
-                            EPICS_CA_MAX_SEARCH_PERIOD.name );
-            epicsPrintf ( "Setting \"%s\" = %f seconds\n",
-                EPICS_CA_MAX_SEARCH_PERIOD.name, this->maxPeriod );
-        }
-    }
 
-    double powerOfTwo = log ( this->maxPeriod / minRoundTripEstimate ) / log ( 2.0 );
-    this->nTimers = static_cast < unsigned > ( powerOfTwo + 1.0 );
-    if ( this->nTimers > channelNode::getMaxSearchTimerCount () ) {
-        this->nTimers = channelNode::getMaxSearchTimerCount ();
-        epicsPrintf ( "\"%s\" out of range (high)\n",
-                        EPICS_CA_MAX_SEARCH_PERIOD.name );
-        epicsPrintf ( "Setting \"%s\" = %f seconds\n",
-            EPICS_CA_MAX_SEARCH_PERIOD.name, 
-            (1<<(this->nTimers-1)) * minRoundTripEstimate );
-    }
-
-    powerOfTwo = log ( beaconAnomalySearchPeriod / minRoundTripEstimate ) / log ( 2.0 );
+    double powerOfTwo = log ( beaconAnomalySearchPeriod / minRoundTripEstimate ) / log ( 2.0 );
     this->beaconAnomalyTimerIndex = static_cast < unsigned > ( powerOfTwo + 1.0 );
     if ( this->beaconAnomalyTimerIndex >= this->nTimers ) {
         this->beaconAnomalyTimerIndex = this->nTimers - 1;
     }
 
-    this->ppSearchTmr.reset ( new epics_auto_ptr < class searchTimer > [ this->nTimers ] );
     for ( unsigned i = 0; i < this->nTimers; i++ ) {
         this->ppSearchTmr[i].reset ( 
             new searchTimer ( *this, timerQueue, i, cacMutexIn, 
@@ -176,6 +191,22 @@ udpiiu::udpiiu (
     }
 #endif
 
+#ifdef IP_MULTICAST_TTL
+    {
+        osiSockOptMcastTTL_t ttl;
+        long val;
+        if(envGetLongConfigParam(&EPICS_CA_MCAST_TTL, &val))
+            val =1;
+        ttl = val;
+        if ( setsockopt(this->sock, IPPROTO_IP, IP_MULTICAST_TTL, (char*)&ttl, sizeof(ttl))) {
+            char sockErrBuf[64];
+            epicsSocketConvertErrnoToString (
+                sockErrBuf, sizeof ( sockErrBuf ) );
+            errlogPrintf("CAC: failed to set mcast ttl %d\n", ttl);
+        }
+    }
+#endif
+
     int boolValue = true;
     int status = setsockopt ( this->sock, SOL_SOCKET, SO_BROADCAST, 
                 (char *) &boolValue, sizeof ( boolValue ) );

src/ca/client/udpiiu.h

@@ -25,6 +25,8 @@
 #ifndef udpiiuh
 #define udpiiuh
 
+#include <memory>
+
 #ifdef epicsExportSharedSymbols
 #   define udpiiuh_accessh_epicsExportSharedSymbols
 #   undef epicsExportSharedSymbols
@@ -32,9 +34,7 @@
 
 #include "osiSock.h"
 #include "epicsThread.h"
-#include "epicsMemory.h"
 #include "epicsTime.h"
-#include "tsMinMax.h"
 #include "tsDLList.h"
 
 #ifdef udpiiuh_accessh_epicsExportSharedSymbols
@@ -160,15 +160,24 @@ private:
     repeaterSubscribeTimer repeaterSubscribeTmr;
     disconnectGovernorTimer govTmr;
     tsDLList < SearchDest > _searchDestList;
-    double maxPeriod;
+    const double maxPeriod;
     double rtteMean;
     double rtteMeanDev;
     cac & cacRef;
     epicsMutex & cbMutex;
     epicsMutex & cacMutex;
-    epics_auto_ptr < epics_auto_ptr < class searchTimer >, eapt_array > ppSearchTmr;
+    const unsigned nTimers;
+    struct SearchArray {
+        typedef std::auto_ptr <searchTimer> value_type;
+        value_type *arr;
+        SearchArray(size_t n) : arr(new value_type[n]) {}
+        ~SearchArray() { delete[] arr; }
+        value_type& operator[](size_t i) const { return arr[i]; }
+    private:
+        SearchArray(const SearchArray&);
+        SearchArray& operator=(const SearchArray&);
+    } ppSearchTmr;
     unsigned nBytesInXmitBuf;
-    unsigned nTimers;
     unsigned beaconAnomalyTimerIndex;
     ca_uint32_t sequenceNumber;
     ca_uint32_t lastReceivedSeqNo;

src/ca/client/virtualCircuit.h

@@ -25,9 +25,7 @@
 #ifndef virtualCircuith  
 #define virtualCircuith
 
-#include "epicsMemory.h"
 #include "tsDLList.h"
-#include "tsMinMax.h"
 
 #include "comBuf.h"
 #include "caServerID.h"

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

@@ -53,7 +53,6 @@ LIBSRCS += outBuf.cc
 LIBSRCS += casCtx.cc 
 LIBSRCS += casEventMask.cc
 LIBSRCS += ioBlocked.cc
-LIBSRCS += casBufferFactory.cc
 LIBSRCS += pvExistReturn.cc
 LIBSRCS += pvAttachReturn.cc
 LIBSRCS += caNetAddr.cc
@@ -73,14 +72,16 @@ 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 ($(VXWORKS_VERSION)$(filter -mcpu=604,$(ARCH_DEP_CFLAGS)), 6.6-mcpu=604)
   casDGIntfOS_CXXFLAGS = -fno-inline
   casStreamOS_CXXFLAGS = -fno-inline
 endif
 
-LIBSRCS_vxWorks += templateInstances.cpp
-
 LIBRARY = cas
 cas_LIBS = ca gdd Com
 cas_SYS_LIBS_WIN32 = ws2_32

src/ca/legacy/pcas/example/directoryService/directoryServer.cc

@@ -13,7 +13,7 @@
 //
 
 #include "directoryServer.h"
-#include "tsMinMax.h"
+#include "epicsAlgorithm.h"
 
 const pvInfo *pvInfo::pFirst;
 
@@ -128,7 +128,7 @@ pvExistReturn directoryServer::pvExistTest
 	}
 	else {
 		size_t diff = pLastStr-pPVName;
-		diff = tsMin (diff, sizeof(pvNameBuf)-1);
+		diff = epicsMin (diff, sizeof(pvNameBuf)-1);
 		memcpy (pvNameBuf, pPVName, diff);
 		pvNameBuf[diff] = '\0';
 		pLastStr = pvNameBuf;

src/ca/legacy/pcas/generic/casBufferFactory.cpp

@@ -1,104 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-/*
- *      Author  Jeffrey O. Hill
- *              johill@lanl.gov
- *              505 665 1831
- */
-
-#include <new>
-
-#include "envDefs.h"
-#include "freeList.h"
-#include "errlog.h"
-
-#define epicsExportSharedSymbols
-#include "clientBufMemoryManager.h"
-#include "caProto.h"
-
-casBufferFactory::casBufferFactory () :
-    smallBufFreeList ( 0 ), largeBufFreeList ( 0 ), largeBufferSizePriv ( 0u )
-{
-    long maxBytesAsALong;
-    long status =  envGetLongConfigParam ( & EPICS_CA_MAX_ARRAY_BYTES, & maxBytesAsALong );
-    if ( status || maxBytesAsALong < 0 ) {
-        errlogPrintf ( "cas: EPICS_CA_MAX_ARRAY_BYTES was not a positive integer\n" );
-        this->largeBufferSizePriv = MAX_TCP;
-    }
-    else {
-        /* allow room for the protocol header so that they get the array size they requested */
-        static const unsigned headerSize = sizeof ( caHdr ) + 2 * sizeof ( ca_uint32_t );
-        ca_uint32_t maxBytes = ( unsigned ) maxBytesAsALong;
-        if ( maxBytes < 0xffffffff - headerSize ) {
-            maxBytes += headerSize;
-        }
-        else {
-            maxBytes = 0xffffffff;
-        }
-        if ( maxBytes < MAX_TCP ) {
-            errlogPrintf ( "cas: EPICS_CA_MAX_ARRAY_BYTES was rounded up to %u\n", MAX_TCP );
-            this->largeBufferSizePriv = MAX_TCP;
-        }
-        else {
-            this->largeBufferSizePriv = maxBytes;
-        }
-    }
-
-    freeListInitPvt ( & this->smallBufFreeList, MAX_MSG_SIZE, 8 );
-    freeListInitPvt ( & this->largeBufFreeList, this->largeBufferSizePriv, 1 );
-}
-
-casBufferFactory::~casBufferFactory ()
-{
-    freeListCleanup ( this->smallBufFreeList );
-    freeListCleanup ( this->largeBufFreeList );
-}
-
-unsigned casBufferFactory::smallBufferSize () const
-{
-    return MAX_MSG_SIZE;
-}
-
-char * casBufferFactory::newSmallBuffer ()
-{
-    void * pBuf = freeListCalloc ( this->smallBufFreeList );
-    if ( ! pBuf ) {
-        throw std::bad_alloc();
-    }
-    return static_cast < char * > ( pBuf );
-}
-
-void casBufferFactory::destroySmallBuffer ( char * pBuf )
-{
-    if ( pBuf ) {
-        freeListFree ( this->smallBufFreeList, pBuf );
-    }
-}
-
-unsigned casBufferFactory::largeBufferSize () const
-{
-    return this->largeBufferSizePriv;
-}
-
-char * casBufferFactory::newLargeBuffer ()
-{
-    void * pBuf = freeListCalloc ( this->largeBufFreeList );
-    if ( ! pBuf ) {
-        throw std::bad_alloc();
-    }
-    return static_cast < char * > ( pBuf );
-}
-
-void casBufferFactory::destroyLargeBuffer ( char * pBuf )
-{
-    if ( pBuf ) {
-        freeListFree ( this->largeBufFreeList, pBuf );
-    }
-}

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

@@ -5,7 +5,7 @@
 *     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. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 /*
  *      Author  Jeffrey O. Hill
@@ -30,9 +30,9 @@ casDGClient::pCASMsgHandler const casDGClient::msgHandlers[] =
     & casDGClient::uknownMessageAction,
     & casDGClient::uknownMessageAction,
 
-    & casDGClient::uknownMessageAction, 
-    & casDGClient::searchAction, 
-    & casDGClient::uknownMessageAction, 
+    & casDGClient::uknownMessageAction,
+    & casDGClient::searchAction,
+    & casDGClient::uknownMessageAction,
     & casDGClient::uknownMessageAction,
     & casDGClient::uknownMessageAction,
 
@@ -51,7 +51,7 @@ casDGClient::pCASMsgHandler const casDGClient::msgHandlers[] =
     & casDGClient::uknownMessageAction,
     & casDGClient::uknownMessageAction,
     & casDGClient::uknownMessageAction,
-    & casDGClient::echoAction,
+    & casDGClient::uknownMessageAction,
     & casDGClient::uknownMessageAction,
 
     & casDGClient::uknownMessageAction,
@@ -64,9 +64,9 @@ casDGClient::pCASMsgHandler const casDGClient::msgHandlers[] =
 //
 casDGClient::casDGClient ( caServerI & serverIn, clientBufMemoryManager & mgrIn ) :
     casCoreClient ( serverIn ),
-    in ( *this, mgrIn, MAX_UDP_RECV + sizeof ( cadg ) ), 
+    in ( *this, mgrIn, MAX_UDP_RECV + sizeof ( cadg ) ),
     out ( *this, mgrIn ),
-    seqNoOfReq ( 0 ), 
+    seqNoOfReq ( 0 ),
     minor_version_number ( 0 )
 {
 }
@@ -92,12 +92,12 @@ void casDGClient::destroy()
 //
 void casDGClient::show (unsigned level) const
 {
-    printf ( "casDGClient at %p\n", 
-        static_cast <const void *> ( this ) );
+    printf ( "casDGClient at %p\n",
+    static_cast <const void *> ( this ) );
     if (level>=1u) {
         char buf[64];
         this->hostName (buf, sizeof(buf));
-            printf ("Client Host=%s\n", buf);
+        printf ("Client Host=%s\n", buf);
         this->casCoreClient::show ( level - 1u );
         this->in.show ( level - 1u );
         this->out.show ( level - 1u );
@@ -111,11 +111,13 @@ caStatus casDGClient::uknownMessageAction ()
 {
     const caHdrLargeArray * mp = this->ctx.getMsg();
 
-    char pHostName[64u];
-    this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) );
+    if ( this->getCAS().getDebugLevel() > 3u ) {
+        char pHostName[64u];
+        this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) );
 
-    caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), 
-        "bad request code=%u in DG\n", mp->m_cmmd );
+        caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(),
+                             "bad request code=%u in DG\n", mp->m_cmmd );
+    }
 
     return S_cas_badProtocol;
 }
@@ -129,13 +131,23 @@ caStatus casDGClient::searchAction()
     const char              *pChanName = static_cast <char * > ( this->ctx.getData() );
     caStatus                status;
 
+    if (!CA_VSUPPORTED(mp->m_count)) {
+        if ( this->getCAS().getDebugLevel() > 3u ) {
+            char pHostName[64u];
+            this->hostName ( pHostName, sizeof ( pHostName ) );
+            printf ( "\"%s\" is searching for \"%s\" but is too old\n",
+                pHostName, pChanName );
+        }
+        return S_cas_badProtocol;
+    }
+
     //
     // check the sanity of the message
     //
     if ( mp->m_postsize <= 1 ) {
         char pHostName[64u];
         this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) );
-        caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), 
+        caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(),
             "empty PV name extension in UDP search request?\n" );
         return S_cas_success;
     }
@@ -143,19 +155,19 @@ caStatus casDGClient::searchAction()
     if ( pChanName[0] == '\0' ) {
         char pHostName[64u];
         this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) );
-        caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), 
+        caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(),
             "zero length PV name in UDP search request?\n" );
         return S_cas_success;
     }
 
     // check for an unterminated string before calling server tool
-    // by searching backwards through the string (some early versions 
+    // by searching backwards through the string (some early versions
     // of the client library might not be setting the pad bytes to nill)
     for ( unsigned i = mp->m_postsize-1; pChanName[i] != '\0'; i-- ) {
         if ( i <= 1 ) {
             char pHostName[64u];
             this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) );
-            caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(), 
+            caServerI::dumpMsg ( pHostName, "?", mp, this->ctx.getData(),
                 "unterminated PV name in UDP search request?\n" );
             return S_cas_success;
         }
@@ -164,7 +176,7 @@ caStatus casDGClient::searchAction()
     if ( this->getCAS().getDebugLevel() > 6u ) {
         char pHostName[64u];
         this->hostName ( pHostName, sizeof ( pHostName ) );
-        printf ( "\"%s\" is searching for \"%s\"\n", 
+        printf ( "\"%s\" is searching for \"%s\"\n",
             pHostName, pChanName );
     }
 
@@ -183,7 +195,7 @@ caStatus casDGClient::searchAction()
     // ask the server tool if this PV exists
     //
     this->userStartedAsyncIO = false;
-    pvExistReturn pver = 
+    pvExistReturn pver =
         this->getCAS()->pvExistTest ( this->ctx, this->lastRecvAddr, pChanName );
 
     //
@@ -193,7 +205,7 @@ caStatus casDGClient::searchAction()
     //
     if ( this->userStartedAsyncIO ) {
         if ( pver.getStatus() != pverAsyncCompletion ) {
-            errMessage (S_cas_badParameter, 
+            errMessage (S_cas_badParameter,
                 "- assuming asynch IO status from caServer::pvExistTest()");
         }
         status = S_cas_success;
@@ -212,13 +224,13 @@ caStatus casDGClient::searchAction()
             break;
 
         case pverAsyncCompletion:
-            errMessage (S_cas_badParameter, 
+            errMessage (S_cas_badParameter,
                 "- unexpected asynch IO status from caServer::pvExistTest() ignored");
             status = S_cas_success;
             break;
 
         default:
-            errMessage (S_cas_badParameter, 
+            errMessage (S_cas_badParameter,
                 "- invalid return from caServer::pvExistTest() ignored");
             status = S_cas_success;
             break;
@@ -230,18 +242,18 @@ caStatus casDGClient::searchAction()
 //
 // caStatus casDGClient::searchResponse()
 //
-caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg, 
+caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg,
                                      const pvExistReturn & retVal )
 {
     caStatus status;
-    
+
     if ( retVal.getStatus() != pverExistsHere ) {
         return S_cas_success;
     }
-    
+
     //
     // starting with V4.1 the count field is used (abused)
-    // by the client to store the minor version number of 
+    // by the client to store the minor version number of
     // the client.
     //
     // Old versions expect alloc of channel in response
@@ -250,8 +262,8 @@ caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg,
     if ( !CA_V44(msg.m_count) ) {
             char pName[64u];
             this->hostName (pName, sizeof (pName));
-            errlogPrintf ( 
-                "client \"%s\" using EPICS R3.11 CA connect protocol was ignored\n", 
+            errlogPrintf (
+                "client \"%s\" using EPICS R3.11 CA connect protocol was ignored\n",
                 pName);
         //
         // old connect protocol was dropped when the
@@ -264,19 +276,19 @@ caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg,
     }
 
     //
-    // cid field is abused to carry the IP 
+    // cid field is abused to carry the IP
     // address in CA_V48 or higher
     // (this allows a CA servers to serve
     // as a directory service)
     //
-    // data type field is abused to carry the IP 
+    // data type field is abused to carry the IP
     // port number here CA_V44 or higher
     // (this allows multiple CA servers on one
     // host)
     //
     ca_uint32_t serverAddr;
     ca_uint16_t serverPort;
-    if ( CA_V48( msg.m_count ) ) {    
+    if ( CA_V48( msg.m_count ) ) {
         struct sockaddr_in  ina;
         if ( retVal.addrIsValid() ) {
             caNetAddr addr = retVal.getAddr();
@@ -296,7 +308,7 @@ caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg,
             ina = addr.getSockIP();
             //
             // We dont fill in the servers address here
-            // because the server was not bound to a particular 
+            // because the server was not bound to a particular
             // interface, and we would need to waste CPU performing
             // the following steps to determine the interface that
             // will be used:
@@ -318,24 +330,24 @@ caStatus casDGClient::searchResponse ( const caHdrLargeArray & msg,
         serverAddr = ~0U;
         serverPort = ntohs ( inetAddr.sin_port );
     }
-    
+
     ca_uint16_t * pMinorVersion;
     epicsGuard < epicsMutex > guard ( this->mutex );
-    status = this->out.copyInHeader ( CA_PROTO_SEARCH, 
-        sizeof ( *pMinorVersion ), serverPort, 0, 
-        serverAddr, msg.m_available, 
+    status = this->out.copyInHeader ( CA_PROTO_SEARCH,
+        sizeof ( *pMinorVersion ), serverPort, 0,
+        serverAddr, msg.m_available,
         reinterpret_cast <void **> ( &pMinorVersion ) );
     //
     // Starting with CA V4.1 the minor version number
     // is appended to the end of each search reply.
-    // This value is ignored by earlier clients. 
+    // This value is ignored by earlier clients.
     //
     if ( status == S_cas_success ) {
         AlignedWireRef < epicsUInt16 > tmp ( *pMinorVersion );
         tmp = CA_MINOR_PROTOCOL_REVISION;
         this->out.commitMsg ();
     }
-    
+
     return status;
 }
 
@@ -362,6 +374,15 @@ caStatus casDGClient::versionAction ()
 {
     const caHdrLargeArray * mp = this->ctx.getMsg();
 
+    if (!CA_VSUPPORTED(mp->m_count)) {
+        if ( this->getCAS().getDebugLevel() > 3u ) {
+            char pHostName[64u];
+            this->hostName ( pHostName, sizeof ( pHostName ) );
+            printf ( "\"%s\" is too old\n",
+                pHostName );
+        }
+        return S_cas_badProtocol;
+    }
     if ( mp->m_count != 0 ) {
         this->minor_version_number = static_cast <ca_uint16_t> ( mp->m_count );
         if ( CA_V411 ( mp->m_count ) ) {
@@ -404,8 +425,8 @@ void casDGClient::sendBeacon ( ca_uint32_t beaconNumber )
 //
 // casDGClient::xSend()
 //
-outBufClient::flushCondition casDGClient::xSend ( char *pBufIn, 
-                        bufSizeT nBytesToSend, bufSizeT & nBytesSent ) 
+outBufClient::flushCondition casDGClient::xSend ( char *pBufIn,
+                        bufSizeT nBytesToSend, bufSizeT & nBytesSent )
 {
     bufSizeT totalBytes = 0;
     while ( totalBytes < nBytesToSend ) {
@@ -418,7 +439,7 @@ outBufClient::flushCondition casDGClient::xSend ( char *pBufIn,
         unsigned sizeDG = pHdr->cadg_nBytes - sizeof ( *pHdr );
 
         if ( pHdr->cadg_addr.isValid() ) {
-            outBufClient::flushCondition stat = 
+            outBufClient::flushCondition stat =
                 this->osdSend ( pDG, sizeDG, pHdr->cadg_addr );
             if ( stat != outBufClient::flushProgress ) {
                 break;
@@ -455,7 +476,7 @@ inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRe
 
     while (pAfter-pCurBuf >= static_cast<int>(MAX_UDP_RECV+sizeof(cadg))) {
         pHdr = reinterpret_cast < cadg * > ( pCurBuf );
-        stat = this->osdRecv ( reinterpret_cast < char * > ( pHdr + 1 ), 
+        stat = this->osdRecv ( reinterpret_cast < char * > ( pHdr + 1 ),
             MAX_UDP_RECV, parm, nDGBytesRecv, pHdr->cadg_addr);
         if (stat==casFillProgress) {
             pHdr->cadg_nBytes = nDGBytesRecv + sizeof(*pHdr);
@@ -487,9 +508,9 @@ inBufClient::fillCondition casDGClient::xRecv (char *pBufIn, bufSizeT nBytesToRe
 // this results in many small UDP frames which unfortunately
 // isnt particularly efficient
 //
-caStatus casDGClient::asyncSearchResponse ( 
+caStatus casDGClient::asyncSearchResponse (
     epicsGuard < casClientMutex > &, const caNetAddr & outAddr,
-	const caHdrLargeArray & msg, const pvExistReturn & retVal,
+    const caHdrLargeArray & msg, const pvExistReturn & retVal,
     ca_uint16_t protocolRevision, ca_uint32_t sequenceNumber )
 {
     if ( retVal.getStatus() != pverExistsHere ) {
@@ -497,7 +518,7 @@ caStatus casDGClient::asyncSearchResponse (
     }
 
     void * pRaw;
-    const outBufCtx outctx = this->out.pushCtx 
+    const outBufCtx outctx = this->out.pushCtx
                     ( sizeof(cadg), MAX_UDP_SEND, pRaw );
     if ( outctx.pushResult() != outBufCtx::pushCtxSuccess ) {
         return S_cas_sendBlocked;
@@ -533,8 +554,8 @@ caStatus casDGClient::processDG ()
 {
     bufSizeT bytesLeft;
     caStatus status;
- 
-	status = S_cas_success;
+
+    status = S_cas_success;
     while ( ( bytesLeft = this->in.bytesPresent() ) ) {
         bufSizeT dgInBytesConsumed;
         const cadg * pReqHdr = reinterpret_cast < cadg * > ( this->in.msgPtr () );
@@ -561,9 +582,9 @@ caStatus casDGClient::processDG ()
 
         // insert version header at the start of the reply message
         this->sendVersion ();
-        
+
         cadg * pRespHdr = static_cast < cadg * > ( pRaw );
-        
+
         //
         // select the next DG in the input stream and start processing it
         //
@@ -593,7 +614,7 @@ caStatus casDGClient::processDG ()
             // a) it used all of the incoming DG or
             // b) it used all of the outgoing DG
             //
-            // In either case commit the DG to the protocol stream and 
+            // In either case commit the DG to the protocol stream and
             // release the send lock
             //
             // if there are not additional messages passed the version header
@@ -689,7 +710,7 @@ void casDGClient::hostName ( char *pBufIn, unsigned bufSizeIn ) const
 void casDGClient::sendVersion ()
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
-    caStatus status = this->out.copyInHeader ( CA_PROTO_VERSION, 0, 
+    caStatus status = this->out.copyInHeader ( CA_PROTO_VERSION, 0,
         0, CA_MINOR_PROTOCOL_REVISION, 0, 0, 0 );
     if ( ! status ) {
         this->out.commitMsg ();
@@ -784,8 +805,8 @@ caStatus casDGClient::processMsg ()
                 msgTmp.m_available = AlignedWireRef < epicsUInt32 > ( smallHdr.m_available );
 
                 if ( payloadSize & 0x7 ) {
-                    status = this->sendErr ( 
-                        & msgTmp, invalidResID, ECA_INTERNAL, 
+                    status = this->sendErr (
+                        & msgTmp, invalidResID, ECA_INTERNAL,
                         "CAS: Datagram request wasn't 8 byte aligned" );
                     this->in.removeMsg ( bytesLeft );
                     break;
@@ -794,7 +815,7 @@ caStatus casDGClient::processMsg ()
                 msgSize = hdrSize + payloadSize;
                 if ( bytesLeft < msgSize ) {
                     if ( msgSize > this->in.bufferSize() ) {
-                        status = this->sendErr ( & msgTmp, invalidResID, ECA_TOLARGE, 
+                        status = this->sendErr ( & msgTmp, invalidResID, ECA_TOLARGE,
                             "client's request didnt fit within the CA server's message buffer" );
                         this->in.removeMsg ( bytesLeft );
                     }
@@ -806,7 +827,7 @@ caStatus casDGClient::processMsg ()
                 if ( this->getCAS().getDebugLevel() > 5u ) {
                     char pHostName[64u];
                     this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) );
-                    caServerI::dumpMsg ( pHostName, "?", 
+                    caServerI::dumpMsg ( pHostName, "?",
                         & msgTmp, rawMP + hdrSize, 0 );
                 }
 
@@ -814,7 +835,7 @@ caStatus casDGClient::processMsg ()
 
             //
             // Reset the context to the default
-            // (guarantees that previous message does not get mixed 
+            // (guarantees that previous message does not get mixed
             // up with the current message)
             //
             this->ctx.setChannel ( NULL );
@@ -841,16 +862,16 @@ caStatus casDGClient::processMsg ()
     }
     catch ( std::exception & except ) {
         this->in.removeMsg ( this->in.bytesPresent() );
-        this->sendErr ( 
-            this->ctx.getMsg(), invalidResID, ECA_INTERNAL, 
+        this->sendErr (
+            this->ctx.getMsg(), invalidResID, ECA_INTERNAL,
             "C++ exception \"%s\" in CA circuit server",
             except.what () );
         status = S_cas_internal;
     }
     catch (...) {
         this->in.removeMsg ( this->in.bytesPresent() );
-        this->sendErr ( 
-            this->ctx.getMsg(), invalidResID, ECA_INTERNAL, 
+        this->sendErr (
+            this->ctx.getMsg(), invalidResID, ECA_INTERNAL,
             "unexpected C++ exception in CA datagram server" );
         status = S_cas_internal;
     }
@@ -859,9 +880,9 @@ caStatus casDGClient::processMsg ()
 }
 
 //
-//	casDGClient::sendErr()
+//  casDGClient::sendErr()
 //
-caStatus casDGClient::sendErr ( const caHdrLargeArray *curp, 
+caStatus casDGClient::sendErr ( const caHdrLargeArray *curp,
     ca_uint32_t cid, const int reportedStatus, const char *pformat, ... )
 {
     unsigned stringSize;
@@ -885,14 +906,14 @@ caStatus casDGClient::sendErr ( const caHdrLargeArray *curp,
     }
 
     unsigned hdrSize = sizeof ( caHdr );
-    if ( ( curp->m_postsize >= 0xffff || curp->m_count >= 0xffff ) && 
+    if ( ( curp->m_postsize >= 0xffff || curp->m_count >= 0xffff ) &&
             CA_V49( this->minor_version_number ) ) {
         hdrSize += 2 * sizeof ( ca_uint32_t );
     }
 
     caHdr * pReqOut;
     epicsGuard < epicsMutex > guard ( this->mutex );
-    caStatus status = this->out.copyInHeader ( CA_PROTO_ERROR, 
+    caStatus status = this->out.copyInHeader ( CA_PROTO_ERROR,
         hdrSize + stringSize, 0, 0, cid, reportedStatus,
         reinterpret_cast <void **> ( & pReqOut ) );
     if ( ! status ) {
@@ -902,7 +923,7 @@ caStatus casDGClient::sendErr ( const caHdrLargeArray *curp,
          * copy back the request protocol
          * (in network byte order)
          */
-        if ( ( curp->m_postsize >= 0xffff || curp->m_count >= 0xffff ) && 
+        if ( ( curp->m_postsize >= 0xffff || curp->m_count >= 0xffff ) &&
                 CA_V49( this->minor_version_number ) ) {
             ca_uint32_t *pLW = ( ca_uint32_t * ) ( pReqOut + 1 );
             pReqOut->m_cmmd = htons ( curp->m_cmmd );
@@ -947,7 +968,7 @@ caStatus casDGClient::echoAction ()
     void * pPayloadOut;
 
     epicsGuard < epicsMutex > guard ( this->mutex );
-    caStatus status = this->out.copyInHeader ( mp->m_cmmd, mp->m_postsize, 
+    caStatus status = this->out.copyInHeader ( mp->m_cmmd, mp->m_postsize,
         mp->m_dataType, mp->m_count, mp->m_cid, mp->m_available,
         & pPayloadOut );
     if ( ! status ) {

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

@@ -205,7 +205,7 @@ caStatus casStrmClient :: processMsg ()
                 if ( bytesLeft < msgSize ) {
                     status = S_cas_success;
                     if ( msgSize > this->in.bufferSize() ) {
-                        this->in.expandBuffer ();
+                        this->in.expandBuffer (msgSize);
                         // msg to large - set up message drain
                         if ( msgSize > this->in.bufferSize() ) {
                             caServerI::dumpMsg ( this->pHostName, this->pUserName, & msgTmp, 0, 
@@ -338,6 +338,16 @@ caStatus casStrmClient::versionAction ( epicsGuard < casClientMutex > & )
         return S_cas_badProtocol;
     }
 
+    if (!CA_VSUPPORTED(mp->m_count)) {
+        if ( this->getCAS().getDebugLevel() > 3u ) {
+            char pHostName[64u];
+            this->hostName ( pHostName, sizeof ( pHostName ) );
+            printf ( "\"%s\" is too old\n",
+                pHostName );
+        }
+        return S_cas_badProtocol;
+    }
+
     double tmp = mp->m_dataType - CA_PROTO_PRIORITY_MIN;
     tmp *= epicsThreadPriorityCAServerHigh - epicsThreadPriorityCAServerLow;
     tmp /= CA_PROTO_PRIORITY_MAX - CA_PROTO_PRIORITY_MIN;
@@ -1267,6 +1277,14 @@ caStatus casStrmClient :: searchResponse (
     const pvExistReturn & retVal )
 {    
     if ( retVal.getStatus() != pverExistsHere ) {
+        if (msg.m_dataType == DOREPLY ) {
+            long status = this->out.copyInHeader ( CA_PROTO_NOT_FOUND, 0,
+                msg.m_dataType, msg.m_count, msg.m_cid, msg.m_available, 0 );
+
+            if ( status == S_cas_success ) {
+                this->out.commitMsg ();
+            }
+        }
         return S_cas_success;
     }
     
@@ -1362,6 +1380,16 @@ caStatus casStrmClient :: searchAction ( epicsGuard < casClientMutex > & guard )
     const char              *pChanName = static_cast <char * > ( this->ctx.getData() );
     caStatus                status;
 
+    if (!CA_VSUPPORTED(mp->m_count)) {
+        if ( this->getCAS().getDebugLevel() > 3u ) {
+            char pHostName[64u];
+            this->hostName ( pHostName, sizeof ( pHostName ) );
+            printf ( "\"%s\" is searching for \"%s\" but is too old\n",
+                pHostName, pChanName );
+        }
+        return S_cas_badProtocol;
+    }
+
     //
     // check the sanity of the message
     //
@@ -1431,11 +1459,8 @@ caStatus casStrmClient :: searchAction ( epicsGuard < casClientMutex > & guard )
         //
         switch ( pver.getStatus() ) {
         case pverExistsHere:
-            status = this->searchResponse ( guard, *mp, pver );
-            break;
-
         case pverDoesNotExistHere:
-            status = S_cas_success;
+            status = this->searchResponse ( guard, *mp, pver );
             break;
 
         case pverAsyncCompletion:

src/ca/legacy/pcas/generic/clientBufMemoryManager.cpp

@@ -13,42 +13,54 @@
  *              505 665 1831
  */
 
+#include <new>
+
+#include <stdlib.h>
+
+#include "epicsAssert.h"
+#include "freeList.h"
+
 #define epicsExportSharedSymbols
 #include "clientBufMemoryManager.h"
+#include "caProto.h"
 
-bufSizeT clientBufMemoryManager::maxSize () const
+clientBufMemoryManager::clientBufMemoryManager()
+    :smallBufFreeList ( 0 )
 {
-    return bufferFactory.largeBufferSize ();
+    freeListInitPvt ( & this->smallBufFreeList, MAX_MSG_SIZE, 8 );
+}
+
+clientBufMemoryManager::~clientBufMemoryManager()
+{
+    freeListCleanup ( this->smallBufFreeList );
 }
 
 casBufferParm clientBufMemoryManager::allocate ( bufSizeT newMinSize )
 {
     casBufferParm parm;
-    if ( newMinSize <= bufferFactory.smallBufferSize () ) {
-        parm.pBuf = bufferFactory.newSmallBuffer ();
-        parm.bufSize = bufferFactory.smallBufferSize ();
-    }
-    else if ( newMinSize <= bufferFactory.largeBufferSize () ) {
-        parm.pBuf = bufferFactory.newLargeBuffer ();
-        parm.bufSize = bufferFactory.largeBufferSize ();
+    if ( newMinSize <= MAX_MSG_SIZE ) {
+        parm.pBuf = (char*)freeListMalloc(this->smallBufFreeList);
+        parm.bufSize = MAX_MSG_SIZE;
     }
     else {
-        parm.pBuf = static_cast < char * > ( ::operator new ( newMinSize ) );
+        // round size up to multiple of 4K
+        newMinSize = ((newMinSize-1)|0xfff)+1;
+        parm.pBuf = (char*)malloc(newMinSize);
         parm.bufSize = newMinSize;
     }
+    if(!parm.pBuf)
+        throw std::bad_alloc();
     return parm;
 }
 
 void clientBufMemoryManager::release ( char * pBuf, bufSizeT bufSize )
 {
-    if ( bufSize == bufferFactory.smallBufferSize () ) {
-        bufferFactory.destroySmallBuffer ( pBuf );
-    }
-    else if ( bufSize == bufferFactory.largeBufferSize () ) {
-        bufferFactory.destroyLargeBuffer ( pBuf );
+    assert(pBuf);
+    if (bufSize <= MAX_MSG_SIZE) {
+        freeListFree(this->smallBufFreeList, pBuf);
     }
     else {
-        ::operator delete ( pBuf );
+        free(pBuf);
     }
 }
 

src/ca/legacy/pcas/generic/clientBufMemoryManager.h

@@ -16,22 +16,6 @@
 typedef unsigned bufSizeT;
 static const unsigned bufSizeT_MAX = UINT_MAX;
 
-class casBufferFactory {
-public:
-    casBufferFactory ();
-    ~casBufferFactory ();
-    unsigned smallBufferSize () const;
-    char * newSmallBuffer ();
-    void destroySmallBuffer ( char * pBuf );
-    unsigned largeBufferSize () const;
-    char * newLargeBuffer ();
-    void destroyLargeBuffer ( char * pBuf );
-private:
-    void * smallBufFreeList; 
-    void * largeBufFreeList; 
-    unsigned largeBufferSizePriv;
-};
-
 struct casBufferParm {
     char * pBuf;
     bufSizeT bufSize;
@@ -39,11 +23,15 @@ struct casBufferParm {
 
 class clientBufMemoryManager {
 public:
+    clientBufMemoryManager();
+    ~clientBufMemoryManager();
+
+    //! @throws std::bad_alloc on failure
     casBufferParm allocate ( bufSizeT newMinSize );
     void release ( char * pBuf, bufSizeT bufSize );
-    bufSizeT maxSize () const;
 private:
-    casBufferFactory bufferFactory;
+
+    void * smallBufFreeList;
 };
 
 #endif // clientBufMemoryManagerh

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

@@ -13,6 +13,9 @@
  *              505 665 1831
  */
 
+#include <stdexcept>
+#include <new>
+
 #include <stdio.h>
 #include <string.h>
 
@@ -155,11 +158,17 @@ bufSizeT inBuf::popCtx ( const inBufCtx &ctx )
     }
 }
 
-void inBuf::expandBuffer ()
+void inBuf::expandBuffer (bufSizeT needed)
 {
-    bufSizeT max = this->memMgr.maxSize();
-    if ( this->bufSize <  max ) {
-        casBufferParm bufParm = this->memMgr.allocate ( max );
+    if (needed > bufSize) {
+        casBufferParm bufParm;
+        try {
+            bufParm = this->memMgr.allocate ( needed );
+        } catch (std::bad_alloc& e) {
+            // caller must check that buffer size has expended
+            return;
+        }
+
         bufSizeT unprocessedBytes = this->bytesPresent ();
         memcpy ( bufParm.pBuf, &this->pBuf[this->nextReadIndex], unprocessedBytes );
         this->bytesInBuffer = unprocessedBytes;
@@ -170,7 +179,7 @@ void inBuf::expandBuffer ()
     }
 }
 
-unsigned inBuf::bufferSize () const
+bufSizeT inBuf::bufferSize() const
 {
     return this->bufSize;
 }

src/ca/legacy/pcas/generic/inBuf.h

@@ -82,8 +82,8 @@ public:
     //
     const inBufCtx pushCtx ( bufSizeT headerSize, bufSizeT bodySize );
 	bufSizeT popCtx ( const inBufCtx & ); // returns actual size
-    unsigned bufferSize () const;
-    void expandBuffer ();
+    bufSizeT bufferSize () const;
+    void expandBuffer (bufSizeT needed);
 private:
     class inBufClient & client;
     class clientBufMemoryManager & memMgr;

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

@@ -59,7 +59,7 @@ caStatus outBuf::allocRawMsg ( bufSizeT msgsize, void **ppMsg )
     msgsize = CA_MESSAGE_ALIGN ( msgsize );
 
     if ( msgsize > this->bufSize ) {
-        this->expandBuffer ();
+        this->expandBuffer (msgsize);
         if ( msgsize > this->bufSize ) {
             return S_cas_hugeRequest;
         }
@@ -316,11 +316,17 @@ void outBuf::show (unsigned level) const
     }
 }
 
-void outBuf::expandBuffer ()
+void outBuf::expandBuffer (bufSizeT needed)
 {
-    bufSizeT max = this->memMgr.maxSize();
-    if ( this->bufSize < max  ) {
-        casBufferParm bufParm = this->memMgr.allocate ( max );
+    if (needed > bufSize) {
+        casBufferParm bufParm;
+        try {
+            bufParm = this->memMgr.allocate ( needed );
+        } catch (std::bad_alloc& e) {
+            // caller must check that buffer size has expended
+            return;
+        }
+
         memcpy ( bufParm.pBuf, this->pBuf, this->stack );
         this->memMgr.release ( this->pBuf, this->bufSize );
         this->pBuf = bufParm.pBuf;

src/ca/legacy/pcas/generic/outBuf.h

@@ -122,7 +122,7 @@ private:
 	bufSizeT stack;
     unsigned ctxRecursCount;
 
-    void expandBuffer ();
+    void expandBuffer (bufSizeT needed);
 
 	outBuf ( const outBuf & );
 	outBuf & operator = ( const outBuf & );

src/ca/legacy/pcas/generic/templateInstances.cpp

@@ -1,29 +0,0 @@
-/*************************************************************************\
-* Copyright (c) 2008 UChicago Argonne LLC, as Operator of Argonne
-*     National Laboratory.
-* Copyright (c) 2002 The Regents of the University of California, as
-*     Operator of Los Alamos National Laboratory.
-* EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
-\*************************************************************************/
-
-#define epicsExportSharedSymbols
-#include "ipIgnoreEntry.h"
-#include "casChannelI.h"
-
-#ifdef _MSC_VER
-#   pragma warning ( push )
-#   pragma warning ( disable:4660 )
-#endif
-
-template class resTable < ipIgnoreEntry, ipIgnoreEntry >;
-template class resTable < casChannelI, chronIntId >;
-template class resTable < casEventMaskEntry, stringId >;
-template class chronIntIdResTable < casChannelI >;
-template class tsFreeList < casMonEvent, 1024, epicsMutexNOOP >;
-template class tsFreeList < casMonitor, 1024, epicsMutex >;
-
-
-#ifdef _MSC_VER
-#   pragma warning ( pop )
-#endif

src/ioc/as/Makefile

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

src/ioc/db/Makefile

@@ -14,14 +14,18 @@ SRC_DIRS += $(IOCDIR)/db
 INC += callback.h
 INC += dbAccess.h
 INC += dbAccessDefs.h
-INC += dbCa.h
 INC += dbAddr.h
 INC += dbBkpt.h
+INC += dbCa.h
 INC += dbChannel.h
+INC += dbConstLink.h
 INC += dbConvert.h
 INC += dbConvertFast.h
+INC += dbConvertJSON.h
+INC += dbDbLink.h
 INC += dbExtractArray.h
 INC += dbEvent.h
+INC += dbJLink.h
 INC += dbLink.h
 INC += dbLock.h
 INC += dbNotify.h
@@ -64,9 +68,13 @@ dbCore_SRCS += dbLock.c
 dbCore_SRCS += dbAccess.c
 dbCore_SRCS += dbBkpt.c
 dbCore_SRCS += dbChannel.c
+dbCore_SRCS += dbConstLink.c
 dbCore_SRCS += dbConvert.c
+dbCore_SRCS += dbConvertJSON.c
+dbCore_SRCS += dbDbLink.c
 dbCore_SRCS += dbFastLinkConv.c
 dbCore_SRCS += dbExtractArray.c
+dbCore_SRCS += dbJLink.c
 dbCore_SRCS += dbLink.c
 dbCore_SRCS += dbNotify.c
 dbCore_SRCS += dbScan.c
@@ -85,7 +93,6 @@ dbCore_SRCS += dbChannelIO.cpp
 dbCore_SRCS += dbSubscriptionIO.cpp
 dbCore_SRCS += dbPutNotifyBlocker.cpp
 dbCore_SRCS += dbContextReadNotifyCache.cpp
-dbCore_SRCS += templateInstances.cpp
 dbCore_SRCS += dbIocRegister.c
 dbCore_SRCS += chfPlugin.c
 dbCore_SRCS += dbState.c

src/ioc/db/callback.c

@@ -24,7 +24,6 @@
 #include "dbDefs.h"
 #include "epicsAtomic.h"
 #include "epicsEvent.h"
-#include "epicsExit.h"
 #include "epicsInterrupt.h"
 #include "epicsRingPointer.h"
 #include "epicsString.h"
@@ -97,7 +96,7 @@ static int priorityValue[NUM_CALLBACK_PRIORITIES] = {0, 1, 2};
 int callbackSetQueueSize(int size)
 {
     if (callbackIsInit) {
-        errlogPrintf("Callback system already initialized\n");
+        fprintf(stderr, "Callback system already initialized\n");
         return -1;
     }
     callbackQueueSize = size;
@@ -107,7 +106,7 @@ int callbackSetQueueSize(int size)
 int callbackParallelThreads(int count, const char *prio)
 {
     if (callbackIsInit) {
-        errlogPrintf("Callback system already initialized\n");
+        fprintf(stderr, "Callback system already initialized\n");
         return -1;
     }
 
@@ -117,7 +116,7 @@ int callbackParallelThreads(int count, const char *prio)
         count = callbackParallelThreadsDefault;
     if (count < 1) count = 1;
 
-    if (!prio || strcmp(prio, "") == 0 || strcmp(prio, "*") == 0) {
+    if (!prio || *prio == 0 || strcmp(prio, "*") == 0) {
         int i;
 
         for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
@@ -126,30 +125,30 @@ int callbackParallelThreads(int count, const char *prio)
     }
     else {
         dbMenu *pdbMenu;
+        int i;
 
         if (!pdbbase) {
-            errlogPrintf("callbackParallelThreads: pdbbase not set\n");
+            fprintf(stderr, "callbackParallelThreads: pdbbase not set\n");
             return -1;
         }
+
         /* Find prio in menuPriority */
         pdbMenu = dbFindMenu(pdbbase, "menuPriority");
-        if (pdbMenu) {
-            int i, gotMatch = 0;
-
-            for (i = 0; i < pdbMenu->nChoice; i++) {
-                gotMatch = (epicsStrCaseCmp(prio, pdbMenu->papChoiceValue[i])==0) ? TRUE : FALSE;
-                if (gotMatch)
-                    break;
-            }
-            if (gotMatch) {
-                callbackQueue[i].threadsConfigured = count;
-                return 0;
-            }
-            else {
-                errlogPrintf("Unknown priority \"%s\"\n", prio);
-                return -1;
-            }
+        if (!pdbMenu) {
+            fprintf(stderr, "callbackParallelThreads: No Priority menu\n");
+            return -1;
         }
+
+        for (i = 0; i < pdbMenu->nChoice; i++) {
+            if (epicsStrCaseCmp(prio, pdbMenu->papChoiceValue[i]) == 0)
+                goto found;
+        }
+        fprintf(stderr, "callbackParallelThreads: "
+            "Unknown priority \"%s\"\n", prio);
+        return -1;
+
+found:
+        callbackQueue[i].threadsConfigured = count;
     }
     return 0;
 }

src/ioc/db/callback.h

@@ -48,14 +48,16 @@ typedef epicsCallback CALLBACK;
 
 typedef void    (*CALLBACKFUNC)(struct callbackPvt*);
 
-#define callbackSetCallback(PFUN,PCALLBACK)\
-( (PCALLBACK)->callback = (PFUN) )
-#define callbackSetPriority(PRIORITY,PCALLBACK)\
-( (PCALLBACK)->priority = (PRIORITY) )
-#define callbackSetUser(USER,PCALLBACK)\
-( (PCALLBACK)->user = (void *)(USER) )
-#define callbackGetUser(USER,PCALLBACK)\
-( (USER) = (void *)((CALLBACK *)(PCALLBACK))->user )
+#define callbackSetCallback(PFUN, PCALLBACK) \
+    ( (PCALLBACK)->callback = (PFUN) )
+#define callbackSetPriority(PRIORITY, PCALLBACK) \
+    ( (PCALLBACK)->priority = (PRIORITY) )
+#define callbackGetPriority(PRIORITY, PCALLBACK) \
+    ( (PRIORITY) = (PCALLBACK)->priority )
+#define callbackSetUser(USER, PCALLBACK) \
+    ( (PCALLBACK)->user = (void *) (USER) )
+#define callbackGetUser(USER, PCALLBACK) \
+    ( (USER) = (PCALLBACK)->user )
 
 epicsShareFunc void callbackInit(void);
 epicsShareFunc void callbackStop(void);

src/ioc/db/dbAccess.c

@@ -34,15 +34,14 @@
 #include "errlog.h"
 #include "errMdef.h"
 
-#define epicsExportSharedSymbols
+#include "epicsExport.h" /* #define epicsExportSharedSymbols */
 #include "caeventmask.h"
 #include "callback.h"
 #include "dbAccessDefs.h"
 #include "dbAddr.h"
 #include "dbBase.h"
 #include "dbBkpt.h"
-#include "dbCa.h"
-#include "dbCommon.h"
+#include "dbCommonPvt.h"
 #include "dbConvertFast.h"
 #include "dbConvert.h"
 #include "dbEvent.h"
@@ -50,11 +49,12 @@
 #include "dbFldTypes.h"
 #include "dbFldTypes.h"
 #include "dbLink.h"
-#include "dbLock.h"
+#include "dbLockPvt.h"
 #include "dbNotify.h"
 #include "dbScan.h"
 #include "dbServer.h"
 #include "dbStaticLib.h"
+#include "dbStaticPvt.h"
 #include "devSup.h"
 #include "epicsEvent.h"
 #include "link.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;
@@ -77,6 +80,8 @@ static short mapDBFToDBR[DBF_NTYPES] = {
     /* DBF_USHORT   => */    DBR_USHORT,
     /* DBF_LONG     => */    DBR_LONG,
     /* DBF_ULONG    => */    DBR_ULONG,
+    /* DBF_INT64    => */    DBR_INT64,
+    /* DBF_UINT64   => */    DBR_UINT64,
     /* DBF_FLOAT    => */    DBR_FLOAT,
     /* DBF_DOUBLE   => */    DBR_DOUBLE,
     /* DBF_ENUM,    => */    DBR_ENUM,
@@ -107,7 +112,7 @@ void dbSpcAsRegisterCallback(SPC_ASCALLBACK func)
 long dbPutSpecial(DBADDR *paddr,int pass)
 {
     long int	(*pspecial)()=NULL;
-    struct rset	*prset;
+    rset        *prset;
     dbCommon 	*precord = paddr->precord;
     long	status=0;
     long	special=paddr->special;
@@ -139,7 +144,7 @@ long dbPutSpecial(DBADDR *paddr,int pass)
 }
 
 static void get_enum_strs(DBADDR *paddr, char **ppbuffer,
-	struct rset *prset,long	*options)
+    rset *prset,long	*options)
 {
 	short		field_type=paddr->field_type;
 	dbFldDes	*pdbFldDes = paddr->pfldDes;
@@ -199,7 +204,7 @@ choice_common:
 }
 
 static void get_graphics(DBADDR *paddr, char **ppbuffer,
-	struct rset *prset,long	*options)
+    rset *prset,long	*options)
 {
 	struct			dbr_grDouble grd;
 	int			got_data=FALSE;
@@ -239,7 +244,7 @@ static void get_graphics(DBADDR *paddr, char **ppbuffer,
 }
 
 static void get_control(DBADDR *paddr, char **ppbuffer,
-	struct rset *prset,long	*options)
+    rset *prset,long	*options)
 {
 	struct dbr_ctrlDouble	ctrld;
 	int			got_data=FALSE;
@@ -279,7 +284,7 @@ static void get_control(DBADDR *paddr, char **ppbuffer,
 }
 
 static void get_alarm(DBADDR *paddr, char **ppbuffer,
-    struct rset *prset, long *options)
+    rset *prset, long *options)
 {
     char *pbuffer = *ppbuffer;
     struct dbr_alDouble ald = {epicsNAN, epicsNAN, epicsNAN, epicsNAN};
@@ -328,7 +333,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
         void *pflin)
 {
 	db_field_log	*pfl= (db_field_log *)pflin;
-	struct rset	*prset;
+    rset	*prset;
         short		field_type;
 	dbCommon	*pcommon;
 	char		*pbuffer = *poriginal;
@@ -368,7 +373,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
 	    memset(pbuffer, '\0', dbr_precision_size);
 	    if((field_type==DBF_FLOAT || field_type==DBF_DOUBLE)
 	    &&  prset && prset->get_precision ){
-		(*prset->get_precision)(paddr,pbuffer);
+                (*prset->get_precision)(paddr,(long *)pbuffer);
 	    } else {
 		*options ^= DBR_PRECISION; /*Turn off DBR_PRECISION*/
 	    }
@@ -397,7 +402,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
 	*poriginal = pbuffer;
 }
 
-struct rset * dbGetRset(const struct dbAddr *paddr)
+rset * dbGetRset(const struct dbAddr *paddr)
 {
 	struct dbFldDes *pfldDes = paddr->pfldDes;
 
@@ -444,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.
@@ -471,7 +460,7 @@ long dbScanPassive(dbCommon *pfrom, dbCommon *pto)
  */
 long dbProcess(dbCommon *precord)
 {
-    struct rset *prset = precord->rset;
+    rset *prset = precord->rset;
     dbRecordType *pdbRecordType = precord->rdes;
     unsigned char tpro = precord->tpro;
     char context[40] = "";
@@ -525,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) ||
@@ -554,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;
@@ -591,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);
@@ -650,7 +641,7 @@ long dbNameToAddr(const char *pname, DBADDR *paddr)
     paddr->dbr_field_type = mapDBFToDBR[dbfType];
 
     if (paddr->special == SPC_DBADDR) {
-        struct rset *prset = dbGetRset(paddr);
+        rset *prset = dbGetRset(paddr);
 
         /* Let record type modify paddr */
         if (prset && prset->cvt_dbaddr) {
@@ -671,7 +662,7 @@ long dbNameToAddr(const char *pname, DBADDR *paddr)
             paddr->dbr_field_type = DBR_CHAR;
         } else if (dbfType >= DBF_INLINK && dbfType <= DBF_FWDLINK) {
             /* Clients see a char array, but keep original dbfType */
-            paddr->no_elements = PVNAME_STRINGSZ + 12;
+            paddr->no_elements = PVLINK_STRINGSZ;
             paddr->field_size = 1;
             paddr->dbr_field_type = DBR_CHAR;
         } else {
@@ -685,6 +676,44 @@ finish:
     return status;
 }
 
+void dbInitEntryFromAddr(struct dbAddr *paddr, DBENTRY *pdbentry)
+{
+    struct dbCommon *prec = paddr->precord;
+    dbCommonPvt *ppvt = CONTAINER(prec, dbCommonPvt, common);
+
+    memset((char *)pdbentry,'\0',sizeof(DBENTRY));
+
+    pdbentry->pdbbase = pdbbase;
+    pdbentry->precordType = prec->rdes;
+    pdbentry->precnode = ppvt->recnode;
+    pdbentry->pflddes = paddr->pfldDes;
+    pdbentry->pfield = paddr->pfield;
+    pdbentry->indfield = paddr->pfldDes->indRecordType;
+}
+
+void dbInitEntryFromRecord(struct dbCommon *prec, DBENTRY *pdbentry)
+{
+    dbCommonPvt *ppvt = CONTAINER(prec, dbCommonPvt, common);
+
+    memset((char *)pdbentry,'\0',sizeof(DBENTRY));
+
+    pdbentry->pdbbase = pdbbase;
+    pdbentry->precordType = prec->rdes;
+    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 */
@@ -696,6 +725,8 @@ long dbValueSize(short dbr_type)
         sizeof(epicsUInt16),         /* USHORT       */
         sizeof(epicsInt32),          /* LONG         */
         sizeof(epicsUInt32),         /* ULONG        */
+        sizeof(epicsInt64),          /* INT64        */
+        sizeof(epicsUInt64),         /* UINT64       */
         sizeof(epicsFloat32),        /* FLOAT        */
         sizeof(epicsFloat64),        /* DOUBLE       */
         sizeof(epicsEnum16)};        /* ENUM         */
@@ -842,7 +873,7 @@ long dbGet(DBADDR *paddr, short dbrType,
     db_field_log *pfl = (db_field_log *)pflin;
     short field_type;
     long capacity, no_elements, offset;
-    struct rset *prset;
+    rset *prset;
     long status = 0;
 
     if (options && *options)
@@ -977,19 +1008,25 @@ devSup* dbDSETtoDevSup(dbRecordType *prdes, struct dset *pdset) {
 static long dbPutFieldLink(DBADDR *paddr,
     short dbrType, const void *pbuffer, long nRequest)
 {
+    dbLinkInfo  link_info;
+    DBADDR      *pdbaddr = NULL;
     dbCommon    *precord = paddr->precord;
+    dbCommon    *lockrecs[2];
+    dbLocker    locker;
     dbFldDes    *pfldDes = paddr->pfldDes;
     long        special = paddr->special;
     struct link *plink = (struct link *)paddr->pfield;
     const char  *pstring = (const char *)pbuffer;
-    DBENTRY     dbEntry;
     struct dsxt *old_dsxt = NULL;
     struct dset *new_dset = NULL;
     struct dsxt *new_dsxt = NULL;
+    devSup      *new_devsup = NULL;
     long        status;
     int         isDevLink;
     short       scan;
 
+    STATIC_ASSERT(DBLOCKER_NALLOC>=2);
+
     switch (dbrType) {
     case DBR_CHAR:
     case DBR_UCHAR:
@@ -1004,31 +1041,57 @@ static long dbPutFieldLink(DBADDR *paddr,
         return S_db_badDbrtype;
     }
 
-    dbInitEntry(pdbbase, &dbEntry);
-    status = dbFindRecord(&dbEntry, precord->name);
-    if (!status) status = dbFindField(&dbEntry, pfldDes->name);
-    if (status) goto finish;
+    status = dbParseLink(pstring, pfldDes->field_type, &link_info);
+    if (status)
+        return status;
+
+    if (link_info.ltype == PV_LINK &&
+        (link_info.modifiers & (pvlOptCA | pvlOptCP | pvlOptCPP)) == 0) {
+        DBADDR tempaddr;
+
+        if (dbNameToAddr(link_info.target, &tempaddr)==0) {
+            /* This will become a DB link. */
+            pdbaddr = malloc(sizeof(*pdbaddr));
+            if (!pdbaddr) {
+                status = S_db_noMemory;
+                goto cleanup;
+            }
+            *pdbaddr = tempaddr; /* struct copy */
+        }
+    }
 
     isDevLink = ellCount(&precord->rdes->devList) > 0 &&
-                (strcmp(pfldDes->name, "INP") == 0 ||
-                 strcmp(pfldDes->name, "OUT") == 0);
+                pfldDes->isDevLink;
 
-    dbLockSetGblLock();
-    dbLockSetRecordLock(precord);
+    memset(&locker, 0, sizeof(locker));
+    lockrecs[0] = precord;
+    lockrecs[1] = pdbaddr ? pdbaddr->precord : NULL;
+    dbLockerPrepare(&locker, lockrecs, 2);
+
+    dbScanLockMany(&locker);
 
     scan = precord->scan;
 
     if (isDevLink) {
-        devSup *pdevSup = dbDTYPtoDevSup(precord->rdes, precord->dtyp);
-        if (pdevSup) {
-            new_dset = pdevSup->pdset;
-            new_dsxt = pdevSup->pdsxt;
+        new_devsup = dbDTYPtoDevSup(precord->rdes, precord->dtyp);
+        if (new_devsup) {
+            new_dset = new_devsup->pdset;
+            new_dsxt = new_devsup->pdsxt;
         }
+    }
 
+    if (dbCanSetLink(plink, &link_info, new_devsup)) {
+        /* link type mis-match prevents assignment */
+        status = S_dbLib_badField;
+        goto unlock;
+    }
+
+    if (isDevLink) {
         if (precord->dset) {
-            pdevSup = dbDSETtoDevSup(precord->rdes, precord->dset);
-            if (pdevSup)
-                old_dsxt = pdevSup->pdsxt;
+            devSup *old_devsup = dbDSETtoDevSup(precord->rdes, precord->dset);
+
+            if (old_devsup)
+                old_dsxt = old_devsup->pdsxt;
         }
 
         if (new_dsxt == NULL ||
@@ -1051,30 +1114,17 @@ static long dbPutFieldLink(DBADDR *paddr,
         }
     }
 
-    switch (plink->type) { /* Old link type */
-    case DB_LINK:
-    case CA_LINK:
-    	dbRemoveLink(plink);
-        break;
-
-    case PV_LINK:
-    case CONSTANT:
-        break;  /* do nothing */
-
-    case MACRO_LINK:
-        break;  /* should never get here */
-
-    default: /* Hardware address */
-        if (!isDevLink) {
-            status = S_db_badHWaddr;
-            goto restoreScan;
-        }
-        break;
+    if (dbLinkIsDefined(plink)) {
+        dbRemoveLink(&locker, plink);   /* Clear out old link */
+    }
+    else if (!isDevLink) {
+        status = S_db_badHWaddr;
+        goto restoreScan;
     }
 
     if (special) status = dbPutSpecial(paddr, 0);
 
-    if (!status) status = dbPutString(&dbEntry, pstring);
+    if (!status) status = dbSetLink(plink, &link_info, new_devsup);
 
     if (!status && special) status = dbPutSpecial(paddr, 1);
 
@@ -1101,11 +1151,10 @@ static long dbPutFieldLink(DBADDR *paddr,
 
     switch (plink->type) { /* New link type */
     case PV_LINK:
-        dbAddLink(precord, plink, pfldDes->field_type);
-        break;
-
     case CONSTANT:
-        break;  /* do nothing */
+    case JSON_LINK:
+        dbAddLink(&locker, plink, pfldDes->field_type, pdbaddr);
+        break;
 
     case DB_LINK:
     case CA_LINK:
@@ -1131,9 +1180,10 @@ postScanEvent:
     if (scan != precord->scan)
         db_post_events(precord, &precord->scan, DBE_VALUE | DBE_LOG);
 unlock:
-    dbLockSetGblUnlock();
-finish:
-    dbFinishEntry(&dbEntry);
+    dbScanUnlockMany(&locker);
+    dbLockerFinalize(&locker);
+cleanup:
+    free(link_info.target);
     return status;
 }
 
@@ -1164,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 {
@@ -1219,7 +1269,7 @@ long dbPut(DBADDR *paddr, short dbrType,
     long no_elements  = paddr->no_elements;
     long special      = paddr->special;
     void *pfieldsave  = paddr->pfield;
-    struct rset *prset = dbGetRset(paddr);
+    rset *prset = dbGetRset(paddr);
     long status = 0;
     long offset;
     dbFldDes *pfldDes;
@@ -1298,4 +1348,3 @@ done:
     paddr->pfield = pfieldsave;
     return status;
 }
-

src/ioc/db/dbAccessDefs.h

@@ -20,6 +20,7 @@
 #include "epicsTime.h"
 #include "dbBase.h"
 #include "dbAddr.h"
+#include "recSup.h"
 
 #ifdef INCLdb_accessh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
@@ -33,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	*/
@@ -181,6 +183,7 @@ struct dbr_alDouble     {DBRalDouble};
 #define S_db_badChoice 	(M_dbAccess|13) /*Illegal choice*/
 #define S_db_badField 	(M_dbAccess|15) /*Illegal field value*/
 #define S_db_lsetLogic 	(M_dbAccess|17) /*Logic error generating lock sets*/
+#define S_db_noLSET     (M_dbAccess|21) /*No link support table or entry*/
 #define S_db_noRSET 	(M_dbAccess|31) /*missing record support entry table*/
 #define S_db_noSupport 	(M_dbAccess|33) /*RSET or DSXT routine not defined*/
 #define S_db_BadSub 	(M_dbAccess|35) /*Subroutine not found*/
@@ -202,7 +205,7 @@ struct dbr_alDouble     {DBRalDouble};
 #define S_db_bufFull    (M_dbAccess|68) /*Buffer full*/
 
 epicsShareFunc long dbPutSpecial(struct dbAddr *paddr,int pass);
-epicsShareFunc struct rset * dbGetRset(const struct dbAddr *paddr);
+epicsShareFunc rset * dbGetRset(const struct dbAddr *paddr);
 epicsShareFunc long dbPutAttribute(
     const char *recordTypename,const char *name,const char*value);
 epicsShareFunc int dbIsValueField(const struct dbFldDes *pdbFldDes);

src/ioc/db/dbCAC.h

@@ -26,12 +26,13 @@
 
 #include "stdlib.h"
 
+#include <memory> // std::auto_ptr
+
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "resourceLib.h"
 #include "cacIO.h"
 #include "compilerDependencies.h"
-#include "epicsMemory.h"
 
 #ifdef dbCACh_restore_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
@@ -193,8 +194,9 @@ private:
     epicsMutex & mutex;
     epicsMutex & cbMutex;
     cacContextNotify & notify;
-    epics_auto_ptr < cacContext > pNetContext;
+    std::auto_ptr < cacContext > pNetContext;
     char * pStateNotifyCache;
+    bool isolated;
 
     cacChannel & createChannel (
         epicsGuard < epicsMutex > &,

src/ioc/db/dbCa.c

@@ -11,7 +11,7 @@
  *    Original Authors: Bob Dalesio and Marty Kraimer
  *    Date:             26MAR96
  */
-
+#define EPICS_DBCA_PRIVATE_API
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -28,6 +28,7 @@
 #include "epicsPrint.h"
 #include "epicsString.h"
 #include "epicsThread.h"
+#include "epicsAtomic.h"
 #include "epicsTime.h"
 #include "errlog.h"
 #include "errMdef.h"
@@ -44,13 +45,18 @@
 #include "dbCaPvt.h"
 #include "dbCommon.h"
 #include "db_convert.h"
+#include "dbLink.h"
 #include "dbLock.h"
 #include "dbScan.h"
 #include "link.h"
+#include "recGbl.h"
 #include "recSup.h"
 
+/* defined in dbContext.cpp
+ * Setup local CA access
+ */
 extern void dbServiceIOInit();
-
+extern int dbServiceIsolate;
 
 static ELLLIST workList = ELLLIST_INIT;    /* Work list for dbCaTask */
 static epicsMutexId workListLock; /*Mutual exclusions semaphores for workList*/
@@ -58,7 +64,7 @@ static epicsEventId workListEvent; /*wakeup event for dbCaTask*/
 static int removesOutstanding = 0;
 #define removesOutstandingWarning 10000
 
-static volatile enum {
+static volatile enum dbCaCtl_t {
     ctlInit, ctlRun, ctlPause, ctlExit
 } dbCaCtl;
 static epicsEventId startStopEvent;
@@ -68,57 +74,47 @@ struct ca_client_context * dbCaClientContext;
 /* Forward declarations */
 static void dbCaTask(void *);
 
+static lset dbCa_lset;
+
 #define printLinks(pcaLink) \
     errlogPrintf("%s has DB CA link to %s\n",\
-        pcaLink->plink->value.pv_link.precord->name, pcaLink->pvname)
+        pcaLink->plink->precord->name, pcaLink->pvname)
 
 static int dbca_chan_count;
 
 /* caLink locking
  *
- * workListLock
- *   This is only used to put request into and take them out of workList.
- *   While this is locked no other locks are taken
+ * Lock ordering:
+ *  dbScanLock -> caLink.lock -> workListLock
  *
- * dbScanLock
- *   dbCaAddLink and dbCaRemoveLink are only called by dbAccess or iocInit
- *   They are only called by dbAccess when it has a global lock on lock set.
- *   It is assumed that ALL other dbCaxxx calls are made only if dbScanLock
- *   is already active. These routines are intended for use by record/device
- *   support.
+ * workListLock:
+ *   Guards access to workList.
  *
- * caLink.lock
- *   Any code that use a caLink takes this lock and releases it when done
+ * dbScanLock:
+ *   All dbCa* functions operating on a single link may only be called when
+ *   the record containing the DBLINK is locked.  Including:
+ *    dbCaGet*()
+ *    isConnected()
+ *    dbCaPutLink()
+ *    scanForward()
+ *    dbCaAddLinkCallback()
+ *    dbCaRemoveLink()
  *
- * dbCaTask and the channel access callbacks NEVER access anything in the 
- *   records except after locking caLink.lock and checking that caLink.plink
- *   is not null. They NEVER call dbScanLock.
+ *   Guard the pointer plink.value.pv_link.pvt, but not the struct caLink
+ *   which is pointed to.
  *
- * The above is necessary to prevent deadlocks and attempts to use a caLink
- *   that has been deleted.
+ * caLink.lock:
+ *   Guards the caLink structure (but not the struct DBLINK)
  *
- * Just a few words about handling dbCaRemoveLink because this is when
- *   it is essential that nothing tries to use a caLink that has been freed.
+ * The dbCaTask only locks caLink, and must not lock the record (a violation of lock order).
  *
- *   dbCaRemoveLink is called when links are being modified. This is only
- *   done with the dbScan mechanism guranteeing that nothing from
- *   database access trys to access the record containing the caLink.
+ * During link modification or IOC shutdown the pca->plink pointer (guarded by caLink.lock)
+ * is used as a flag to indicate that a link is no longer active.
  *
- *   Thus the problem is to make sure that nothing from channel access
- *   accesses a caLink that is deleted. This is done as follows.
+ * References to the struct caLink are owned by the dbCaTask, and any scanOnceCallback()
+ * which is in progress.
  *
- *   dbCaRemoveLink does the following:
- *      epicsMutexMustLock(pca->lock);
- *      pca->plink = 0;
- *      plink->value.pv_link.pvt = 0;
- *      epicsMutexUnlock(pca->lock);
- *      addAction(pca,CA_CLEAR_CHANNEL);
- *
- *   dbCaTask issues a ca_clear_channel and then frees the caLink.
- *
- *   If any channel access callback gets called before the ca_clear_channel
- *   it finds pca->plink==0 and does nothing. Once ca_clear_channel
- *   is called no other callback for this caLink will be called.
+ * The libca and scanOnceCallback callbacks take no action if pca->plink==NULL.
  *
  *   dbCaPutLinkCallback causes an additional complication because
  *   when dbCaRemoveLink is called the callback may not have occured.
@@ -159,11 +155,23 @@ static void addAction(caLink *pca, short link_action)
         epicsEventSignal(workListEvent);
 }
 
-static void dbCaLinkFree(caLink *pca)
+static void caLinkInc(caLink *pca)
 {
+    assert(epicsAtomicGetIntT(&pca->refcount)>0);
+    epicsAtomicIncrIntT(&pca->refcount);
+}
+
+static void caLinkDec(caLink *pca)
+{
+    int cnt;
     dbCaCallback callback;
     void *userPvt = 0;
 
+    cnt = epicsAtomicDecrIntT(&pca->refcount);
+    assert(cnt>=0);
+    if(cnt>0)
+        return;
+
     if (pca->chid) {
         ca_clear_channel(pca->chid);
         --dbca_chan_count;
@@ -184,52 +192,86 @@ static void dbCaLinkFree(caLink *pca)
     if (callback) callback(userPvt);
 }
 
+/* Block until worker thread has processed all previously queued actions.
+ * Does not prevent additional actions from being queued.
+ */
+void dbCaSync(void)
+{
+    epicsEventId wake;
+    caLink templink;
+
+    /* we only partially initialize templink.
+     * It has no link field and no subscription
+     * so the worker must handle it early
+     */
+    memset(&templink, 0, sizeof(templink));
+    templink.refcount = 1;
+
+    wake = epicsEventMustCreate(epicsEventEmpty);
+    templink.lock = epicsMutexMustCreate();
+
+    templink.userPvt = wake;
+
+    addAction(&templink, CA_SYNC);
+
+    epicsEventMustWait(wake);
+    /* Worker holds workListLock when calling epicsEventMustTrigger()
+     * we cycle through workListLock to ensure worker call to
+     * epicsEventMustTrigger() returns before we destroy the event.
+     */
+    epicsMutexMustLock(workListLock);
+    epicsMutexUnlock(workListLock);
+
+    assert(templink.refcount==1);
+
+    epicsMutexDestroy(templink.lock);
+    epicsEventDestroy(wake);
+}
+
+epicsShareFunc unsigned long dbCaGetUpdateCount(struct link *plink)
+{
+    caLink *pca = (caLink *)plink->value.pv_link.pvt;
+    unsigned long ret;
+
+    if (!pca) return (unsigned long)-1;
+
+    epicsMutexMustLock(pca->lock);
+
+    ret = pca->nUpdate;
+
+    epicsMutexUnlock(pca->lock);
+
+    return ret;
+}
+
 void dbCaCallbackProcess(void *userPvt)
 {
     struct link *plink = (struct link *)userPvt;
-    dbCommon *pdbCommon = plink->value.pv_link.precord;
 
-    dbScanLock(pdbCommon);
-    pdbCommon->rset->process(pdbCommon);
-    dbScanUnlock(pdbCommon);
+    dbLinkAsyncComplete(plink);
 }
 
 void dbCaShutdown(void)
 {
-    if (dbCaCtl == ctlRun || dbCaCtl == ctlPause) {
-        dbCaCtl = ctlExit;
-        epicsEventSignal(workListEvent);
-        epicsEventMustWait(startStopEvent);
-        epicsEventDestroy(startStopEvent);
-    } else {
-        /* manually cleanup queue since dbCa thread isn't running
-         * which only happens in unit tests
-         */
-        caLink *pca;
-        epicsMutexMustLock(workListLock);
-        while((pca=(caLink*)ellGet(&workList))!=NULL) {
-            if(pca->link_action&CA_CLEAR_CHANNEL) {
-                dbCaLinkFree(pca);
-            }
-        }
-        epicsMutexUnlock(workListLock);
-    }
+    enum dbCaCtl_t cur = dbCaCtl;
+    assert(cur == ctlRun || cur == ctlPause);
+    dbCaCtl = ctlExit;
+    epicsEventSignal(workListEvent);
+    epicsEventMustWait(startStopEvent);
 }
 
-void dbCaLinkInitIsolated(void)
+static void dbCaLinkInitImpl(int isolate)
 {
+    dbServiceIsolate = isolate;
+    dbServiceIOInit();
+
     if (!workListLock)
         workListLock = epicsMutexMustCreate();
     if (!workListEvent)
         workListEvent = epicsEventMustCreate(epicsEventEmpty);
-    dbCaCtl = ctlExit;
-}
 
-void dbCaLinkInit(void)
-{
-    dbServiceIOInit();
-    dbCaLinkInitIsolated();
-    startStopEvent = epicsEventMustCreate(epicsEventEmpty);
+    if(!startStopEvent)
+        startStopEvent = epicsEventMustCreate(epicsEventEmpty);
     dbCaCtl = ctlPause;
 
     epicsThreadCreate("dbCaLink", epicsThreadPriorityMedium,
@@ -238,6 +280,16 @@ void dbCaLinkInit(void)
     epicsEventMustWait(startStopEvent);
 }
 
+void dbCaLinkInitIsolated(void)
+{
+    dbCaLinkInitImpl(1);
+}
+
+void dbCaLinkInit(void)
+{
+    dbCaLinkInitImpl(0);
+}
+
 void dbCaRun(void)
 {
     if (dbCaCtl == ctlPause) {
@@ -262,6 +314,7 @@ void dbCaAddLinkCallback(struct link *plink,
     assert(!plink->value.pv_link.pvt);
 
     pca = (caLink *)dbCalloc(1, sizeof(caLink));
+    pca->refcount = 1;
     pca->lock = epicsMutexMustCreate();
     pca->plink = plink;
     pca->pvname = epicsStrDup(plink->value.pv_link.pvname);
@@ -270,13 +323,20 @@ void dbCaAddLinkCallback(struct link *plink,
     pca->userPvt = userPvt;
 
     epicsMutexMustLock(pca->lock);
+    plink->lset = &dbCa_lset;
     plink->type = CA_LINK;
     plink->value.pv_link.pvt = pca;
     addAction(pca, CA_CONNECT);
     epicsMutexUnlock(pca->lock);
 }
 
-void dbCaRemoveLink(struct link *plink)
+long dbCaAddLink(struct dbLocker *locker, struct link *plink, short dbfType)
+{
+    dbCaAddLinkCallback(plink, 0, 0, NULL);
+    return 0;
+}
+
+void dbCaRemoveLink(struct dbLocker *locker, struct link *plink)
 {
     caLink *pca = (caLink *)plink->value.pv_link.pvt;
 
@@ -284,13 +344,16 @@ void dbCaRemoveLink(struct link *plink)
     epicsMutexMustLock(pca->lock);
     pca->plink = 0;
     plink->value.pv_link.pvt = 0;
+    plink->value.pv_link.pvlMask = 0;
+    plink->type = PV_LINK;
+    plink->lset = NULL;
     /* Unlock before addAction or dbCaTask might free first */
     epicsMutexUnlock(pca->lock);
     addAction(pca, CA_CLEAR_CHANNEL);
 }
 
-long dbCaGetLink(struct link *plink,short dbrType, void *pdest,
-    epicsEnum16 *pstat, epicsEnum16 *psevr, long *nelements)
+long dbCaGetLink(struct link *plink, short dbrType, void *pdest,
+    long *nelements)
 {
     caLink *pca = (caLink *)plink->value.pv_link.pvt;
     long   status = 0;
@@ -343,15 +406,15 @@ long dbCaGetLink(struct link *plink,short dbrType, void *pdest,
         assert(pca->pgetNative);
         status = fConvert(pca->pgetNative, pdest, 0);
     } else {
-        long ntoget = *nelements;
+        unsigned long ntoget = *nelements;
         struct dbAddr dbAddr;
         long (*aConvert)(struct dbAddr *paddr, void *to, long nreq, long nto, long off);
 
         aConvert = dbGetConvertRoutine[newType][dbrType];
         assert(pca->pgetNative);
 
-        if (ntoget > pca->nelements)
-            ntoget = pca->nelements;
+        if (ntoget > pca->usedelements)
+            ntoget = pca->usedelements;
         *nelements = ntoget;
 
         memset((void *)&dbAddr, 0, sizeof(dbAddr));
@@ -362,13 +425,23 @@ long dbCaGetLink(struct link *plink,short dbrType, void *pdest,
         aConvert(&dbAddr, pdest, ntoget, ntoget, 0);
     }
 done:
-    if (pstat) *pstat = pca->stat;
-    if (psevr) *psevr = pca->sevr;
-    if (link_action) addAction(pca, link_action);
+    if (link_action)
+        addAction(pca, link_action);
+    if (!status)
+        recGblInheritSevr(plink->value.pv_link.pvlMask & pvlOptMsMode,
+            plink->precord, pca->stat, pca->sevr);
     epicsMutexUnlock(pca->lock);
+
     return status;
 }
 
+static long dbCaPutAsync(struct link *plink,short dbrType,
+    const void *pbuffer,long nRequest)
+{
+    return dbCaPutLinkCallback(plink, dbrType, pbuffer, nRequest,
+        dbCaCallbackProcess, plink);
+}
+
 long dbCaPutLinkCallback(struct link *plink,short dbrType,
     const void *pbuffer,long nRequest,dbCaCallback callback,void *userPvt)
 {
@@ -406,6 +479,7 @@ long dbCaPutLinkCallback(struct link *plink,short dbrType,
         if (!pca->pputNative) {
             pca->pputNative = dbCalloc(pca->nelements,
                 dbr_value_size[ca_field_type(pca->chid)]);
+            pca->putnelements = 0;
 /* Fixed and disabled by ANJ, see comment above.
             plink->value.pv_link.pvlMask |= pvlOptOutNative;
  */
@@ -415,6 +489,7 @@ long dbCaPutLinkCallback(struct link *plink,short dbrType,
 
             fConvert = dbFastPutConvertRoutine[dbrType][newType];
             status = fConvert(pbuffer, pca->pputNative, 0);
+            pca->putnelements = 1;
         } else {
             struct dbAddr dbAddr;
             long (*aConvert)(struct dbAddr *paddr, const void *from, long nreq, long nfrom, long off);
@@ -427,10 +502,7 @@ long dbCaPutLinkCallback(struct link *plink,short dbrType,
             if(nRequest>pca->nelements)
                 nRequest = pca->nelements;
             status = aConvert(&dbAddr, pbuffer, nRequest, pca->nelements, 0);
-            if(nRequest<pca->nelements) {
-                long elemsize = dbr_value_size[ca_field_type(pca->chid)];
-                memset(nRequest*elemsize+(char*)pca->pputNative, 0, (pca->nelements-nRequest)*elemsize);
-            }
+            pca->putnelements = nRequest;
         }
         link_action |= CA_WRITE_NATIVE;
         pca->gotOutNative = TRUE;
@@ -450,7 +522,13 @@ long dbCaPutLinkCallback(struct link *plink,short dbrType,
     return status;
 }
 
-int dbCaIsLinkConnected(const struct link *plink)
+long dbCaPutLink(struct link *plink, short dbrType,
+    const void *pbuffer, long nRequest)
+{
+    return dbCaPutLinkCallback(plink, dbrType, pbuffer, nRequest, 0, NULL);
+}
+
+static int isConnected(const struct link *plink)
 {
     caLink *pca;
 
@@ -460,7 +538,7 @@ int dbCaIsLinkConnected(const struct link *plink)
     return pca->isConnected;
 }
 
-void dbCaScanFwdLink(struct link *plink) {
+static void scanForward(struct link *plink) {
     short fwdLinkValue = 1;
 
     if (plink->value.pv_link.pvlMask & pvlOptFWD)
@@ -479,7 +557,7 @@ void dbCaScanFwdLink(struct link *plink) {
         return -1; \
     }
 
-long dbCaGetNelements(const struct link *plink, long *nelements)
+static long getElements(const struct link *plink, long *nelements)
 {
     caLink *pca;
 
@@ -489,7 +567,7 @@ long dbCaGetNelements(const struct link *plink, long *nelements)
     return 0;
 }
 
-long dbCaGetAlarm(const struct link *plink,
+static long getAlarm(const struct link *plink,
     epicsEnum16 *pstat, epicsEnum16 *psevr)
 {
     caLink *pca;
@@ -501,7 +579,7 @@ long dbCaGetAlarm(const struct link *plink,
     return 0;
 }
 
-long dbCaGetTimeStamp(const struct link *plink,
+static long getTimeStamp(const struct link *plink,
     epicsTimeStamp *pstamp)
 {
     caLink *pca;
@@ -512,7 +590,7 @@ long dbCaGetTimeStamp(const struct link *plink,
     return 0;
 }
 
-int dbCaGetLinkDBFtype(const struct link *plink)
+static int getDBFtype(const struct link *plink)
 {
     caLink *pca;
     int  type;
@@ -543,7 +621,7 @@ long dbCaGetAttributes(const struct link *plink,
     return 0;
 }
 
-long dbCaGetControlLimits(const struct link *plink,
+static long getControlLimits(const struct link *plink,
     double *low, double *high)
 {
     caLink *pca;
@@ -559,7 +637,7 @@ long dbCaGetControlLimits(const struct link *plink,
     return gotAttributes ? 0 : -1;
 }
 
-long dbCaGetGraphicLimits(const struct link *plink,
+static long getGraphicLimits(const struct link *plink,
     double *low, double *high)
 {
     caLink *pca;
@@ -575,7 +653,7 @@ long dbCaGetGraphicLimits(const struct link *plink,
     return gotAttributes ? 0 : -1;
 }
 
-long dbCaGetAlarmLimits(const struct link *plink,
+static long getAlarmLimits(const struct link *plink,
     double *lolo, double *low, double *high, double *hihi)
 {
     caLink *pca;
@@ -593,7 +671,7 @@ long dbCaGetAlarmLimits(const struct link *plink,
     return gotAttributes ? 0 : -1;
 }
 
-long dbCaGetPrecision(const struct link *plink, short *precision)
+static long getPrecision(const struct link *plink, short *precision)
 {
     caLink *pca;
     int gotAttributes;
@@ -605,7 +683,7 @@ long dbCaGetPrecision(const struct link *plink, short *precision)
     return gotAttributes ? 0 : -1;
 }
 
-long dbCaGetUnits(const struct link *plink,
+static long getUnits(const struct link *plink,
     char *units, int unitsSize)
 {
     caLink *pca;
@@ -620,6 +698,63 @@ long dbCaGetUnits(const struct link *plink,
     return gotAttributes ? 0 : -1;
 }
 
+static long doLocked(struct link *plink, dbLinkUserCallback rtn, void *priv)
+{
+    caLink *pca;
+    long status;
+
+    pcaGetCheck
+    status = rtn(plink, priv);
+    epicsMutexUnlock(pca->lock);
+    return status;
+}
+
+static void scanComplete(void *raw, dbCommon *prec)
+{
+    caLink *pca = raw;
+    epicsMutexMustLock(pca->lock);
+    if(!pca->plink) {
+        /* IOC shutdown or link re-targeted.  Do nothing. */
+    } else if(pca->scanningOnce==0) {
+        errlogPrintf("dbCa.c complete callback w/ scanningOnce==0\n");
+    } else if(--pca->scanningOnce){
+        /* another scan is queued */
+        if(scanOnceCallback(prec, scanComplete, raw)) {
+            errlogPrintf("dbCa.c failed to re-queue scanOnce\n");
+        } else
+            caLinkInc(pca);
+    }
+    epicsMutexUnlock(pca->lock);
+    caLinkDec(pca);
+}
+
+/* must be called with pca->lock held */
+static void scanLinkOnce(dbCommon *prec, caLink *pca) {
+    if(pca->scanningOnce==0) {
+        if(scanOnceCallback(prec, scanComplete, pca)) {
+            errlogPrintf("dbCa.c failed to queue scanOnce\n");
+        } else
+            caLinkInc(pca);
+    }
+    if(pca->scanningOnce<5)
+        pca->scanningOnce++;
+    /* else too many scans queued */
+}
+
+static lset dbCa_lset = {
+    0, 1, /* not Constant, Volatile */
+    NULL, dbCaRemoveLink,
+    NULL, NULL, NULL,
+    isConnected,
+    getDBFtype, getElements,
+    dbCaGetLink,
+    getControlLimits, getGraphicLimits, getAlarmLimits,
+    getPrecision, getUnits,
+    getAlarm, getTimeStamp,
+    dbCaPutLink, dbCaPutAsync,
+    scanForward, doLocked
+};
+
 static void connectionCallback(struct connection_handler_args arg)
 {
     caLink *pca;
@@ -634,13 +769,13 @@ static void connectionCallback(struct connection_handler_args arg)
     pca->isConnected = (ca_state(arg.chid) == cs_conn);
     if (!pca->isConnected) {
         struct pv_link *ppv_link = &plink->value.pv_link;
-        dbCommon *precord = ppv_link->precord;
+        dbCommon *precord = plink->precord;
 
         pca->nDisconnect++;
         if (precord &&
             ((ppv_link->pvlMask & pvlOptCP) ||
              ((ppv_link->pvlMask & pvlOptCPP) && precord->scan == 0)))
-            scanOnce(precord);
+            scanLinkOnce(precord, pca);
         goto done;
     }
     pca->hasReadAccess = ca_read_access(arg.chid);
@@ -675,6 +810,7 @@ static void connectionCallback(struct connection_handler_args arg)
     }
     pca->gotFirstConnection = TRUE;
     pca->nelements = ca_element_count(arg.chid);
+    pca->usedelements = 0;
     pca->dbrType = ca_field_type(arg.chid);
     if ((plink->value.pv_link.pvlMask & pvlOptInpNative) && !pca->pgetNative) {
         link_action |= CA_MONITOR_NATIVE;
@@ -712,9 +848,10 @@ static void eventCallback(struct event_handler_args arg)
     epicsMutexMustLock(pca->lock);
     plink = pca->plink;
     if (!plink) goto done;
+    pca->nUpdate++;
     monitor = pca->monitor;
     userPvt = pca->userPvt;
-    precord = plink->value.pv_link.precord;
+    precord = plink->precord;
     if (arg.status != ECA_NORMAL) {
         if (precord) {
             if (arg.status != ECA_NORDACCESS &&
@@ -728,6 +865,7 @@ static void eventCallback(struct event_handler_args arg)
         goto done;
     }
     assert(arg.dbr);
+    assert(arg.count<=pca->nelements);
     size = arg.count * dbr_value_size[arg.type];
     if (arg.type == DBR_TIME_STRING &&
         ca_field_type(pca->chid) == DBR_ENUM) {
@@ -747,10 +885,12 @@ static void eventCallback(struct event_handler_args arg)
     case DBR_TIME_DOUBLE:
         assert(pca->pgetNative);
         memcpy(pca->pgetNative, dbr_value_ptr(arg.dbr, arg.type), size);
+        pca->usedelements = arg.count;
         pca->gotInNative = TRUE;
         break;
     default:
-        errMessage(-1, "dbCa: eventCallback Logic Error\n");
+        errlogPrintf("dbCa: eventCallback Logic Error. dbr=%ld dbf=%d\n",
+                     arg.type, ca_field_type(pca->chid));
         break;
     }
     pdbr_time_double = (struct dbr_time_double *)arg.dbr;
@@ -762,7 +902,7 @@ static void eventCallback(struct event_handler_args arg)
 
         if ((ppv_link->pvlMask & pvlOptCP) ||
             ((ppv_link->pvlMask & pvlOptCPP) && precord->scan == 0))
-        scanOnce(precord);
+        scanLinkOnce(precord, pca);
     }
 done:
     epicsMutexUnlock(pca->lock);
@@ -831,11 +971,11 @@ static void accessRightsCallback(struct access_rights_handler_args arg)
     pca->hasWriteAccess = ca_write_access(arg.chid);
     if (pca->hasReadAccess && pca->hasWriteAccess) goto done;
     ppv_link = &plink->value.pv_link;
-    precord = ppv_link->precord;
+    precord = plink->precord;
     if (precord &&
         ((ppv_link->pvlMask & pvlOptCP) ||
          ((ppv_link->pvlMask & pvlOptCPP) && precord->scan == 0)))
-        scanOnce(precord);
+        scanLinkOnce(precord, pca);
 done:
     epicsMutexUnlock(pca->lock);
 }
@@ -862,7 +1002,7 @@ static void getAttribEventCallback(struct event_handler_args arg)
     getAttributes = pca->getAttributes;
     getAttributesPvt = pca->getAttributesPvt;
     if (arg.status != ECA_NORMAL) {
-        dbCommon *precord = plink->value.pv_link.precord;
+        dbCommon *precord = plink->precord;
         if (precord) {
             errlogPrintf("dbCa: getAttribEventCallback record %s error %s\n",
                 precord->name, ca_message(arg.status));
@@ -918,11 +1058,15 @@ static void dbCaTask(void *arg)
                 break; /* workList is empty */
             }
             link_action = pca->link_action;
+            if (link_action&CA_SYNC)
+                epicsEventMustTrigger((epicsEventId)pca->userPvt); /* dbCaSync() requires workListLock to be held here */
             pca->link_action = 0;
             if (link_action & CA_CLEAR_CHANNEL) --removesOutstanding;
             epicsMutexUnlock(workListLock);         /* Give back immediately */
+            if (link_action&CA_SYNC)
+                continue;
             if (link_action & CA_CLEAR_CHANNEL) {   /* This must be first */
-                dbCaLinkFree(pca);
+                caLinkDec(pca);
                 /* No alarm is raised. Since link is changing so what? */
                 continue; /* No other link_action makes sense */
             }
@@ -951,11 +1095,11 @@ static void dbCaTask(void *arg)
                 assert(pca->pputNative);
                 if (pca->putType == CA_PUT) {
                     status = ca_array_put(
-                        pca->dbrType, pca->nelements,
+                        pca->dbrType, pca->putnelements,
                         pca->chid, pca->pputNative);
                 } else if (pca->putType==CA_PUT_CALLBACK) {
                     status = ca_array_put_callback(
-                        pca->dbrType, pca->nelements,
+                        pca->dbrType, pca->putnelements,
                         pca->chid, pca->pputNative,
                         putComplete, pca);
                 } else {
@@ -1005,15 +1149,15 @@ static void dbCaTask(void *arg)
                 }
             }
             if (link_action & CA_MONITOR_NATIVE) {
-                size_t element_size;
-    
-                element_size = dbr_value_size[ca_field_type(pca->chid)];
+
                 epicsMutexMustLock(pca->lock);
-                pca->pgetNative = dbCalloc(pca->nelements, element_size);
+                pca->elementSize = dbr_value_size[ca_field_type(pca->chid)];
+                pca->pgetNative = dbCalloc(pca->nelements, pca->elementSize);
                 epicsMutexUnlock(pca->lock);
+
                 status = ca_add_array_event(
-                    ca_field_type(pca->chid)+DBR_TIME_STRING,
-                    ca_element_count(pca->chid),
+                    dbf_type_to_DBR_TIME(ca_field_type(pca->chid)),
+                    0, /* dynamic size */
                     pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
                     &pca->evidNative);
                 if (status != ECA_NORMAL) {

src/ioc/db/dbCa.h

@@ -1,20 +1,17 @@
 /*************************************************************************\
-* Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+* Copyright (c) 2015 The University of Chicago, as Operator of Argonne
 *     National Laboratory.
 * Copyright (c) 2002 The Regents of the University of California, as
 *     Operator of Los Alamos National Laboratory.
-* EPICS BASE Versions 3.13.7
-* and higher are distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* dbCa.h	*/
+/* dbCa.h */
 
 #ifndef INCdbCah
 #define INCdbCah
 
-#include "shareLib.h"
-#include "epicsTime.h"
-#include "link.h"
+#include "dbLink.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,48 +26,60 @@ epicsShareFunc void dbCaRun(void);
 epicsShareFunc void dbCaPause(void);
 epicsShareFunc void dbCaShutdown(void);
 
+struct dbLocker;
 epicsShareFunc void dbCaAddLinkCallback(struct link *plink,
     dbCaCallback connect, dbCaCallback monitor, void *userPvt);
-#define dbCaAddLink(plink) dbCaAddLinkCallback((plink), 0, 0, 0)
-epicsShareFunc void dbCaRemoveLink(struct link *plink);
+epicsShareFunc long dbCaAddLink(struct dbLocker *locker, struct link *plink, short dbfType);
+epicsShareFunc void dbCaRemoveLink(struct dbLocker *locker, struct link *plink);
+
 epicsShareFunc long dbCaGetLink(struct link *plink,
-    short dbrType, void *pbuffer, epicsEnum16 *pstat, epicsEnum16 *psevr,
-    long *nRequest);
+    short dbrType, void *pbuffer, long *nRequest);
+
+epicsShareFunc long dbCaGetAttributes(const struct link *plink,
+    dbCaCallback callback, void *userPvt);
+
 epicsShareFunc long dbCaPutLinkCallback(struct link *plink,
     short dbrType, const void *pbuffer,long nRequest,
     dbCaCallback callback, void *userPvt);
-#define dbCaPutLink(plink, dbrType, pbuffer, nRequest) \
-    dbCaPutLinkCallback((plink), (dbrType), (pbuffer), (nRequest), 0, 0)
-epicsShareFunc int dbCaIsLinkConnected(const struct link *plink);
-epicsShareFunc void dbCaScanFwdLink(struct link *plink);
-
-/* The following are available after the link is connected*/
-epicsShareFunc long dbCaGetNelements(const struct link *plink,
-    long *nelements);
-#define dbCaGetSevr(plink, severity) \
-    dbCaGetAlarm((plink), NULL, (severity))
-epicsShareFunc long dbCaGetAlarm(const struct link *plink,
-    epicsEnum16 *status, epicsEnum16 *severity);
-epicsShareFunc long dbCaGetTimeStamp(const struct link *plink,
-    epicsTimeStamp *pstamp);
-epicsShareFunc int dbCaGetLinkDBFtype(const struct link *plink);
-
-/*The following  are available after attribute request is complete*/
-epicsShareFunc long dbCaGetAttributes(const struct link *plink,
-    dbCaCallback callback, void *userPvt);
-epicsShareFunc long dbCaGetControlLimits(const struct link *plink,
-    double *low, double *high);
-epicsShareFunc long dbCaGetGraphicLimits(const struct link *plink,
-    double *low, double *high);
-epicsShareFunc long dbCaGetAlarmLimits(const struct link *plink,
-    double *lolo, double *low, double *high, double *hihi);
-epicsShareFunc long dbCaGetPrecision(const struct link *plink,
-    short *precision);
-epicsShareFunc long dbCaGetUnits(const struct link *plink,
-    char *units, int unitsSize);
+epicsShareFunc long dbCaPutLink(struct link *plink,short dbrType,
+    const void *pbuffer,long nRequest);
 
 extern struct ca_client_context * dbCaClientContext;
 
+#ifdef EPICS_DBCA_PRIVATE_API
+epicsShareFunc void dbCaSync(void);
+epicsShareFunc unsigned long dbCaGetUpdateCount(struct link *plink);
+#endif
+
+/* These macros are for backwards compatibility */
+
+#define dbCaIsLinkConnected(link) \
+    dbIsLinkConnected(link)
+
+#define dbCaGetLinkDBFtype(link) \
+    dbGetLinkDBFtype(link)
+#define dbCaGetNelements(link, nelements) \
+    dbGetNelements(link, nelements)
+#define dbCaGetSevr(link, sevr) \
+    dbGetAlarm(link, NULL, sevr)
+#define dbCaGetAlarm(link, stat, sevr) \
+    dbGetAlarm(link, stat, sevr)
+#define dbCaGetTimeStamp(link, pstamp) \
+    dbGetTimeStamp(link, pstamp)
+#define dbCaGetControlLimits(link, low, high) \
+    dbGetControlLimits(link, low, high)
+#define dbCaGetGraphicLimits(link, low, high) \
+    dbGetGraphicLimits(link, low, high)
+#define dbCaGetAlarmLimits(link, lolo, low, high, hihi) \
+    dbGetAlarmLimits(link, lolo, low, high, hihi)
+#define dbCaGetPrecision(link, prec) \
+    dbGetPrecision(link, prec)
+#define dbCaGetUnits(link, units, unitSize) \
+    dbGetUnits(link, units, unitSize)
+
+#define dbCaScanFwdLink(link) \
+    dbScanFwdLink(link)
+
 #ifdef __cplusplus
 }
 #endif

src/ioc/db/dbCaPvt.h

@@ -6,14 +6,11 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* dbCaPvt.h */
-/****************************************************************
-*
-*	Current Author:		Bob Dalesio
-*	Contributing Author:	Marty Kraimer
-*	Date:			08APR96
-*
-****************************************************************/
+/* dbCaPvt.h
+ *
+ * Original Authors: Bob Dalesio, Marty Kraimer
+ *
+ */
 
 #ifndef INC_dbCaPvt_H
 #define INC_dbCaPvt_H
@@ -32,63 +29,70 @@
 #define	CA_MONITOR_NATIVE		0x10
 #define	CA_MONITOR_STRING		0x20
 #define	CA_GET_ATTRIBUTES		0x40
+#define	CA_SYNC                 0x1000
 /* write type */
 #define CA_PUT          0x1
 #define CA_PUT_CALLBACK 0x2
-
+
 typedef struct caLink
 {
-	ELLNODE		node;
-	epicsMutexId	lock;
-	struct link	*plink;
-        char		*pvname;
-	chid 		chid;
-	short		link_action;
-        /* The following have new values after each data event*/
-	epicsEnum16	sevr;
-	epicsEnum16	stat;
-	epicsTimeStamp	timeStamp;
-        /* The following have values after connection*/
-	short		dbrType;
-	long		nelements;
-        char		hasReadAccess;
-        char		hasWriteAccess;
-        char            isConnected;
-	char		gotFirstConnection;
-        /* The following are for dbCaAddLinkCallback */
-        dbCaCallback    connect;
-        dbCaCallback    monitor;
-        void            *userPvt;
-        /* The following are for write request */
-        short           putType;
-        dbCaCallback    putCallback;
-        void            *putUserPvt;
-        /* The following are for access to additional attributes*/
-        char            gotAttributes;
-        dbCaCallback	getAttributes;
-        void            *getAttributesPvt;
-        /* The following have values after getAttribEventCallback*/
-        double          controlLimits[2];
-        double          displayLimits[2];
-        double          alarmLimits[4];
-        short           precision;
-        char            units[MAX_UNITS_SIZE];  /* units of value */
-        /* The following are for handling data*/
-	void 		*pgetNative;
-	char		*pgetString;
-	void		*pputNative;
-	char		*pputString;
-	evid		evidNative;
-	evid		evidString;
-	char		gotInNative;
-	char		gotInString;
-	char		gotOutNative;
-	char		gotOutString;
-	char		newOutNative;
-	char		newOutString;
-        /* The following are for dbcar*/
-	unsigned long	nDisconnect;
-	unsigned long	nNoWrite; /*only modified by dbCaPutLink*/
+    ELLNODE		node;
+    int         refcount;
+    epicsMutexId	lock;
+    struct link	*plink;
+    char		*pvname;
+    chid 		chid;
+    short		link_action;
+    /* The following have new values after each data event*/
+    epicsEnum16	sevr;
+    epicsEnum16	stat;
+    epicsTimeStamp	timeStamp;
+    /* The following have values after connection*/
+    short		dbrType;
+    size_t elementSize; /* size of one element in pgetNative */
+    unsigned long nelements; /* PVs max array size */
+    unsigned long usedelements; /* currently used in pgetNative */
+    unsigned long putnelements; /* currently used in pputNative */
+    char		hasReadAccess;
+    char		hasWriteAccess;
+    char            isConnected;
+    char		gotFirstConnection;
+    /* The following are for dbCaAddLinkCallback */
+    dbCaCallback    connect;
+    dbCaCallback    monitor;
+    void            *userPvt;
+    /* The following are for write request */
+    short           putType;
+    dbCaCallback    putCallback;
+    void            *putUserPvt;
+    /* The following are for access to additional attributes*/
+    char            gotAttributes;
+    dbCaCallback	getAttributes;
+    void            *getAttributesPvt;
+    /* The following have values after getAttribEventCallback*/
+    double          controlLimits[2];
+    double          displayLimits[2];
+    double          alarmLimits[4];
+    short           precision;
+    char            units[MAX_UNITS_SIZE];  /* units of value */
+    /* The following are for handling data*/
+    void 		*pgetNative;
+    char		*pgetString;
+    void		*pputNative;
+    char		*pputString;
+    evid		evidNative;
+    evid		evidString;
+    char		gotInNative;
+    char		gotInString;
+    char		gotOutNative;
+    char		gotOutString;
+    char		newOutNative;
+    char		newOutString;
+    unsigned char scanningOnce;
+    /* The following are for dbcar*/
+    unsigned long	nDisconnect;
+    unsigned long	nNoWrite; /*only modified by dbCaPutLink*/
+    unsigned long   nUpdate;
 }caLink;
 
 #endif /* INC_dbCaPvt_H */

src/ioc/db/dbCaTest.c

@@ -87,10 +87,10 @@ long dbcar(char *precordname, int level)
                 !dbIsAlias(pdbentry)) {
                 pdbRecordType = pdbentry->precordType;
                 precord = (dbCommon *)pdbentry->precnode->precord;
+                dbScanLock(precord);
                 for (j=0; j<pdbRecordType->no_links; j++) {
                     pdbFldDes = pdbRecordType->papFldDes[pdbRecordType->link_ind[j]];
                     plink = (DBLINK *)((char *)precord + pdbFldDes->offset);
-                    dbLockSetGblLock();
                     if (plink->type == CA_LINK) {
                         ncalinks++;
                         pca = (caLink *)plink->value.pv_link.pvt;
@@ -135,8 +135,8 @@ long dbcar(char *precordname, int level)
                             }
                         }
                     }
-                    dbLockSetGblUnlock();
                 }
+                dbScanUnlock(precord);
                 if (precordname) goto done;
             }
             status = dbNextRecord(pdbentry);
@@ -189,10 +189,8 @@ void dbcaStats(int *pchans, int *pdiscon)
                     dbFldDes *pdbFldDes = pdbRecordType->papFldDes[i];
                     plink = (DBLINK *)((char *)precord + pdbFldDes->offset);
                     if (plink->type == CA_LINK) {
-                        caLink *pca = (caLink *)plink->value.pv_link.pvt;
-
                         ncalinks++;
-                        if (pca && pca->chid && ca_state(pca->chid) == cs_conn) {
+                        if (dbCaIsLinkConnected(plink)) {
                             nconnected++;
                         }
                     }

src/ioc/db/dbChannel.c

@@ -19,7 +19,6 @@
 
 #include "cantProceed.h"
 #include "epicsAssert.h"
-#include "epicsExit.h"
 #include "epicsString.h"
 #include "errlog.h"
 #include "freeList.h"
@@ -108,7 +107,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;
@@ -133,7 +132,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;
@@ -160,7 +159,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;
@@ -244,15 +243,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);
 }
@@ -262,36 +258,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 */
@@ -455,6 +453,8 @@ static short mapDBFToDBR[DBF_NTYPES] =
     /* DBF_USHORT   => */DBR_USHORT,
     /* DBF_LONG     => */DBR_LONG,
     /* DBF_ULONG    => */DBR_ULONG,
+    /* DBF_INT64    => */DBR_INT64,
+    /* DBF_UINT64   => */DBR_UINT64,
     /* DBF_FLOAT    => */DBR_FLOAT,
     /* DBF_DOUBLE   => */DBR_DOUBLE,
     /* DBF_ENUM,    => */DBR_ENUM,
@@ -510,7 +510,7 @@ dbChannel * dbChannelCreate(const char *name)
     paddr->dbr_field_type = mapDBFToDBR[dbfType];
 
     if (paddr->special == SPC_DBADDR) {
-        struct rset *prset = dbGetRset(paddr);
+        rset *prset = dbGetRset(paddr);
 
         /* Let record type modify paddr */
         if (prset && prset->cvt_dbaddr) {
@@ -532,7 +532,7 @@ dbChannel * dbChannelCreate(const char *name)
                 paddr->dbr_field_type = DBR_CHAR;
             } else if (dbfType >= DBF_INLINK && dbfType <= DBF_FWDLINK) {
                 /* Clients see a char array, but keep original dbfType */
-                paddr->no_elements = PVNAME_STRINGSZ + 12;
+                paddr->no_elements = PVLINK_STRINGSZ;
                 paddr->field_size = 1;
                 paddr->dbr_field_type = DBR_CHAR;
             } else {

src/ioc/db/dbChannelIO.h

@@ -26,7 +26,6 @@
 #endif
 
 #include "compilerDependencies.h"
-#include "epicsMemory.h"
 
 #ifdef dbChannelIOh_restore_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols

src/ioc/db/dbChannelNOOP.h

@@ -0,0 +1,118 @@
+#ifndef DBCHANNELNOOP_H
+#define DBCHANNELNOOP_H
+
+#include <string.h>
+#include <string>
+
+#include "cacIO.h"
+#include "caerr.h"
+
+/** @brief A channel which never connects
+ *
+ * Used when dbCa is placed in isolated mode for unittests
+ */
+class dbChannelNOOP : public cacChannel
+{
+    std::string myname;
+public:
+    dbChannelNOOP(const char *name, cacChannelNotify &notify)
+        :cacChannel(notify)
+        ,myname(name)
+    {}
+
+    virtual void destroy (
+            CallbackGuard & /*callbackGuard*/,
+            epicsGuard < epicsMutex > & /*mutualExclusionGuard*/ )
+    {
+        delete this; // goodbye cruel world
+    }
+
+    virtual unsigned getName (
+            epicsGuard < epicsMutex > &,
+            char * pBuf, unsigned bufLen ) const throw ()
+    {
+        const char* name = myname.c_str();
+        if(bufLen>myname.size()+1) {
+            bufLen=myname.size()+1;
+        }
+        memcpy(pBuf, name, bufLen);
+        pBuf[--bufLen] = '\0';
+        return bufLen;
+    }
+
+    // !! deprecated, avoid use  !!
+    virtual const char * pName (
+            epicsGuard < epicsMutex > & guard ) const throw ()
+    {return myname.c_str();}
+
+    virtual void show (
+            epicsGuard < epicsMutex > &,
+            unsigned level ) const
+    {}
+
+    virtual void initiateConnect (
+            epicsGuard < epicsMutex > & )
+    {}
+
+    virtual unsigned requestMessageBytesPending (
+            epicsGuard < epicsMutex > & /*mutualExclusionGuard*/ )
+    {return 0;}
+
+    virtual void flush (
+            epicsGuard < epicsMutex > & /*mutualExclusionGuard*/ )
+    {}
+
+    virtual ioStatus read (
+            epicsGuard < epicsMutex > &mut,
+            unsigned type, arrayElementCount count,
+            cacReadNotify &notify, ioid * = 0 )
+    {
+        notify.exception(mut, ECA_NORDACCESS, "dbChannelNOOP", type, count);
+        return iosSynch;
+    }
+
+    virtual void write (
+            epicsGuard < epicsMutex > &,
+            unsigned type, arrayElementCount count,
+            const void *pValue )
+    {}
+
+    virtual ioStatus write (
+            epicsGuard < epicsMutex > &mut,
+            unsigned type, arrayElementCount count,
+            const void */*pValue*/, cacWriteNotify & notify, ioid * = 0 )
+    {
+        notify.exception(mut, ECA_NOWTACCESS, "dbChannelNOOP", type, count);
+        return iosSynch;
+    }
+
+    virtual void subscribe (
+            epicsGuard < epicsMutex > &mut, unsigned type,
+            arrayElementCount count, unsigned /*mask*/, cacStateNotify & notify,
+            ioid * = 0 )
+    {
+        // should never subscribe
+        notify.exception(mut, ECA_BADMASK, "dbChannelNOOP", type, count);
+    }
+
+    virtual void ioCancel (
+            CallbackGuard & callbackGuard,
+            epicsGuard < epicsMutex > & mutualExclusionGuard,
+            const ioid & )
+    {}
+
+    virtual void ioShow (
+            epicsGuard < epicsMutex > &,
+            const ioid &, unsigned level ) const
+    {}
+
+    virtual short nativeType (
+            epicsGuard < epicsMutex > & ) const
+    {return 0;} // DBR_STRING
+
+    virtual arrayElementCount nativeElementCount (
+            epicsGuard < epicsMutex > & ) const
+    {return 1;}
+};
+
+#endif // DBCHANNELNOOP_H

src/ioc/db/dbCommon.dbd

@@ -92,6 +92,12 @@
 		interest(4)
 		extra("ELLLIST             mlis")
 	}
+	field(BKLNK,DBF_NOACCESS) {
+		prompt("Backwards link tracking")
+		special(SPC_NOMOD)
+		interest(4)
+		extra("ELLLIST             bklnk")
+	}
 	field(DISP,DBF_UCHAR) {
 		prompt("Disable putField")
 	}
@@ -191,7 +197,7 @@
 		prompt("Address of RSET")
 		special(SPC_NOMOD)
 		interest(4)
-		extra("struct rset         *rset")
+        extra("struct typed_rset   *rset")
 	}
 	field(DSET,DBF_NOACCESS) {
 		prompt("DSET address")

src/ioc/db/dbCommonPvt.h

@@ -0,0 +1,14 @@
+#ifndef DBCOMMONPVT_H
+#define DBCOMMONPVT_H
+
+#include "dbCommon.h"
+
+/** Base internal additional information for every record
+ */
+typedef struct dbCommonPvt {
+    struct dbRecordNode *recnode;
+
+    struct dbCommon common;
+} dbCommonPvt;
+
+#endif // DBCOMMONPVT_H

src/ioc/db/dbConstLink.c

@@ -0,0 +1,234 @@
+/*************************************************************************\
+* Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+*     National Laboratory.
+* Copyright (c) 2002 The Regents of the University of California, as
+*     Operator of Los Alamos National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+/* dbConstLink.c
+ *
+ *      Original Authors: Bob Dalesio, Marty Kraimer
+ *      Current Author: Andrew Johnson
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "dbDefs.h"
+#include "epicsStdlib.h"
+
+#define epicsExportSharedSymbols
+#include "dbAccessDefs.h"
+#include "dbAddr.h"
+#include "dbCommon.h"
+#include "dbConstLink.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 */
+static lset dbConst_lset;
+
+void dbConstInitLink(struct link *plink)
+{
+    plink->lset = &dbConst_lset;
+}
+
+void dbConstAddLink(struct link *plink)
+{
+    plink->lset = &dbConst_lset;
+}
+
+/**************************** Member functions ****************************/
+
+static long dbConstLoadScalar(struct link *plink, short dbrType, void *pbuffer)
+{
+    const char *pstr = plink->value.constantStr;
+    size_t len;
+
+    if (!pstr)
+        return S_db_badField;
+    len = strlen(pstr);
+
+    /* Choice values must be numeric */
+    if (dbrType == DBF_MENU || dbrType == DBF_ENUM || dbrType == DBF_DEVICE)
+        dbrType = DBF_USHORT;
+
+    if (*pstr == '[' && pstr[len-1] == ']') {
+        /* Convert from JSON array */
+        long nReq = 1;
+
+        return dbPutConvertJSON(pstr, dbrType, pbuffer, &nReq);
+    }
+
+    return convert[dbrType](pstr, pbuffer, NULL);
+}
+
+static long dbConstLoadLS(struct link *plink, char *pbuffer, epicsUInt32 size,
+    epicsUInt32 *plen)
+{
+    const char *pstr = plink->value.constantStr;
+
+    if (!pstr)
+        return S_db_badField;
+
+    return dbLSConvertJSON(pstr, pbuffer, size, plen);
+}
+
+static long dbConstLoadArray(struct link *plink, short dbrType, void *pbuffer,
+        long *pnReq)
+{
+    const char *pstr = plink->value.constantStr;
+
+    if (!pstr)
+        return S_db_badField;
+
+    /* Choice values must be numeric */
+    if (dbrType == DBF_MENU || dbrType == DBF_ENUM || dbrType == DBF_DEVICE)
+        dbrType = DBF_USHORT;
+
+    return dbPutConvertJSON(pstr, dbrType, pbuffer, pnReq);
+}
+
+static long dbConstGetNelements(const struct link *plink, long *nelements)
+{
+    *nelements = 0;
+    return 0;
+}
+
+static long dbConstGetValue(struct link *plink, short dbrType, void *pbuffer,
+        long *pnRequest)
+{
+    if (pnRequest)
+        *pnRequest = 0;
+    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,
+    dbConstLoadScalar,
+    dbConstLoadLS,
+    dbConstLoadArray,
+    NULL,
+    NULL, dbConstGetNelements,
+    dbConstGetValue,
+    NULL, NULL, NULL,
+    NULL, NULL,
+    NULL, NULL,
+    dbConstPutValue, NULL,
+    NULL, NULL
+};

src/ioc/db/dbConstLink.h

@@ -0,0 +1,34 @@
+/*************************************************************************\
+* Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne
+*     National Laboratory.
+* Copyright (c) 2002 The Regents of the University of California, as
+*     Operator of Los Alamos National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+/* dbConstLink.h
+ *
+ *  Created on: April 3rd, 2016
+ *      Author: Andrew Johnson
+ */
+
+#ifndef INC_dbConstLink_H
+#define INC_dbConstLink_H
+
+#include "shareLib.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct link;
+
+epicsShareFunc void dbConstInitLink(struct link *plink);
+epicsShareFunc void dbConstAddLink(struct link *plink);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* INC_dbConstLink_H */
+