Update version to 3.15.6, remove "not released" from release notes

Unfortunately this causes really bad things to happen; the
configure/RULES file is getting overwritten by the contents of
src/libCom/as/RULES, so we need a different approach.

This reverts commit 47c361f135.

README

@@ -2,14 +2,14 @@
 EPICS Base - the central core of a control system toolkit
 ---------------------------------------------------------
 
-Copyright UChicago Argonne LLC, as Operator of Argonne
-National Laboratory.
+Copyright (c) 1991-2003 The University of Chicago, 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 is distributed subject to a Software License
-Agreement found in the file LICENSE that is included with
-this distribution.
+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.
 
 ---------------------------------------------------------
 
@@ -20,5 +20,5 @@ Additional information about EPICS including mailing list
 archives and subscription instructions, documentation and
 training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
-	http://www.aps.anl.gov/epics/
+	https://epics.anl.gov/
 

appveyor.yml

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

ci/appveyor-make.bat

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

ci/appveyor-prepare.bat

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

ci/travis-build.sh

@@ -17,7 +17,7 @@ ticker() {
 
 CACHEKEY=1
 
-EPICS_HOST_ARCH=`sh startup/EpicsHostArch`
+EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
 
 [ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD"
 
@@ -86,5 +86,5 @@ make -j2 $EXTRA
 if [ "$TEST" != "NO" ]
 then
    make tapfiles
-   find . -name '*.tap' -print0 | xargs -0 -n1 prove -e cat -f
+   make -s test-results
 fi

configure/CONFIG

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

configure/CONFIG.CrossCommon

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

configure/CONFIG_BASE

@@ -3,12 +3,13 @@
 #     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
+# 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 directories
+# Epics base directories
 
 EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
 EPICS_BASE_HOST_LIB = $(EPICS_BASE)/lib/$(EPICS_HOST_ARCH)
@@ -18,12 +19,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
@@ -36,16 +37,17 @@ 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))
 
 #---------------------------------------------------------------
@@ -57,7 +59,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
@@ -67,11 +69,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)
 
-#---------------------------------------------------------------
+#-------------------------------------------------------
 # tools for installing libraries and products
-INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
+INSTALL_QUIETLY := $(if $(findstring s,$(MAKEFLAGS)),-q,)
+INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(INSTALL_QUIETLY)
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
@@ -81,7 +83,7 @@ MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
 REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
 
 #---------------------------------------------------------------
-# Our versions of lex (flex) and yacc (antelope)
+# private versions of lex/yacc from EPICS
 EYACC = $(TOOLS)/antelope$(HOSTEXE)
 ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
 
@@ -89,6 +91,28 @@ YACC  = $(EYACC)
 LEX   = $(ELEX)
 
 #---------------------------------------------------------------
-# The 3.15 version of msi supports new options
+# Our use of msi is incompatible with older versions
 
 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,30 +15,19 @@
 # EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
 # version number to be included in the reported version string.
 
-# 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.
-
+# 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.
 BASE_3_14 = NO
-BASE_3_15 = NO
-BASE_3_16 = YES
+BASE_3_15 = YES
 
 # EPICS_VERSION must be a number >0 and <256
 EPICS_VERSION = 3
 
 # EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 16
+EPICS_REVISION = 15
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 1
+EPICS_MODIFICATION = 6
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero

configure/CONFIG_COMMON

@@ -38,6 +38,10 @@ 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
@@ -79,7 +83,6 @@ 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,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -329,14 +332,6 @@ 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,10 +35,8 @@ 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

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

@@ -8,12 +8,10 @@
 #*************************************************************************
 #RULES.Db
 
-# Set db substitutions and template file suffixes
+# Set db substitutions file suffix
 SUBST_SUFFIX ?= .substitutions
-TEMPL_SUFFIX ?= .template
 
-#---------------------------------------------------------------
-# vpath
+#####################################################  vpath
 
 vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
@@ -21,13 +19,12 @@ 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 %$(TEMPL_SUFFIX) $(USR_VPATH) $(SRC_DIRS) $(COMMON_DIR)
+vpath %.template $(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)
@@ -36,15 +33,13 @@ 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
@@ -91,28 +86,31 @@ 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)/*$(TEMPL_SUFFIX)
+          $(COMMON_DIR)/*$(SUBST_SUFFIX) $(COMMON_DIR)/*.template
 
 # 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 $(TEMPL_SUFFIX),$(addprefix ../,$(TEMPLATE2)))
-TEMPLATE_FILENAME = $(firstword $(wildcard $($*_TEMPLATE) \
-            $(addprefix ../,$($*_TEMPLATE)) ../$*$(TEMPL_SUFFIX) $(TEMPLATE3) \
-            ../template))
+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
 
 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)
 
@@ -125,8 +123,7 @@ ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\
 ACFDEPENDS_CMD = $(MKMF) -m $@ $(ACF_INCLUDES) $(COMMONDEP_TARGET) $<
 ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@
 
-#---------------------------------------------------------------
-# dependencies
+#####################################################  dependancies
 
 HINC += $(addsuffix .h,$(DBDINC_NAME))
 COMMON_DBDINC += $(addprefix $(COMMON_DIR)/,$(HINC))
@@ -136,12 +133,12 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) \
                     $(patsubst $(COMMON_DIR)/%,%, \
                     $(filter-out $(COMMON_DIR)/bpt%.dbd,$(COMMON_DBDS))))
 
-#---------------------------------------------------------------
+##################################################### 
 
 ifndef T_A
 
 DEP = .d
-TEMPLATE3 += $(addsuffix $(TEMPL_SUFFIX), $(TEMPLATE2))
+TEMPLATE3+=$(addsuffix .template, $(TEMPLATE2))
 
 COMMON_DIR = .
 INSTALL_DBDS =
@@ -156,13 +153,18 @@ ACTIONS += install
 ACTIONS += buildInstall
 ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
-actionArchTargets = $(foreach action, $(ACTIONS), \
-    $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))
-cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), clean$(DIVIDER)$(arch))
+actionArchTargets = $(foreach x, $(ACTIONS),\ $(foreach arch,$(BUILD_ARCHS), $(x)$(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
 
@@ -170,30 +172,20 @@ buildInstall : build
 
 rebuild: clean install
 
-.PHONY: all $(ACTIONS)
+.PHONY: all host $(ACTIONS)
 
 $(actionArchTargets) $(BUILD_ARCHS): install
 $(cleanArchTargets): clean
 
 .PHONY: $(BUILD_ARCHS) $(actionArchTargets) $(cleanArchTargets)
 
-else
-  # T_A is defined
-  ifeq ($(EPICS_HOST_ARCH),$(T_A))
-    host: install
-  else
-    host:
-  endif
-
-  .PHONY: host
-endif # T_A
+endif # T_A defined
 
 ifneq (,$(strip $(DBDDEPENDS_FILES)))
 -include $(DBDDEPENDS_FILES)
 endif
 
-#---------------------------------------------------------------
-# build dependancies, clean rule
+#####################################################  build dependancies, clean rule
 
 inc : $(COMMON_INC) $(INSTALL_INC)
 
@@ -213,8 +205,7 @@ db_clean :
 
 realclean: clean
 
-#---------------------------------------------------------------
-# Dependency files
+##################################################### Dependency files
 
 %Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@
@@ -265,19 +256,19 @@ menu%.h$(DEP): ../menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%.db$(DEP): %$(SUBST_SUFFIX)
+%.db$(RAW)$(DEP): %$(SUBST_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@
 
-%.db$(DEP): ../%$(SUBST_SUFFIX)
+%.db$(RAW)$(DEP): ../%$(SUBST_SUFFIX)
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) -S$< $(TEMPLATE_FILENAME) > $@
 
-%.db$(DEP): %$(TEMPL_SUFFIX)
+%.db$(RAW)$(DEP): %.template
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 
-%.db$(DEP): ../%$(TEMPL_SUFFIX)
+%.db$(RAW)$(DEP): ../%.template
 	@$(RM) $@
 	$(MSI3_15) -D $(DBFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 
@@ -291,8 +282,14 @@ menu%.h$(DEP): ../menu%.dbd
 
 .PRECIOUS: %$(DEP)
 
-#---------------------------------------------------------------
-# Substitution files
+##################################################### 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
 
 #  WARNING: CREATESUBSTITUTIONS script needs output dir on command line
 
@@ -313,21 +310,25 @@ $(INSTALL_DB)/%$(SUBST_SUFFIX): ../%$(SUBST_SUFFIX)
 
 .PRECIOUS: $(COMMON_DIR)/%$(SUBST_SUFFIX)
 
-#---------------------------------------------------------------
-# Template files
+##################################################### Template files
 
-$(INSTALL_DB)/%$(TEMPL_SUFFIX): %$(TEMPL_SUFFIX)
+$(COMMON_DIR)/%.template: $(COMMON_DIR)/%.edf 
+	@$(RM) $@
+	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $@.VAR $<
+	@$(REPLACEVAR) < $@.VAR > $@
+	@$(RM) $@.VAR
+
+$(INSTALL_DB)/%.template: %.template
 	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_DB)/%$(TEMPL_SUFFIX): ../%$(TEMPL_SUFFIX)
+$(INSTALL_DB)/%.template: ../%.template
 	$(ECHO) "Installing template file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-.PRECIOUS: $(COMMON_DIR)/%$(TEMPL_SUFFIX)
+.PRECIOUS: $(COMMON_DIR)/%.template
 
-#---------------------------------------------------------------
-# INC files
+##################################################### INC files
 
 $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
 	@$(RM) $(notdir $@)
@@ -361,8 +362,7 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 
 .PRECIOUS: $(COMMON_DIR)/%.h
 
-#---------------------------------------------------------------
-# DBD files
+##################################################### DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
@@ -425,8 +425,7 @@ $(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 $@)
@@ -445,44 +444,37 @@ $(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
 
 $(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
 	@$(RM) $(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 $@) $<
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 .PRECIOUS: $(COMMON_DIR)/%.html %.html
 
-#---------------------------------------------------------------
-# DB files
+##################################################### DB files
 
-$(COMMON_DIR)/%.db: $(COMMON_DIR)/%.edf 
+$(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf 
 	$(E2DB) $(E2DB_SYSFLAGS) $(E2DB_FLAGS) -n $*.VAR $<
 	@$(REPLACEVAR) < $*.VAR > $@
 	@$(RM) $*.VAR
 
-$(COMMON_DIR)/%.db: %$(SUBST_SUFFIX)
+$(COMMON_DIR)/%.db$(RAW): %$(SUBST_SUFFIX)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) -S$< $(TEMPLATE_FILENAME)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db: ../%$(SUBST_SUFFIX)
+$(COMMON_DIR)/%.db$(RAW): ../%$(SUBST_SUFFIX)
 	$(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) -S$< $(TEMPLATE_FILENAME)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db: %$(TEMPL_SUFFIX)
+$(COMMON_DIR)/%.db$(RAW): %.template
 	$(ECHO) "Inflating database from $<"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.db: ../%$(TEMPL_SUFFIX)
+$(COMMON_DIR)/%.db$(RAW): ../%.template
 	$(ECHO) "Inflating database from $<"
 	@$(RM) $(notdir $@)
 	$(MSI3_15) $(DBFLAGS) -o $(notdir $@) $<
@@ -500,6 +492,22 @@ $(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)
@@ -507,6 +515,7 @@ $(INSTALL_DB)/%: %
 $(INSTALL_DB)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+endif
 
 $(INSTALL_DB)/%.db: $(COMMON_DIR)/%.db
 	$(ECHO) "Installing created db file $@"
@@ -522,8 +531,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) $@
@@ -539,3 +548,4 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 
+##################################################### END OF FILE

configure/RULES_BUILD

@@ -25,7 +25,6 @@ vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.pl $(USR_VPATH) $(ALL_SRC_DIRS)
 
 #---------------------------------------------------------------
 
@@ -103,6 +102,7 @@ endif
 #   Products and Object libraries
 #
 PRODTARGETS += $(PRODNAME) $(MUNCHNAME) $(CTDT_SRCS) $(CTDT_OBJS) $(NMS)
+TESTPRODTARGETS += $(TESTPRODNAME) $(TESTMUNCHNAME)
 
 #---------------------------------------------------------------
 #   Test specifications and test result files
@@ -141,7 +141,7 @@ rebuild: clean install
 
 build: inc
 
-build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
+build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
 
 inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS)
@@ -159,20 +159,21 @@ clean: build_clean
 
 build_clean:
 	$(ECHO) "Cleaning"
-	@$(RM) *.i *$(OBJ) *.a $(TESTPRODNAME) \
+	@$(RM) *.i *$(OBJ) *.a \
 	$(LIBNAME) $(TESTLIBNAME) $(SHRLIBNAME) $(TESTSHRLIBNAME) \
 	$(DLLSTUB_LIBNAME) $(TESTDLLSTUB_LIBNAME) \
 	$(LOADABLE_SHRLIBNAME) \
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
-	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
+	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) $(TESTPRODTARGETS) \
 	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
 
-$(DIRECTORY_TARGETS) :
-	$(MKDIR) $@
+# Sort mkdir targets to remove duplicates & make parents first
+$(DIRECTORY_TARGETS):
+	$(MKDIR) $(sort $@)
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -255,15 +256,13 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
 
-# must be a seperate rule since when not using '-d' the
+# must be a separate rule since when not using '-d' the
 # prefix for .h will be different then .c
 %.h : %.c %.y
 
 %.c: %.l
-	@$(RM) $*.yy.c
-	$(LEX) $(LEXOPT) -t $< > $*.yy.c
 	@$(RM) $@
-	$(MV) $*.yy.c $@
+	$(LEX) $(LEXOPT) -o$@ $<
 
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -322,6 +321,10 @@ $(MUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
 	@$(RM) $@
 	$(MUNCH_CMD)
 
+$(TESTMUNCHNAME): %$(MUNCH_SUFFIX): $(MUNCH_DEPENDS) %$(EXE)
+	@$(RM) $@
+	$(MUNCH_CMD)
+
 #---------------------------------------------------------------
 # GeSys modules for RTEMS
 $(MODNAME): %$(MODEXT): %$(EXE)
@@ -348,7 +351,7 @@ testspec: $(TESTSCRIPTS)
 test-results: tapfiles
 ifneq ($(TAPFILES),)
 ifdef RUNTESTS_ENABLED
-	prove --failures --ext .tap --exec cat --color $(TAPFILES)
+	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
 endif
 endif
 
@@ -383,14 +386,6 @@ endif
 	@$(RM) $@
 	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
-#---------------------------------------------------------------
-# 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
 
@@ -525,7 +520,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
 .PHONY: runtests tapfiles clean-tests test-results junitfiles
-.PHONY: checkRelease warnRelease noCheckRelease FORCE
+.PHONY: checkRelease warnRelease noCheckRelease
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_TARGET

@@ -38,6 +38,17 @@ $(foreach target, $(PROD) $(TESTPROD), \
 
 #-----------------------------------------------------------------------
 
+# These must be done before PROD2_template
+define TESTLIBRARY_template
+$(1)_DIR = .
+TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
+endef
+
+$(foreach target, $(TESTLIBRARY), \
+    $(eval $(call TESTLIBRARY_template,$(strip $(target)))))
+
+#-----------------------------------------------------------------------
+
 define TARGET2_template
 $(1)_LDLIBS += $$($(1)_LIBS)
 $(1)_LDLIBS += $$(if $$(strip $$($(1)_LIBS_$(OS_CLASS))), \
@@ -123,16 +134,6 @@ $(foreach target, $(LIBRARY), \
 
 #-----------------------------------------------------------------------
 
-define LIBRARY3_template
-$(1)_DIR = .
-TESTBUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
-endef
-
-$(foreach target, $(TESTLIBRARY), \
-    $(eval $(call LIBRARY3_template,$(strip $(target)))))
-
-#-----------------------------------------------------------------------
-
 define LOADABLE_LIBRARY_template
 LOADABLE_BUILD_LIBRARY += $$(if $$(strip $$($(1)_OBJSNAME) $$(LIBRARY_OBJS)),$(1),)
 

configure/os/CONFIG.Common.RTEMS

@@ -136,6 +136,13 @@ MOD_LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(POSIX_LDFLAGS) \
 LINK.mod = $(CCC) -o $@ $(PRODDIR_LDFLAGS) $(MOD_LDFLAGS)
 LINK.mod += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(MOD_LDLIBS)
 
+#--------------------------------------------------
+# Here munching means creating a bootable object binary
+ifdef MUNCH_SUFFIX
+  MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+  TESTMUNCHNAME = $(TESTPRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
+endif
+
 #--------------------------------------------------
 # RTEMS has neither shared libraries nor dynamic loading
 STATIC_BUILD=YES

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -15,7 +15,6 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -13,7 +13,6 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -7,7 +7,6 @@ ARCH_DEP_CFLAGS += -DHAVE_PPCBUG
 ARCH_DEP_CFLAGS += -DNVRAM_INDIRECT
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -15,7 +15,6 @@ ARCH_DEP_CFLAGS += -DRTEMS_NETWORK_CONFIG_CLUSTER_SPACE=5120
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -16,7 +16,6 @@ ARCH_DEP_CFLAGS += -DBSP_NVRAM_BASE_ADDR=0xf1110000
 OP_SYS_LDLIBS += -lbspExt
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $< $@
 endef

configure/os/CONFIG.Common.RTEMS-pc386

@@ -8,7 +8,6 @@
 RTEMS_TARGET_CPU=i386
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< temp.bin
 	$(BIN2BOOT) $@ 0x00097E00 \

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -9,7 +9,6 @@ RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 
 MUNCH_SUFFIX = .boot
-MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< $@
 endef

configure/os/CONFIG.Common.linux-xscale_be

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

configure/os/CONFIG.Common.linuxCommon

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

configure/os/CONFIG.Common.vxWorksCommon

@@ -1,7 +1,7 @@
 # CONFIG.Common.vxWorksCommon
 #
 # Definitions for vxWorks target archs
-# Override these definitions in CONFIG_SITE.Common.vxWorksCommon
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorksCommon
 # or CONFIG_SITE.<host>.vxWorksCommon
 #-------------------------------------------------------
 
@@ -63,6 +63,8 @@ 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
@@ -78,47 +80,49 @@ VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
 
 #--------------------------------------------------
-# Fix old Linux WIND_HOST_TYPE
+# Fix WIND_BASE for vxWorks 6.x on linux
+# NB: We know the value of WIND_HOST_TYPE here, but not VXWORKS_VERSION
 ifeq ($(WIND_HOST_TYPE),x86-linux)
-  WIND_HOST_TYPE = x86-linux2
+  WIND_HOST_TYPE_5 = x86-linux
+  WIND_HOST_TYPE_6 = x86-linux2
+  WIND_HOST_TYPE = $(WIND_HOST_TYPE_$(VXWORKS_MAJOR_VERSION))
 endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
 
-GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+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))
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+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))
 
 #--------------------------------------------------
-# Wind River moved nm out of GNU_BIN in some versions
+# This finds nm on any supported VxWorks version
 
-WORKBENCH_BIN = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin
-UTILITIES_BIN = $(WIND_BASE)/utilities-$(UTILITIES_VERSION)/$(WIND_HOST_TYPE)/bin
-
-NM_DIR_6.4 = $(WORKBENCH_BIN)
-NM_DIR_6.5 = $(WORKBENCH_BIN)
-NM_DIR_6.6 = $(WORKBENCH_BIN)
-NM_DIR_6.7 = $(GNU_BIN)
-NM_DIR_6.8 = $(UTILITIES_BIN)
-NM_DIR_6.9 = $(UTILITIES_BIN)
-NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN))
-
-NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NMPROG = $(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NM = $(firstword $(wildcard $(WIND_BASE)/*/$(WIND_HOST_TYPE)/bin/$(NMPROG)))
 
 #--------------------------------------------------
 # A linker script is essential for munching from vxWorks 6.6 onwards
-# (i.e. with versions that use gcc 4.1.2 or later).
+# (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)
 MUNCH_LDFLAGS_6 = -T $(VX_DIR)/target/h/tool/gnu/ldscripts/link.OUT
 MUNCH_LDFLAGS = $(MUNCH_LDFLAGS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # These are required by some of the Wind River tools
 export WIND_BASE
+export WIND_HOME = $(WIND_BASE)
 export WIND_HOST_TYPE
 export TOOL_FAMILY = GNU
 
@@ -127,10 +131,11 @@ export TOOL_FAMILY = GNU
 OP_SYS_CPPFLAGS += -DvxWorks=vxWorks
 OP_SYS_CFLAGS += -fno-builtin
 
-# Fix for vxWorks headers that use macros defined in vxWorks.h but
+# Fix for vxWorks 5 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.
+# from defining the OFFSET macro, which generates lots of warnings in
+# both vxWorks 5 and 6.
 OP_SYS_INCLUDE_CPPFLAGS += -include $(VX_DIR)/target/h/vxWorks.h
 
 #--------------------------------------------------
@@ -143,6 +148,7 @@ 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
@@ -164,6 +170,8 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 
 #--------------------------------------------------
 # Link definitions
+CROSS_LDFLAGS =
+#
 LINK.cpp = $(LD) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
 LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
 

configure/os/CONFIG.UnixCommon.Common

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

configure/os/CONFIG.darwinCommon.darwinCommon

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

configure/os/CONFIG.linux-386.Common

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

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-linux2
+WIND_HOST_TYPE = x86-linux

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-linux2
+WIND_HOST_TYPE = x86-linux

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-linux2
+WIND_HOST_TYPE = x86-linux

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-linux2
+WIND_HOST_TYPE = x86-linux

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

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

configure/os/CONFIG.linux-x86_64.Common

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

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

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

configure/os/CONFIG_SITE.Common.linux-xscale_be

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

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -1,13 +1,21 @@
 # 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.  Do not include any third-level digits.
+# 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.
 
-# 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.
+# Note: vxWorks 5.4.x (Tornado 2.0.x) is not supported
 
+#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
@@ -19,19 +27,8 @@ 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)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
-
-
-# WorkBench Version number, if you're using vxWorks 6.x
-
-#WORKBENCH_VERSION = 2.6
-#WORKBENCH_VERSION = 3.0
-#WORKBENCH_VERSION = 3.2
-WORKBENCH_VERSION = 3.3
-
-
-# Utilities Version number, required from vxWorks 6.8 and later
-
-UTILITIES_VERSION = 1.0

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

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

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

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

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

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

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

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

documentation/KnownProblems.html

@@ -4,37 +4,25 @@
 <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 Base-3.16.1</title>
+  <title>Known Problems in R3.15.6</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS Base R3.16.1: Known Problems</h1>
+<h1 style="text-align: center">EPICS Base R3.15.6: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-3.16.1 tree. Download them, then use the GNU Patch program as
+base-3.15.6 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.16.1</b>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.15.6</b>
 % <b>patch -p1 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
 
-<p>The following problems were known by the developers at the time of this
-release:</p>
+<p>The following significant problems have been reported with this
+version of EPICS Base:</p>
 
 <ul>
 
-<!-- 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>
+  <li>None known as yet.</li>
 
 </ul>
 

documentation/README.1st

@@ -1,24 +1,24 @@
                            Installation Instructions
 
-                           EPICS Base Release 3.16.1
+                           EPICS Base Release 3.15.6
 
    --------------------------------------------------------------------------
 
   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
 
    --------------------------------------------------------------------------
 
@@ -85,17 +85,17 @@
      as processes on the host platform.
 
      vxWorks
-     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
+     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
      base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
      target-specific overrides.
 
-     Consult the vxWorks 6.x EPICS web pages and the vxWorks documentation
-     for information about configuring your vxWorks operating system for use
-     with EPICS.
+     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.
 
      RTEMS
      For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or
@@ -166,12 +166,11 @@
 
     base/startup directory - contains scripts to set environment and path
 
-         EpicsHostArch       C shell script to set EPICS_HOST_ARCH env variable
-         EpicsHostArch.pl    Perl script to set EPICS_HOST_ARCH env variable
-         Site.profile        bourne shell script to set path and env variables
-         Site.cshrc          c shell script to set path and env variables
-         cygwin.bat          WIN32 bat file to set cygwin path and env variables
-         win32.bat           WIN32 bat file to set path and env variables
+         EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
+         unix.csh            C shell script to set path and env variables
+         unix.sh             Bourne shell script to set path and env variables
+         win32.bat           Bat file example to configure win32-x86 target
+         windows.bat         Bat file example to configure windows-x64 target
 
     base/configure directory - contains build definitions and rules
 

documentation/README.darwin.html

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

documentation/README.html

@@ -9,7 +9,7 @@
 <BODY>
 <CENTER>
 <H1>Installation Instructions</H1>
-<H2>EPICS Base Release 3.16.1</H2><BR>
+<H2>EPICS Base Release 3.15.6</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</H3>
@@ -90,16 +90,17 @@
  as processes on the host platform.</P>
 
 <P><B>vxWorks</B><BR>
- 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
+ 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
  base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
  target-specific overrides.</P>
 
-<P>Consult the <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
- 6.x</a> EPICS web pages and the vxWorks documentation for information
+<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
  about configuring your vxWorks operating system for use with EPICS.</P>
 
 <P><B>RTEMS</B><BR>
@@ -128,7 +129,7 @@
 
 <H3><A NAME="0_0_8"> Documentation</A></H3>
 <BLOCKQUOTE>EPICS documentation is available through the
- <a href="http://www.aps.anl.gov/epics/">EPICS website</a> at Argonne.
+ <a href="https://epics.anl.gov/">EPICS website</a> at Argonne.
  <P>Release specific documentation can also be found in the base/documentation
  directory of the distribution.</BLOCKQUOTE>
 
@@ -176,12 +177,11 @@
 
 <H4>base/startup directory - contains scripts to set environment and path</H4>
 <PRE>
-        EpicsHostArch       C shell script to set EPICS_HOST_ARCH env variable
-        EpicsHostArch.pl    Perl script to set EPICS_HOST_ARCH env variable
-        Site.profile        bourne shell script to set path and env variables
-        Site.cshrc          c shell script to set path and env variables
-        cygwin.bat          WIN32 bat file to set cygwin path and env variables
-        win32.bat           WIN32 bat file to set path and env variables
+        EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
+        unix.csh            C shell script to set path and env variables
+        unix.sh             Bourne shell script to set path and env variables
+        win32.bat           Bat file example to configure win32-x86 target
+        windows.bat         Bat file example to configure windows-x64 target
 </PRE>
 
 <H4>base/configure directory - contains build definitions and rules</H4>
@@ -190,12 +190,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 +206,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 +340,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 +350,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,27 +33,29 @@
 <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 production releases of EPICS Base.</p>
+that should be performed when creating new 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 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
+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
 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 used below:</p>
+<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>
 
 <dl>
-  <dt><strong>Release Manager</strong> ()</dt>
+  <dt><strong>Release Manager</strong> (Ralph Lange)</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>
@@ -131,40 +133,36 @@ the final release version.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Tag the module in Git using these tag conventions:
+      <td>Tag the module in Git, using these tag conventions:
         <ul>
           <li>
-            <tt>R3.16.1-pre<i>n</i></tt>
+            <tt>R3.15.6-pre1</tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R3.16.1-rc<i>n</i></tt>
+            <tt>R3.15.6-rc1</tt>
             &mdash; release candidate tag
             </li>
         </ul>
         <blockquote><tt>
-          cd base-3.16<br />
-          git tag -m 'ANJ: Tagged for 3.16.1-rc1' R3.16.1-rc1
+          cd base-3.15<br />
+          git tag -m 'RL: Tagged for 3.15.6-rc1' R3.15.6-rc1
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <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:
+      <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:
         <blockquote><tt>
-          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
+          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
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-3.16.1-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-3.15.6-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -258,7 +256,7 @@ the final release version.</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>
@@ -275,28 +273,23 @@ the final release version.</p>
       <td>Release Manager</td>
       <td>Tag the module in Git:
         <blockquote><tt>
-          cd base-3.16<br />
-          git tag -m 'ANJ: Tagged for 3.16.1' R3.16.1</i>
+          cd base-3.15<br />
+          git tag -m 'RL: Tagged for 3.15.6' R3.15.6
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <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:
+      <td>Export the tagged version into a tarfile. Note that this command
+        generates a gzipped tarfile directly from the repository:
         <blockquote><tt>
-          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
+          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
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-3.16.1.tar.gz
+          gpg --armor --sign --detach-sig base-3.15.6.tar.gz
           </tt></blockquote>
         </td>
       </tr>

src/ca/client/CAref.html

@@ -314,21 +314,11 @@ 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>
@@ -756,12 +746,6 @@ 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
@@ -784,7 +768,11 @@ 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.</p>
+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>
 
 <h3><a name="Configurin2">Configuring a CA Server</a></h3>
 
@@ -1021,7 +1009,7 @@ d:/user/epics/base-3.15/lib/win32-x86/Com.lib</code></p>
 <h2><a name="CommandUtils">Command Line Utilities</a></h2>
 
 <h3><a name="acctst">acctst</a></h3>
-<pre>acctst &lt;PV name&gt; [progress logging level] [channel duplication count] 
+<pre>acctst &lt;PV name&gt; [progress logging level] [channel duplication count]
                  [test repetition count] [enable preemptive callback]</pre>
 
 <h4>Description</h4>
@@ -2091,7 +2079,7 @@ example, be beneficial when tuning an archiver installation.</p>
 <p>Significant performance gains can be realized when the CA client library
 doesn't wait for a response to return from the server after each request. All
 requests which require interaction with a CA server are accumulated (buffered)
-and not forwarded to the IOC until one of <code>ca_flush_io()</code>, 
+and not forwarded to the IOC until one of <code>ca_flush_io()</code>,
 <code>ca_pend_io()</code>, <code>ca_pend_event()</code>, or
 <code>ca_sg_block()</code> are called allowing several operations to be
 efficiently sent over the network together. Any process variable values written
@@ -2115,16 +2103,16 @@ shouldn't test the success of a CA function call by checking to see if the
 returned value is zero as is the UNIX convention. Below are several methods to
 test CA function returns. See <a href="#ca_signal"><code>ca_signal()</code> and
 <code>SEVCHK()</code></a> for more information on this topic.</p>
-<pre>status = ca_XXXX(); 
-SEVCHK( status, "ca_XXXX() returned failure status"); 
+<pre>status = ca_XXXX();
+SEVCHK( status, "ca_XXXX() returned failure status");
 
-if ( status &amp; CA_M_SUCCESS ) { 
-        printf ( "The requested ca_XXXX() operation didn't complete successfully"); 
-} 
+if ( status &amp; CA_M_SUCCESS ) {
+        printf ( "The requested ca_XXXX() operation didn't complete successfully");
+}
 
-if ( status != ECA_NORMAL ) { 
+if ( status != ECA_NORMAL ) {
         printf("The requested ca_XXXX() operation didn't complete successfully because \"%s\"\n",
-                ca_message ( status ) ); 
+                ca_message ( status ) );
 }</pre>
 
 <h3><a name="Channel">Channel Access Data Types</a></h3>
@@ -2297,7 +2285,7 @@ int main ( int argc, char ** argv )
     unsigned nBytes;
     unsigned elementCount;
     char timeString[32];
-    unsigned i;    
+    unsigned i;
     chid chan;
     double sum;
     int status;
@@ -2340,7 +2328,7 @@ int main ( int argc, char ** argv )
     epicsTimeToStrftime ( timeString, sizeof ( timeString ),
         "%a %b %d %Y %H:%M:%S.%f", &amp; pTD-&gt;stamp );
 
-    printf ( "The sum of elements in %s at %s was %f\n", 
+    printf ( "The sum of elements in %s at %s was %f\n",
         argv[1], timeString, sum );
 
     ca_clear_channel ( chan );
@@ -2371,7 +2359,7 @@ executing within the user's callback function.</p>
 <pre>typedef struct event_handler_args {
     void            *usr;   /* user argument supplied with request */
     chanId          chid;   /* channel id */
-    long            type;   /* the type of the item returned */ 
+    long            type;   /* the type of the item returned */
     long            count;  /* the element count of the item returned */
     const void      *dbr;   /* a pointer to the item returned */
     int             status; /* ECA_XXX status of the requested op from the server */
@@ -2394,7 +2382,7 @@ attached to the request, an exception handler is executed in the client. The
 default exception handler prints a message on the console and exits if the
 exception condition is severe. Certain internal exceptions within the CA client
 library, and failures detected by the SEVCHK macro may also cause the exception
-handler to be invoked. To modify this behavior see 
+handler to be invoked. To modify this behavior see
 <code><a href="#ca_add_exception_event">ca_add_exception_event</a>()</code>.</p>
 
 <h3><a name="Server">Server and Client Share the Same Address Space on The Same
@@ -2686,6 +2674,14 @@ automatically released by the system when the process exits and
 vxWorks or RTEMS no cleanup occurs unless the application calls
 <code>ca_context_destroy()</code>.</p>
 
+<p>Note: This operation blocks until any user callbacks for any channel
+created in the current context have run to completion. If callbacks take a
+lock (mutex) then it is the user's responsibility to ensure that this lock
+is not held when <code>ca_clear_context()</code> is called, otherwise a
+deadlock may ensue. (See also
+<code><a href="#ca_clear_channel">ca_clear_channel</a>()</code> and
+<code><a href="#ca_clear_event">ca_clear_subscription</a>()</code>.)</p>
+
 <h4>Returns</h4>
 
 <p>ECA_NORMAL - Normal successful completion</p>
@@ -2758,7 +2754,7 @@ time.</p>
 </dl>
 <dl>
   <dt><code>USERFUNC</code></dt>
-    <dd>Optional address of the user's callback function to be run when the
+    <dd>Optional pointer to the user's callback function to be run when the
       connection state changes. Casual users of channel access may decide to
       set this field to null or 0 if they do not need to have a callback
       function run in response to each connection state change event.
@@ -2831,6 +2827,12 @@ efficiently sent over the network in one message.</p>
 clearing a channel does shutdown and reclaim any channel state change event
 subscriptions (monitors) registered with the channel.</p>
 
+<p>Note: This operation blocks until any user callbacks for this channel
+have run to completion. If callbacks take a lock (mutex) then it is the
+user's responsibility to ensure that this lock is not held when
+<code>ca_clear_channel()</code> is called, otherwise a deadlock may ensue.
+(See also <code><a href="#ca_clear_event">ca_clear_subscription</a>()</code>.)</p>
+
 <h4>Arguments</h4>
 <dl>
   <dt><code>CHID</code></dt>
@@ -2845,16 +2847,16 @@ subscriptions (monitors) registered with the channel.</p>
 
 <h3><code><a name="ca_put">ca_put()</a></code></h3>
 <pre>#include &lt;cadef.h&gt;
-int ca_put ( chtype TYPE, 
-        chid CHID, void *PVALUE ); 
-int ca_array_put ( chtype TYPE, unsigned long COUNT, 
+int ca_put ( chtype TYPE,
+        chid CHID, void *PVALUE );
+int ca_array_put ( chtype TYPE, unsigned long COUNT,
         chid CHID, const void *PVALUE);
 typedef void ( caEventCallBackFunc ) (struct event_handler_args);
-int ca_put_callback ( chtype TYPE, 
-        chid CHID, const void *PVALUE, 
-        caEventCallBackFunc PFUNC, void *USERARG ); 
-int ca_array_put_callback ( chtype TYPE, unsigned long COUNT, 
-        chid CHID, const void *PVALUE, 
+int ca_put_callback ( chtype TYPE,
+        chid CHID, const void *PVALUE,
+        caEventCallBackFunc PFUNC, void *USERARG );
+int ca_array_put_callback ( chtype TYPE, unsigned long COUNT,
+        chid CHID, const void *PVALUE,
         caEventCallBackFunc PFUNC, void *USERARG );</pre>
 
 <h4>Description</h4>
@@ -2933,7 +2935,7 @@ but they do not cause the record to be processed.</p>
 </dl>
 <dl>
   <dt><code>PFUNC</code></dt>
-    <dd>address of <a href="#User">user supplied callback function</a> to be
+    <dd>Pointer to a <a href="#User">user supplied callback function</a> to be
       run when the requested operation completes</dd>
 </dl>
 <dl>
@@ -3041,7 +3043,7 @@ when a CA get request is initiated.</p>
 </dl>
 <dl>
   <dt><code>USERFUNC</code></dt>
-    <dd>Address of <a href="#User">user supplied callback function</a> to be
+    <dd>Pointer to a <a href="#User">user supplied callback function</a> to be
       run when the requested operation completes.</dd>
 </dl>
 <dl>
@@ -3081,7 +3083,7 @@ when a CA get request is initiated.</p>
 typedef void ( caEventCallBackFunc ) (struct event_handler_args);
 int ca_create_subscription ( chtype TYPE, unsigned long COUNT,
         chid CHID, unsigned long MASK,
-        caEventCallBackFunc USERFUNC, void *USERARG, 
+        caEventCallBackFunc USERFUNC, void *USERARG,
         evid *PEVID );</pre>
 
 <h4>Description</h4>
@@ -3142,8 +3144,8 @@ indicating the current state of the channel.</p>
     <dd>channel identifier</dd>
 </dl>
 <dl>
-  <dt><code>USRERFUNC</code></dt>
-    <dd>The address of <a href="#User">user supplied callback function</a> to
+  <dt><code>USERFUNC</code></dt>
+    <dd>Pointer to a <a href="#User">user supplied callback function</a> to
       be invoked with each subscription update.</dd>
 </dl>
 <dl>
@@ -3165,7 +3167,7 @@ indicating the current state of the channel.</p>
   <dt><code>MASK</code></dt>
     <dd>A mask with bits set for each of the event trigger types requested. The
       event trigger mask must be a <em>bitwise or</em> of one or more of the
-      following constants. 
+      following constants.
       <ul>
         <li>DBE_VALUE - Trigger events when the channel value exceeds the
           monitor dead band</li>
@@ -3212,6 +3214,13 @@ and not forwarded to the server until one of <code>ca_flush_io()</code>, <code>c
 <code>ca_pend_event()</code>, or <code>ca_sg_block()</code> are called. This allows several requests to be
 efficiently sent together in one message.</p>
 
+<p>Note: This operation blocks until any user callbacks for this channel
+have run to completion. If callbacks take a lock (mutex) then it is the
+user's responsibility to ensure that this lock is not held when
+<code>ca_clear_subscription()</code> is called, otherwise a deadlock may
+ensue. (See also <code><a
+href="#ca_clear_channel">ca_clear_channel</a>()</code>.)</p>
+
 <h4>Arguments</h4>
 <dl>
   <dt>EVID</dt>
@@ -3376,7 +3385,7 @@ becomes full.</p>
 
 <h3><code><a name="ca_signal">ca_signal()</a></code></h3>
 <pre>#include &lt;cadef.h&gt;
-int ca_signal ( long CA_STATUS, const char * CONTEXT_STRING ); 
+int ca_signal ( long CA_STATUS, const char * CONTEXT_STRING );
 void SEVCHK( CA_STATUS, CONTEXT_STRING );</pre>
 
 <h4>Description</h4>
@@ -3393,7 +3402,7 @@ recommended error handler for simple applications which do not wish to write
 code testing the status returned from each channel access call.</p>
 
 <h4>Examples</h4>
-<pre>status = ca_context_create (...); 
+<pre>status = ca_context_create (...);
 SEVCHK ( status, "Unable to create a CA client context" );</pre>
 
 <p>If the application only wishes to print the message associated with an error
@@ -3417,7 +3426,7 @@ this purpose.</p>
 
 <h3><code><a
 name="ca_add_exception_event">ca_add_exception_event()</a></code></h3>
-<pre>#include &lt;cadef.h&gt; 
+<pre>#include &lt;cadef.h&gt;
 typedef void (*pCallback) ( struct exception_handler_args HANDLERARGS );
 int ca_add_exception_event ( pCallback  USERFUNC, void *USERARG );</pre>
 
@@ -3441,7 +3450,7 @@ field should not be used.</p>
 <h4>Arguments</h4>
 <dl>
   <dt><code>USERFUNC</code></dt>
-    <dd>Address of user callback function to be executed when an exceptions
+    <dd>Pointer to a user callback function to be executed when exceptions
       occur. Passing a null value causes the default exception handler to be
       reinstalled. The following structure is passed by value to the user's
       callback function. Currently, the <code>op</code> field can be one of
@@ -3576,7 +3585,7 @@ default handler uses fprintf to send messages to 'stderr'.</p>
 <h4>Arguments</h4>
 <dl>
   <dt><code>PFUNC</code></dt>
-    <dd>The address of a user supplied callback handler to be invoked when CA
+    <dd>A pointer to a user supplied callback handler to be invoked when CA
       prints diagnostic messages. Installing a null pointer will cause the
       default callback handler to be reinstalled.</dd>
 </dl>
@@ -3624,9 +3633,9 @@ specified channel.</p>
 </dl>
 <dl>
   <dt><code>PFUNC</code></dt>
-    <dd>Address of user supplied callback function. A null pointer uninstalls
+    <dd>Pointer to a user supplied callback function. A null pointer uninstalls
       the current handler. The following arguments are passed <em>by value</em>
-      to the supplied callback handler. 
+      to the supplied callback handler.
       <pre>typedef struct ca_access_rights {
     unsigned    read_access:1;
     unsigned    write_access:1;
@@ -3966,8 +3975,8 @@ type.</p>
 prints diagnostics to standard out.</p>
 
 <h4>Examples</h4>
-<pre>void ca_test_event (); 
-status = ca_create_subscription ( type, chid, ca_test_event, NULL, NULL ); 
+<pre>void ca_test_event ();
+status = ca_create_subscription ( type, chid, ca_test_event, NULL, NULL );
 SEVCHK ( status, .... );</pre>
 
 <h4>See Also</h4>
@@ -4001,8 +4010,8 @@ outstanding within them at any given time.</p>
 </dl>
 
 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
-status = ca_sg_create ( &amp;gid ); 
+<pre>CA_SYNC_GID gid;
+status = ca_sg_create ( &amp;gid );
 SEVCHK ( status, Sync group create failed );</pre>
 
 <h4>Returns</h4>
@@ -4040,8 +4049,8 @@ int ca_sg_delete ( CA_SYNC_GID GID );</pre>
 </dl>
 
 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
-status = ca_sg_delete ( gid ); 
+<pre>CA_SYNC_GID gid;
+status = ca_sg_delete ( gid );
 SEVCHK ( status, Sync group delete failed );</pre>
 
 <h4>Returns</h4>
@@ -4152,7 +4161,7 @@ will not block unless additional subsequent requests are made.</p>
 </dl>
 
 <h4>Examples</h4>
-<pre>CA_SYNC_GID gid; 
+<pre>CA_SYNC_GID gid;
 status = ca_sg_reset(gid);</pre>
 
 <h4>Returns</h4>
@@ -4165,7 +4174,7 @@ status = ca_sg_reset(gid);</pre>
 <pre>#include &lt;cadef.h&gt;
 int ca_sg_put ( CA_SYNC_GID GID, chtype TYPE,
         chid CHID, void *PVALUE );
-int ca_sg_array_put ( CA_SYNC_GID GID, chtype TYPE, 
+int ca_sg_array_put ( CA_SYNC_GID GID, chtype TYPE,
         unsigned long COUNT, chid CHID, void *PVALUE );</pre>
 
 <p>Write a value, or array of values, to a channel and increment the outstanding
@@ -4306,7 +4315,7 @@ reissued.</p>
 
 <h3><code><a name="ca_client_status">ca_client_status()</a></code></h3>
 <pre>int ca_client_status ( unsigned level );
-int ca_context_status ( struct ca_client_context *CONTEXT, 
+int ca_context_status ( struct ca_client_context *CONTEXT,
        unsigned LEVEL );</pre>
 
 <h4>Description</h4>

src/ca/client/Makefile

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

src/ca/client/access.cpp

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

src/ca/client/autoPtrDestroy.h

@@ -0,0 +1,94 @@
+/*************************************************************************\
+* 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,8 +28,7 @@
 #define CA_VERSION_STRING( MINOR_REVISION ) \
 ( capStrOfX ( CA_MAJOR_PROTOCOL_REVISION ) "." capStrOfX ( MINOR_REVISION ) )
 #define CA_UKN_MINOR_VERSION    0u /* unknown minor version */
-#define CA_MINIMUM_SUPPORTED_VERSION 4u
-#   define CA_VSUPPORTED(MINOR) ((MINOR)>=CA_MINIMUM_SUPPORTED_VERSION)
+#if CA_MAJOR_PROTOCOL_REVISION == 4u
 #   define CA_V41(MINOR) ((MINOR)>=1u) 
 #   define CA_V42(MINOR) ((MINOR)>=2u)
 #   define CA_V43(MINOR) ((MINOR)>=3u)
@@ -43,6 +42,35 @@
 #   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 );
     }
 
-    std::auto_ptr < CallbackGuard > pCBGuard;
+    epics_auto_ptr < CallbackGuard > pCBGuard;
     if ( ! enablePreemptiveCallback ) {
         pCBGuard.reset ( new CallbackGuard ( this->cbMutex ) );
     }

src/ca/client/cac.cpp

@@ -32,7 +32,6 @@
 #include "envDefs.h"
 #include "locationException.h"
 #include "errlog.h"
-#include "epicsExport.h"
 
 #define epicsExportSharedSymbols
 #include "addrList.h"
@@ -219,15 +218,9 @@ cac::cac (
             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 ();
-            }
+        freeListInitPvt ( &this->tcpLargeRecvBufFreeList, this->maxRecvBytesTCP, 1 );
+        if ( ! this->tcpLargeRecvBufFreeList ) {
+            throw std::bad_alloc ();
         }
         unsigned bufsPerArray = this->maxRecvBytesTCP / comBuf::capacityBytes ();
         if ( bufsPerArray > 1u ) {
@@ -238,7 +231,9 @@ cac::cac (
     catch ( ... ) {
         osiSockRelease ();
         delete [] this->pUserName;
-        freeListCleanup ( this->tcpSmallRecvBufFreeList );
+        if ( this->tcpSmallRecvBufFreeList ) {
+            freeListCleanup ( this->tcpSmallRecvBufFreeList );
+        }
         if ( this->tcpLargeRecvBufFreeList ) {
             freeListCleanup ( this->tcpLargeRecvBufFreeList );
         }
@@ -265,14 +260,9 @@ 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, 11, pdst );
+            piiu, CA_UKN_MINOR_VERSION, pdst );
         free ( pNode );
         if ( newIIU ) {
             piiu->start ( guard );
@@ -328,9 +318,7 @@ cac::~cac ()
     }
 
     freeListCleanup ( this->tcpSmallRecvBufFreeList );
-    if ( this->tcpLargeRecvBufFreeList ) {
-        freeListCleanup ( this->tcpLargeRecvBufFreeList );
-    }
+    freeListCleanup ( this->tcpLargeRecvBufFreeList );
 
     delete [] this->pUserName;
 

src/ca/client/cac.h

@@ -51,7 +51,6 @@
 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
@@ -194,6 +193,12 @@ 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
@@ -350,8 +355,6 @@ private:
 
 	cac ( const cac & );
 	cac & operator = ( const cac & );
-
-    friend class tcpiiu;
 };
 
 inline const char * cac::userNamePointer () const
@@ -382,6 +385,35 @@ 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,7 +58,6 @@ 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,14 +26,13 @@
 #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"
 
@@ -403,8 +402,8 @@ private:
     epicsEvent ioDone;
     epicsEvent callbackThreadActivityComplete;
     epicsThreadId createdByThread;
-    std::auto_ptr < CallbackGuard > pCallbackGuard;
-    std::auto_ptr < cacContext > pServiceContext;
+    epics_auto_ptr < CallbackGuard > pCallbackGuard;
+    epics_auto_ptr < cacContext > pServiceContext;
     caExceptionHandler * ca_exception_func;
     void * ca_exception_arg;
     caPrintfFunc * pVPrintfFunc;

src/ca/client/oldChannelNotify.cpp

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

src/ca/client/perl/CA.pm

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

src/ca/client/perl/Makefile

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

src/ca/client/perl/caget.pl

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

src/ca/client/repeaterSubscribeTimer.cpp

@@ -66,8 +66,6 @@ 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 );
@@ -94,15 +92,12 @@ 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,7 +70,6 @@ private:
     repeaterTimerNotify & iiu;
     epicsMutex & cbMutex;
     cacContextNotify & ctxNotify;
-    mutable epicsMutex stateMutex;
     unsigned attempts;
     bool registered;
     bool once;

src/ca/client/searchTimer.cpp

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

src/ca/client/tcpiiu.cpp

@@ -26,9 +26,6 @@
 
 #include <stdexcept>
 #include <string>
-
-#include <stdlib.h>
-
 #include "errlog.h"
 
 #define epicsExportSharedSymbols
@@ -690,7 +687,7 @@ tcpiiu::tcpiiu (
     curDataBytes ( 0ul ),
     comBufMemMgr ( comBufMemMgrIn ),
     cacRef ( cac ),
-    pCurData ( (char*) freeListMalloc(this->cacRef.tcpSmallRecvBufFreeList) ),
+    pCurData ( cac.allocateSmallBufferTCP () ),
     pSearchDest ( pSearchDestIn ),
     mutex ( mutexIn ),
     cbMutex ( cbMutexIn ),
@@ -714,12 +711,9 @@ 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 ) {
-        freeListFree(this->cacRef.tcpSmallRecvBufFreeList, this->pCurData);
+        cac.releaseSmallBufferTCP ( this->pCurData );
         char sockErrBuf[64];
         epicsSocketConvertErrnoToString ( 
             sockErrBuf, sizeof ( sockErrBuf ) );
@@ -1029,14 +1023,11 @@ tcpiiu :: ~tcpiiu ()
 
     // free message body cache
     if ( this->pCurData ) {
-        if ( this->curDataMax <= MAX_TCP ) {
-            freeListFree(this->cacRef.tcpSmallRecvBufFreeList, this->pCurData);
-        }
-        else if ( this->cacRef.tcpLargeRecvBufFreeList ) {
-            freeListFree(this->cacRef.tcpLargeRecvBufFreeList, this->pCurData);
+        if ( this->curDataMax == MAX_TCP ) {
+            this->cacRef.releaseSmallBufferTCP ( this->pCurData );
         }
         else {
-            free ( this->pCurData );
+            this->cacRef.releaseLargeBufferTCP ( this->pCurData );
         }
     }
 }
@@ -1206,46 +1197,18 @@ bool tcpiiu::processIncoming (
         // make sure we have a large enough message body cache
         //
         if ( this->curMsg.m_postsize > this->curDataMax ) {
-            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);
+            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 ();
                 }
-
-            } 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()
+                else {
+                    this->printFormated ( mgr.cbGuard,
+                        "CAC: not enough memory for message body cache (ignoring response message)\n");
                 }
-                this->pCurData = newbuf;
-                this->curDataMax = newsize;
-
-            } else {
-                this->printFormated ( mgr.cbGuard,
-                    "CAC: not enough memory for message body cache (ignoring response message)\n");
             }
         }
 
@@ -1463,7 +1426,7 @@ void tcpiiu::readNotifyRequest ( epicsGuard < epicsMutex > & guard,
     }
     arrayElementCount maxBytes;
     if ( CA_V49 ( this->minorProtocolVersion ) ) {
-        maxBytes = 0xfffffff0;
+        maxBytes = this->cacRef.largeBufferSizeTCP ();
     }
     else {
         maxBytes = MAX_TCP;
@@ -1574,7 +1537,7 @@ void tcpiiu::subscriptionRequest (
         guard, CA_V413(this->minorProtocolVersion) );
     arrayElementCount maxBytes;
     if ( CA_V49 ( this->minorProtocolVersion ) ) {
-        maxBytes = 0xfffffff0;
+        maxBytes = this->cacRef.largeBufferSizeTCP ();
     }
     else {
         maxBytes = MAX_TCP;
@@ -1621,7 +1584,7 @@ void tcpiiu::subscriptionUpdateRequest (
         guard, CA_V413(this->minorProtocolVersion) );
     arrayElementCount maxBytes;
     if ( CA_V49 ( this->minorProtocolVersion ) ) {
-        maxBytes = 0xfffffff0;
+        maxBytes = this->cacRef.largeBufferSizeTCP ();
     }
     else {
         maxBytes = MAX_TCP;

src/ca/client/templateInstances.cpp

@@ -0,0 +1,89 @@
+/*************************************************************************\
+* 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/tools/caput.c

@@ -8,7 +8,7 @@
 * Copyright (c) 2002 Berliner Elektronenspeicherringgesellschaft fuer
 *     Synchrotronstrahlung.
 * EPICS BASE is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution. 
+* in file LICENSE that is included with this distribution.
 \*************************************************************************/
 
 /*
@@ -419,7 +419,7 @@ int main (int argc, char *argv[])
         if (argc > optind+1) {
             for (i = optind + 1; i < argc; i++) {
                 strcat(cbuf, " ");
-                strcat(cbuf, argv[i]); 
+                strcat(cbuf, argv[i]);
             }
         }
 
@@ -530,6 +530,11 @@ int main (int argc, char *argv[])
         /* Use standard put with defined timeout */
         result = ca_array_put (dbrType, count, pvs[0].chid, pbuf);
     }
+    if (result != ECA_NORMAL) {
+        fprintf(stderr, "Error from put operation: %s\n", ca_message(result));
+        return 1;
+    }
+
     result = ca_pend_io(caTimeout);
     if (result == ECA_TIMEOUT) {
         fprintf(stderr, "Write operation timed out: Data was not written.\n");
@@ -545,7 +550,7 @@ int main (int argc, char *argv[])
     }
 
     if (result != ECA_NORMAL) {
-        fprintf(stderr, "Error occured writing data.\n");
+        fprintf(stderr, "Error occured writing data: %s\n", ca_message(result));
         return 1;
     }
 

src/ca/client/tools/tool_lib.c

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

src/ca/client/udpiiu.cpp

@@ -64,52 +64,6 @@ 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 ()
 //
@@ -131,15 +85,14 @@ udpiiu::udpiiu (
     repeaterSubscribeTmr (
         m_repeaterTimerNotify, timerQueue, cbMutexIn, ctxNotifyIn ),
     govTmr ( *this, timerQueue, cacMutexIn ),
-    maxPeriod ( getMaxPeriod() ),
+    maxPeriod ( maxSearchPeriodDefault ),
     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 ),
@@ -151,13 +104,45 @@ 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 ( beaconAnomalySearchPeriod / minRoundTripEstimate ) / log ( 2.0 );
+    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 );
     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, 
@@ -180,7 +165,7 @@ udpiiu::udpiiu (
 
 #ifdef IP_ADD_MEMBERSHIP
     {
-        int flag = 1;
+        osiSockOptMcastLoop_t flag = 1;
         if ( setsockopt ( this->sock, IPPROTO_IP, IP_MULTICAST_LOOP,
                           (char *) &flag, sizeof ( flag ) ) == -1 ) {
             char sockErrBuf[64];
@@ -191,22 +176,6 @@ udpiiu::udpiiu (
     }
 #endif
 
-#ifdef IP_MULTICAST_TTL
-    {
-        int 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,8 +25,6 @@
 #ifndef udpiiuh
 #define udpiiuh
 
-#include <memory>
-
 #ifdef epicsExportSharedSymbols
 #   define udpiiuh_accessh_epicsExportSharedSymbols
 #   undef epicsExportSharedSymbols
@@ -34,7 +32,9 @@
 
 #include "osiSock.h"
 #include "epicsThread.h"
+#include "epicsMemory.h"
 #include "epicsTime.h"
+#include "tsMinMax.h"
 #include "tsDLList.h"
 
 #ifdef udpiiuh_accessh_epicsExportSharedSymbols
@@ -160,24 +160,15 @@ private:
     repeaterSubscribeTimer repeaterSubscribeTmr;
     disconnectGovernorTimer govTmr;
     tsDLList < SearchDest > _searchDestList;
-    const double maxPeriod;
+    double maxPeriod;
     double rtteMean;
     double rtteMeanDev;
     cac & cacRef;
     epicsMutex & cbMutex;
     epicsMutex & cacMutex;
-    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;
+    epics_auto_ptr < epics_auto_ptr < class searchTimer >, eapt_array > ppSearchTmr;
     unsigned nBytesInXmitBuf;
+    unsigned nTimers;
     unsigned beaconAnomalyTimerIndex;
     ca_uint32_t sequenceNumber;
     ca_uint32_t lastReceivedSeqNo;

src/ca/client/virtualCircuit.h

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

src/ca/legacy/pcas/build/Makefile

@@ -53,6 +53,7 @@ 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,12 +74,13 @@ LIBSRCS += casStreamIO.cc
 LIBSRCS += ipIgnoreEntry.cc
 
 # There is a bug in some vxWorks compilers that these work around:
-ifeq ($(VX_GNU_VERSION), 4.1.2)
-  casStreamOS_CXXFLAGS_vxWorks-ppc604_altivec = -O0
-  casStreamOS_CXXFLAGS_vxWorks-ppc604_long = -O0
-  casStreamOS_CXXFLAGS_vxWorks-ppc604 = -O0
+ifeq ($(VXWORKS_VERSION)$(filter -mcpu=604,$(ARCH_DEP_CFLAGS)), 6.6-mcpu=604)
+  casDGIntfOS_CXXFLAGS = -fno-inline
+  casStreamOS_CXXFLAGS = -fno-inline
 endif
 
+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 "epicsAlgorithm.h"
+#include "tsMinMax.h"
 
 const pvInfo *pvInfo::pFirst;
 
@@ -128,7 +128,7 @@ pvExistReturn directoryServer::pvExistTest
 	}
 	else {
 		size_t diff = pLastStr-pPVName;
-		diff = epicsMin (diff, sizeof(pvNameBuf)-1);
+		diff = tsMin (diff, sizeof(pvNameBuf)-1);
 		memcpy (pvNameBuf, pPVName, diff);
 		pvNameBuf[diff] = '\0';
 		pLastStr = pvNameBuf;

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

@@ -0,0 +1,104 @@
+/*************************************************************************\
+* 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::uknownMessageAction,
+    & casDGClient::echoAction,
     & 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,13 +111,11 @@ caStatus casDGClient::uknownMessageAction ()
 {
     const caHdrLargeArray * mp = this->ctx.getMsg();
 
-    if ( this->getCAS().getDebugLevel() > 3u ) {
-        char pHostName[64u];
-        this->lastRecvAddr.stringConvert ( pHostName, sizeof ( pHostName ) );
+    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;
 }
@@ -131,23 +129,13 @@ 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;
     }
@@ -155,19 +143,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;
         }
@@ -176,7 +164,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 );
     }
 
@@ -195,7 +183,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 );
 
     //
@@ -205,7 +193,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;
@@ -224,13 +212,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;
@@ -242,18 +230,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
@@ -262,8 +250,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
@@ -276,19 +264,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();
@@ -308,7 +296,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:
@@ -330,24 +318,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;
 }
 
@@ -374,15 +362,6 @@ 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 ) ) {
@@ -425,8 +404,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 ) {
@@ -439,7 +418,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;
@@ -476,7 +455,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);
@@ -508,9 +487,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 ) {
@@ -518,7 +497,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;
@@ -554,8 +533,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 () );
@@ -582,9 +561,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
         //
@@ -614,7 +593,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
@@ -665,6 +644,11 @@ caStatus casDGClient::processDG ()
         if ( status != S_cas_success ) {
             break;
         }
+
+        if ( this->in.bytesPresent () > 0 && dgInBytesConsumed == 0 && status == S_cas_success ) {
+            this->in.removeMsg ( this->in.bytesPresent() );
+        }
+
     }
     return status;
 }
@@ -705,7 +689,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 ();
@@ -800,8 +784,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;
@@ -810,7 +794,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 );
                     }
@@ -822,7 +806,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 );
                 }
 
@@ -830,7 +814,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 );
@@ -857,16 +841,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;
     }
@@ -875,9 +859,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;
@@ -901,14 +885,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 ) {
@@ -918,7 +902,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 );
@@ -963,7 +947,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/casPVI.cc

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

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

@@ -205,7 +205,7 @@ caStatus casStrmClient :: processMsg ()
                 if ( bytesLeft < msgSize ) {
                     status = S_cas_success;
                     if ( msgSize > this->in.bufferSize() ) {
-                        this->in.expandBuffer (msgSize);
+                        this->in.expandBuffer ();
                         // msg to large - set up message drain
                         if ( msgSize > this->in.bufferSize() ) {
                             caServerI::dumpMsg ( this->pHostName, this->pUserName, & msgTmp, 0, 
@@ -338,16 +338,6 @@ 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;
@@ -1277,14 +1267,6 @@ 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;
     }
     
@@ -1380,16 +1362,6 @@ 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
     //
@@ -1459,10 +1431,13 @@ caStatus casStrmClient :: searchAction ( epicsGuard < casClientMutex > & guard )
         //
         switch ( pver.getStatus() ) {
         case pverExistsHere:
-        case pverDoesNotExistHere:
             status = this->searchResponse ( guard, *mp, pver );
             break;
 
+        case pverDoesNotExistHere:
+            status = S_cas_success;
+            break;
+
         case pverAsyncCompletion:
             errMessage ( S_cas_badParameter, 
                 "- unexpected asynch IO status from "

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

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

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

@@ -16,6 +16,22 @@
 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;
@@ -23,15 +39,11 @@ 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:
-
-    void * smallBufFreeList;
+    casBufferFactory bufferFactory;
 };
 
 #endif // clientBufMemoryManagerh

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

@@ -13,9 +13,6 @@
  *              505 665 1831
  */
 
-#include <stdexcept>
-#include <new>
-
 #include <stdio.h>
 #include <string.h>
 
@@ -158,17 +155,11 @@ bufSizeT inBuf::popCtx ( const inBufCtx &ctx )
     }
 }
 
-void inBuf::expandBuffer (bufSizeT needed)
+void inBuf::expandBuffer ()
 {
-    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 max = this->memMgr.maxSize();
+    if ( this->bufSize <  max ) {
+        casBufferParm bufParm = this->memMgr.allocate ( max );
         bufSizeT unprocessedBytes = this->bytesPresent ();
         memcpy ( bufParm.pBuf, &this->pBuf[this->nextReadIndex], unprocessedBytes );
         this->bytesInBuffer = unprocessedBytes;
@@ -179,7 +170,7 @@ void inBuf::expandBuffer (bufSizeT needed)
     }
 }
 
-bufSizeT inBuf::bufferSize() const
+unsigned 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
-    bufSizeT bufferSize () const;
-    void expandBuffer (bufSizeT needed);
+    unsigned bufferSize () const;
+    void expandBuffer ();
 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 (msgsize);
+        this->expandBuffer ();
         if ( msgsize > this->bufSize ) {
             return S_cas_hugeRequest;
         }
@@ -316,17 +316,11 @@ void outBuf::show (unsigned level) const
     }
 }
 
-void outBuf::expandBuffer (bufSizeT needed)
+void outBuf::expandBuffer ()
 {
-    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 max = this->memMgr.maxSize();
+    if ( this->bufSize < max  ) {
+        casBufferParm bufParm = this->memMgr.allocate ( max );
         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 (bufSizeT needed);
+    void expandBuffer ();
 
 	outBuf ( const outBuf & );
 	outBuf & operator = ( const outBuf & );

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

@@ -0,0 +1,29 @@
+/*************************************************************************\
+* 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

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

src/ioc/db/Makefile

@@ -14,18 +14,14 @@ 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
@@ -68,13 +64,9 @@ 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
@@ -93,6 +85,7 @@ 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,6 +24,7 @@
 #include "dbDefs.h"
 #include "epicsAtomic.h"
 #include "epicsEvent.h"
+#include "epicsExit.h"
 #include "epicsInterrupt.h"
 #include "epicsRingPointer.h"
 #include "epicsString.h"
@@ -45,6 +46,7 @@
 #include "epicsExport.h"
 #include "link.h"
 #include "recSup.h"
+#include "dbUnitTest.h" /* for testSyncCallback() */
 
 
 static int callbackQueueSize = 2000;
@@ -80,6 +82,10 @@ static int callbackIsInit;
 static char *threadNamePrefix[NUM_CALLBACK_PRIORITIES] = {
     "cbLow", "cbMedium", "cbHigh"
 };
+#define FULL_MSG(name) "callbackRequest: " name " ring buffer full\n"
+static char *fullMessage[NUM_CALLBACK_PRIORITIES] = {
+    FULL_MSG("cbLow"), FULL_MSG("cbMedium"), FULL_MSG("cbHigh")
+};
 static unsigned int threadPriority[NUM_CALLBACK_PRIORITIES] = {
     epicsThreadPriorityScanLow - 1,
     epicsThreadPriorityScanLow + 4,
@@ -91,7 +97,7 @@ static int priorityValue[NUM_CALLBACK_PRIORITIES] = {0, 1, 2};
 int callbackSetQueueSize(int size)
 {
     if (callbackIsInit) {
-        fprintf(stderr, "Callback system already initialized\n");
+        errlogPrintf("Callback system already initialized\n");
         return -1;
     }
     callbackQueueSize = size;
@@ -101,7 +107,7 @@ int callbackSetQueueSize(int size)
 int callbackParallelThreads(int count, const char *prio)
 {
     if (callbackIsInit) {
-        fprintf(stderr, "Callback system already initialized\n");
+        errlogPrintf("Callback system already initialized\n");
         return -1;
     }
 
@@ -111,7 +117,7 @@ int callbackParallelThreads(int count, const char *prio)
         count = callbackParallelThreadsDefault;
     if (count < 1) count = 1;
 
-    if (!prio || *prio == 0 || strcmp(prio, "*") == 0) {
+    if (!prio || strcmp(prio, "") == 0 || strcmp(prio, "*") == 0) {
         int i;
 
         for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
@@ -120,30 +126,30 @@ int callbackParallelThreads(int count, const char *prio)
     }
     else {
         dbMenu *pdbMenu;
-        int i;
 
         if (!pdbbase) {
-            fprintf(stderr, "callbackParallelThreads: pdbbase not set\n");
+            errlogPrintf("callbackParallelThreads: pdbbase not set\n");
             return -1;
         }
-
         /* Find prio in menuPriority */
         pdbMenu = dbFindMenu(pdbbase, "menuPriority");
-        if (!pdbMenu) {
-            fprintf(stderr, "callbackParallelThreads: No Priority menu\n");
-            return -1;
-        }
+        if (pdbMenu) {
+            int i, gotMatch = 0;
 
-        for (i = 0; i < pdbMenu->nChoice; i++) {
-            if (epicsStrCaseCmp(prio, pdbMenu->papChoiceValue[i]) == 0)
-                goto found;
+            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;
+            }
         }
-        fprintf(stderr, "callbackParallelThreads: "
-            "Unknown priority \"%s\"\n", prio);
-        return -1;
-
-found:
-        callbackQueue[i].threadsConfigured = count;
     }
     return 0;
 }
@@ -283,11 +289,7 @@ int callbackRequest(CALLBACK *pcallback)
     pushOK = epicsRingPointerPush(mySet->queue, pcallback);
 
     if (!pushOK) {
-        char msg[48] = "callbackRequest: ";
-
-        strcat(msg, threadNamePrefix[priority]);
-        strcat(msg, " ring buffer full\n");
-        epicsInterruptContextMessage(msg);
+        epicsInterruptContextMessage(fullMessage[priority]);
         mySet->queueOverflow = TRUE;
         return S_db_bufFull;
     }
@@ -352,3 +354,86 @@ void callbackRequestProcessCallbackDelayed(CALLBACK *pcallback,
     callbackSetProcess(pcallback, Priority, pRec);
     callbackRequestDelayed(pcallback, seconds);
 }
+
+/* Sync. process of testSyncCallback()
+ *
+ * 1. For each priority, make a call to callbackRequest() for each worker.
+ * 2. Wait until all callbacks are concurrently being executed
+ * 3. Last worker to begin executing signals success and begins waking up other workers
+ * 4. Last worker to wake signals testSyncCallback() to complete
+ */
+typedef struct {
+    epicsEventId wait_phase2, wait_phase4;
+    int nphase2, nphase3;
+    epicsCallback cb;
+} sync_helper;
+
+static void sync_callback(epicsCallback *cb)
+{
+    sync_helper *helper;
+    callbackGetUser(helper, cb);
+
+    testGlobalLock();
+
+    assert(helper->nphase2 > 0);
+    if(--helper->nphase2!=0) {
+        /* we are _not_ the last to start. */
+        testGlobalUnlock();
+        epicsEventMustWait(helper->wait_phase2);
+        testGlobalLock();
+    }
+
+    /* we are either the last to start, or have been
+     * woken by the same and must pass the wakeup along
+     */
+    epicsEventMustTrigger(helper->wait_phase2);
+
+    assert(helper->nphase2 == 0);
+    assert(helper->nphase3 > 0);
+
+    if(--helper->nphase3==0) {
+        /* we are the last to wake up.  wake up testSyncCallback() */
+        epicsEventMustTrigger(helper->wait_phase4);
+    }
+
+    testGlobalUnlock();
+}
+
+void testSyncCallback(void)
+{
+    sync_helper helper[NUM_CALLBACK_PRIORITIES];
+    unsigned i;
+
+    testDiag("Begin testSyncCallback()");
+
+    for(i=0; i<NUM_CALLBACK_PRIORITIES; i++) {
+        helper[i].wait_phase2 = epicsEventMustCreate(epicsEventEmpty);
+        helper[i].wait_phase4 = epicsEventMustCreate(epicsEventEmpty);
+
+        /* no real need to lock here, but do so anyway so that valgrind can establish
+         * the locking requirements for sync_helper.
+         */
+        testGlobalLock();
+        helper[i].nphase2 = helper[i].nphase3 = callbackQueue[i].threadsRunning;
+        testGlobalUnlock();
+
+        callbackSetUser(&helper[i], &helper[i].cb);
+        callbackSetPriority(i, &helper[i].cb);
+        callbackSetCallback(sync_callback, &helper[i].cb);
+
+        callbackRequest(&helper[i].cb);
+    }
+
+    for(i=0; i<NUM_CALLBACK_PRIORITIES; i++) {
+        epicsEventMustWait(helper[i].wait_phase4);
+    }
+
+    for(i=0; i<NUM_CALLBACK_PRIORITIES; i++) {
+        testGlobalLock();
+        epicsEventDestroy(helper[i].wait_phase2);
+        epicsEventDestroy(helper[i].wait_phase4);
+        testGlobalUnlock();
+    }
+
+    testDiag("Complete testSyncCallback()");
+}

src/ioc/db/callback.h

@@ -42,20 +42,20 @@ typedef struct callbackPvt {
 	int		priority;
 	void		*user; /*for use by callback user*/
         void            *timer; /*for use by callback itself*/
-}CALLBACK;
+}epicsCallback;
+
+typedef epicsCallback CALLBACK;
 
 typedef void    (*CALLBACKFUNC)(struct callbackPvt*);
 
-#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 )
+#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 )
 
 epicsShareFunc void callbackInit(void);
 epicsShareFunc void callbackStop(void);

src/ioc/db/dbAccess.c

@@ -41,7 +41,8 @@
 #include "dbAddr.h"
 #include "dbBase.h"
 #include "dbBkpt.h"
-#include "dbCommonPvt.h"
+#include "dbCa.h"
+#include "dbCommon.h"
 #include "dbConvertFast.h"
 #include "dbConvert.h"
 #include "dbEvent.h"
@@ -49,12 +50,11 @@
 #include "dbFldTypes.h"
 #include "dbFldTypes.h"
 #include "dbLink.h"
-#include "dbLockPvt.h"
+#include "dbLock.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"
@@ -77,8 +77,6 @@ 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,
@@ -109,7 +107,7 @@ void dbSpcAsRegisterCallback(SPC_ASCALLBACK func)
 long dbPutSpecial(DBADDR *paddr,int pass)
 {
     long int	(*pspecial)()=NULL;
-    rset        *prset;
+    struct rset	*prset;
     dbCommon 	*precord = paddr->precord;
     long	status=0;
     long	special=paddr->special;
@@ -141,7 +139,7 @@ long dbPutSpecial(DBADDR *paddr,int pass)
 }
 
 static void get_enum_strs(DBADDR *paddr, char **ppbuffer,
-    rset *prset,long	*options)
+	struct rset *prset,long	*options)
 {
 	short		field_type=paddr->field_type;
 	dbFldDes	*pdbFldDes = paddr->pfldDes;
@@ -201,7 +199,7 @@ choice_common:
 }
 
 static void get_graphics(DBADDR *paddr, char **ppbuffer,
-    rset *prset,long	*options)
+	struct rset *prset,long	*options)
 {
 	struct			dbr_grDouble grd;
 	int			got_data=FALSE;
@@ -241,7 +239,7 @@ static void get_graphics(DBADDR *paddr, char **ppbuffer,
 }
 
 static void get_control(DBADDR *paddr, char **ppbuffer,
-    rset *prset,long	*options)
+	struct rset *prset,long	*options)
 {
 	struct dbr_ctrlDouble	ctrld;
 	int			got_data=FALSE;
@@ -281,7 +279,7 @@ static void get_control(DBADDR *paddr, char **ppbuffer,
 }
 
 static void get_alarm(DBADDR *paddr, char **ppbuffer,
-    rset *prset, long *options)
+    struct rset *prset, long *options)
 {
     char *pbuffer = *ppbuffer;
     struct dbr_alDouble ald = {epicsNAN, epicsNAN, epicsNAN, epicsNAN};
@@ -293,10 +291,14 @@ static void get_alarm(DBADDR *paddr, char **ppbuffer,
     if (*options & DBR_AL_LONG) {
         struct dbr_alLong *pal = (struct dbr_alLong*) pbuffer;
 
-        pal->upper_alarm_limit   = (epicsInt32) ald.upper_alarm_limit;
-        pal->upper_warning_limit = (epicsInt32) ald.upper_warning_limit;
-        pal->lower_warning_limit = (epicsInt32) ald.lower_warning_limit;
-        pal->lower_alarm_limit   = (epicsInt32) ald.lower_alarm_limit;
+        pal->upper_alarm_limit   = finite(ald.upper_alarm_limit) ?
+            (epicsInt32) ald.upper_alarm_limit : 0;
+        pal->upper_warning_limit = finite(ald.upper_warning_limit) ?
+            (epicsInt32) ald.upper_warning_limit : 0;
+        pal->lower_warning_limit = finite(ald.lower_warning_limit) ?
+            (epicsInt32) ald.lower_warning_limit : 0;
+        pal->lower_alarm_limit   = finite(ald.lower_alarm_limit) ?
+            (epicsInt32) ald.lower_alarm_limit : 0;
 
         if (no_data)
             *options ^= DBR_AL_LONG; /*Turn off option*/
@@ -326,7 +328,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
         void *pflin)
 {
 	db_field_log	*pfl= (db_field_log *)pflin;
-    rset	*prset;
+	struct rset	*prset;
         short		field_type;
 	dbCommon	*pcommon;
 	char		*pbuffer = *poriginal;
@@ -366,7 +368,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,(long *)pbuffer);
+		(*prset->get_precision)(paddr,pbuffer);
 	    } else {
 		*options ^= DBR_PRECISION; /*Turn off DBR_PRECISION*/
 	    }
@@ -395,7 +397,7 @@ static void getOptions(DBADDR *paddr, char **poriginal, long *options,
 	*poriginal = pbuffer;
 }
 
-rset * dbGetRset(const struct dbAddr *paddr)
+struct rset * dbGetRset(const struct dbAddr *paddr)
 {
 	struct dbFldDes *pfldDes = paddr->pfldDes;
 
@@ -469,7 +471,7 @@ long dbScanPassive(dbCommon *pfrom, dbCommon *pto)
  */
 long dbProcess(dbCommon *precord)
 {
-    rset *prset = precord->rset;
+    struct rset *prset = precord->rset;
     dbRecordType *pdbRecordType = precord->rdes;
     unsigned char tpro = precord->tpro;
     char context[40] = "";
@@ -648,7 +650,7 @@ long dbNameToAddr(const char *pname, DBADDR *paddr)
     paddr->dbr_field_type = mapDBFToDBR[dbfType];
 
     if (paddr->special == SPC_DBADDR) {
-        rset *prset = dbGetRset(paddr);
+        struct rset *prset = dbGetRset(paddr);
 
         /* Let record type modify paddr */
         if (prset && prset->cvt_dbaddr) {
@@ -669,7 +671,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 = PVLINK_STRINGSZ;
+            paddr->no_elements = PVNAME_STRINGSZ + 12;
             paddr->field_size = 1;
             paddr->dbr_field_type = DBR_CHAR;
         } else {
@@ -683,32 +685,6 @@ 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;
-}
-
 long dbValueSize(short dbr_type)
 {
     /* sizes for value associated with each DBR request type */
@@ -720,8 +696,6 @@ 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         */
@@ -868,7 +842,7 @@ long dbGet(DBADDR *paddr, short dbrType,
     db_field_log *pfl = (db_field_log *)pflin;
     short field_type;
     long capacity, no_elements, offset;
-    rset *prset;
+    struct rset *prset;
     long status = 0;
 
     if (options && *options)
@@ -1003,25 +977,19 @@ 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:
@@ -1036,57 +1004,31 @@ static long dbPutFieldLink(DBADDR *paddr,
         return S_db_badDbrtype;
     }
 
-    status = dbParseLink(pstring, pfldDes->field_type, &link_info, 0);
-    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 */
-        }
-    }
+    dbInitEntry(pdbbase, &dbEntry);
+    status = dbFindRecord(&dbEntry, precord->name);
+    if (!status) status = dbFindField(&dbEntry, pfldDes->name);
+    if (status) goto finish;
 
     isDevLink = ellCount(&precord->rdes->devList) > 0 &&
-                pfldDes->isDevLink;
+                (strcmp(pfldDes->name, "INP") == 0 ||
+                 strcmp(pfldDes->name, "OUT") == 0);
 
-    memset(&locker, 0, sizeof(locker));
-    lockrecs[0] = precord;
-    lockrecs[1] = pdbaddr ? pdbaddr->precord : NULL;
-    dbLockerPrepare(&locker, lockrecs, 2);
-
-    dbScanLockMany(&locker);
+    dbLockSetGblLock();
+    dbLockSetRecordLock(precord);
 
     scan = precord->scan;
 
     if (isDevLink) {
-        new_devsup = dbDTYPtoDevSup(precord->rdes, precord->dtyp);
-        if (new_devsup) {
-            new_dset = new_devsup->pdset;
-            new_dsxt = new_devsup->pdsxt;
+        devSup *pdevSup = dbDTYPtoDevSup(precord->rdes, precord->dtyp);
+        if (pdevSup) {
+            new_dset = pdevSup->pdset;
+            new_dsxt = pdevSup->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) {
-            devSup *old_devsup = dbDSETtoDevSup(precord->rdes, precord->dset);
-
-            if (old_devsup)
-                old_dsxt = old_devsup->pdsxt;
+            pdevSup = dbDSETtoDevSup(precord->rdes, precord->dset);
+            if (pdevSup)
+                old_dsxt = pdevSup->pdsxt;
         }
 
         if (new_dsxt == NULL ||
@@ -1109,17 +1051,30 @@ static long dbPutFieldLink(DBADDR *paddr,
         }
     }
 
-    if (dbLinkIsDefined(plink)) {
-        dbRemoveLink(&locker, plink);   /* Clear out old link */
-    }
-    else if (!isDevLink) {
-        status = S_db_badHWaddr;
-        goto restoreScan;
+    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 (special) status = dbPutSpecial(paddr, 0);
 
-    if (!status) status = dbSetLink(plink, &link_info, new_devsup);
+    if (!status) status = dbPutString(&dbEntry, pstring);
 
     if (!status && special) status = dbPutSpecial(paddr, 1);
 
@@ -1146,11 +1101,12 @@ static long dbPutFieldLink(DBADDR *paddr,
 
     switch (plink->type) { /* New link type */
     case PV_LINK:
-    case CONSTANT:
-    case JSON_LINK:
-        dbAddLink(&locker, plink, pfldDes->field_type, pdbaddr);
+        dbAddLink(precord, plink, pfldDes->field_type);
         break;
 
+    case CONSTANT:
+        break;  /* do nothing */
+
     case DB_LINK:
     case CA_LINK:
     case MACRO_LINK:
@@ -1175,10 +1131,9 @@ postScanEvent:
     if (scan != precord->scan)
         db_post_events(precord, &precord->scan, DBE_VALUE | DBE_LOG);
 unlock:
-    dbScanUnlockMany(&locker);
-    dbLockerFinalize(&locker);
-cleanup:
-    free(link_info.target);
+    dbLockSetGblUnlock();
+finish:
+    dbFinishEntry(&dbEntry);
     return status;
 }
 
@@ -1264,7 +1219,7 @@ long dbPut(DBADDR *paddr, short dbrType,
     long no_elements  = paddr->no_elements;
     long special      = paddr->special;
     void *pfieldsave  = paddr->pfield;
-    rset *prset = dbGetRset(paddr);
+    struct rset *prset = dbGetRset(paddr);
     long status = 0;
     long offset;
     dbFldDes *pfldDes;

src/ioc/db/dbAccessDefs.h

@@ -20,7 +20,6 @@
 #include "epicsTime.h"
 #include "dbBase.h"
 #include "dbAddr.h"
-#include "recSup.h"
 
 #ifdef INCLdb_accessh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
@@ -182,7 +181,6 @@ 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*/
@@ -204,7 +202,7 @@ struct dbr_alDouble     {DBRalDouble};
 #define S_db_bufFull    (M_dbAccess|68) /*Buffer full*/
 
 epicsShareFunc long dbPutSpecial(struct dbAddr *paddr,int pass);
-epicsShareFunc rset * dbGetRset(const struct dbAddr *paddr);
+epicsShareFunc struct 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/dbBkpt.c

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

src/ioc/db/dbCAC.h

@@ -26,13 +26,12 @@
 
 #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
@@ -194,9 +193,8 @@ private:
     epicsMutex & mutex;
     epicsMutex & cbMutex;
     cacContextNotify & notify;
-    std::auto_ptr < cacContext > pNetContext;
+    epics_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,7 +28,6 @@
 #include "epicsPrint.h"
 #include "epicsString.h"
 #include "epicsThread.h"
-#include "epicsAtomic.h"
 #include "epicsTime.h"
 #include "errlog.h"
 #include "errMdef.h"
@@ -45,18 +44,13 @@
 #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*/
@@ -64,7 +58,7 @@ static epicsEventId workListEvent; /*wakeup event for dbCaTask*/
 static int removesOutstanding = 0;
 #define removesOutstandingWarning 10000
 
-static volatile enum dbCaCtl_t {
+static volatile enum {
     ctlInit, ctlRun, ctlPause, ctlExit
 } dbCaCtl;
 static epicsEventId startStopEvent;
@@ -74,47 +68,57 @@ 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->precord->name, pcaLink->pvname)
+        pcaLink->plink->value.pv_link.precord->name, pcaLink->pvname)
 
 static int dbca_chan_count;
 
 /* caLink locking
  *
- * Lock ordering:
- *  dbScanLock -> caLink.lock -> workListLock
+ * workListLock
+ *   This is only used to put request into and take them out of workList.
+ *   While this is locked no other locks are taken
  *
- * workListLock:
- *   Guards access to workList.
+ * 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.
  *
- * 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()
+ * caLink.lock
+ *   Any code that use a caLink takes this lock and releases it when done
  *
- *   Guard the pointer plink.value.pv_link.pvt, but not the struct caLink
- *   which is pointed to.
+ * 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.
  *
- * caLink.lock:
- *   Guards the caLink structure (but not the struct DBLINK)
+ * The above is necessary to prevent deadlocks and attempts to use a caLink
+ *   that has been deleted.
  *
- * The dbCaTask only locks caLink, and must not lock the record (a violation of lock order).
+ * 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.
  *
- * 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.
+ *   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.
  *
- * References to the struct caLink are owned by the dbCaTask, and any scanOnceCallback()
- * which is in progress.
+ *   Thus the problem is to make sure that nothing from channel access
+ *   accesses a caLink that is deleted. This is done as follows.
  *
- * The libca and scanOnceCallback callbacks take no action if pca->plink==NULL.
+ *   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.
  *
  *   dbCaPutLinkCallback causes an additional complication because
  *   when dbCaRemoveLink is called the callback may not have occured.
@@ -155,23 +159,11 @@ static void addAction(caLink *pca, short link_action)
         epicsEventSignal(workListEvent);
 }
 
-static void caLinkInc(caLink *pca)
+static void dbCaLinkFree(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;
@@ -192,86 +184,52 @@ static void caLinkDec(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;
 
-    dbLinkAsyncComplete(plink);
+    dbScanLock(pdbCommon);
+    pdbCommon->rset->process(pdbCommon);
+    dbScanUnlock(pdbCommon);
 }
 
 void dbCaShutdown(void)
 {
-    enum dbCaCtl_t cur = dbCaCtl;
-    assert(cur == ctlRun || cur == ctlPause);
-    dbCaCtl = ctlExit;
-    epicsEventSignal(workListEvent);
-    epicsEventMustWait(startStopEvent);
+    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);
+    }
 }
 
-static void dbCaLinkInitImpl(int isolate)
+void dbCaLinkInitIsolated(void)
 {
-    dbServiceIsolate = isolate;
-    dbServiceIOInit();
-
     if (!workListLock)
         workListLock = epicsMutexMustCreate();
     if (!workListEvent)
         workListEvent = epicsEventMustCreate(epicsEventEmpty);
+    dbCaCtl = ctlExit;
+}
 
-    if(!startStopEvent)
-        startStopEvent = epicsEventMustCreate(epicsEventEmpty);
+void dbCaLinkInit(void)
+{
+    dbServiceIOInit();
+    dbCaLinkInitIsolated();
+    startStopEvent = epicsEventMustCreate(epicsEventEmpty);
     dbCaCtl = ctlPause;
 
     epicsThreadCreate("dbCaLink", epicsThreadPriorityMedium,
@@ -280,16 +238,6 @@ static void dbCaLinkInitImpl(int isolate)
     epicsEventMustWait(startStopEvent);
 }
 
-void dbCaLinkInitIsolated(void)
-{
-    dbCaLinkInitImpl(1);
-}
-
-void dbCaLinkInit(void)
-{
-    dbCaLinkInitImpl(0);
-}
-
 void dbCaRun(void)
 {
     if (dbCaCtl == ctlPause) {
@@ -314,7 +262,6 @@ 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);
@@ -323,20 +270,13 @@ 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);
 }
 
-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)
+void dbCaRemoveLink(struct link *plink)
 {
     caLink *pca = (caLink *)plink->value.pv_link.pvt;
 
@@ -344,16 +284,13 @@ void dbCaRemoveLink(struct dbLocker *locker, 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,
-    long *nelements)
+long dbCaGetLink(struct link *plink,short dbrType, void *pdest,
+    epicsEnum16 *pstat, epicsEnum16 *psevr, long *nelements)
 {
     caLink *pca = (caLink *)plink->value.pv_link.pvt;
     long   status = 0;
@@ -406,15 +343,15 @@ long dbCaGetLink(struct link *plink, short dbrType, void *pdest,
         assert(pca->pgetNative);
         status = fConvert(pca->pgetNative, pdest, 0);
     } else {
-        unsigned long ntoget = *nelements;
+        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->usedelements)
-            ntoget = pca->usedelements;
+        if (ntoget > pca->nelements)
+            ntoget = pca->nelements;
         *nelements = ntoget;
 
         memset((void *)&dbAddr, 0, sizeof(dbAddr));
@@ -425,23 +362,13 @@ long dbCaGetLink(struct link *plink, short dbrType, void *pdest,
         aConvert(&dbAddr, pdest, ntoget, ntoget, 0);
     }
 done:
-    if (link_action)
-        addAction(pca, link_action);
-    if (!status)
-        recGblInheritSevr(plink->value.pv_link.pvlMask & pvlOptMsMode,
-            plink->precord, pca->stat, pca->sevr);
+    if (pstat) *pstat = pca->stat;
+    if (psevr) *psevr = pca->sevr;
+    if (link_action) addAction(pca, link_action);
     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)
 {
@@ -479,7 +406,6 @@ 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;
  */
@@ -489,7 +415,6 @@ 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);
@@ -502,7 +427,10 @@ long dbCaPutLinkCallback(struct link *plink,short dbrType,
             if(nRequest>pca->nelements)
                 nRequest = pca->nelements;
             status = aConvert(&dbAddr, pbuffer, nRequest, pca->nelements, 0);
-            pca->putnelements = nRequest;
+            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);
+            }
         }
         link_action |= CA_WRITE_NATIVE;
         pca->gotOutNative = TRUE;
@@ -522,13 +450,7 @@ long dbCaPutLinkCallback(struct link *plink,short dbrType,
     return status;
 }
 
-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)
+int dbCaIsLinkConnected(const struct link *plink)
 {
     caLink *pca;
 
@@ -538,7 +460,7 @@ static int isConnected(const struct link *plink)
     return pca->isConnected;
 }
 
-static void scanForward(struct link *plink) {
+void dbCaScanFwdLink(struct link *plink) {
     short fwdLinkValue = 1;
 
     if (plink->value.pv_link.pvlMask & pvlOptFWD)
@@ -557,7 +479,7 @@ static void scanForward(struct link *plink) {
         return -1; \
     }
 
-static long getElements(const struct link *plink, long *nelements)
+long dbCaGetNelements(const struct link *plink, long *nelements)
 {
     caLink *pca;
 
@@ -567,7 +489,7 @@ static long getElements(const struct link *plink, long *nelements)
     return 0;
 }
 
-static long getAlarm(const struct link *plink,
+long dbCaGetAlarm(const struct link *plink,
     epicsEnum16 *pstat, epicsEnum16 *psevr)
 {
     caLink *pca;
@@ -579,7 +501,7 @@ static long getAlarm(const struct link *plink,
     return 0;
 }
 
-static long getTimeStamp(const struct link *plink,
+long dbCaGetTimeStamp(const struct link *plink,
     epicsTimeStamp *pstamp)
 {
     caLink *pca;
@@ -590,7 +512,7 @@ static long getTimeStamp(const struct link *plink,
     return 0;
 }
 
-static int getDBFtype(const struct link *plink)
+int dbCaGetLinkDBFtype(const struct link *plink)
 {
     caLink *pca;
     int  type;
@@ -621,7 +543,7 @@ long dbCaGetAttributes(const struct link *plink,
     return 0;
 }
 
-static long getControlLimits(const struct link *plink,
+long dbCaGetControlLimits(const struct link *plink,
     double *low, double *high)
 {
     caLink *pca;
@@ -637,7 +559,7 @@ static long getControlLimits(const struct link *plink,
     return gotAttributes ? 0 : -1;
 }
 
-static long getGraphicLimits(const struct link *plink,
+long dbCaGetGraphicLimits(const struct link *plink,
     double *low, double *high)
 {
     caLink *pca;
@@ -653,7 +575,7 @@ static long getGraphicLimits(const struct link *plink,
     return gotAttributes ? 0 : -1;
 }
 
-static long getAlarmLimits(const struct link *plink,
+long dbCaGetAlarmLimits(const struct link *plink,
     double *lolo, double *low, double *high, double *hihi)
 {
     caLink *pca;
@@ -671,7 +593,7 @@ static long getAlarmLimits(const struct link *plink,
     return gotAttributes ? 0 : -1;
 }
 
-static long getPrecision(const struct link *plink, short *precision)
+long dbCaGetPrecision(const struct link *plink, short *precision)
 {
     caLink *pca;
     int gotAttributes;
@@ -683,7 +605,7 @@ static long getPrecision(const struct link *plink, short *precision)
     return gotAttributes ? 0 : -1;
 }
 
-static long getUnits(const struct link *plink,
+long dbCaGetUnits(const struct link *plink,
     char *units, int unitsSize)
 {
     caLink *pca;
@@ -698,63 +620,6 @@ static long getUnits(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;
@@ -769,13 +634,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 = plink->precord;
+        dbCommon *precord = ppv_link->precord;
 
         pca->nDisconnect++;
         if (precord &&
             ((ppv_link->pvlMask & pvlOptCP) ||
              ((ppv_link->pvlMask & pvlOptCPP) && precord->scan == 0)))
-            scanLinkOnce(precord, pca);
+            scanOnce(precord);
         goto done;
     }
     pca->hasReadAccess = ca_read_access(arg.chid);
@@ -784,11 +649,16 @@ static void connectionCallback(struct connection_handler_args arg)
     if (pca->gotFirstConnection) {
         if (pca->nelements != ca_element_count(arg.chid) ||
             pca->dbrType != ca_field_type(arg.chid)) {
-            /* BUG: We have no way to clear any old subscription with the
-             *      originally chosen data type/size.  That will continue
-             *      to send us data and will result in an assert() fail.
-             */
-            /* Let next dbCaGetLink and/or dbCaPutLink determine options */
+            /* Size or type changed, clear everything and let the next call
+               to dbCaGetLink() and/or dbCaPutLink() reset everything */
+            if (pca->evidNative) {
+                ca_clear_event(pca->evidNative);
+                pca->evidNative = 0;
+            }
+            if (pca->evidString) {
+                ca_clear_event(pca->evidString);
+                pca->evidString = 0;
+            }
             plink->value.pv_link.pvlMask &=
                 ~(pvlOptInpNative | pvlOptInpString |
                   pvlOptOutNative | pvlOptOutString);
@@ -805,7 +675,6 @@ 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;
@@ -837,15 +706,15 @@ static void eventCallback(struct event_handler_args arg)
     struct dbr_time_double *pdbr_time_double;
     dbCaCallback monitor = 0;
     void *userPvt = 0;
+    int doScan = 1;
 
     assert(pca);
     epicsMutexMustLock(pca->lock);
     plink = pca->plink;
     if (!plink) goto done;
-    pca->nUpdate++;
     monitor = pca->monitor;
     userPvt = pca->userPvt;
-    precord = plink->precord;
+    precord = plink->value.pv_link.precord;
     if (arg.status != ECA_NORMAL) {
         if (precord) {
             if (arg.status != ECA_NORDACCESS &&
@@ -859,7 +728,6 @@ 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) {
@@ -867,33 +735,34 @@ static void eventCallback(struct event_handler_args arg)
         memcpy(pca->pgetString, dbr_value_ptr(arg.dbr, arg.type), size);
         pca->gotInString = TRUE;
     } else switch (arg.type){
+    case DBR_TIME_ENUM:
+        /* Disable the record scan if we also have a string monitor */
+        doScan = !(plink->value.pv_link.pvlMask & pvlOptInpString);
+        /* fall through */
     case DBR_TIME_STRING: 
     case DBR_TIME_SHORT: 
     case DBR_TIME_FLOAT:
-    case DBR_TIME_ENUM:
     case DBR_TIME_CHAR:
     case DBR_TIME_LONG:
     case DBR_TIME_DOUBLE:
         assert(pca->pgetNative);
         memcpy(pca->pgetNative, dbr_value_ptr(arg.dbr, arg.type), size);
-        pca->usedelements = arg.count;
         pca->gotInNative = TRUE;
         break;
     default:
-        errlogPrintf("dbCa: eventCallback Logic Error. dbr=%ld dbf=%d\n",
-                     arg.type, ca_field_type(pca->chid));
+        errMessage(-1, "dbCa: eventCallback Logic Error\n");
         break;
     }
     pdbr_time_double = (struct dbr_time_double *)arg.dbr;
     pca->sevr = pdbr_time_double->severity;
     pca->stat = pdbr_time_double->status;
     memcpy(&pca->timeStamp, &pdbr_time_double->stamp, sizeof(epicsTimeStamp));
-    if (precord) {
+    if (doScan && precord) {
         struct pv_link *ppv_link = &plink->value.pv_link;
 
         if ((ppv_link->pvlMask & pvlOptCP) ||
             ((ppv_link->pvlMask & pvlOptCPP) && precord->scan == 0))
-        scanLinkOnce(precord, pca);
+        scanOnce(precord);
     }
 done:
     epicsMutexUnlock(pca->lock);
@@ -962,11 +831,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 = plink->precord;
+    precord = ppv_link->precord;
     if (precord &&
         ((ppv_link->pvlMask & pvlOptCP) ||
          ((ppv_link->pvlMask & pvlOptCPP) && precord->scan == 0)))
-        scanLinkOnce(precord, pca);
+        scanOnce(precord);
 done:
     epicsMutexUnlock(pca->lock);
 }
@@ -993,7 +862,7 @@ static void getAttribEventCallback(struct event_handler_args arg)
     getAttributes = pca->getAttributes;
     getAttributesPvt = pca->getAttributesPvt;
     if (arg.status != ECA_NORMAL) {
-        dbCommon *precord = plink->precord;
+        dbCommon *precord = plink->value.pv_link.precord;
         if (precord) {
             errlogPrintf("dbCa: getAttribEventCallback record %s error %s\n",
                 precord->name, ca_message(arg.status));
@@ -1049,15 +918,11 @@ 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 */
-                caLinkDec(pca);
+                dbCaLinkFree(pca);
                 /* No alarm is raised. Since link is changing so what? */
                 continue; /* No other link_action makes sense */
             }
@@ -1086,11 +951,11 @@ static void dbCaTask(void *arg)
                 assert(pca->pputNative);
                 if (pca->putType == CA_PUT) {
                     status = ca_array_put(
-                        pca->dbrType, pca->putnelements,
+                        pca->dbrType, pca->nelements,
                         pca->chid, pca->pputNative);
                 } else if (pca->putType==CA_PUT_CALLBACK) {
                     status = ca_array_put_callback(
-                        pca->dbrType, pca->putnelements,
+                        pca->dbrType, pca->nelements,
                         pca->chid, pca->pputNative,
                         putComplete, pca);
                 } else {
@@ -1140,16 +1005,17 @@ 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->elementSize = dbr_value_size[ca_field_type(pca->chid)];
-                pca->pgetNative = dbCalloc(pca->nelements, pca->elementSize);
+                pca->pgetNative = dbCalloc(pca->nelements, element_size);
                 epicsMutexUnlock(pca->lock);
-
                 status = ca_add_array_event(
-                    dbf_type_to_DBR_TIME(ca_field_type(pca->chid)),
-                    0, /* dynamic size */
-                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0, 0);
+                    ca_field_type(pca->chid)+DBR_TIME_STRING,
+                    ca_element_count(pca->chid),
+                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
+                    &pca->evidNative);
                 if (status != ECA_NORMAL) {
                     errlogPrintf("dbCaTask ca_add_array_event %s\n",
                         ca_message(status));
@@ -1161,7 +1027,8 @@ static void dbCaTask(void *arg)
                 pca->pgetString = dbCalloc(1, MAX_STRING_SIZE);
                 epicsMutexUnlock(pca->lock);
                 status = ca_add_array_event(DBR_TIME_STRING, 1,
-                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0, 0);
+                    pca->chid, eventCallback, pca, 0.0, 0.0, 0.0,
+                    &pca->evidString);
                 if (status != ECA_NORMAL) {
                     errlogPrintf("dbCaTask ca_add_array_event %s\n",
                         ca_message(status));

src/ioc/db/dbCa.h

@@ -1,17 +1,20 @@
 /*************************************************************************\
-* Copyright (c) 2015 The University of Chicago, as Operator of Argonne
+* 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 is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
+* 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. 
 \*************************************************************************/
-/* dbCa.h */
+/* dbCa.h	*/
 
 #ifndef INCdbCah
 #define INCdbCah
 
-#include "dbLink.h"
+#include "shareLib.h"
+#include "epicsTime.h"
+#include "link.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,60 +29,48 @@ 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);
-epicsShareFunc long dbCaAddLink(struct dbLocker *locker, struct link *plink, short dbfType);
-epicsShareFunc void dbCaRemoveLink(struct dbLocker *locker, struct link *plink);
-
+#define dbCaAddLink(plink) dbCaAddLinkCallback((plink), 0, 0, 0)
+epicsShareFunc void dbCaRemoveLink(struct link *plink);
 epicsShareFunc long dbCaGetLink(struct link *plink,
-    short dbrType, void *pbuffer, long *nRequest);
-
-epicsShareFunc long dbCaGetAttributes(const struct link *plink,
-    dbCaCallback callback, void *userPvt);
-
+    short dbrType, void *pbuffer, epicsEnum16 *pstat, epicsEnum16 *psevr,
+    long *nRequest);
 epicsShareFunc long dbCaPutLinkCallback(struct link *plink,
     short dbrType, const void *pbuffer,long nRequest,
     dbCaCallback callback, void *userPvt);
-epicsShareFunc long dbCaPutLink(struct link *plink,short dbrType,
-    const void *pbuffer,long nRequest);
+#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);
 
 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,11 +6,14 @@
 * EPICS BASE is distributed subject to a Software License Agreement found
 * in file LICENSE that is included with this distribution.
 \*************************************************************************/
-/* dbCaPvt.h
- *
- * Original Authors: Bob Dalesio, Marty Kraimer
- *
- */
+/* dbCaPvt.h */
+/****************************************************************
+*
+*	Current Author:		Bob Dalesio
+*	Contributing Author:	Marty Kraimer
+*	Date:			08APR96
+*
+****************************************************************/
 
 #ifndef INC_dbCaPvt_H
 #define INC_dbCaPvt_H
@@ -29,68 +32,63 @@
 #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;
-    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;
-    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;
+	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*/
 }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,8 +189,10 @@ 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 (dbCaIsLinkConnected(plink)) {
+                        if (pca && pca->chid && ca_state(pca->chid) == cs_conn) {
                             nconnected++;
                         }
                     }

src/ioc/db/dbChannel.c

@@ -19,6 +19,7 @@
 
 #include "cantProceed.h"
 #include "epicsAssert.h"
+#include "epicsExit.h"
 #include "epicsString.h"
 #include "errlog.h"
 #include "freeList.h"
@@ -454,8 +455,6 @@ 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,
@@ -511,7 +510,7 @@ dbChannel * dbChannelCreate(const char *name)
     paddr->dbr_field_type = mapDBFToDBR[dbfType];
 
     if (paddr->special == SPC_DBADDR) {
-        rset *prset = dbGetRset(paddr);
+        struct rset *prset = dbGetRset(paddr);
 
         /* Let record type modify paddr */
         if (prset && prset->cvt_dbaddr) {
@@ -533,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 = PVLINK_STRINGSZ;
+                paddr->no_elements = PVNAME_STRINGSZ + 12;
                 paddr->field_size = 1;
                 paddr->dbr_field_type = DBR_CHAR;
             } else {

src/ioc/db/dbChannelIO.h

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

src/ioc/db/dbChannelNOOP.h

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