Update libcom and base version numbers, no -DEV

Not updating pva2pva, the next 7.0.2.2 release should
keep the previous tagged version

.ci/travis-build.sh

@@ -6,18 +6,9 @@ die() {
   exit 1
 }
 
-ticker() {
-  while true
-  do
-    sleep 60
-    date -R
-    [ -r "$1" ] && tail -n10 "$1"
-  done
-}
-
 CACHEKEY=1
 
-EPICS_HOST_ARCH=`sh startup/EpicsHostArch`
+export EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
 
 [ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD"
 
@@ -57,28 +48,24 @@ EOF
 fi
 
 # set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
 if [ -n "$RTEMS" ]
 then
   echo "Cross RTEMS${RTEMS} for pc386"
-  install -d /home/travis/.cache
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
-  | tar -C /home/travis/.cache -xj
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
+  | tar -C / -xmj
 
   sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' configure/os/CONFIG_SITE.Common.RTEMS
   cat << EOF >> configure/os/CONFIG_SITE.Common.RTEMS
 RTEMS_VERSION=$RTEMS
-RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
+RTEMS_BASE=$HOME/.rtems
 EOF
   cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
 EOF
 
   # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
   echo -n "Using QEMU: "
   type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
 fi
 
 make -j2 $EXTRA

.ci/travis-prepare.sh

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

.gitmodules

@@ -1,15 +1,3 @@
-[submodule "modules/libcom"]
-    path = modules/libcom
-    url = ./
-    branch = libcom/master
-[submodule "modules/database"]
-    path = modules/database
-    url = ./
-    branch = database/master
-[submodule "modules/ca"]
-    path = modules/ca
-    url = ./
-    branch = ca/master
 [submodule "modules/pvData"]
     path = modules/pvData
     url = https://github.com/epics-base/pvDataCPP

.tools/make-tar.sh

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

.travis.yml

@@ -11,23 +11,17 @@ addons:
     - perl
     - clang
     - g++-mingw-w64-i686
-    - bison
-    - flex
-    - texinfo
-    - install-info
-cache:
-  directories:
-   - $HOME/.cache
-install:
- - ./.ci/travis-prepare.sh
+    - qemu-system-x86
 script:
- - ./.ci/travis-build.sh
+  - .ci/travis-build.sh
 env:
- - BRCORE=master BRLIBCOM=master BRCA=master
- - CMPLR=clang
- - USR_CXXFLAGS=-std=c++11
- - CMPLR=clang USR_CXXFLAGS=-std=c++11
- - WINE=32 TEST=NO STATIC=YES
- - WINE=32 TEST=NO STATIC=NO
- - RTEMS=4.10 TEST=NO
- - RTEMS=4.9 TEST=NO
+  - CMPLR=gcc
+  - CMPLR=clang
+  - CMPLR=gcc   STATIC=YES
+  - CMPLR=clang STATIC=YES
+  - CMPLR=gcc   EXTRA=CMD_CXXFLAGS=-std=c++11
+  - CMPLR=clang EXTRA=CMD_CXXFLAGS=-std=c++11
+  - WINE=32 TEST=NO STATIC=YES
+  - WINE=32 TEST=NO STATIC=NO
+  - RTEMS=4.10 TEST=YES
+  - RTEMS=4.9  TEST=YES

configure/CONFIG

@@ -20,11 +20,14 @@ else
 endif
 
 # Provide a default if the user hasn't set EPICS_HOST_ARCH
-ifeq ($(strip $(EPICS_HOST_ARCH)),)
-  # NB: We must set the environment variable for submodules to include
-  # the correct modules/RELEASE.<host>.local file to set EPICS_BASE,
-  # they can't do this for themselves since CONFIG is relative to it:
-  export EPICS_HOST_ARCH := $(shell $(CONFIG)/../startup/EpicsHostArch.pl)
+#
+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

configure/CONFIG.gnuCommon

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

configure/CONFIG_ADDONS

@@ -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.
 #*************************************************************************
 #
 #	check for add-on CFLAGS and CXXFLAGS
@@ -37,9 +37,6 @@
 #    PROD_LIBS     libs needed by PROD and TESTPROD
 #    LIB_LIBS      libs needed by shared LIBRARY
 #    SHRLIB_LIBS   libs needed by shared LIBRARY
-#    USR_OBJLIBS   R3.13 vxWorks object libs needed building libraries and prods
-#    PROD_OBJLIBS  R3.13 vxWorks object    libs needed for building prods
-#    LIB_OBJLIBS   R3.13 vxWorks object libs needed for building libraries
 #    USR_SYS_LIBS  system libs needed building libraries and prods
 #    PROD_SYS_LIBS system libs needed for building prods
 #    LIB_SYS_LIBS  system libs needed for building libraries
@@ -273,30 +270,6 @@ OBJS_HOST+=$(OBJS_HOST_DEFAULT)
 endif
 endif
 
-ifneq ($(strip $(PROD_OBJLIBS_$(OS_CLASS))),)
-PROD_OBJLIBS+=$(subst -nil-,,$(PROD_OBJLIBS_$(OS_CLASS)))
-else
-ifdef PROD_OBJLIBS_DEFAULT
-PROD_OBJLIBS+=$(PROD_OBJLIBS_DEFAULT)
-endif
-endif
-
-ifneq ($(strip $(LIB_OBJLIBS_$(OS_CLASS))),)
-LIB_OBJLIBS+=$(subst -nil-,,$(LIB_OBJLIBS_$(OS_CLASS)))
-else
-ifdef LIB_OBJLIBS_DEFAULT
-LIB_OBJLIBS+=$(LIB_OBJLIBS_DEFAULT)
-endif
-endif
-
-ifneq ($(strip $(USR_OBJLIBS_$(OS_CLASS))),)
-USR_OBJLIBS+=$(subst -nil-,,$(USR_OBJLIBS_$(OS_CLASS)))
-else
-ifdef USR_OBJLIBS_DEFAULT
-USR_OBJLIBS+=$(USR_OBJLIBS_DEFAULT)
-endif
-endif
-
 ifneq ($(strip $(LIB_OBJS_$(OS_CLASS))),)
 LIB_OBJS+=$(subst -nil-,,$(LIB_OBJS_$(OS_CLASS)))
 else
@@ -581,4 +554,3 @@ ifdef LIB_RCS_DEFAULT
 LIB_RCS+=$(LIB_RCS_DEFAULT)
 endif
 endif
-

configure/CONFIG_BASE

@@ -30,10 +30,11 @@ endif # BASE_TOP
 #---------------------------------------------------------------
 # Where to find the installed build tools
 #   Windows does not like commands with relative paths starting ../
-#   but the Perl scripts in TOP/src/tools are OK
+#   so TOOLS must be an absolute path, although Perl scripts are OK.
+#   FIND_TOOL is for scripts run before the build reaches src/tools.
 
 TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
-FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(TOP)/src/tools/$(1)))
+FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) $(EPICS_BASE)/src/tools/$(1)))
 
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
@@ -42,7 +43,7 @@ PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.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)
+GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)
 
 #---------------------------------------------------------------
 # tools for installing libraries and products
@@ -54,3 +55,8 @@ INSTALL_LIBRARY = $(INSTALL)
 # tools for making header dependencies and variable replacement
 MKMF       = $(PERL) $(TOOLS)/mkmf.pl
 REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl
+
+#---------------------------------------------------------------
+# tools for cleaning out unwanted files
+CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
+DEPCLEAN = $(call FIND_TOOL,depclean.pl)

configure/CONFIG_BASE_VERSION

@@ -15,17 +15,26 @@
 # 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
+# We define convenience macros for our release series to be NO or YES, so
+# Makefiles can detect 'Series X or later', or 'Series X only' like this:
+#
 #   ifdef BASE_3_14
 #       true for 3.14 or later
 #   ifdef BASE_3_15
 #       true for 3.15 or later
+#   ifdef BASE_3_16
+#       true for 3.16 or later
+#   ifdef BASE_7_0
+#       true for 7.0 or later
+#
 #   ifeq ($(BASE_3_14),YES)
 #       true for 3.14.x only
 #   ifeq ($(BASE_3_15),YES)
-#       true for 3.15 only
+#       true for 3.15.x only
 #   ifeq ($(BASE_3_16),YES)
-#       true for 3.16 only.
+#       true for 3.16.x only.
+#   ifeq ($(BASE_7_0),YES)
+#       true for 7.0.x only.
 
 BASE_3_14 = NO
 BASE_3_15 = NO
@@ -39,14 +48,16 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 1
+EPICS_MODIFICATION = 2
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero
 EPICS_PATCH_LEVEL = 2
 
-# This will end in -DEV between official releases
-EPICS_DEV_SNAPSHOT=-DEV
+# Between official releases, the EPICS_PATCH_LEVEL gets incremented
+# and a -DEV suffix is added (similar to the Maven -SNAPSHOT versions)
+EPICS_DEV_SNAPSHOT=
+#EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
@@ -55,7 +66,6 @@ EPICS_DEV_SNAPSHOT=-DEV
 #EPICS_DEV_SNAPSHOT=-rc1-DEV
 #EPICS_DEV_SNAPSHOT=-rc2
 #EPICS_DEV_SNAPSHOT=-rc2-DEV
-#EPICS_DEV_SNAPSHOT=
 
 # No changes should be needed below here
 

configure/CONFIG_COMMON

@@ -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.
 #*************************************************************************
 #
 #  CONFIG_COMMON
@@ -76,10 +76,14 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Make echo output - suppress echoing if make's '-s' flag is set
+# Silencing the build - suppress messages during 'make -s'
 NOP = :
-ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
-QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MFLAGS)),-q,)
+
+#-------------------------------------------------------
+# Convert 'make -q' flag into '-i' for genVersionHeader.pl
+QUESTION_FLAG := $(if $(findstring q,$(MFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -89,7 +93,7 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
-#Directories for libraries
+# Directories for libraries
 SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
 
 #-------------------------------------------------------
@@ -163,13 +167,13 @@ TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES))
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS =  $($*_OBJLIBS) $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
+TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
 
 PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
-PROD_LD_OBJS = $(USR_OBJLIBS) $(PROD_OBJLIBS) $(TARGET_OBJS) $(PRODUCT_OBJS)
+PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)
 
 LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
-LIBRARY_LD_OBJS = $(USR_OBJLIBS) $(LIB_OBJLIBS) $(TARGET_OBJS) $(LIBRARY_OBJS)
+LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
 # Windows resource files
@@ -261,7 +265,7 @@ LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRA
 LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
 
 #--------------------------------------------------
-# prefix, suffix, and ldflags for loadable shared libraries 
+# prefix, suffix, and ldflags for loadable shared libraries
 TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
 LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
 LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)
@@ -459,5 +463,5 @@ COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \
 SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
 SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
 SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
- 
+
 endif

configure/CONFIG_SITE_ENV

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

configure/RULES

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 ifndef T_A

configure/RULES.Db

@@ -4,9 +4,10 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#RULES.Db
+
+# RULES.Db
 
 # Set db substitutions and template file suffixes
 SUBST_SUFFIX ?= .substitutions

configure/RULES.ioc

@@ -4,9 +4,10 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#RULES.ioc
+
+# RULES.ioc
 
 include $(CONFIG)/RULES_DIRS
 

configure/RULES_ARCHS

@@ -90,6 +90,4 @@ realclean:
 .PHONY : $(BUILD_ARCHS) rebuild archsCommonClean
 .PHONY : $(ACTIONS) clean realclean archclean host all
 
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER
+include $(CONFIG)/RULES_COMMON

configure/RULES_BUILD

@@ -6,11 +6,12 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+
+# RULES_BUILD
+
+# Rules for making things specified in a Makefile
 #
-#	Rules for making things specified in Makefile
-#
-#	we are in O.$(T_A), but most sources are elsewhere
-#
+# CWD is O.$(T_A), but most sources are elsewhere
 
 ifndef BASE_RULES_BUILD
 BASE_RULES_BUILD=1
@@ -42,6 +43,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
 SCRIPTS += $(SCRIPTS_HOST)
+TARGETS += $(TARGETS_HOST)
 TESTLIBRARY += $(TESTLIBRARY_HOST)
 TESTSCRIPTS += $(TESTSCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
@@ -53,6 +55,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
 SCRIPTS += $(SCRIPTS_IOC)
+TARGETS += $(TARGETS_IOC)
 TESTLIBRARY += $(TESTLIBRARY_IOC)
 TESTSCRIPTS += $(TESTSCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
@@ -79,9 +82,9 @@ else
 host:
 endif
 
--include $(CONFIG)/RULES_FILE_TYPE
+include $(CONFIG)/RULES_FILE_TYPE
 
--include $(CONFIG)/RULES.Db
+include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
@@ -185,7 +188,7 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	$(CONVERTRELEASE) checkRelease
+	+$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
@@ -199,9 +202,9 @@ endif
 
 $(TESTPRODNAME) $(PRODNAME): $(PRODUCT_OBJS) $(PROD_RESS) $(PROD_DEPLIBS)
 
-$(TESTPRODNAME) $(PRODNAME): %$(EXE):
+$(TESTPRODNAME) $(PRODNAME): %$(EXE): | $(INSTALL_LIB)
 	@$(RM) $@
-	$(DEBUGCMD) $(LINK.cpp)
+	$(LINK.cpp)
 	$(MT_EXE_COMMAND)
 
 %_ctdt$(OBJ) : %_ctdt.c
@@ -256,15 +259,13 @@ YACCOPT ?= $($*_YACCOPT)
 	$(MV) $*.tab.c $*.c
 	$(if $(findstring -d, $(YACCOPT)),$(MV) $*.tab.h $*.h,)
 
-# must be a seperate rule since when not using '-d' the
+# must be a separate rule since when not using '-d' the
 # prefix for .h will be different then .c
 %.h : %.c %.y
 
 %.c: %.l
-	@$(RM) $*.yy.c
-	$(LEX) $(LEXOPT) -t $< > $*.yy.c
 	@$(RM) $@
-	$(MV) $*.yy.c $@
+	$(LEX) $(LEXOPT) -o$@ $<
 
 #---------------------------------------------------------------
 # Libraries, shared/DLL and stubs
@@ -304,6 +305,10 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
+$(LIBNAME) $(SHRLIBNAME) $(LOADABLE_SHRLIBNAME): | $(INSTALL_LIB)
+$(INSTALL_LIB):
+	@$(MKDIR) $@
+
 #---------------------------------------------------------------
 # C++ munching for VxWorks
 
@@ -361,14 +366,17 @@ ifneq ($(TAPFILES),)
 ifdef RUNTESTS_ENABLED
 	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
 endif
+
+CURRENT_TAPFILES := $(wildcard $(TAPFILES))
+CURRENT_JUNITFILES := $(wildcard $(JUNITFILES))
 endif
 
 clean-tests:
-ifneq ($(TAPFILES),)
-	$(RM) $(TAPFILES)
+ifneq ($(CURRENT_TAPFILES),)
+	$(RM) $(CURRENT_TAPFILES)
 endif
-ifneq ($(JUNITFILES),)
-	$(RM) $(JUNITFILES)
+ifneq ($(CURRENT_JUNITFILES),)
+	$(RM) $(CURRENT_JUNITFILES)
 endif
 
 tapfiles: $(TESTSCRIPTS) $(TAPFILES)
@@ -392,7 +400,7 @@ endif
 # Generate a perl program to exec the real test binary.
 %.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
-	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<
 
 #---------------------------------------------------------------
 # Generate header with version number from VCS
@@ -463,9 +471,11 @@ $(INSTALL_TCLLIB)/%: ../%
 	@$(INSTALL) -d -m $(BIN_PERMISSIONS) $< $(INSTALL_TCLLIB)
 endif
 
+ifneq ($(TCLINDEX),)
 $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS)
 	$(ECHO) "Updating $@"
 	$(ECHO) eval auto_mkindex $(INSTALL_TCLLIB) "$(TCLLIBNAME)" | tclsh
+endif
 
 $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: %
 	$(ECHO) "Installing loadable shared library $@"
@@ -531,7 +541,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
--include $(CONFIG)/RULES_EXPAND
+include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
@@ -540,5 +550,9 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PHONY: runtests tapfiles clean-tests test-results junitfiles
 .PHONY: checkRelease warnRelease noCheckRelease FORCE
 
+include $(CONFIG)/RULES_COMMON
+
+else
+    $(warning Warning: Base configure/RULES_BUILD file included more than once. \
+        Does configure/RELEASE have multiple pointers to $(EPICS_BASE)?)
 endif # BASE_RULES_BUILD
-#	EOF RULES_BUILD

configure/RULES_COMMON

@@ -0,0 +1,48 @@
+#*************************************************************************
+# Copyright (c) 2018 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# These rules show the set of Makefiles, config files and
+# rules files loaded by GNUmake.
+
+show-makefiles::
+	@echo
+	@echo Makefiles read:
+define SHOW_MAKEFILE_template
+show-makefiles::
+	@echo "    $(1)"
+endef
+$(foreach file,$(MAKEFILE_LIST), \
+    $(eval $(call SHOW_MAKEFILE_template,$(file))))
+
+.PHONY: show-makefiles
+
+
+# These rules support printing a Makefile variable values.
+# Many variables are only set inside an O.<arch> build directory.
+#   make PRINT.T_A
+
+PRINT_Var = $(@:PRINT.%=%)
+PRINT.%:
+	@echo $(PRINT_Var) = '$($(PRINT_Var))'
+
+.PHONY: PRINT PRINT.%
+
+
+# Clean rules for recursively deleting editor backup files
+# and dependency (.d) files from CWD and below.
+
+cvsclean:
+	$(PERL) $(CVSCLEAN)
+depclean:
+	$(PERL) $(DEPCLEAN)
+
+.PHONY: cvsclean depclean
+
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_DIRS

@@ -86,13 +86,11 @@ $(DIRS) $(dirActionTargets) $(dirArchTargets) $(dirActionArchTargets) :
 $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
     $(foreach dir, $(DIRS), $(dir)$(DIVIDER)%)
 
-.PHONY : $(DIRS) all host rebuild
-.PHONY : $(ARCHS) $(ACTIONS)
-.PHONY : $(dirActionTargets) $(dirArchTargets)
-.PHONY : $(dirActionArchTargets)
-.PHONY : $(actionArchTargets)
 
+.PHONY: $(DIRS) all host rebuild
+.PHONY: $(ARCHS) $(ACTIONS)
+.PHONY: $(dirActionTargets) $(dirArchTargets)
+.PHONY: $(dirActionArchTargets)
+.PHONY: $(actionArchTargets)
 
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER
+include $(CONFIG)/RULES_COMMON

configure/RULES_EXPAND

@@ -1,4 +1,13 @@
-# <top>/configure/RULES_EXPAND
+#*************************************************************************
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# RULES_EXPAND
 
 vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 

configure/RULES_FILE_TYPE

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

configure/RULES_MODULES

@@ -0,0 +1,47 @@
+#*************************************************************************
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# Support modules can use these rules to build submodules too.
+#
+# The requirements to do so are:
+#    1. Create a file CONFIG_SITE.local in the same directory as the
+#       Makefile, which defines these variables (the last one is empty):
+#           PARENT_MODULE - The name submodules call their parent
+#           INSTALL_LOCATION := $($(PARENT_MODULE))
+#           CONFIG_INSTALLS =
+#    2. The Makefile must set TOP and include $(TOP)/configure/CONFIG and
+#       CONFIG_SITE.local
+#    3. Submodules are added to the SUBMODULES variable in the Makefile
+#    4. Dependencies between submodules must be set using
+#           <name>_DEPEND_DIRS = <prerequisites>
+#    5. The Makefile must end by including $(TOP)/configure/RULES_MODULES
+#    6. Submodules must have a configure/RELEASE file that contains
+#           -include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
+#    7. Submodules must have a configure/CONFIG_SITE file that contains
+#           -include $(TOP)/../CONFIG_SITE.local
+
+# Add checked-out submodules to DIRS
+DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+
+include $(CONFIG)/RULES_DIRS
+
+INSTALL_LOCATION_ABS := $(abspath $(INSTALL_LOCATION))
+RELEASE_LOCAL := RELEASE.$(EPICS_HOST_ARCH).local
+
+# Ensure that RELEASE.<host>.local exists before doing anything else
+all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
+    $(dirActionArchTargets) $(actionArchTargets): | $(RELEASE_LOCAL)
+
+# Convenience target
+RELEASE.host: $(RELEASE_LOCAL)
+
+$(RELEASE_LOCAL): Makefile CONFIG_SITE.local
+	$(ECHO) Creating $@ with
+	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)"
+	@echo $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)> $@
+realclean:
+	$(RM) $(wildcard RELEASE.*.local)
+
+.PHONY: RELEASE.host realclean

configure/RULES_OCTAVE

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 # Octave definitions and rules

configure/RULES_TARGET

@@ -1,18 +1,13 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#
-#  RULES_TARGET
-#
-#  This file is to be maintained by the community.
-#
-#-----------------------------------------------------------------------
+
+# RULES_TARGET
 
 define TARGET_template
 $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
@@ -20,7 +15,7 @@ $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \
              $$($(1)_$(2)_DEFAULT))
 endef
 
-$(foreach type, SRCS RCS OBJS LDFLAGS OBJLIBS LDOBJS SYS_LIBS , \
+$(foreach type, SRCS RCS OBJS LDFLAGS LDOBJS SYS_LIBS , \
 $(foreach target, $(PROD) $(TESTPROD) $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY) , \
     $(eval $(call TARGET_template,$(strip $(target)),$(type)))))
 
@@ -152,4 +147,3 @@ $(foreach target, $(LOADABLE_LIBRARY), \
     $(eval $(call LOADABLE_LIBRARY_template,$(strip $(target)))))
 
 #-----------------------------------------------------------------------
-

configure/RULES_TOP

@@ -9,20 +9,30 @@
 
 include $(CONFIG)/RULES_DIRS
 
-distclean: realclean cvsclean realuninstall
+# Disable most top rules when installing into a parent's tree, indicated
+# by PARENT_MODULE being set in the modules/CONFIG_SITE.local file and
+# INSTALL_LOCATION pointing to the the same place as in the parent.
+ifeq ($(origin PARENT_MODULE),file)
+  ifeq ($(INSTALL_LOCATION),$($(PARENT_MODULE)))
+    DISABLE_TOP_RULES=YES
+  endif
+endif
 
-CVSCLEAN = $(call FIND_TOOL,cvsclean.pl)
-cvsclean:
-	$(PERL) $(CVSCLEAN)
+ifndef DISABLE_TOP_RULES
+  #
+  # Rules for a regular application top directory
+  #
+
+distclean: realclean cvsclean realuninstall
 
 realuninstall: uninstallDirs
 	$(RMDIR) $(INSTALL_LOCATION_BIN)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
 
-UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
-    $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
+UNINSTALL_DIRS += $(INSTALL_DB) $(INSTALL_DBD) $(INSTALL_DOC) $(INSTALL_HTML)
+UNINSTALL_DIRS += $(INSTALL_INCLUDE) $(INSTALL_TEMPLATES) $(DIRECTORY_TARGETS)
 ifneq ($(INSTALL_LOCATION),$(TOP))
-UNINSTALL_DIRS += $(INSTALL_CONFIG)
+  UNINSTALL_DIRS += $(INSTALL_CONFIG)
 endif
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
@@ -36,6 +46,8 @@ uninstall$(DIVIDER)%:
 	$(RMDIR) $(INSTALL_LOCATION_BIN)/$(archPart)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)/$(archPart)
 
+# Remove the bin and lib directories if they have no sub-directories
+#
 cleandirs:
 	@$(NOP)
 ifeq ($(wildcard $(INSTALL_LOCATION_BIN)/*),)
@@ -45,6 +57,16 @@ ifeq ($(wildcard $(INSTALL_LOCATION_LIB)/*),)
 	$(RMDIR) $(INSTALL_LOCATION_LIB)
 endif
 
+else
+  #
+  # Using a disabled rule aborts
+  #
+
+  cleandirs distclean uninstall realuninstall archuninstall:
+	$(error Target '$@' not available in a submodule)
+
+endif # DISABLE_TOP_RULES
+
 
 help:
 	@echo "Usage: gnumake [options] [target] ..."
@@ -60,31 +82,39 @@ help:
 	@echo "                      Cannot be used within an O.<arch> dir"
 	@echo "     rebuild        - Same as clean install"
 	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
-	@echo "     runtests       - Run self-tests, summarize results"
+	@echo "     depclean       - Removes .d files from all O.<arch> dirs."
+	@echo "     cvsclean       - Removes backup files etc. from all dirs below"
+	@echo "     runtests       - Run self-tests, summarize results immediately"
+	@echo "     tapfiles       - Run self-tests, save to O.<arch>/*.tap files"
+	@echo "     test-results   - Summarize all O.<arch>/*.tap files"
+	@echo "     clean-tests    - Removes all O.<arch>/*.tap files"
 	@echo "\"Partial\" build targets supported by Makefiles:"
 	@echo "     host           - Builds and installs $(EPICS_HOST_ARCH) only."
 	@echo "     inc$(DIVIDER)<arch>     - Installs <arch> only header files."
 	@echo "     build$(DIVIDER)<arch>   - Builds and installs <arch> only."
 	@echo "     install$(DIVIDER)<arch> - Builds and installs <arch> only."
 	@echo "     clean$(DIVIDER)<arch>   - Cleans <arch> binaries in O.<arch> dirs only."
-	@echo "     uninstall$(DIVIDER)<arch> - Remove bin & lib directories for <arch> only."
 	@echo "Targets supported by top level Makefile:"
+ifndef DISABLE_TOP_RULES
 	@echo "     archuninstall  - Remove bin & lib directories created by this hostarch."
+	@echo "     uninstall$(DIVIDER)<arch> - Remove bin & lib directories for <arch> only."
 	@echo "     uninstall      - Remove install directories created by this hostarch."
 	@echo "     realuninstall  - Removes ALL install dirs"
 	@echo "     distclean      - Same as realclean cvsclean realuninstall."
-	@echo "     cvsclean       - Removes cvs .#* files in all dirs of directory tree"
+endif
 	@echo "     help           - Prints this list of valid make targets "
-	@echo "Indiv. object targets are supported by O.<arch> level Makefile .e.g"
+	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"
 	@echo "     xxxRecord.o"
 
-.PHONY: cleandirs distclean cvsclean realuninstall archuninstall uninstallDirs
-.PHONY: uninstall help
+.PHONY: cleandirs distclean uninstall help
+.PHONY: realuninstall archuninstall uninstallDirs
 
-# Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
-#
-RELEASE_CFG_TOP_RULES = $(foreach top, $(RELEASE_TOPS), \
-    $(wildcard $($(top))/cfg/TOP_RULES*))
-ifneq ($(RELEASE_CFG_TOP_RULES),)
-  include $(RELEASE_CFG_TOP_RULES)
+ifndef DISABLE_TOP_RULES
+  # Include <top>/cfg/TOP_RULES* files from tops defined in RELEASE* files
+  #
+  RELEASE_CFG_TOP_RULES = $(foreach top, $(RELEASE_TOPS), \
+      $(wildcard $($(top))/cfg/TOP_RULES*))
+  ifneq ($(RELEASE_CFG_TOP_RULES),)
+    include $(RELEASE_CFG_TOP_RULES)
+  endif
 endif

configure/os/CONFIG.Common.RTEMS

@@ -27,9 +27,13 @@ ifneq ($(CONFIG),$(TOP)/configure)
 -include $(TOP)/configure/CONFIG_SITE.Common.RTEMS
 endif
 
+#--------------------------------------------------
+# Set RTEMS_BSP from T_A if not already done
+RTEMS_BSP ?= $(subst RTEMS-,,$(T_A))
+
 #-------------------------------------------------------
 # Pick up the RTEMS tool/path definitions from the RTEMS BSP directory.
-include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(subst RTEMS-,,$(T_A))/Makefile.inc
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(RTEMS_BSP)/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(CONFIG.CC)
 
@@ -72,7 +76,7 @@ CPPFLAGS += $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
  $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
  $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS)
 
-ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way

configure/os/CONFIG.Common.RTEMS-at91rm9200ek

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

configure/os/CONFIG.Common.RTEMS-beatnik

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = beatnik
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

configure/os/CONFIG.Common.RTEMS-gen68360

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

configure/os/CONFIG.Common.RTEMS-mcp750

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

configure/os/CONFIG.Common.RTEMS-mvme167

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

configure/os/CONFIG.Common.RTEMS-mvme2100

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme2100
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

configure/os/CONFIG.Common.RTEMS-mvme2700

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

configure/os/CONFIG.Common.RTEMS-mvme3100

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme3100
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

configure/os/CONFIG.Common.RTEMS-mvme5500

@@ -5,6 +5,7 @@
 # All RTEMS targets use the same Makefile fragment
 #
 EXE = .elf
+RTEMS_BSP = mvme5500
 RTEMS_TARGET_CPU = powerpc
 GNU_TARGET = powerpc-rtems
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL

configure/os/CONFIG.Common.RTEMS-pc386

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

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

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

configure/os/CONFIG.Common.RTEMS-psim

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

configure/os/CONFIG.Common.RTEMS-uC5282

@@ -5,6 +5,7 @@
 #
 # All RTEMS targets use the same Makefile fragment
 #
+RTEMS_BSP = uC5282
 RTEMS_TARGET_CPU = m68k
 ARCH_DEP_CFLAGS += -DMY_DO_BOOTP=NULL
 

configure/os/CONFIG.Common.vxWorksCommon

@@ -146,8 +146,10 @@ SHRLIB_CFLAGS =
 SHRLIB_LDFLAGS =
 
 #--------------------------------------------------
-# Earlier versions of gcc don't understand -MF
-HDEPENDS_COMPFLAGS = -MM > $@
+# Don't use gcc 2.x for dependency generation
+
+HDEPENDS_METHOD_2 = MKMF
+HDEPENDS_METHOD = $(firstword $(HDEPENDS_METHOD_$(VX_GNU_MAJOR_VERSION)) COMP)
 
 #--------------------------------------------------
 # osithead use default stack, YES or NO override

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -65,14 +65,14 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
+SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -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.win32-x86.Common

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

configure/os/CONFIG.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
 
 

configure/os/CONFIG_SITE.Common.RTEMS-pc386

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

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

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

configure/os/CONFIG_SITE.Common.linux-x86

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

configure/os/CONFIG_SITE.Common.linux-x86_64

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

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

@@ -8,7 +8,8 @@ GNU_TARGET = arm-xilinx-linux-gnueabi
 
 # Set GNU tools install path
 # Examples are installations at the APS:
-GNU_DIR = /usr/local/vw/zynq-2011.09
+#GNU_DIR = /usr/local/vw/zynq-2011.09
+GNU_DIR = /usr/local/vw/zynq-2016.1/gnu/arm/lin
 #GNU_DIR = /usr/local/Xilinx/SDK/2016.3/gnu/arm/lin
 #GNU_DIR = /APSshare/XilinxSDK/2015.4/gnu/arm/lin
 

documentation/KnownProblems.html

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

documentation/README.1st

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

documentation/README.darwin.html

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

documentation/README.html

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

documentation/RELEASE_NOTES.html

@@ -8,7 +8,19 @@
 
 <body lang="en">
 
-<h1 align="center">EPICS Release 7.0.2.x</h1>
+<p>These release notes describe changes that have been made since the previous
+release of this series of EPICS Base. <b>Note that changes which were merged up
+from commits to new releases in an older Base series are not described at the
+top of this file but have entries that appear lower down, under the series to
+which they were originally committed.</b> Thus it is important to read more than
+just the first section to understand everything that has changed in each
+release.</p>
+
+<p>The external PVA submodules each have their own separate set of release notes
+which should also be read to understand what has changed since an earlier
+release.</p>
+
+<h1 align="center">EPICS Release 7.0.2.2</h1>
 
 <!-- Insert new items immediately below this template ...
 
@@ -18,6 +30,120 @@
 
 -->
 
+<h3>Build System changes</h3>
+
+<ul>
+
+<li>The GNUmake build targets <tt>cvsclean</tt> and <tt>depclean</tt> are now
+available from any directory; previously they were only available from
+application top directories.</li>
+
+<li>The approach that EPICS Base uses for building submodules inside the parent
+module looks useful for support modules too. The rules for building submodules
+have been modified and extracted into a new <tt>RULES_MODULES</tt> file, so a
+support module will be able to use them too without having to copy them into its
+own <tt>modules/Makefile</tt>. There are some specific requirements that support
+modules and their submodules must follow, which are described as comments in the
+new <tt>base/configure/RULES_MODULES</tt> file itself.</li>
+
+</ul>
+
+<h3>EPICS_BASE_VERSION Update Policy change</h3>
+
+<p>In the past, a build of EPICS using sources checked out from the repository
+branch between official releases would have shown the version number of the
+previous release, followed by a <q>-DEV</q> suffix, for example
+<q>7.0.2.1-DEV</q>.</p>
+
+<p>The policy that controls when the number gets updated has been changed, and
+now immediately after a release has been tagged the version number will be
+updated to the next patch release version, plus the <q>-DEV</q> suffix as
+before. Thus following <q>7.0.2.2</q> the version number will show as
+<q>7.0.2.3-DEV</q>. This does not require the next official release to be
+numbered <q>7.0.2.3</q> though, it could become <q>7.0.3</q> or even
+<q>7.1.0</q> if the changes incorporated into it are more substantial than bug
+fixes.</p>
+
+<h3>Drop CLOCK_MONOTONIC_RAW from posix/osdMonotonic.c</h3>
+
+<p>Turns out this is ~10x slower to query than CLOCK_MONOTONIC.</p>
+
+
+<h1 align="center">EPICS Release 7.0.2.1</h1>
+
+<h3>Linking shared libraries on macOS</h3>
+
+<p>The linker flag <tt>-flat_namespace</tt> has been restored for creating
+shared libraries, although not for loadable libraries (bundles). This was
+required for building using the latest versions of Apple XCode.</p>
+
+<h3>Fix DB_LINK loop breaking</h3>
+
+<p>A regression was introduced in 7.0.2 which caused record chains with loops to
+be incorrectly broken. Processing should be skipped when a DB_LINK with Process
+Passive (PP) closes a loop to a synchronous record.</p>
+
+<p>Instead in 7.0.2 the targeted record would be processed if processing began
+with a remote action (or some other caller of <tt>dbPutField()</tt>). This would
+result in the loop running a second time. The loop would be broken on the second
+iteration.</p>
+
+<p><a href="https://bugs.launchpad.net/epics-base/+bug/1809570">See lp:
+#1809570</a></p>
+
+<h3>Old dbStaticLib APIs removed</h3>
+
+<p>Support for some obsolete dbStaticLib Database Configuration Tool (DCT) APIs
+was removed some time ago, but vestiges of them still remained. The following
+routines and macros and have now finally been removed:</p>
+
+<ul>
+<li>int dbGetFieldType(DBENTRY *pdbentry)</li>
+<li>int dbGetLinkType(DBENTRY *pdbentry)</li>
+<li>DCT_STRING</li>
+<li>DCT_INTEGER</li>
+<li>DCT_REAL</li>
+<li>DCT_MENU</li>
+<li>DCT_MENUFORM</li>
+<li>DCT_INLINK</li>
+<li>DCT_OUTLINK</li>
+<li>DCT_FWDLINK</li>
+<li>DCT_NOACCESS</li>
+<li>DCT_LINK_CONSTANT</li>
+<li>DCT_LINK_FORM</li>
+<li>DCT_LINK_PV</li>
+</ul>
+
+<h3>Fix for <tt>dbhcr</tt> before <tt>iocInit</tt></h3>
+
+<p>The <tt>dbhcr</tt> command used to work before <tt>iocInit</tt> as well as
+afterwards. It displays all records that have hardware addresses (VME_IO,
+CAMAC_IO, GPIB_IO, INST_IO etc.) but stopped working if run before iocInit due
+to the rewrite of the link address parser code in dbStaticLib. This release
+fixes that issue, although in some cases the output may be slightly different
+than it used to be.</p>
+
+
+<h1 align="center">EPICS Release 7.0.2</h1>
+
+<h3>Launchpad Bugs</h3>
+
+<p>The list of tracked bugs fixed in this release can be found on the
+<a href="https://launchpad.net/epics-base/+milestone/7.0.2">Launchpad Milestone
+page for EPICS Base 7.0.2</a>.</p>
+
+
+<h3>Git Branches Recombined</h3>
+
+<p>The four separate Git branches <tt>core/master</tt>, <tt>libcom/master</tt>,
+<tt>ca/master</tt> and <tt>database/master</tt> have been recombined into one
+branch called <tt>7.0</tt>. Keeping these as 4 separate branches in the same
+repository made it impossible to create merge requests that contained changes in
+more than one of these modules. The layout of the source files has not changed
+at all however, so the source code for libcom, ca and the database are still
+found separately under the module subdirectory.</p>
+
+
 <h1 align="center">EPICS Release 7.0.1.1</h1>
 
 <h3>Changed SIML failure behavior</h3>
@@ -82,9 +208,168 @@ code than documentation. Send questions to the tech-talk mailing list and we'll
 be happy to try and answer them!</p>
 
 
-<h2 align="center">Changes from the 3.16 branch since 3.16.1</h2>
+<h2 align="center">Changes between 3.16.1 and 3.16.2</h2>
 
-<!-- Insert inherited items immediately below here ... -->
+<p>The list of tracked bugs fixed in this release can be found on the
+<a href="https://launchpad.net/epics-base/+milestone/3.16.2">Launchpad Milestone
+page for EPICS Base 3.16.2</a>.</p>
+
+<h3>Status reporting for the callback and scanOnce task queues</h3>
+
+<p>Two new iocsh commands and some associated underlying APIs have been added to
+show the state of the queues that feed the three callback tasks and the scanOnce
+task, including a high-water mark which can optionally be reset. The new iocsh
+commands are <tt>callbackQueueShow</tt> and <tt>scanOnceQueueShow</tt>; both
+take an optional integer argument which must be non-zero to reset the
+high-water mark.</p>
+
+<h3>Support for event codes greater than or equal to NUM_TIME_EVENTS</h3>
+
+<p>Event numbers greater than or equal to NUM_TIME_EVENTS are now allowed if
+supported by the registered event time provider, which must provide its own
+advancing timestamp validation for such events.</p>
+
+<p>Time events numbered 0 through (NUM_TIME_EVENTS-1) are still validated by
+code in epicsGeneralTime.c that checks for advancing timestamps and enforces
+that restriction.</p>
+
+<h3>Type-safe Device and Driver Support Tables</h3>
+
+<p>Type-safe versions of the device and driver support structures <tt>dset</tt>
+and <tt>drvet</tt> have been added to the devSup.h and drvSup.h headers
+respectively. The original structure definitions have not been changed so
+existing support modules will still build normally, but older modules can be
+modified and new code written to be compatible with both.</p>
+
+<p>The old structure definitions will be replaced by the new ones if the macros
+<tt>USE_TYPED_DSET</tt> and/or <tt>USE_TYPED_DRVET</tt> are defined when the
+appropriate header is included. The best place to define these is in the
+Makefile, as with the <tt>USE_TYPED_RSET</tt> macro that was introduced in
+Base-3.16.1 and described below. See the comments in devSup.h for a brief usage
+example, or look at <a href="https://github.com/epics-modules/ipac/commit/a7e0ff4089b9aa39108bc8569e95ba7fcf07cee9">
+this commit</a> to the ipac module to see a module conversion.</p>
+
+<p>A helper function <tt>DBLINK* dbGetDevLink(dbCommon *prec)</tt> has also been
+added to devSup.h which fetches a pointer to the INP or OUT field of the
+record.</p>
+
+<h3>RTEMS build configuration update, running tests under QEMU</h3>
+
+<p>This release includes the ability to run the EPICS unit tests built for a
+special version of the RTEMS-pc386 target architecture on systems that have an
+appropriate QEMU emulator installed (<tt>qemu-system-i386</tt>). It is also now
+possible to create sub-architectures of RTEMS targets, whereas previously the
+EPICS target architecture name had to be <tt>RTEMS-$(RTEMS_BSP)</tt>.</p>
+
+<p>The new target <tt>RTEMS-pc386-qemu</tt> builds binaries that can be run in
+the <tt>qemu-system-i386</tt> PC System emulator. This target is a derivative of
+the original <tt>RTEMS-pc386</tt> target but with additional software to build
+an in-memory file-system, and some minor modifications to allow the unit tests
+to work properly under QEMU. When this target is enabled, building any of the
+make targets that cause the built-in self-tests to be run (such as
+<tt>make&nbsp;runtests</tt>) will also run the tests for RTEMS using QEMU.</p>
+
+<p>To allow the new 3-component RTEMS target name, the EPICS build system for
+RTEMS was modified to allow a <tt>configure/os/CONFIG.Common.&lt;arch&gt;</tt>
+file to set the <tt>RTEMS_BSP</tt> variable to inform the build what RTEMS BSP
+to use. Previously this was inferred from the value of the <tt>T_A</tt> make
+variable, but that prevents having multiple EPICS targets that build against the
+same BSP. All the included RTEMS target configuration files have been updated;
+build configuration files for out-of-tree RTEMS targets will continue to work as
+the original rules are used to set <tt>RTEMS_BSP</tt> if it hasn't been set when
+needed.</p>
+
+<h3>Link type enhancements</h3>
+
+<p>This release adds three new link types: "state", "debug" and "trace". The
+"state" link type gets and puts boolean values from/to the dbState library that
+was added in the 3.15.1 release. The "debug" link type sets the
+<code>jlink::debug</code> flag in its child link, while the "trace" link type
+also causes the arguments and return values for all calls to the child link's
+jlif and lset routines to be printed on stdout. The debug flag can no longer be
+set using an info tag. The addition of the "trace" link type has allowed over
+200 lines of conditional diagnostic printf() calls to be removed from the other
+link types.</p>
+
+<p>The "calc" link type can now be used for output links as well as input links.
+This allows modification of the output value and even combining it with values
+from other input links. See the separate JSON Link types document for
+details.</p>
+
+<p>A new <code>start_child()</code> method was added to the end of the jlif
+interface table.</p>
+
+<p>The <code>lset</code> methods have now been properly documented in the
+dbLink.h header file using Doxygen annotations, although we do not run Doxygen
+on the source tree yet to generate API documentation.</p>
+
+<p>Link types that utilize child links must now indicate whether the child will
+be used for input, output or forward linking by the return value from its
+<code>parse_start_map()</code> method. The <code>jlif_key_result</code> enum now
+contains 3 values <code>jlif_key_child_inlink</code>,
+<code>jlif_key_child_outlink</code> and <code>jlif_key_child_fwdlink</code>
+instead of the single <code>jlif_key_child_link</code> that was previously used
+for this.</p>
+
+<h3>GNUmake targets for debugging</h3>
+
+<p>Some additional build rules have been added to help debug configuration
+problems with the build system. Run <tt>make show-makefiles</tt> to get a sorted
+list of all the files that the build system includes when building in the
+current directory.</p>
+
+<p>A new pattern rule for <tt>PRINT.%</tt> can be used to show the value of any
+GNUmake variable for the current build directory (make sure you are in the right
+directory though, many variables are only set when inside the
+<tt>O.<i>arch</i></tt> build directory). For example <tt>make PRINT.T_A</tt>
+will display the build target architecture name from inside a
+<tt>O.<i>arch</i></tt> directory but the variable will be empty from an
+application top or src directory. <tt>make PRINT.EPICS_BASE</tt> will show the
+path to Base from any EPICS application directory though.</p>
+
+<h3>Propagate PUTF across Asynchronous record processing</h3>
+
+<p>The IOC contains a mechanism involving the PUTF and RPRO fields of each
+record to ensure that if a record is busy when it receives a put to one of its
+fields, the record will be processed again to ensure that the new field value
+has been correctly acted on. Until now that mechanism only worked if the put was
+to the asynchronous record itself, so puts that were chained from some other
+record via a DB link did not cause reprocessing.</p>
+
+<p>In this release the mechanism has been extended to propagate the PUTF state
+across DB links until all downstream records have been reprocessed. Some
+additional information about the record state can be shown by setting the TPRO
+field of an upstream record, and even more trace data is displayed if the
+debugging variable <tt>dbAccessDebugPUTF</tt> is set in addition to TPRO.</p>
+
+<h3>Finding info fields</h3>
+
+<p>A new iocsh command <code>dbli</code> lists the info fields defined in the
+database, and can take a glob pattern to limit output to specific info names.
+The newly added dbStaticLib function <code>dbNextMatchingInfo()</code> iterates
+through the info fields defined in the current record, and is used to implement
+the new command.</p>
+
+<h3>Output from <tt>dbpr</tt> command enhanced</h3>
+
+<p>The "DataBase Print Record" command <tt>dbpr</tt> now generates slightly
+better output, with more field types having their own display methods. This
+release also includes additional protection against buffer overflows while
+printing long links in <tt>dbpr</tt>, and corrects the output of long strings
+from the <tt>dbgf</tt> command.</p>
+
+<h3>Record types mbbiDirect and mbboDirect upgraded to 32 bit</h3>
+
+<p>The VAL fields and related fields of these records are now <tt>DBF_LONG</tt>.
+(Not <tt>DBF_ULONG</tt> in order to prevent Channel Access from promoting them
+to <tt>DBF_DOUBLE</tt>.) Additional bit fields <tt>B10</tt>...<tt>B1F</tt> have
+been added.</p>
+
+<p>Device support that accesses <tt>VAL</tt> or the bit fields directly (most
+don't) and aims for compatibility with old and new versions of these records
+should use at least 32 bit integer types to avoid bit loss. The number of bit
+fields can be calculated using <code>8&nbsp;*&nbsp;sizeof(prec->val)</code>
+which is correct in both versions.</p>
 
 <h3>Restore use of ledlib for VxWorks command editing</h3>
 
@@ -176,6 +461,27 @@ preprocessor macro):</p>
 #endif
 </pre></blockquote>
 
+<p>If the code uses the old db_access.h types (probably because it's calling
+Channel Access APIs) then it will have to test against the EPICS version number
+instead, like this:</p>
+
+<blockquote><pre>
+#include &lt;epicsVersion.h&gt;
+
+#ifndef VERSION_INT
+#  define VERSION_INT(V,R,M,P) ( ((V)&lt;&lt;24) | ((R)&lt;&lt;16) | ((M)&lt;&lt;8) | (P))
+#endif
+#ifndef EPICS_VERSION_INT
+#  define EPICS_VERSION_INT VERSION_INT(EPICS_VERSION, EPICS_REVISION, EPICS_MODIFICATION, EPICS_PATCH_LEVEL)
+#endif
+
+#if EPICS_VERSION_INT &gt;= VERSION_INT(3,16,1,0)
+    /* Code where Base has INT64 support */
+#else
+    /* Code for older versions */
+#endif
+</pre></blockquote>
+
 <p>Channel Access does not (and probably never will) directly support 64-bit
 integer types, so the new field types are presented to the CA server as
 <tt>DBF_DOUBLE</tt> values. This means that field values larger than 2^52
@@ -343,15 +649,15 @@ to implement the link APIs, so will work properly after these conversions:</p>
 link type, i.e. change this code:
 
 <pre>
-    if (prec->siml.type == CONSTANT) {
-        recGblInitConstantLink(&amp;prec->siml, DBF_USHORT, &amp;prec->simm);
+    if (prec-&gt;siml.type == CONSTANT) {
+        recGblInitConstantLink(&amp;prec-&gt;siml, DBF_USHORT, &amp;prec-&gt;simm);
     }
 </pre>
 
 into this:
 
 <pre>
-    recGblInitConstantLink(&amp;prec->siml, DBF_USHORT, &amp;prec->simm);
+    recGblInitConstantLink(&amp;prec-&gt;siml, DBF_USHORT, &amp;prec-&gt;simm);
 </pre>
 
 Note that <tt>recGblInitConstantLink()</tt> still returns TRUE if the field was
@@ -364,20 +670,20 @@ or undefined links, FALSE for links whose <tt>dbGetLink()</tt> routine may
 return different values on different calls. For example this:
 
 <pre>
-    if (prec->dol.type != CONSTANT)
+    if (prec-&gt;dol.type != CONSTANT)
 </pre>
 
 should become this:
 
 <pre>
-    if (!dbLinkIsConstant(&amp;prec->dol))
+    if (!dbLinkIsConstant(&amp;prec-&gt;dol))
 </pre>
 
 When the converted software is also required to build against older versions of
 Base, this macro definition may be useful:
 
 <pre>
-#define dbLinkIsConstant(lnk) ((lnk)->type == CONSTANT)
+#define dbLinkIsConstant(lnk) ((lnk)-&gt;type == CONSTANT)
 </pre>
 </li>
 
@@ -385,7 +691,7 @@ Base, this macro definition may be useful:
 link has been resolved as a CA link using code such as
 
 <pre>
-    if (prec->inp.type == CA_LINK)
+    if (prec-&gt;inp.type == CA_LINK)
 </pre>
 
 will still compile and run, but will only work properly with the old CA link
@@ -395,7 +701,7 @@ examine or modify data inside the link. After conversion the above line would
 probably become:
 
 <pre>
-    if (dbLinkIsVolatile(&amp;prec->inp))
+    if (dbLinkIsVolatile(&amp;prec-&gt;inp))
 </pre>
 
 A volatile link is one like a Channel Access link which may disconnect and
@@ -405,7 +711,7 @@ same state they started in. For compatibility when building against older
 versions of Base, this macro definition may be useful:
 
 <pre>
-#define dbLinkIsVolatile(lnk) ((lnk)->type == CA_LINK)
+#define dbLinkIsVolatile(lnk) ((lnk)-&gt;type == CA_LINK)
 </pre>
 </li>
 
@@ -705,11 +1011,102 @@ the stdout stream, making it hard to parse.</p>
 callback.h header and removed the need for dbScan.c to reach into the internals
 of its CALLBACK objects.</p>
 
-
-<h2 align="center">Changes from the 3.15 branch since 3.15.5</h2>
+<h2 align="center">Changes from the 3.15 branch since 3.15.6</h2>
 
 <!-- Insert inherited items immediately below here ... -->
 
+<h3>Perl CA bindings fixed for macOS Mojave</h3>
+
+<p>Apple removed some Perl header files from macOS Mojave that were available
+in their SDK, requiring a change to the include paths used when compiling the
+CA bindings. The new version should build on new and older macOS versions, and
+these changes may also help other targets that have an incomplete installation
+of Perl (the build will continue after printing a warning that the Perl CA
+bindings could not be built).</p>
+
+<h3>Routine <tt>epicsTempName()</tt> removed from libCom</h3>
+
+<p>This routine was a simple wrapper around the C89 function <tt>tmpnam()</tt>
+which is now seen as unsafe and causes warning messages to be generated by
+most modern compilers. The two internal uses of this function have been
+modified to call <tt>epicsTempFile()</tt> instead. We were unable to find any
+published code that used this function, so it was removed immediately instead
+of being deprecated.</p>
+
+<h3>DBD Parsing of Record Types</h3>
+
+<p>The Perl DBD file parser has been made slightly more liberal; the order in
+which DBD files must be parsed is now more flexible, so that a record type
+definition can now be parsed after a device support that referred to that
+record type. A warning message will be displayed when the device support is
+seen, but the subsequent loading of the record type will be accepted without
+triggering an error. See
+<a href="https://bugs.launchpad.net/epics-base/+bug/1801145">Launchpad bug
+#1801145</a>.</p>
+
+<h3>menuScan and several record types documented with POD</h3>
+
+<p>The EPICS Wiki pages describing a number of standard record types has been
+converted into the Perl POD documentation format and added to the DBD files,
+so at build-time an HTML version of these documents is generated and installed
+into the htmls directory. Thanks to Tony Pietryla.</p>
+
+<h3>CA client tools learned <tt>-V</tt> option</h3>
+
+<p>This displays the version numbers of EPICS Base and the CA protocol.</p>
+
+
+<h2 align="center">Changes made between 3.15.5 and 3.15.6</h2>
+
+<h3>Unsetting environment variables</h3>
+
+<p>The new command <code>epicsEnvUnset <i>varname</i></code> can be used to
+unset an environment variable.</p>
+
+<h3>Warning indicators in msi (and macLib) output</h3>
+
+<p>The libCom macro expansion library has been modified so that when the
+SUPPRESS_WARNINGS flag is set it will no longer include any <tt>,undefined</tt>
+or <tt>,recursive</tt> indicators in its output when undefined or recursive
+macros are encountered. These indicators were harmless when the output was fed
+into an IOC along with a definition for the macro, but when the <tt>msi</tt>
+tool was used to generate other kinds of files they caused problems. If the
+<tt>msi -V</tt> flag is used the markers will still be present in the output
+whenever the appropriate condition is seen.</p>
+
+<h3>Improvements to msi</h3>
+
+<p>In addition to fixing its response to discovering parsing errors in its
+substitution input file (reported as Launchpad
+<a href="https://bugs.launchpad.net/epics-base/+bug/1503661">bug #1503661</a>)
+so it now deletes the incomplete output file, the msi program has been cleaned
+up a little bit internally.</p>
+
+<h3>All array records now post monitors on their array-length fields</h3>
+
+<p>The waveform record has been posting monitors on its NORD field since Base
+3.15.0.1; we finally got around to doing the equivalent in all the other
+built-in record types, which even required modifying device support in some
+cases. This fixes <a href="https://bugs.launchpad.net/epics-base/+bug/1730727">
+Launchpad bug #1730727</a>.</p>
+
+<h3>HOWTO: Converting Wiki Record Reference to POD</h3>
+
+<p>Some documentation has been added to the <tt>dbdToHtml.pl</tt> script
+explaining how Perl POD (Plain Old Documentation) markup can be added to
+<tt>.dbd</tt> files to generate HTML documentation for the record types. To see
+these instructions, run <tt>perl&nbsp;bin/&lt;host&gt;/dbdToHtml.pl&nbsp;-H</tt>
+or <tt>perldoc&nbsp;bin/&lt;host&gt;/dbdToHtml.pl</tt>.</p>
+
+<h3>Fix problem with numeric soft events</h3>
+
+<p>Changing from numeric to named soft events introduced an incompatibility
+when a numeric event 1-255 is converted from a DOUBLE, e.g. from a calc record.
+The <tt>post_event()</tt> API is not marked deprecated any more.
+
+<p>Also <code>scanpel</code> has been modified to accept a glob pattern for
+event name filtering and to show events with no connected records as well.</p>
+
 <h3>Add osiSockOptMcastLoop_t and osiSockTest</h3>
 
 <p>Added a new OS-independent typedef for multicast socket options, and a test
@@ -724,9 +1121,115 @@ of having go modify or replace the original. A new .gitignore pattern
 tells git to ignore all configure/*.local files.</p>
 
 
-<h2 align="center">Changes from the 3.14 branch since 3.15.5</h2>
+<h2 align="center">Changes from the 3.14 branch between 3.15.5 and 3.15.6</h2>
 
-<!-- Insert inherited items immediately below here ... -->
+<h3>Fix broken <tt>EPICS_IOC_LOG_FILE_LIMIT=0</tt> setting</h3>
+
+<p>The Application Developers' Guide says this is allowed and disables the
+limit on the log-file, but it hasn't actually worked for some time (if ever).
+Note that the iocLogServer will be removed from newer Base release sometime
+soon as its functionality can be implemented by other dedicated log servers
+such as logstash or syslog-ng.</p>
+
+<p>Fixes <a href="https://bugs.launchpad.net/bugs/1786858">lp:1786858</a>
+and part of <a href="https://bugs.launchpad.net/bugs/1786966">lp:1786966</a>.
+</p>
+
+<h3>Cleanup of startup directory</h3>
+
+<p>The files in the startup directory have not been maintained in recent years
+and have grown crufty (technical term). This release includes the following
+updates to these files:</p>
+
+<ul>
+
+<li>The Perl <tt>EpicsHostArch.pl</tt> script has been rewritten, and support
+for a few previously missing host architectures has been added to it.</li>
+
+<li>The <tt>EpicsHostArch.pl</tt> script has also been moved into the standard
+<tt>src/tools</tt> directory, from where it will be installed into
+<tt>lib/perl</tt>. In this new location it is no longer executable, so it must
+be run by the <tt>perl</tt> executable.</li>
+
+<li>The build system has been adjusted to look for <tt>EpicsHostArch.pl</tt> in
+both places if the <tt>EPICS_HOST_ARCH</tt> environment variable has not been
+set at build-time.</li>
+
+<li>Sites that used the original Perl script to set <tt>EPICS_HOST_ARCH</tt> as
+part of their standard environment will need to adjust their scripts when they
+upgrade to this release.</li>
+
+<li>The <tt>EpicsHostArch</tt> shell script has been replaced with a wrapper
+routine that calls the Perl <tt>EpicsHostArch.pl</tt> script. Sites that rely on
+this script to set <tt>EPICS_HOST_ARCH</tt> should consider switching to the
+Perl script instead.</li>
+
+<li>The <tt>Site.cshrc</tt> and <tt>Site.profile</tt> files have been renamed to
+<tt>unix.csh</tt> and <tt>unix.sh</tt>, respectively.</li>
+
+<li>The existing <tt>win32.bat</tt> file has been cleaned up and a new
+<tt>windows.bat</tt> file added for 64-bit targets. The contents of these files
+should be seen as examples, don't uncomment or install parts for software that
+you don't explicitly know that you need.</li>
+
+</ul>
+
+<h3>Recent Apple XCode Build Issues</h3>
+
+<p>The latest version of XCode will not compile calls to <tt>system()</tt> or
+<tt>clock_settime()</tt> for iOS targets. There were several places in Base
+where these were being compiled, although there were probably never called. The
+code has now been modified to permit iOS builds to complete again.</p>
+
+<h3>Prevent illegal alarm severities</h3>
+
+<p>A check has been added to <tt>recGblResetAlarms()</tt> that prevents records
+from getting an alarm severity higher than INVALID_ALARM. It is still possible
+for a field like HSV to get set to a value that is not a legal alarm severity,
+but the core IOC code should never copy such a value into a record's SEVR or
+ACKS fields. With this fix the record's alarm severity will be limited to
+INVALID_ALARM.</p>
+
+<h3>Fixes for Launchpad bugs</h3>
+
+<p>The following launchpad bugs have fixes included:</p>
+
+<ul>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1786320">
+    lp: #1786320</a>, dbCa subscribes twice to ENUM</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/541221">
+    lp: #541221</a>, 'assert (pca->pgetNative)' failed in ../dbCa.c</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1747091">
+    lp: #1747091</a>, epicsTimeGetEvent() / generalTime bug</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1743076">
+    lp: #1743076</a>, Segfault in ca_attach_context() during exits</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1751380">
+    lp: #1751380</a>, Deadlock in ca_clear_subscription()</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1597809">
+    lp: #1597809</a>, Setting NAME field in DB file may break IOC</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1770292">
+    lp: #1770292</a>, get_alarm_double() inconsistent across record types</li>
+<li><a href="https://bugs.launchpad.net/epics-base/+bug/1771298">
+    lp: #1771298</a>, Conversion of NaN to integer relies on undefined
+    behavior</li>
+</ul>
+
+<h3>Updated VxWorks Timezone settings</h3>
+
+<p>Removed the settings for 2017; fixed the hour of the change for MET.</p>
+
+<h3>Fixed camonitor server side relative timestamps bug</h3>
+
+<p>Initialize the first time-stamp from the first monitor, not the client-side
+current time in this configuration.</p>
+
+<h3>Build changes for MSVC</h3>
+
+<p>Windows builds using Visual Studio 2015 and later now use the <tt>-FS</tt>
+compiler option to allow parallel builds to work properly.</p>
+
+<p>We now give the <tt>-FC</tt> option to tell the compiler to print absolute
+paths for source files in diagnostic messages.</p>
 
 <h3>Extend maximum Posix epicsEventWaitWithTimeout() delay</h3>
 

documentation/ReleaseChecklist.html

@@ -37,6 +37,8 @@ that should be performed when creating production releases of EPICS Base.</p>
 
 <h3>The Release Process</h3>
 
+<h4>Full Process</h4>
+
 <p>The version released on the Feature Freeze date is designated the first
 pre-release, <tt>-pre1</tt>. The first release candidate <tt>-rc1</tt> is the
 first version that has undergone testing by the developers and has shown no
@@ -49,6 +51,13 @@ release candidate has been available for 2 weeks without any new problems being
 reported or major changes having to be committed, the final release can be
 made.</p>
 
+<h4>Short Process for Patch Releases</h4>
+
+<p>The Patch Release date and its scope are agreed upon a few weeks ahead of the
+release. If no blocking issues are raised, the release is made by the Release
+Manager on or as soon as possible after that date, following the steps below
+starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
+
 <h3>Roles</h3>
 
 <p>The following roles are used below:</p>
@@ -64,6 +73,7 @@ made.</p>
     <dd>Responsible for the EPICS website</dd>
 </dl>
 
+<form>
 <table border="1" width="100%">
   <tbody>
     <tr>
@@ -124,72 +134,72 @@ made.</p>
       <th colspan="3">Creating pre-release and release-candidate versions</th>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <!-- Submodules... -->
       <td>Edit and commit changes to the EPICS version number file
         configure/CONFIG_BASE_VERSION.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></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>R7.1.1-pre<i>n</i></tt>
+            <tt>R7.0.2-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R7.1.1-rc<i>n</i></tt>
+            <tt>R7.0.2-rc<i>n</i></tt>
             &mdash; release candidate tag
             </li>
-        </ul>
+          </ul>
         <blockquote><tt>
-          cd base-7.1<br />
-          git tag -m 'ANJ: Tagged for 7.1.1-rc1' R7.1.1-rc1
+          cd base-7.0<br />
+          git tag -m 'ANJ: Tagged for 7.0.2-rc1' R7.0.2-rc1
           </tt></blockquote>
         Note that submodules must <em>not</em> be tagged with the version used
         for the top-level, they each have their own separate version numbers
         that are only tagged at the final release.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Export the tagged version into a tarfile. The <tt>make-tar.sh</tt>
         script generates a gzipped tarfile directly from the tag, excluding the
         files and directories that are only used for continuous integration:
         <blockquote><tt>
-          cd base-7.1<br />
-          .ci/make-tar.sh R7.1.1-rc1 base-7.1.1-rc1.tar.gz base-7.1.1-rc1/
+          cd base-7.0<br />
+          ./.tools/make-tar.sh R7.0.2-rc1 base-7.0.2-rc1.tar.gz base-7.0.2-rc1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.1.1-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.2-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tarfile by extracting its contents and building it on at
         least one supported platform.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Copy the tarfile and its signature to the Base download area of the
         website and add the new files to the website Base download index
         page.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Create or update a website subdirectory to hold the release
         documentation, and copy in selected files from the base/documentation
         and base/html directories of the tarfile.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Create or modify the webpage for the new release with links to the
         release documents and tar file. Pre-release and release-candidate
@@ -247,11 +257,13 @@ made.</p>
           </ul>
         </td>
       </tr>
+
     <tr>
-      <th colspan="3">Release Approval</th>
+      <th colspan="3" id="ReleaseApproval">
+        Release Approval</th>
     </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></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 for 2 weeks without any major
@@ -261,51 +273,89 @@ made.</p>
       <th colspan="3">Creating the final release version</th>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Edit and commit changes to the EPICS version number file
-        configure/CONFIG_BASE_VERSION.</td>
+      <td>
+        <p>For each external submodule, check if the module's release version
+          number (and SHRLIB_VERSION setting) has been updated if appropriate,
+          and that its Release Notes have been updated to cover any changes.
+          Commit any fixes and tag the module if that hasn't already been
+          done.</p>
+        <p>Update all external submodules on the Base-7.0 branch and
+          commit.</p></td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
-      <td>Tag the module in Git:
+      <td>Edit and commit changes to the EPICS Base version number file and
+        the embedded module version files:
+        <ul>
+          <li>configure/CONFIG_BASE_VERSION </li>
+          <li>modules/libcom/configure/CONFIG_LIBCOM_VERSION</li>
+          <li>modules/ca/configure/CONFIG_CA_VERSION</li>
+          <li>modules/database/configure/CONFIG_DATABASE_VERSION</li>
+          </ul></td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>Tag the epics-base module in Git:
         <blockquote><tt>
-          cd base-7.1<br />
-          git tag -m 'ANJ: Tagged for 7.1.1' R7.1.1</i>
+          cd base-7.0<br />
+          git tag -m 'ANJ: Tagged for 7.0.2.2' R7.0.2.2</i>
           </tt></blockquote>
-        </td>
+        Don't push the new tag to the Launchpad repository yet.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Export the tagged version into a tarfile. The <tt>make-tar.sh</tt>
         script generates a gzipped tarfile directly from the tag, excluding the
         files and directories that are only used for continuous integration:
         <blockquote><tt>
-          cd base-7.1<br />
-          .ci/make-tar.sh R7.1.1 base-7.1.1.tar.gz base-7.1.1/
+          cd base-7.0<br />
+          ./.tools/make-tar.sh R7.0.2.2 base-7.0.2.2.tar.gz base-7.0.2.2/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.1.1.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.2.2.tar.gz
           </tt></blockquote>
         </td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Test the tar file by extracting its contents and building it on at
-        least one supported platform</td>
+        least one supported platform. When this succeeds the new git tag can be
+        pushed to the Launchpad repository:
+        <blockquote><tt>
+          git push --follow-tags upstream 7.0
+          </tt></blockquote>
+        </td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>Edit and commit changes to the EPICS Base version number file and
+        the embedded module version files:
+        <ul>
+          <li>configure/CONFIG_BASE_VERSION </li>
+          <li>modules/libcom/configure/CONFIG_LIBCOM_VERSION</li>
+          <li>modules/ca/configure/CONFIG_CA_VERSION</li>
+          <li>modules/database/configure/CONFIG_DATABASE_VERSION</li>
+        </ul>
+        Version numbers should be set to the next expected patch release,
+        with a "-DEV" tag added (where applicable).
+      </td>
+    </tr>
+    <tr>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Copy the tarfile and its signature to the Base download area of the
         website.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Find all Launchpad bug reports with the status Fix Committed which
         have been fixed in this release and mark them Fix Released.</td>
@@ -314,48 +364,49 @@ made.</p>
       <th colspan="3">Publish and Announce it</th>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
-      <td>Copy the tar file and its <tt>.asc</tt> signature file to the Base
-        download area of the website.</td>
+      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
+        Launchpad milestone for this release version.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Update the website subdirectory that holds the release
         documentation, and copy in the files from the base/documentation
         directory of the tarfile.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Update the webpage for the new release with links to the release
         documents and tar file.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Add the new release tar file to the website Base download index
         page.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Link to the release webpage from other relevent areas of the
         website - update front page and sidebars.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Website Manager</td>
       <td>Add an entry to the website News page, linking to the new version
         webpage.</td>
       </tr>
     <tr>
-      <td>&nbsp;</td>
+      <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>Announce the release on the tech-talk mailing list.</td>
       </tr>
     </tbody>
   </table>
+</form>
 </body>
 </html>

modules/CONFIG_SITE.local

@@ -3,8 +3,11 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# When building submodules, this should always be true:
-INSTALL_LOCATION = $(EPICS_BASE)
+# The name our submodules know us by:
+PARENT_MODULE = EPICS_BASE
 
-# Stop submodules from installing their configuration files:
+# When building submodules, this should always be true:
+INSTALL_LOCATION := $($(PARENT_MODULE))
+
+# Stop submodules installing their configure/ files into our area
 CONFIG_INSTALLS =

modules/Makefile

@@ -5,6 +5,7 @@
 
 TOP = ..
 include $(TOP)/configure/CONFIG
+include CONFIG_SITE.local
 
 # Submodules for bundle build
 SUBMODULES += libcom
@@ -39,20 +40,4 @@ example_DEPEND_DIRS = pva2pva pvaClient
 # Allow sites to add extra submodules
 -include Makefile.local
 
-# Add only checked-out submodules to DIRS
-DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
-
-include $(TOP)/configure/RULES_DIRS
-
-INSTALL_LOCATION_ABS := $(abspath $(INSTALL_LOCATION))
-RELEASE_LOCAL := RELEASE.$(EPICS_HOST_ARCH).local
-
-# Ensure that RELEASE.<host>.local exists before doing anything else
-all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
-    $(dirActionArchTargets) $(actionArchTargets): | $(RELEASE_LOCAL)
-
-$(RELEASE_LOCAL):
-	$(ECHO) Creating $@, EPICS_BASE = $(INSTALL_LOCATION_ABS)
-	@echo EPICS_BASE = $(INSTALL_LOCATION_ABS)> $@
-realclean:
-	$(RM) $(RELEASE_LOCAL)
+include $(TOP)/configure/RULES_MODULES

modules/ca/.ci/travis-build.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e -x
+
+# set RTEMS to eg. "4.9" or "4.10"
+# requires qemu, bison, flex, texinfo, install-info
+if [ -n "$RTEMS" ]
+then
+  # find local qemu-system-i386
+  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
+  echo -n "Using QEMU: "
+  type qemu-system-i386 || echo "Missing qemu"
+  EXTRA=RTEMS_QEMU_FIXUPS=YES
+fi
+
+make -j2 $EXTRA
+
+if [ "$TEST" != "NO" ]
+then
+  make -j2 tapfiles
+  make -s test-results
+fi

modules/ca/.ci/travis-prepare.sh

@@ -0,0 +1,132 @@
+#!/bin/sh
+set -e -x
+
+CURDIR="$PWD"
+
+QDIR="$HOME/.cache/qemu"
+
+if [ -n "$RTEMS" -a "$TEST" = "YES" ]
+then
+  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
+  cd "$HOME/.build/qemu"
+
+  HEAD=`git log -n1 --pretty=format:%H`
+  echo "HEAD revision $HEAD"
+
+  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
+  echo "Cached revision $BUILT"
+
+  if [ "$HEAD" != "$BUILT" ]
+  then
+    echo "Building QEMU"
+    git submodule --quiet update --init
+
+    install -d "$HOME/.build/qemu/build"
+    cd         "$HOME/.build/qemu/build"
+
+    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
+    make -j2
+    make install
+
+    echo "$HEAD" > "$HOME/.cache/qemu/built"
+  fi
+fi
+
+cd "$CURDIR"
+
+cat << EOF > configure/RELEASE.local
+EPICS_BASE=$HOME/.source/epics-base
+EOF
+
+install -d "$HOME/.source"
+cd "$HOME/.source"
+
+add_base_module() {
+  MODULE=$1
+  BRANCH=$2
+  ( cd epics-base/modules && \
+  git clone --quiet --depth 5 --branch "$MODULE"/"$BRANCH" https://github.com/${REPOBASE:-epics-base}/epics-base.git "$MODULE" && \
+  cd "$MODULE" && git log -n1 )
+}
+
+git clone --quiet --depth 5 --branch core/"${BRCORE:-master}" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
+( cd epics-base && git log -n1 )
+add_base_module libcom "${BRLIBCOM:-master}"
+
+EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
+
+# requires wine and g++-mingw-w64-i686
+if [ "$WINE" = "32" ]
+then
+  echo "Cross mingw32"
+  sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
+CMPLR_PREFIX=i686-w64-mingw32-
+EOF
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
+EOF
+fi
+
+if [ "$STATIC" = "YES" ]
+then
+  echo "Build static libraries/executables"
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+SHARED_LIBRARIES=NO
+STATIC_BUILD=YES
+EOF
+fi
+
+case "$CMPLR" in
+clang)
+  echo "Host compiler is clang"
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
+EOF
+
+  # hack
+  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
+
+  clang --version
+  ;;
+*)
+  echo "Host compiler is default"
+  gcc --version
+  ;;
+esac
+
+cat <<EOF >> epics-base/configure/CONFIG_SITE
+USR_CPPFLAGS += $USR_CPPFLAGS
+USR_CFLAGS += $USR_CFLAGS
+USR_CXXFLAGS += $USR_CXXFLAGS
+EOF
+
+# set RTEMS to eg. "4.9" or "4.10"
+# requires qemu, bison, flex, texinfo, install-info
+if [ -n "$RTEMS" ]
+then
+  echo "Cross RTEMS${RTEMS} for pc386"
+  install -d /home/travis/.cache
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
+  | tar -C /home/travis/.cache -xj
+
+  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
+RTEMS_VERSION=$RTEMS
+RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
+EOF
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+EOF
+
+  # find local qemu-system-i386
+  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
+  echo -n "Using QEMU: "
+  type qemu-system-i386 || echo "Missing qemu"
+  EXTRA=RTEMS_QEMU_FIXUPS=YES
+fi
+
+make -j2 -C epics-base $EXTRA

modules/ca/.travis.yml

@@ -0,0 +1,26 @@
+sudo: false
+dist: trusty
+language: c
+compiler:
+  - gcc
+addons:
+  apt:
+    packages:
+    - libreadline6-dev
+    - libncurses5-dev
+    - perl
+    - clang
+    - g++-mingw-w64-i686
+install:
+ - ./.ci/travis-prepare.sh
+script:
+ - ./.ci/travis-build.sh
+env:
+ - BRCORE=master BRLIBCOM=master TEST=NO
+ - CMPLR=clang TEST=NO
+ - USR_CXXFLAGS=-std=c++11 TEST=NO
+ - CMPLR=clang USR_CXXFLAGS=-std=c++11 TEST=NO
+ - WINE=32 TEST=NO STATIC=YES
+ - WINE=32 TEST=NO STATIC=NO
+ - RTEMS=4.10 TEST=NO
+ - RTEMS=4.9 TEST=NO

modules/ca/Makefile

@@ -0,0 +1,17 @@
+#*************************************************************************
+# 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.
+#*************************************************************************
+
+TOP = .
+include $(TOP)/configure/CONFIG
+
+DIRS += configure src
+
+src_DEPEND_DIRS = configure
+
+include $(TOP)/configure/RULES_TOP

modules/ca/configure/CONFIG

@@ -0,0 +1,28 @@
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!
+
+# Allow user to override where the build rules come from
+RULES = $(EPICS_BASE)
+
+# RELEASE files point to other application tops
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+-include $(TOP)/configure/RELEASE.Common.$(T_A)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+CONFIG = $(RULES)/configure
+include $(CONFIG)/CONFIG
+
+# Override the Base definition:
+INSTALL_LOCATION = $(TOP)
+
+# CONFIG_SITE files contain other build configuration settings
+include $(TOP)/configure/CONFIG_SITE
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+ -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
+ -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+endif

modules/ca/configure/CONFIG_CA_MODULE

@@ -0,0 +1,9 @@
+#*************************************************************************
+# Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# Libraries needed to link a host tool
+EPICS_BASE_HOST_LIBS = ca Com

modules/ca/configure/CONFIG_CA_VERSION

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

modules/ca/configure/CONFIG_SITE

@@ -0,0 +1,42 @@
+# CONFIG_SITE
+
+# Make any application-specific changes to the EPICS build
+#   configuration variables in this file.
+#
+# Host/target specific settings can be specified in files named
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+#   CONFIG_SITE.Common.$(T_A)
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+# CHECK_RELEASE controls the consistency checking of the support
+#   applications pointed to by the RELEASE* files.
+# Normally CHECK_RELEASE should be set to YES.
+# Set CHECK_RELEASE to NO to disable checking completely.
+# Set CHECK_RELEASE to WARN to perform consistency checking but
+#   continue building even if conflicts are found.
+CHECK_RELEASE = YES
+
+# Set this when you only want to compile this application
+#   for a subset of the cross-compiled target architectures
+#   that Base is built for.
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
+
+# To install files into a location other than $(TOP) define
+#   INSTALL_LOCATION here.
+#INSTALL_LOCATION=</absolute/path/to/install/top>
+
+# Set this when the IOC and build host use different paths
+#   to the install location. This may be needed to boot from
+#   a Microsoft FTP server say, or on some NFS configurations.
+#IOCS_APPL_TOP = </IOC's/absolute/path/to/install/top>
+
+# For application debugging purposes, override the HOST_OPT and/
+#   or CROSS_OPT settings from base/configure/CONFIG_SITE
+#HOST_OPT = NO
+#CROSS_OPT = NO
+
+# These allow developers to override the CONFIG_SITE variable
+# settings without having to modify the configure/CONFIG_SITE
+# file itself.
+-include $(TOP)/../CONFIG_SITE.local
+-include $(TOP)/configure/CONFIG_SITE.local

modules/ca/configure/Makefile

@@ -0,0 +1,15 @@
+#*************************************************************************
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+TOP = ..
+
+include $(TOP)/configure/CONFIG
+
+TARGETS = $(CONFIG_TARGETS)
+CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
+
+CFG += CONFIG_CA_MODULE
+CFG += CONFIG_CA_VERSION
+
+include $(TOP)/configure/RULES

modules/ca/configure/RELEASE

@@ -0,0 +1,39 @@
+# RELEASE - Location of external support modules
+#
+# IF YOU CHANGE ANY PATHS in this file or make API changes to
+# any modules it refers to, you should do a "make rebuild" in
+# this application's top level directory.
+#
+# The EPICS build process does not check dependencies against
+# any files from outside the application, so it is safest to
+# rebuild it completely if any modules it depends on change.
+#
+# Host- or target-specific settings can be given in files named
+#  RELEASE.$(EPICS_HOST_ARCH).Common
+#  RELEASE.Common.$(T_A)
+#  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+#
+# This file is parsed by both GNUmake and an EPICS Perl script,
+# so it may ONLY contain definititions of paths to other support
+# modules, variable definitions that are used in module paths,
+# and include statements that pull in other RELEASE files.
+# Variables may be used before their values have been set.
+# Build variables that are NOT used in paths should be set in
+# the CONFIG_SITE file.
+
+# Variables and paths to dependent modules:
+#MODULES = /path/to/modules
+#MYMODULE = $(MODULES)/my-module
+
+# If building the EPICS modules individually, set these:
+#EPICS_LIBCOM = $(MODULES)/libcom-3.17.0
+#EPICS_BASE = $(MODULES)/core-7.0.1
+
+# Set RULES here if you want to use build rules from elsewhere:
+#RULES = $(MODULES)/build-rules
+
+# These lines allow developers to override these RELEASE settings
+# without having to modify this file directly.
+-include $(TOP)/../RELEASE.local
+-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
+-include $(TOP)/configure/RELEASE.local

modules/ca/configure/RULES

@@ -0,0 +1,6 @@
+# RULES
+
+include $(CONFIG)/RULES
+
+# Library should be rebuilt because LIBOBJS may have changed.
+$(LIBNAME): ../Makefile

modules/ca/configure/RULES_DIRS

@@ -0,0 +1,2 @@
+#RULES_DIRS
+include $(CONFIG)/RULES_DIRS

modules/ca/configure/RULES_TOP

@@ -0,0 +1,2 @@
+#RULES_TOP
+include $(CONFIG)/RULES_TOP

modules/ca/src/Makefile

@@ -0,0 +1,25 @@
+#*************************************************************************
+# 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 the file LICENSE that is included with this distribution.
+#*************************************************************************
+
+TOP = ..
+include $(TOP)/configure/CONFIG
+
+# Channel Access Client
+
+DIRS += client
+
+DIRS += tools
+tools_DEPEND_DIRS = client
+
+DIRS += perl
+perl_DEPEND_DIRS = client
+
+DIRS += template
+
+include $(TOP)/configure/RULES_DIRS

modules/ca/src/client/CASG.cpp

@@ -0,0 +1,308 @@
+/*************************************************************************\
+* 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.
+\*************************************************************************/
+
+/*
+ *      Author: Jeffrey O. Hill
+ */
+
+#include <string>
+#include <stdexcept>
+
+#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
+
+#include "errlog.h"
+
+#define epicsExportSharedSymbols
+#include "iocinf.h"
+#include "syncGroup.h"
+#include "oldAccess.h"
+#include "cac.h"
+#include "sgAutoPtr.h"
+
+CASG::CASG ( epicsGuard < epicsMutex > & guard, ca_client_context & cacIn ) :
+    client ( cacIn ), magic ( CASG_MAGIC )
+{
+    client.installCASG ( guard, *this );
+}
+
+CASG::~CASG ()
+{
+}
+
+void CASG::destructor (
+    CallbackGuard & cbGuard,
+    epicsGuard < epicsMutex > & guard )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+
+    if ( this->verify ( guard ) ) {
+        this->reset ( cbGuard, guard );
+        this->client.uninstallCASG ( guard, *this );
+        this->magic = 0;
+    }
+    else {
+        this->printFormated ( "cac: attempt to destroy invalid sync group ignored\n" );
+    }
+    this->~CASG ();
+}
+
+bool CASG::verify ( epicsGuard < epicsMutex > & ) const
+{
+    return ( this->magic == CASG_MAGIC );
+}
+
+/*
+ * CASG::block ()
+ */
+int CASG::block (
+    epicsGuard < epicsMutex > * pcbGuard,
+    epicsGuard < epicsMutex > & guard,
+    double timeout )
+{
+    epicsTime cur_time;
+    epicsTime beg_time;
+    double delay;
+    double remaining;
+    int status;
+
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+
+    // prevent recursion nightmares by disabling blocking
+    // for IO from within a CA callback.
+    if ( epicsThreadPrivateGet ( caClientCallbackThreadId ) ) {
+        return ECA_EVDISALLOW;
+    }
+
+    if ( timeout < 0.0 ) {
+        return ECA_TIMEOUT;
+    }
+
+    cur_time = epicsTime::getCurrent ();
+
+    this->client.flush ( guard );
+
+    beg_time = cur_time;
+    delay = 0.0;
+
+    while ( 1 ) {
+        if ( this->ioPendingList.count() == 0u ) {
+            status = ECA_NORMAL;
+            break;
+        }
+
+        remaining = timeout - delay;
+        if ( remaining <= CAC_SIGNIFICANT_DELAY ) {
+            /*
+             * Make sure that we take care of
+             * recv backlog at least once
+             */
+            status = ECA_TIMEOUT;
+            break;
+        }
+
+        if ( pcbGuard ) {
+            epicsGuardRelease < epicsMutex > unguard ( guard );
+            {
+                epicsGuardRelease < epicsMutex > uncbGuard ( *pcbGuard );
+                this->sem.wait ( remaining );
+            }
+        }
+        else {
+            epicsGuardRelease < epicsMutex > unguard ( guard );
+            this->sem.wait ( remaining );
+        }
+
+        /*
+         * force a time update
+         */
+        cur_time = epicsTime::getCurrent ();
+
+        delay = cur_time - beg_time;
+    }
+
+    return status;
+}
+
+void CASG::reset (
+    CallbackGuard & cbGuard,
+    epicsGuard < epicsMutex > & guard )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    this->destroyCompletedIO ( cbGuard, guard );
+    this->destroyPendingIO ( cbGuard, guard );
+}
+
+// lock must be applied
+void CASG::destroyCompletedIO (
+    CallbackGuard & cbGuard,
+    epicsGuard < epicsMutex > & guard )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    syncGroupNotify * pNotify;
+    while ( ( pNotify = this->ioCompletedList.get () ) ) {
+        pNotify->destroy ( cbGuard, guard );
+    }
+}
+
+void CASG::destroyPendingIO (
+    CallbackGuard & cbGuard,
+    epicsGuard < epicsMutex > & guard )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    while ( syncGroupNotify * pNotify = this->ioPendingList.first () ) {
+        pNotify->cancel ( cbGuard, guard );
+        // cancel must release the guard while
+        // canceling put callbacks so we
+        // must double check list membership
+        if ( pNotify->ioPending ( guard ) ) {
+            this->ioPendingList.remove ( *pNotify );
+        }
+        else {
+            this->ioCompletedList.remove ( *pNotify );
+        }
+        pNotify->destroy ( cbGuard, guard );
+    }
+}
+
+void CASG::show ( unsigned level ) const
+{
+    epicsGuard < epicsMutex > guard ( this->client.mutexRef () );
+    this->show ( guard, level );
+}
+
+void CASG::show (
+    epicsGuard < epicsMutex > & guard, unsigned level ) const
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    ::printf ( "Sync Group: id=%u, magic=%u, opPend=%u\n",
+        this->getId (), this->magic, this->ioPendingList.count () );
+    if ( level ) {
+        ::printf ( "\tPending" );
+        tsDLIterConst < syncGroupNotify > notifyPending =
+            this->ioPendingList.firstIter ();
+        while ( notifyPending.valid () ) {
+            notifyPending->show ( guard, level - 1u );
+            notifyPending++;
+        }
+        ::printf ( "\tCompleted" );
+        tsDLIterConst < syncGroupNotify > notifyCompleted =
+            this->ioCompletedList.firstIter ();
+        while ( notifyCompleted.valid () ) {
+            notifyCompleted->show ( guard, level - 1u );
+            notifyCompleted++;
+        }
+    }
+}
+
+bool CASG::ioComplete (
+    CallbackGuard & cbGuard,
+    epicsGuard < epicsMutex > & guard )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    this->destroyCompletedIO ( cbGuard, guard );
+    return this->ioPendingList.count () == 0u;
+}
+
+void CASG::put ( epicsGuard < epicsMutex > & guard, chid pChan, 
+    unsigned type, arrayElementCount count, const void * pValue )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    sgAutoPtr < syncGroupWriteNotify > pNotify ( guard, *this );
+    pNotify = syncGroupWriteNotify::factory ( 
+        this->freeListWriteOP, *this, & CASG :: recycleWriteNotifyIO, pChan );
+    pNotify->begin ( guard, type, count, pValue );
+    pNotify.release ();
+}
+
+void CASG::get ( epicsGuard < epicsMutex > & guard, chid pChan, 
+                unsigned type, arrayElementCount count, void *pValue )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    sgAutoPtr < syncGroupReadNotify > pNotify ( guard, *this );
+    pNotify = syncGroupReadNotify::factory ( 
+        this->freeListReadOP, *this, & CASG :: recycleReadNotifyIO, pChan, pValue );
+    pNotify->begin ( guard, type, count );
+    pNotify.release ();
+}
+
+void CASG::completionNotify (
+    epicsGuard < epicsMutex > & guard, syncGroupNotify & notify )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    this->ioPendingList.remove ( notify );
+    this->ioCompletedList.add ( notify );
+    if ( this->ioPendingList.count () == 0u ) {
+        this->sem.signal ();
+    }
+}
+
+void CASG :: recycleReadNotifyIO ( epicsGuard < epicsMutex > & guard, 
+                            syncGroupReadNotify & io )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    this->freeListReadOP.release ( & io );
+}
+
+void CASG :: recycleWriteNotifyIO ( epicsGuard < epicsMutex > & guard, 
+                            syncGroupWriteNotify & io )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    this->freeListWriteOP.release ( & io );
+}
+
+int CASG :: printFormated ( const char *pformat, ... )
+{
+    va_list theArgs;
+    int status;
+
+    va_start ( theArgs, pformat );
+
+    status = this->client.varArgsPrintFormated ( pformat, theArgs );
+
+    va_end ( theArgs );
+
+    return status;
+}
+
+void CASG::exception (
+    epicsGuard < epicsMutex > & guard,
+    int status, const char * pContext,
+    const char * pFileName, unsigned lineNo )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    if ( status != ECA_CHANDESTROY ) {
+        this->client.exception (
+            guard, status, pContext, pFileName, lineNo );
+    }
+}
+
+void CASG::exception (
+    epicsGuard < epicsMutex > & guard,
+    int status, const char * pContext,
+    const char * pFileName, unsigned lineNo, oldChannelNotify & chan,
+    unsigned type, arrayElementCount count, unsigned op )
+{
+    guard.assertIdenticalMutex ( this->client.mutexRef() );
+    if ( status != ECA_CHANDESTROY ) {
+        this->client.exception (
+            guard, status, pContext, pFileName,
+            lineNo, chan, type, count, op );
+    }
+}
+
+void CASG::operator delete ( void * )
+{
+    // Visual C++ .net appears to require operator delete if
+    // placement operator delete is defined? I smell a ms rat
+    // because if I declare placement new and delete, but
+    // comment out the placement delete definition there are
+    // no undefined symbols.
+    errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
+        __FILE__, __LINE__ );
+}

modules/ca/src/client/Makefile

@@ -0,0 +1,136 @@
+#*************************************************************************
+# 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.
+#*************************************************************************
+
+TOP = ../..
+
+include $(TOP)/configure/CONFIG
+
+HTMLS += CAref.html
+
+#
+#	includes to install from this subproject
+#
+INC += cadef.h
+INC += caerr.h
+INC += caeventmask.h
+INC += caProto.h
+INC += db_access.h
+INC += addrList.h
+INC += cacIO.h
+INC += caDiagnostics.h
+INC += net_convert.h
+INC += caVersion.h
+INC += caVersionNum.h
+
+LIBSRCS += cac.cpp
+LIBSRCS += cacChannel.cpp
+LIBSRCS += cacChannelNotify.cpp
+LIBSRCS += cacContextNotify.cpp
+LIBSRCS += cacReadNotify.cpp
+LIBSRCS += cacWriteNotify.cpp
+LIBSRCS += cacStateNotify.cpp
+LIBSRCS += access.cpp
+LIBSRCS += iocinf.cpp
+LIBSRCS += convert.cpp
+LIBSRCS += test_event.cpp
+LIBSRCS += repeater.cpp
+LIBSRCS += searchTimer.cpp
+LIBSRCS += disconnectGovernorTimer.cpp
+LIBSRCS += repeaterSubscribeTimer.cpp
+LIBSRCS += baseNMIU.cpp
+LIBSRCS += nciu.cpp
+LIBSRCS += netiiu.cpp
+LIBSRCS += udpiiu.cpp
+LIBSRCS += tcpiiu.cpp
+LIBSRCS += noopiiu.cpp
+LIBSRCS += netReadNotifyIO.cpp
+LIBSRCS += netWriteNotifyIO.cpp
+LIBSRCS += netSubscription.cpp
+LIBSRCS += tcpSendWatchdog.cpp
+LIBSRCS += tcpRecvWatchdog.cpp
+LIBSRCS += bhe.cpp
+LIBSRCS += ca_client_context.cpp
+LIBSRCS += oldChannelNotify.cpp
+LIBSRCS += oldSubscription.cpp
+LIBSRCS += getCallback.cpp
+LIBSRCS += getCopy.cpp
+LIBSRCS += putCallback.cpp
+LIBSRCS += syncgrp.cpp
+LIBSRCS += CASG.cpp
+LIBSRCS += syncGroupNotify.cpp
+LIBSRCS += syncGroupReadNotify.cpp
+LIBSRCS += syncGroupWriteNotify.cpp
+LIBSRCS += localHostName.cpp
+LIBSRCS += comQueRecv.cpp
+LIBSRCS += comQueSend.cpp
+LIBSRCS += comBuf.cpp
+LIBSRCS += hostNameCache.cpp
+LIBSRCS += msgForMultiplyDefinedPV.cpp
+
+LIBRARY=ca
+
+ca_RCS = ca.rc
+
+ca_LIBS = Com
+
+ca_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
+
+#   libs needed for PROD and TESTPRODUCT
+PROD_LIBS = ca Com
+# needed when its an object library build
+PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
+
+PROD_DEFAULT += caRepeater catime acctst caConnTest casw caEventRate
+PROD_vxWorks = -nil-
+PROD_RTEMS = -nil-
+PROD_iOS = -nil-
+
+OBJS_vxWorks = catime acctst caConnTest casw caEventRate acctstRegister
+
+caRepeater_SRCS = caRepeater.cpp
+catime_SRCS = catimeMain.c catime.c
+acctst_SRCS = acctstMain.c acctst.c
+caEventRate_SRCS = caEventRateMain.cpp caEventRate.cpp
+casw_SRCS = casw.cpp
+caConnTest_SRCS = caConnTestMain.cpp caConnTest.cpp
+
+casw_SYS_LIBS_solaris = socket
+
+SCRIPTS_HOST = S99caRepeater
+SCRIPTS_Linux = caRepeater.service
+
+EXPAND += S99caRepeater@
+EXPAND += caRepeater.service@
+EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN))
+
+SRC_DIRS += $(TOP)/src/client/test
+PROD_HOST += ca_test
+ca_test_SRCS = ca_test_main.c ca_test.c
+ca_test_LIBS  = ca Com
+ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
+
+OBJS_vxWorks += ca_test
+
+EXPANDVARS += EPICS_CA_MAJOR_VERSION
+EXPANDVARS += EPICS_CA_MINOR_VERSION
+EXPANDVARS += EPICS_CA_MAINTENANCE_VERSION
+EXPANDVARS += EPICS_CA_DEVELOPMENT_FLAG
+
+EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))")
+
+# shared library ABI version.
+SHRLIB_VERSION = $(EPICS_CA_MAJOR_VERSION).$(EPICS_CA_MINOR_VERSION).$(EPICS_CA_MAINTENANCE_VERSION)
+
+include $(TOP)/configure/RULES
+
+
+# Can't use EXPAND as generated headers must appear
+# in O.Common, but EXPAND emits rules for O.$(T_A)
+../O.Common/caVersionNum.h: ../caVersionNum.h@
+	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@

modules/ca/src/client/S99caRepeater@

@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# System-V init script for the EPICS CA Repeater.
+#
+
+INSTALL_BIN=@INSTALL_BIN@
+
+# To change the default values for the EPICS environment parameters,
+# uncomment and modify the relevant lines below. These are the only
+# EPICS environment variables that the CA Repeater makes use of.
+
+# EPICS_CA_REPEATER_PORT="5065" export EPICS_CA_REPEATER_PORT
+
+if [ $1 = "start" ]; then
+    if [ -x $INSTALL_BIN/caRepeater ]; then
+        echo "Starting EPICS CA Repeater "
+        $INSTALL_BIN/caRepeater &
+    fi
+else
+    if [ $1 = "stop" ]; then
+        pid=`ps -e | sed -ne '/caRepeat/s/^ *\([1-9][0-9]*\).*$/\1/p'`
+        if [ "${pid}" != "" ]; then
+            echo "Stopping EPICS CA Repeater "
+            kill ${pid}
+        fi
+    fi
+fi
+

modules/ca/src/client/SearchDest.h

@@ -0,0 +1,39 @@
+/*************************************************************************\
+ * 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. 
+\*************************************************************************/
+
+#ifndef SearchDest_h
+#define SearchDest_h
+
+#include <osiSock.h>
+#include <epicsTime.h>
+#include <tsDLList.h>
+#include "caProto.h"
+
+class channelNode;
+class epicsMutex;
+template < class T > class epicsGuard;
+
+struct SearchDest :
+    public tsDLNode < SearchDest > {
+    virtual ~SearchDest () {};
+    struct Callback {
+        virtual ~Callback () {};
+        virtual void notify (
+            const caHdr & msg, const void * pPayload,
+            const osiSockAddr & addr, const epicsTime & ) = 0;
+        virtual void show ( 
+            epicsGuard < epicsMutex > &, unsigned level ) const = 0;
+    };
+    virtual void searchRequest ( epicsGuard < epicsMutex > &,
+        const char * pbuf, size_t len ) = 0;
+    virtual void show ( epicsGuard < epicsMutex > &, unsigned level ) const = 0;
+};
+
+#endif // SearchDest_h

modules/ca/src/client/acctstMain.c

@@ -0,0 +1,70 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "cadef.h"
+#include "caDiagnostics.h"
+
+int main ( int argc, char **argv )
+{
+    unsigned progressLoggingLevel;
+    unsigned channelCount;
+    unsigned repetitionCount;
+	enum ca_preemptive_callback_select preempt;
+	int aBoolean;
+
+
+    if ( argc < 2 || argc > 6 ) {
+        printf ("usage: %s <PV name> [progress logging level] [channel count] "
+                "[repetition count] [enable preemptive callback]\n", 
+                argv[0] );
+        return 1;        
+    }
+
+    if ( argc >= 3 ) {
+        progressLoggingLevel = atoi ( argv[2] );
+    }
+    else {
+        progressLoggingLevel = 0;
+    }
+
+    if ( argc >= 4 ) {
+        channelCount = atoi ( argv[3] );
+    }
+    else {
+        channelCount = 20000;
+    }
+
+    if ( argc >= 5 ) {
+        repetitionCount = atoi ( argv[4] );
+    }
+    else {
+        repetitionCount = 1;
+    }
+
+    if ( argc >= 6 ) {
+        aBoolean = atoi ( argv[5] );
+    }
+    else {
+        aBoolean = 0;
+    }
+	if ( aBoolean ) {
+		preempt = ca_enable_preemptive_callback;
+	}
+	else {
+		preempt = ca_disable_preemptive_callback;
+	}
+
+    acctst ( argv[1], progressLoggingLevel, channelCount, repetitionCount, preempt );
+
+    return 0;
+}

modules/ca/src/client/acctstRegister.cpp

@@ -0,0 +1,69 @@
+/*************************************************************************\
+* 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.
+\*************************************************************************/
+
+/*
+ * CA client library diagnostics IOC shell registration
+ * Authors:
+ * Jeff Hill
+ */
+
+#include <iocsh.h>
+#include "caDiagnostics.h"
+
+/* Information needed by iocsh */
+static const iocshArg     acctstArg0 = { "channel name", iocshArgString };
+static const iocshArg     acctstArg1 = { "interest level", iocshArgInt };
+static const iocshArg     acctstArg2 = { "channel count", iocshArgInt };
+static const iocshArg     acctstArg3 = { "repetition count", iocshArgInt };
+static const iocshArg     acctstArg4 = { "preemptive callback select", iocshArgInt };
+
+static const iocshArg    *acctstArgs[] =
+{
+    &acctstArg0,
+    &acctstArg1,
+    &acctstArg2,
+    &acctstArg3,
+    &acctstArg4
+};
+static const iocshFuncDef acctstFuncDef = {"acctst", 5, acctstArgs};
+
+
+/* Wrapper called by iocsh, selects the argument types that print needs */
+static void acctstCallFunc(const iocshArgBuf *args) {
+    if ( args[1].ival <  0 ) {
+        printf ( "negative interest level not allowed\n" );
+        return;
+    }
+    if ( args[2].ival <  0 ) {
+        printf ( "negative channel count not allowed\n" );
+        return;
+    }
+    if ( args[3].ival <  0 ) {
+        printf ( "negative repetition count not allowed\n" );
+        return;
+    }
+    acctst (
+        args[0].sval, /* channel name */
+        ( unsigned ) args[1].ival, /* interest level */
+        ( unsigned ) args[2].ival, /* channel count */
+        ( unsigned ) args[3].ival, /* repetition count */
+        ( ca_preemptive_callback_select ) args[4].ival );  /* preemptive callback select */
+}
+
+struct AutoInit {
+    AutoInit ();
+};
+
+AutoInit :: AutoInit () 
+{
+    iocshRegister ( &acctstFuncDef, acctstCallFunc );
+}
+
+AutoInit autoInit;
+

modules/ca/src/client/addrList.h

@@ -0,0 +1,40 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+
+#ifndef addrListh
+#define addrListh
+
+#include "shareLib.h"
+#include "envDefs.h" 
+#include "osiSock.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+epicsShareFunc void epicsShareAPI configureChannelAccessAddressList 
+    ( struct ELLLIST *pList, SOCKET sock, unsigned short port );
+
+epicsShareFunc int epicsShareAPI addAddrToChannelAccessAddressList
+    ( struct ELLLIST *pList, const ENV_PARAM *pEnv, 
+    unsigned short port, int ignoreNonDefaultPort );
+
+epicsShareFunc void epicsShareAPI printChannelAccessAddressList 
+    ( const struct ELLLIST *pList );
+
+epicsShareFunc void epicsShareAPI removeDuplicateAddresses
+    ( struct ELLLIST *pDestList, ELLLIST *pSrcList, int silent);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* ifndef addrListh */
+

modules/ca/src/client/autoPtrFreeList.h

@@ -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. 
+\*************************************************************************/
+
+/*  
+ *
+ *                              
+ *                    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 autoPtrFreeListh
+#define autoPtrFreeListh
+
+#ifdef epicsExportSharedSymbols
+#   define autoPtrFreeListh_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include "tsFreeList.h"
+#include "compilerDependencies.h"
+
+#ifdef autoPtrFreeListh_epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#endif
+
+template < class T, unsigned N = 0x400, class MUTEX = epicsMutex >
+class autoPtrFreeList {
+public:
+    autoPtrFreeList ( tsFreeList < T, N, MUTEX > &, T * );
+    ~autoPtrFreeList ();
+    T & operator * () const;
+    T * operator -> () const;
+    T * get () const;
+    T * release ();
+private:
+    T * p;
+    tsFreeList < T, N, MUTEX > & freeList;
+    // not implemented
+    autoPtrFreeList & operator = ( const autoPtrFreeList & );
+    autoPtrFreeList ( const autoPtrFreeList < T, N, MUTEX > & );
+};
+
+template < class T, unsigned N, class MUTEX >
+inline autoPtrFreeList < T, N, MUTEX >::autoPtrFreeList ( 
+    tsFreeList < T, N, MUTEX > & freeListIn, T * pIn ) :
+    p ( pIn ), freeList ( freeListIn ) {}
+
+template < class T, unsigned N, class MUTEX >
+inline autoPtrFreeList < T, N, MUTEX >::~autoPtrFreeList ()
+{
+    if ( this->p ) {
+        this->p->~T();
+        // its probably a good idea to require that the class has placement delete
+        // by calling it during cleanup if the compiler supports it
+#       if defined ( CXX_PLACEMENT_DELETE )
+            T::operator delete ( this->p, this->freeList );
+#       else
+            this->freeList.release ( this->p );
+#       endif
+    }
+}
+
+template < class T, unsigned N, class MUTEX >
+inline T & autoPtrFreeList < T, N, MUTEX >::operator * () const
+{
+    return * this->p;
+}
+
+template < class T, unsigned N, class MUTEX >
+inline T * autoPtrFreeList < T, N, MUTEX >::operator -> () const
+{
+    return this->p;
+}
+
+template < class T, unsigned N, class MUTEX >
+inline T * autoPtrFreeList < T, N, MUTEX >::get () const
+{
+    return this->p;
+}
+
+template < class T, unsigned N, class MUTEX >
+inline T * autoPtrFreeList < T, N, MUTEX >::release ()
+{
+    T *pTmp = this->p;
+    this->p = 0;
+    return pTmp;
+}
+
+#endif // #ifdef autoPtrFreeListh

modules/ca/src/client/autoPtrRecycle.h

@@ -0,0 +1,92 @@
+/*************************************************************************\
+* 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 autoPtrRecycleh
+#define autoPtrRecycleh
+
+template < class T >
+class autoPtrRecycle {
+public:
+    autoPtrRecycle ( 
+        epicsGuard < epicsMutex > &, chronIntIdResTable < baseNMIU > &,
+        cacRecycle &, T * );
+    ~autoPtrRecycle ();
+    T & operator * () const;
+    T * operator -> () const;
+    T * get () const;
+    T * release ();
+private:
+    T * p;
+    cacRecycle & r;
+    chronIntIdResTable < baseNMIU > & ioTable;
+    epicsGuard < epicsMutex > & guard;
+    // not implemented
+	autoPtrRecycle ( const autoPtrRecycle & );
+	autoPtrRecycle & operator = ( const autoPtrRecycle & );
+};
+
+template < class T >
+inline autoPtrRecycle<T>::autoPtrRecycle ( 
+    epicsGuard < epicsMutex > & guardIn, chronIntIdResTable < baseNMIU > & tbl,
+        cacRecycle & rIn, T * pIn ) :
+    p ( pIn ), r ( rIn ), ioTable ( tbl ), guard ( guardIn ) {}
+
+template < class T >
+inline autoPtrRecycle<T>::~autoPtrRecycle ()
+{
+    if ( this->p ) {
+        baseNMIU *pb = this->p;
+        this->ioTable.remove ( *pb );
+        pb->destroy ( this->guard, this->r );
+    }
+}
+
+template < class T >
+inline T & autoPtrRecycle<T>::operator * () const
+{
+    return * this->p;
+}
+
+template < class T >
+inline T * autoPtrRecycle<T>::operator -> () const
+{
+    return this->p;
+}
+
+template < class T >
+inline T * autoPtrRecycle<T>::get () const
+{
+    return this->p;
+}
+
+template < class T >
+inline T * autoPtrRecycle<T>::release ()
+{
+    T *pTmp = this->p;
+    this->p = 0;
+    return pTmp;
+}
+
+#endif // #ifdef autoPtrRecycleh

modules/ca/src/client/baseNMIU.cpp

@@ -0,0 +1,39 @@
+/*************************************************************************\
+* 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: Jeff Hill
+ */
+
+#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
+
+#include "iocinf.h"
+#include "nciu.h"
+#include "netIO.h"
+
+baseNMIU::~baseNMIU ()
+{
+}
+
+void baseNMIU::forceSubscriptionUpdate (
+        epicsGuard < epicsMutex > &, nciu & )
+{
+}
+
+
+
+

modules/ca/src/client/bhe.cpp

@@ -0,0 +1,358 @@
+/*************************************************************************\
+* 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: Jeff Hill
+ */
+
+#include <string>
+#include <stdexcept>
+#include <limits.h>
+#include <float.h>
+
+#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
+
+#include "errlog.h"
+
+#define epicsExportSharedSymbols
+#include "iocinf.h"
+#include "virtualCircuit.h"
+#include "bhe.h"
+
+/*
+ * set average to -1.0 so that when the next beacon
+ * occurs we can distinguish between:
+ * o new server
+ * o existing server's beacon we are seeing
+ *  for the first time shortly after program
+ *  start up
+ *
+ * if creating this in response to a search reply
+ * and not in response to a beacon then 
+ * we set the beacon time stamp to
+ * zero (so we can correctly compute the period
+ * between the 1st and 2nd beacons)
+ */
+bhe::bhe ( epicsMutex & mutexIn, const epicsTime & initialTimeStamp, 
+          unsigned initialBeaconNumber, const inetAddrID & addr ) :
+    inetAddrID ( addr ), timeStamp ( initialTimeStamp ), averagePeriod ( - DBL_MAX ),
+    mutex ( mutexIn ), pIIU ( 0 ), lastBeaconNumber ( initialBeaconNumber )
+{
+#   ifdef DEBUG
+    {
+        char name[64];
+        addr.name ( name, sizeof ( name ) );
+        ::printf ( "created beacon entry for %s\n", name );
+    }
+#   endif
+}
+
+bhe::~bhe ()
+{
+}
+
+void bhe::beaconAnomalyNotify ( epicsGuard < epicsMutex > & guard )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    if ( this->pIIU ) {
+        this->pIIU->beaconAnomalyNotify ( guard );
+    }
+}
+
+#ifdef DEBUG
+void bhe::logBeacon ( const char * pDiagnostic, 
+                     const double & currentPeriod,
+                     const epicsTime & currentTime )
+{
+    if ( this->pIIU ) {
+        char name[64];
+        this->name ( name, sizeof ( name ) );
+        char date[64];
+        currentTime.strftime ( date, sizeof ( date ), 
+            "%a %b %d %Y %H:%M:%S.%f");
+        ::printf ( "%s cp=%g ap=%g %s %s\n",
+            pDiagnostic, currentPeriod, 
+            this->averagePeriod, name, date );
+    }
+}
+#else
+inline void bhe::logBeacon ( const char * /* pDiagnostic */,
+    const double & /* currentPeriod */,
+    const epicsTime & /* currentTime */ )
+{
+}
+#endif
+
+#ifdef DEBUG
+void bhe::logBeaconDiscard ( unsigned beaconAdvance,
+                     const epicsTime & currentTime )
+{
+    if ( this->pIIU ) {
+        char name[64];
+        this->name ( name, sizeof ( name ) );
+        char date[64];
+        currentTime.strftime ( date, sizeof ( date ), 
+            "%a %b %d %Y %H:%M:%S.%f");
+        ::printf ( "bb %u %s %s\n",
+            beaconAdvance, name, date );
+    }
+}
+#else
+void bhe::logBeaconDiscard ( unsigned /* beaconAdvance */,
+                     const epicsTime & /* currentTime */ )
+{
+}
+#endif
+
+/*
+ * update beacon period
+ *
+ * updates beacon period, and looks for beacon anomalies
+ */
+bool bhe::updatePeriod ( 
+    epicsGuard < epicsMutex > & guard, const epicsTime & programBeginTime, 
+    const epicsTime & currentTime, ca_uint32_t beaconNumber, 
+    unsigned protocolRevision )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+
+    //
+    // this block is enetered if the beacon was created as a side effect of
+    // creating a connection and so we dont yet know the first beacon time 
+    // and  sequence number
+    //
+    if ( this->timeStamp == epicsTime () ) {
+        if ( CA_V410 ( protocolRevision ) ) {
+            this->lastBeaconNumber = beaconNumber;
+        }
+
+        this->beaconAnomalyNotify ( guard );
+
+        /* 
+         * this is the 1st beacon seen - the beacon time stamp
+         * was not initialized during BHE create because
+         * a TCP/IP connection created the beacon.
+         * (nothing to do but set the beacon time stamp and return)
+         */
+        this->timeStamp = currentTime;
+
+        logBeacon ( "fb", - DBL_MAX, currentTime );
+
+        return false;
+    }
+
+    // 1) detect beacon duplications due to redundant routes
+    // 2) detect lost beacons due to input queue overrun or damage
+    if ( CA_V410 ( protocolRevision ) ) {
+        unsigned beaconSeqAdvance;
+        if ( beaconNumber >= this->lastBeaconNumber ) {
+            beaconSeqAdvance = beaconNumber - this->lastBeaconNumber;
+        }
+        else {
+            beaconSeqAdvance = ( ca_uint32_max - this->lastBeaconNumber ) + beaconNumber;
+        }
+        this->lastBeaconNumber = beaconNumber;
+
+        // throw out sequence numbers just prior to, or the same as, the last one received 
+        // (this situation is probably caused by a temporary duplicate route )
+        if ( beaconSeqAdvance == 0 ||  beaconSeqAdvance > ca_uint32_max - 256 ) {
+            logBeaconDiscard ( beaconSeqAdvance, currentTime );
+            return false;
+        }
+
+        // throw out sequence numbers that jump forward by only a few numbers 
+        // (this situation is probably caused by a duplicate route 
+        // or a beacon due to input queue overun)
+        if ( beaconSeqAdvance > 1 &&  beaconSeqAdvance < 4 ) {
+            logBeaconDiscard ( beaconSeqAdvance, currentTime );
+            return false;
+        }
+    }
+
+    // compute the beacon period (if we have seen at least two beacons)
+    bool netChange = false;
+    double currentPeriod = currentTime - this->timeStamp;
+
+    if ( this->averagePeriod < 0.0 ) {
+        double totalRunningTime;
+
+        this->beaconAnomalyNotify ( guard );
+
+        /*
+         * this is the 2nd beacon seen. We cant tell about
+         * the change in period at this point so we just
+         * initialize the average period and return.
+         */
+        this->averagePeriod = currentPeriod;
+
+        logBeacon ( "fp", currentPeriod, currentTime );
+
+
+        /*
+         * ignore beacons seen for the first time shortly after
+         * init, but do not ignore beacons arriving with a short
+         * period because the IOC was rebooted soon after the 
+         * client starts up.
+         */
+        totalRunningTime = this->timeStamp - programBeginTime;
+        if ( currentPeriod <= totalRunningTime ) {
+            netChange = true;
+        }
+    }
+    else {
+
+        /*
+         * Is this an IOC seen because of a restored
+         * network segment? 
+         *
+         * It may be possible to get false triggers here 
+         * if the client is busy, but this does not cause
+         * problems because the echo response will tell us 
+         * that the server is available
+         */
+        if ( currentPeriod >= this->averagePeriod * 1.25 ) {
+
+            /* 
+             * trigger on any missing beacon 
+             * if connected to this server
+             */    
+            this->beaconAnomalyNotify ( guard );
+
+            if ( currentPeriod >= this->averagePeriod * 3.25 ) {
+                /* 
+                 * trigger on any 3 contiguous missing beacons 
+                 * if not connected to this server
+                 */
+                netChange = true;
+            }
+            logBeacon ( "bah", currentPeriod, currentTime );
+        }
+
+        /*
+         * Is this an IOC seen because of an IOC reboot
+         * (beacon come at a higher rate just after the
+         * IOC reboots). Lower tolarance here because we
+         * dont have to worry about lost beacons.
+         *
+         * It may be possible to get false triggers here 
+         * if the client is busy, but this does not cause
+         * problems because the echo response will tell us 
+         * that the server is available
+         */
+        else if ( currentPeriod <= this->averagePeriod * 0.80 ) {
+            this->beaconAnomalyNotify ( guard );
+            netChange = true;
+            logBeacon ( "bal", currentPeriod, currentTime );
+        }
+        else if ( this->pIIU ) {
+            // update state of health for active virtual circuits 
+            // if the beacon looks ok
+            this->pIIU->beaconArrivalNotify ( guard );
+            logBeacon ( "vb", currentPeriod, currentTime );
+        }
+
+        // update a running average period
+        this->averagePeriod = currentPeriod * 0.125 + 
+            this->averagePeriod * 0.875;
+    }
+
+    this->timeStamp = currentTime;
+
+    return netChange;
+}
+
+void bhe::show ( unsigned level ) const
+{
+    epicsGuard < epicsMutex > guard ( this->mutex );
+    this->show ( guard, level );
+}
+
+void bhe::show ( epicsGuard < epicsMutex > &, unsigned level ) const
+{
+    char host [64];
+    this->name ( host, sizeof ( host ) );
+    if ( this->averagePeriod == -DBL_MAX ) {
+        ::printf ( "CA beacon hash entry for %s <no period estimate>\n", 
+            host );
+    }
+    else {
+        ::printf ( "CA beacon hash entry for %s with period estimate %f\n", 
+            host, this->averagePeriod );
+    }
+    if ( level > 0u ) {
+        char date[64];
+        this->timeStamp.strftime ( date, sizeof ( date ), "%a %b %d %Y %H:%M:%S");
+        ::printf ( "\tbeacon number %u, on %s\n", 
+            this->lastBeaconNumber, date );
+    }
+}
+
+double bhe::period ( epicsGuard < epicsMutex > & guard ) const 
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    return this->averagePeriod;
+}
+
+epicsTime bhe::updateTime ( epicsGuard < epicsMutex > & guard ) const
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    return this->timeStamp;
+}
+
+void bhe::registerIIU ( 
+    epicsGuard < epicsMutex > & guard, tcpiiu & iiu )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    this->pIIU = & iiu;
+}
+
+void bhe::unregisterIIU ( 
+    epicsGuard < epicsMutex > & guard, tcpiiu & iiu )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    if ( this->pIIU == & iiu ) {
+        this->pIIU = 0;
+        this->timeStamp = epicsTime();
+        this->averagePeriod = - DBL_MAX;
+        logBeacon ( "ui", this->averagePeriod, epicsTime::getCurrent () );
+    }
+}
+
+void bhe::operator delete ( void * )
+{
+    // Visual C++ .net appears to require operator delete if
+    // placement operator delete is defined? I smell a ms rat
+    // because if I declare placement new and delete, but
+    // comment out the placement delete definition there are
+    // no undefined symbols.
+    errlogPrintf ( "%s:%d this compiler is confused about placement delete - memory was probably leaked",
+        __FILE__, __LINE__ );
+}
+
+void * bheFreeStore::allocate ( size_t size )
+{
+    return freeList.allocate ( size );
+}
+
+void bheFreeStore::release ( void * pCadaver )
+{
+    freeList.release ( pCadaver );
+}
+
+bheMemoryManager::~bheMemoryManager () {}
+
+

modules/ca/src/client/bhe.h

@@ -0,0 +1,122 @@
+/*************************************************************************\
+* 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: Jeff Hill
+ */
+
+#ifndef bheh
+#define bheh
+
+#ifdef epicsExportSharedSymbols
+#   define bhehEpicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include "tsDLList.h"
+#include "tsFreeList.h"
+#include "epicsTime.h"
+#include "compilerDependencies.h"
+
+#ifdef bhehEpicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#   include "shareLib.h"
+#endif
+
+#include "inetAddrID.h"
+#include "caProto.h"
+
+class tcpiiu;
+class bheMemoryManager;
+
+// using a pure abstract wrapper class around the free list avoids
+// Tornado 2.0.1 GNU compiler bugs
+class epicsShareClass bheMemoryManager {
+public:
+    virtual ~bheMemoryManager ();
+    virtual void * allocate ( size_t ) = 0;
+    virtual void release ( void * ) = 0;
+};
+
+class bhe : public tsSLNode < bhe >, public inetAddrID {
+public:
+    epicsShareFunc bhe ( 
+        epicsMutex &, const epicsTime & initialTimeStamp, 
+        unsigned initialBeaconNumber, const inetAddrID & addr );
+    epicsShareFunc ~bhe (); 
+    epicsShareFunc bool updatePeriod ( 
+        epicsGuard < epicsMutex > &,
+        const epicsTime & programBeginTime, 
+        const epicsTime & currentTime, ca_uint32_t beaconNumber, 
+        unsigned protocolRevision );
+    epicsShareFunc double period ( epicsGuard < epicsMutex > & ) const;
+    epicsShareFunc epicsTime updateTime ( epicsGuard < epicsMutex > & ) const;
+    epicsShareFunc void show ( unsigned level ) const;
+    epicsShareFunc void show ( epicsGuard < epicsMutex > &, unsigned /* level */ ) const;
+    epicsShareFunc void registerIIU ( epicsGuard < epicsMutex > &, tcpiiu & );
+    epicsShareFunc void unregisterIIU ( epicsGuard < epicsMutex > &, tcpiiu & );
+    epicsShareFunc void * operator new ( size_t size, bheMemoryManager & );
+#ifdef CXX_PLACEMENT_DELETE
+    epicsShareFunc void operator delete ( void *, bheMemoryManager & );
+#endif
+private:
+    epicsTime timeStamp;
+    double averagePeriod;
+    epicsMutex & mutex;
+    tcpiiu * pIIU;
+    ca_uint32_t lastBeaconNumber;
+    void beaconAnomalyNotify ( epicsGuard < epicsMutex > & );
+    void logBeacon ( const char * pDiagnostic, 
+                     const double & currentPeriod,
+                     const epicsTime & currentTime );
+    void logBeaconDiscard ( unsigned beaconAdvance,
+                     const epicsTime & currentTime );
+	bhe ( const bhe & );
+	bhe & operator = ( const bhe & );
+    epicsShareFunc void operator delete ( void * );
+};
+
+// using a wrapper class around the free list avoids
+// Tornado 2.0.1 GNU compiler bugs
+class bheFreeStore : public bheMemoryManager {
+public:
+    bheFreeStore () {}
+    void * allocate ( size_t );
+    void release ( void * );
+private:
+    tsFreeList < bhe, 0x100 > freeList;
+	bheFreeStore ( const bheFreeStore & );
+	bheFreeStore & operator = ( const bheFreeStore & );
+};
+
+inline void * bhe::operator new ( size_t size, 
+        bheMemoryManager & mgr )
+{ 
+    return mgr.allocate ( size );
+}
+
+#ifdef CXX_PLACEMENT_DELETE
+inline void bhe::operator delete ( void * pCadaver, 
+        bheMemoryManager & mgr )
+{ 
+    mgr.release ( pCadaver );
+}
+#endif
+
+#endif // ifdef bheh
+
+

modules/ca/src/client/ca.rc

@@ -0,0 +1,36 @@
+#include <winver.h>
+#include "epicsVersion.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
+ PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS VOS__WINDOWS32
+ FILETYPE VFT_UNKNOWN
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments","Channel Access Library for EPICS\0"
+            VALUE "CompanyName", "The EPICS collaboration\0"
+            VALUE "FileDescription", "Channel Access Library\0"
+            VALUE "FileVersion", EPICS_VERSION_STRING "\0"
+            VALUE "InternalName", "ca\0"
+            VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0"
+            VALUE "OriginalFilename", "ca.dll\0"
+            VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0"
+            VALUE "ProductVersion", EPICS_VERSION_STRING "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END

modules/ca/src/client/caConnTest.cpp

@@ -0,0 +1,109 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
+
+#include "cadef.h"
+#include "epicsTime.h"
+
+static unsigned channelCount = 0u;
+static unsigned connCount = 0u;
+static bool subsequentConnect = false;
+
+epicsTime begin;
+
+extern "C" void caConnTestConnHandler ( struct connection_handler_args args )
+{
+    if ( args.op == CA_OP_CONN_UP ) {
+        if ( connCount == 0u ) {
+            if ( subsequentConnect ) {
+                printf ("the first channel connected\n");
+                begin = epicsTime::getCurrent ();
+            }
+        }
+        connCount++;
+        // printf  ( "." );
+        // fflush ( stdout );
+        if ( connCount == channelCount ) {
+            epicsTime current = epicsTime::getCurrent ();
+            double delay = current - begin;
+            printf ( "all channels connected after %f sec ( %f sec per channel)\n",
+                delay, delay / channelCount );
+        }
+    }
+    else if ( args.op == CA_OP_CONN_DOWN ) {
+        if ( connCount == channelCount ) {
+            printf ( "channels are disconnected\n" );
+            subsequentConnect = true;
+        }
+        connCount--;
+        if ( connCount == 0u ) {
+            printf ( "all channels are disconnected\n" );
+        }
+    }
+    else {
+        assert ( 0 );
+    }
+}
+
+void caConnTest ( const char *pNameIn, unsigned channelCountIn, double delayIn )
+{
+    unsigned iteration = 0u;
+    int status;
+	unsigned i;
+	chid *pChans;
+
+    channelCount = channelCountIn;
+
+    pChans = new chid [channelCount];
+	
+	while ( 1 ) {
+        connCount = 0u;
+        subsequentConnect = false;
+        begin = epicsTime::getCurrent ();
+
+        printf ( "initializing CA client library\n" );
+
+		status = ca_task_initialize();
+		SEVCHK ( status, "CA init failed" );
+
+        printf ( "creating channels\n" );
+
+		for ( i = 0u; i < channelCount; i++ ) {
+			status = ca_search_and_connect ( pNameIn, 
+                &pChans[i], caConnTestConnHandler, 0 );
+			SEVCHK ( status, "CA search problems" );
+		}
+
+        printf ( "all channels were created\n" );
+
+		ca_pend_event ( delayIn );
+
+        if ( iteration & 1 ) {
+		    for ( i = 0u; i < channelCount; i++ ) {
+			    status = ca_clear_channel ( pChans[i] );
+			    SEVCHK ( status, "ca_clear_channel() problems" );
+		    }
+            printf ( "all channels were destroyed\n" );
+        }
+
+        printf ( "shutting down CA client library\n" );
+
+		status = ca_task_exit ();
+		SEVCHK ( status, "task exit problems" );
+
+        iteration++;
+	}
+
+    //delete [] pChans;
+}

modules/ca/src/client/caConnTestMain.cpp

@@ -0,0 +1,45 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+
+#include <stdio.h>
+#include <epicsStdlib.h>
+
+#include "caDiagnostics.h"
+
+int main ( int argc, char **argv )
+{
+    double delay = 60.0 * 5.0;
+    unsigned count = 2000;
+
+    if ( argc < 2 || argc > 4 ) {
+        printf ( "usage: %s < channel name > [ < count > ] [ < delay sec > ]\n", argv[0] );
+        return -1;
+    }
+
+    if ( argc >= 3 ) {
+        int nConverted = sscanf ( argv[2], "%u", &count );
+        if ( nConverted != 1 ) {
+            printf ( "conversion failed, changing channel count arg \"%s\" to %u\n",
+                argv[1], count );
+        }
+    }
+
+    if ( argc >= 4 ) {
+        int nConverted = epicsScanDouble( argv[3], &delay );
+        if ( nConverted != 1 ) {
+            printf ( "conversion failed, changing delay arg \"%s\" to %f\n",
+                argv[2], delay );
+        }
+    }
+
+    caConnTest ( argv[1], count, delay );
+
+    return 0;
+}

modules/ca/src/client/caDiagnostics.h

@@ -0,0 +1,38 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+
+#ifndef caDiagnosticsh
+#define caDiagnosticsh
+
+#include "cadef.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum appendNumberFlag {appendNumber, dontAppendNumber};
+int catime ( const char *channelName, unsigned channelCount, enum appendNumberFlag appNF );
+
+int acctst ( const char *pname, unsigned logggingInterestLevel, 
+            unsigned channelCount, unsigned repetitionCount, 
+            enum ca_preemptive_callback_select select );
+
+#define CATIME_OK 0
+#define CATIME_ERROR -1
+
+#ifdef __cplusplus
+}
+#endif
+
+void caConnTest ( const char *pNameIn, unsigned channelCountIn, double delayIn );
+
+#endif /* caDiagnosticsh */
+
+

modules/ca/src/client/caEventRate.cpp

@@ -0,0 +1,139 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+
+#include <stdio.h>
+#include <limits.h>
+#include <math.h>
+
+#include "cadef.h"
+#include "dbDefs.h"
+#include "epicsTime.h"
+#include "errlog.h"
+
+/*
+ * event_handler()
+ */
+extern "C" void eventCallBack ( struct event_handler_args args )
+{
+    unsigned *pCount = static_cast < unsigned * > ( args.usr );
+    (*pCount)++;
+}
+
+/*
+ * caEventRate ()
+ */
+void caEventRate ( const char *pName, unsigned count )
+{
+    static const double initialSamplePeriod = 1.0;
+    static const double maxSamplePeriod = 60.0 * 5.0;
+    unsigned eventCount = 0u;
+
+    chid * pChidTable = new chid [ count ];
+
+    {
+        printf ( "Connecting to CA Channel \"%s\" %u times.", 
+                    pName, count );
+        fflush ( stdout );
+    
+        epicsTime begin = epicsTime::getCurrent ();
+        for ( unsigned i = 0u; i < count; i++ ) {
+            int status = ca_search ( pName,  & pChidTable[i] );
+            SEVCHK ( status, NULL );
+        }
+    
+        int status = ca_pend_io ( 10000.0 );
+        if ( status != ECA_NORMAL ) {
+            fprintf ( stderr, " not found.\n" );
+            return;
+        }
+        epicsTime end = epicsTime::getCurrent ();
+    
+        printf ( " done(%f sec).\n", end - begin );
+    }
+
+    {
+        printf ( "Subscribing %u times.", count );
+        fflush ( stdout );
+        
+        epicsTime begin = epicsTime::getCurrent ();
+        for ( unsigned i = 0u; i < count; i++ ) {
+            int addEventStatus = ca_add_event ( DBR_FLOAT, 
+                pChidTable[i], eventCallBack, &eventCount, NULL);
+            SEVCHK ( addEventStatus, __FILE__ );
+        }
+    
+        int status = ca_flush_io ();
+        SEVCHK ( status, __FILE__ );
+    
+        epicsTime end = epicsTime::getCurrent ();
+    
+        printf ( " done(%f sec).\n", end - begin );
+    }
+        
+    {
+        printf ( "Waiting for initial value events." );
+        fflush ( stdout );
+    
+        // let the first one go by 
+        epicsTime begin = epicsTime::getCurrent ();
+        while ( eventCount < count ) {
+            int status = ca_pend_event ( 0.01 );
+            if ( status != ECA_TIMEOUT ) {
+                SEVCHK ( status, NULL );
+            }
+        }
+        epicsTime end = epicsTime::getCurrent ();
+    
+        printf ( " done(%f sec).\n", end - begin );
+    }
+
+    double samplePeriod = initialSamplePeriod;
+    double X = 0.0;
+    double XX = 0.0;
+    unsigned N = 0u;
+    while ( true ) {
+        unsigned nEvents, lastEventCount, curEventCount;
+
+        epicsTime beginPend = epicsTime::getCurrent ();
+        lastEventCount = eventCount;
+        int status = ca_pend_event ( samplePeriod );
+        curEventCount = eventCount;
+        epicsTime endPend = epicsTime::getCurrent ();
+        if ( status != ECA_TIMEOUT ) {
+            SEVCHK ( status, NULL );
+        }
+
+        if ( curEventCount >= lastEventCount ) {
+            nEvents = curEventCount - lastEventCount;
+        }
+        else {
+            nEvents = ( UINT_MAX - lastEventCount ) + curEventCount + 1u;
+        }
+
+        N++;
+
+        double period = endPend - beginPend;
+        double Hz = nEvents / period;
+
+        X += Hz;
+        XX += Hz * Hz;
+
+        double mean = X / N;
+        double stdDev = sqrt ( XX / N - mean * mean );
+
+        printf ( "CA Event Rate (Hz): current %g mean %g std dev %g\n", 
+            Hz, mean, stdDev );
+
+        if ( samplePeriod < maxSamplePeriod ) {
+            samplePeriod += samplePeriod;
+        }
+    }
+}
+

modules/ca/src/client/caEventRateMain.cpp

@@ -0,0 +1,38 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+void caEventRate ( const char *pName, unsigned count );
+
+int main ( int argc, char **argv )
+{
+    if ( argc < 2 || argc > 3 ) {
+        fprintf ( stderr, "usage: %s < PV name > [subscription count]\n", argv[0] );
+        return 0;
+    }
+
+    unsigned count;
+    if ( argc == 3 ) {
+        int status = sscanf ( argv[2], " %u ", & count );
+        if ( status != 1 ) {
+            fprintf ( stderr, "expected unsigned integer 2nd argument\n" );
+            return 0;
+        }
+    }
+    else {
+        count = 1;
+    }
+
+    caEventRate ( argv[1], count );
+
+    return 0;
+}

modules/ca/src/client/caProto.h

@@ -0,0 +1,187 @@
+/*************************************************************************\
+* 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
+ */
+
+#ifndef __CAPROTO__
+#define __CAPROTO__ 
+
+#define capStrOf(A) #A
+#define capStrOfX(A) capStrOf ( A )
+
+/* 
+ * CA protocol revision
+ * TCP/UDP port number (bumped each major protocol change) 
+ */
+#define CA_MAJOR_PROTOCOL_REVISION 4
+#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)
+#   define CA_V41(MINOR) ((MINOR)>=1u) 
+#   define CA_V42(MINOR) ((MINOR)>=2u)
+#   define CA_V43(MINOR) ((MINOR)>=3u)
+#   define CA_V44(MINOR) ((MINOR)>=4u)
+#   define CA_V45(MINOR) ((MINOR)>=5u)
+#   define CA_V46(MINOR) ((MINOR)>=6u)
+#   define CA_V47(MINOR) ((MINOR)>=7u)
+#   define CA_V48(MINOR) ((MINOR)>=8u)
+#   define CA_V49(MINOR) ((MINOR)>=9u)    /* large arrays, dispatch priorities */
+#   define CA_V410(MINOR) ((MINOR)>=10u)  /* beacon counter */
+#   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. */
+
+/*
+ * These port numbers are only used if the CA repeater and 
+ * CA server port numbers cant be obtained from the EPICS 
+ * environment variables "EPICS_CA_REPEATER_PORT" and
+ * "EPICS_CA_SERVER_PORT"
+ */
+#define CA_PORT_BASE            IPPORT_USERRESERVED + 56U
+#define CA_SERVER_PORT          (CA_PORT_BASE+CA_MAJOR_PROTOCOL_REVISION*2u)
+#define CA_REPEATER_PORT        (CA_PORT_BASE+CA_MAJOR_PROTOCOL_REVISION*2u+1u)
+
+/* 
+ * 1500 (max of ethernet and 802.{2,3} MTU) - 20(IP) - 8(UDP) 
+ * (the MTU of Ethernet is currently independent of its speed varient)
+ */
+#define ETHERNET_MAX_UDP        ( 1500u - 20u - 8u )
+#define MAX_UDP_RECV            ( 0xffff + 16u ) /* allow large frames to be received in the future */
+#define MAX_UDP_SEND            1024u /* original MAX_UDP */
+#define MAX_TCP                 ( 1024 * 16u ) /* so waveforms fit */
+#define MAX_MSG_SIZE            ( MAX_TCP ) /* the larger of tcp and udp max */
+
+#define CA_PROTO_PRIORITY_MIN 0u
+#define CA_PROTO_PRIORITY_MAX 99u
+
+/*
+ * architecture independent types
+ *
+ * (so far this works on all archs we have ported to)
+ */
+typedef unsigned char   ca_uint8_t;
+typedef unsigned short  ca_uint16_t;
+typedef unsigned int    ca_uint32_t;
+typedef float           ca_float32_t;
+typedef ca_uint32_t     caResId;
+
+#define ca_uint32_max 0xffffffff
+
+        /* values for m_cmmd */
+#define CA_PROTO_VERSION        0u  /* set minor version and priority (used to be NOOP cmd) */
+#define CA_PROTO_EVENT_ADD      1u  /* add an event */
+#define CA_PROTO_EVENT_CANCEL   2u  /* cancel an event */
+#define CA_PROTO_READ           3u  /* read and return a channel value*/
+#define CA_PROTO_WRITE          4u  /* write a channel value */
+#define CA_PROTO_SNAPSHOT       5u  /* snapshot of the system */
+#define CA_PROTO_SEARCH         6u  /* IOC channel search */
+#define CA_PROTO_BUILD          7u  /* build - obsolete */
+#define CA_PROTO_EVENTS_OFF     8u  /* flow control */ 
+#define CA_PROTO_EVENTS_ON      9u  /* flow control */ 
+#define CA_PROTO_READ_SYNC      10u /* purge old reads */ 
+#define CA_PROTO_ERROR          11u /* an operation failed */ 
+#define CA_PROTO_CLEAR_CHANNEL  12u /* free chan resources */
+#define CA_PROTO_RSRV_IS_UP     13u /* CA server has joined the net */
+#define CA_PROTO_NOT_FOUND      14u /* channel not found */
+#define CA_PROTO_READ_NOTIFY    15u /* add a one shot event */
+#define CA_PROTO_READ_BUILD     16u /* read and build - obsolete */
+#define REPEATER_CONFIRM        17u /* registration confirmation */
+#define CA_PROTO_CREATE_CHAN    18u /* client creates channel in server */
+#define CA_PROTO_WRITE_NOTIFY   19u /* notify after write chan value */
+#define CA_PROTO_CLIENT_NAME    20u /* CA V4.1 identify client */
+#define CA_PROTO_HOST_NAME      21u /* CA V4.1 identify client */
+#define CA_PROTO_ACCESS_RIGHTS  22u /* CA V4.2 asynch access rights chg */
+#define CA_PROTO_ECHO           23u /* CA V4.3 connection verify */
+#define REPEATER_REGISTER       24u /* register for repeater fan out */
+#define CA_PROTO_SIGNAL         25u /* knock the server out of select */
+#define CA_PROTO_CREATE_CH_FAIL 26u /* unable to create chan resource in server */
+#define CA_PROTO_SERVER_DISCONN 27u /* server deletes PV (or channel) */
+
+#define CA_PROTO_LAST_CMMD CA_PROTO_SERVER_DISCONN
+
+/*
+ * for use with search and not_found (if search fails and
+ * its not a broadcast tell the client to look elesewhere)
+ */
+#define DOREPLY     10u
+#define DONTREPLY   5u
+
+/*
+ * for use with the m_dataType field in UDP messages emitted by servers
+ */
+#define sequenceNoIsValid 1
+
+/* size of object in bytes rounded up to nearest oct word */
+#define OCT_ROUND(A)    (((A)+7)/8)
+#define OCT_SIZEOF(A)   (OCT_ROUND(sizeof(A)))
+
+/* size of object in bytes rounded up to nearest long word */
+#define QUAD_ROUND(A)   ((A)+3)/4)
+#define QUAD_SIZEOF(A)  (QUAD_ROUND(sizeof(A)))
+
+/* size of object in bytes rounded up to nearest short word */
+#define BI_ROUND(A)     (((A)+1)/2)
+#define BI_SIZEOF(A)    (BI_ROUND(sizeof(A)))
+
+/*
+ * For communicating access rights to the clients
+ *
+ * (placed in m_available hdr field of CA_PROTO_ACCESS_RIGHTS cmmd
+ */
+#define CA_PROTO_ACCESS_RIGHT_READ  (1u<<0u)
+#define CA_PROTO_ACCESS_RIGHT_WRITE (1u<<1u)
+
+/*
+ * All structures passed in the protocol must have individual
+ * fields aligned on natural boundaries.
+ *
+ * NOTE: all structures declared in this file must have a
+ * byte count which is evenly divisible by 8 matching
+ * the largest atomic data type in db_access.h.
+ */
+#define CA_MESSAGE_ALIGN(A) (OCT_ROUND(A)<<3u)
+
+/*
+ * the common part of each message sent/recv by the
+ * CA server.
+ */
+typedef struct ca_hdr {
+    ca_uint16_t m_cmmd;         /* operation to be performed */
+    ca_uint16_t m_postsize;     /* size of payload */
+    ca_uint16_t m_dataType;     /* operation data type */
+    ca_uint16_t m_count;        /* operation data count */
+    ca_uint32_t m_cid;          /* channel identifier */
+    ca_uint32_t m_available;    /* protocol stub dependent */
+} caHdr;
+
+/*
+ * for  monitor (event) message extension
+ */
+struct  mon_info {
+    ca_float32_t    m_lval;     /* low delta */
+    ca_float32_t    m_hval;     /* high delta */ 
+    ca_float32_t    m_toval;    /* period btween samples */
+    ca_uint16_t     m_mask;     /* event select mask */
+    ca_uint16_t     m_pad;      /* extend to 32 bits */
+};
+
+/*
+ * PV names greater than this length assumed to be invalid
+ */
+#define unreasonablePVNameSize 500u
+
+#endif /* __CAPROTO__ */
+

modules/ca/src/client/caRepeater.cpp

@@ -0,0 +1,42 @@
+/*************************************************************************\
+* 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. 
+\*************************************************************************/
+/*
+ *
+ *  CA UDP repeater standalone executable
+ *
+ *  Author:      Jeff Hill
+ *  Date:        3-27-90
+ *
+ *  PURPOSE:
+ *  Broadcasts fan out over the LAN, but old IP kernels do not allow
+ *  two processes on the same machine to get the same broadcast
+ *  (and modern IP kernels do not allow two processes on the same machine
+ *  to receive the same unicast).
+ *
+ *  This code fans out UDP messages sent to the CA repeater port
+ *  to all CA client processes that have subscribed.
+ *
+ *  NOTES:
+ *
+ *  see repeater.c
+ *
+ */
+
+#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
+
+#include "epicsAssert.h"
+#include "udpiiu.h"
+
+int main()
+{
+    ca_repeater ();
+    return ( 0 );
+}
+

modules/ca/src/client/caRepeater.service@

@@ -0,0 +1,25 @@
+#
+# Linux systemd service file for the EPICS CA Repeater
+#
+# To install this file, as root:
+#   cp caRepeater.service /etc/systemd/system
+#   chmod 664 /etc/systemd/system/caRepeater.service
+#   systemctl daemon-reload
+#   systemctl enable caRepeater
+#   systemctl start caRepeater
+#
+# To check the status:
+#   systemctl status caRepeater
+
+[Unit]
+Description=EPICS CA Repeater
+Requires=network.target
+After=network.target
+
+[Service]
+ExecStart=@INSTALL_BIN@/caRepeater
+Restart=always
+User=daemon
+
+[Install]
+WantedBy=multi-user.target

modules/ca/src/client/caServerID.h

@@ -0,0 +1,88 @@
+/*************************************************************************\
+* 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: Jeff Hill
+ */
+
+#ifndef caServerIDh
+#define caServerIDh
+
+#include "osiSock.h"
+#include "resourceLib.h"
+#include "caProto.h"
+
+class caServerID {
+public:
+    caServerID ( const struct sockaddr_in & addrIn, unsigned priority );
+    bool operator == ( const caServerID & ) const;
+    resTableIndex hash () const;
+    osiSockAddr address () const;
+    unsigned priority () const;
+private:
+    struct sockaddr_in addr;
+    ca_uint8_t pri;
+};
+
+inline caServerID::caServerID ( 
+    const struct sockaddr_in & addrIn, unsigned priorityIn ) :
+    addr ( addrIn ), pri ( static_cast <ca_uint8_t> ( priorityIn ) )
+{
+    assert ( priorityIn <= 0xff );
+}
+
+inline bool caServerID::operator == ( const caServerID & rhs ) const
+{
+    if (    this->addr.sin_addr.s_addr == rhs.addr.sin_addr.s_addr && 
+            this->addr.sin_port == rhs.addr.sin_port &&
+            this->pri == rhs.pri ) {
+        return true;
+    }
+    return false;
+}
+
+inline resTableIndex caServerID::hash () const
+{
+    // start with a very small server table to speed
+    // up the flush traverse for the frequent case -
+    // a small numbers of servers
+    const unsigned caServerMinIndexBitWidth = 2u;
+    const unsigned caServerMaxIndexBitWidth = 32u;
+
+    unsigned index;
+    index = this->addr.sin_addr.s_addr;
+    index ^= this->addr.sin_port;
+    index ^= this->addr.sin_port >> 8u;
+    index ^= this->pri;
+    return integerHash ( caServerMinIndexBitWidth, 
+        caServerMaxIndexBitWidth, index );
+}
+
+inline osiSockAddr caServerID::address () const
+{
+    osiSockAddr tmp;
+    tmp.ia = this->addr;
+    return tmp;
+}
+
+inline unsigned caServerID::priority () const
+{
+    return this->pri;
+}
+
+#endif // ifdef caServerID
+
+

modules/ca/src/client/caVersion.h

@@ -0,0 +1,28 @@
+/*************************************************************************\
+* Copyright (c) 2017 UChicago Argonne LLC, as Operator of Argonne
+*     National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+#ifndef CAVERSION_H
+#define CAVERSION_H
+
+#include <epicsVersion.h>
+#include <shareLib.h>
+
+#ifndef VERSION_INT
+#  define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
+#endif
+
+/* include generated headers with:
+ *   EPICS_CA_MAJOR_VERSION
+ *   EPICS_CA_MINOR_VERSION
+ *   EPICS_CA_MAINTENANCE_VERSION
+ *   EPICS_CA_DEVELOPMENT_FLAG
+ */
+#include "caVersionNum.h"
+
+#define CA_VERSION_INT VERSION_INT(EPICS_CA_MAJOR_VERSION, EPICS_CA_MINOR_VERSION, EPICS_CA_MAINTENANCE_VERSION, 0)
+
+#endif // CAVERSION_H

modules/ca/src/client/caVersionNum.h@

@@ -0,0 +1,7 @@
+#ifndef CAVERSION_H
+#  error include caVersion.h, not this header
+#endif
+#define EPICS_CA_MAJOR_VERSION @EPICS_CA_MAJOR_VERSION@
+#define EPICS_CA_MINOR_VERSION @EPICS_CA_MINOR_VERSION@
+#define EPICS_CA_MAINTENANCE_VERSION @EPICS_CA_MAINTENANCE_VERSION@
+#define EPICS_CA_DEVELOPMENT_FLAG @EPICS_CA_DEVELOPMENT_FLAG@

modules/ca/src/client/ca_client_context.cpp

@@ -0,0 +1,811 @@
+/*************************************************************************\
+* 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.
+\*************************************************************************/
+
+/*
+ *
+ *
+ *                    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
+ */
+
+#ifdef _MSC_VER
+#   pragma warning(disable:4355)
+#endif
+
+#include <stdexcept>
+#include <string> // vxWorks 6.0 requires this include
+#include <stdio.h>
+
+#include "epicsExit.h"
+#include "errlog.h"
+#include "locationException.h"
+
+#define epicsExportSharedSymbols
+#include "iocinf.h"
+#include "oldAccess.h"
+#include "cac.h"
+
+epicsShareDef epicsThreadPrivateId caClientCallbackThreadId;
+
+static epicsThreadOnceId cacOnce = EPICS_THREAD_ONCE_INIT;
+
+const unsigned ca_client_context :: flushBlockThreshold = 0x58000;
+
+extern "C" void cacExitHandler ( void *)
+{
+    epicsThreadPrivateDelete ( caClientCallbackThreadId );
+    caClientCallbackThreadId = 0;
+    delete ca_client_context::pDefaultServiceInstallMutex;
+}
+
+// runs once only for each process
+extern "C" void cacOnceFunc ( void * )
+{
+    caClientCallbackThreadId = epicsThreadPrivateCreate ();
+    assert ( caClientCallbackThreadId );
+    ca_client_context::pDefaultServiceInstallMutex = newEpicsMutex;
+    epicsAtExit ( cacExitHandler,0 );
+}
+
+extern epicsThreadPrivateId caClientContextId;
+
+cacService * ca_client_context::pDefaultService = 0;
+epicsMutex * ca_client_context::pDefaultServiceInstallMutex;
+
+ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
+    createdByThread ( epicsThreadGetIdSelf () ),
+    ca_exception_func ( 0 ), ca_exception_arg ( 0 ),
+    pVPrintfFunc ( errlogVprintf ), fdRegFunc ( 0 ), fdRegArg ( 0 ),
+    pndRecvCnt ( 0u ), ioSeqNo ( 0u ), callbackThreadsPending ( 0u ),
+    localPort ( 0 ), fdRegFuncNeedsToBeCalled ( false ),
+    noWakeupSincePend ( true )
+{
+    static const unsigned short PORT_ANY = 0u;
+
+    if ( ! osiSockAttach () ) {
+        throwWithLocation ( noSocket () );
+    }
+
+    epicsThreadOnce ( & cacOnce, cacOnceFunc, 0 );
+    {
+        epicsGuard < epicsMutex > guard ( *ca_client_context::pDefaultServiceInstallMutex );
+        if ( ca_client_context::pDefaultService ) {
+            this->pServiceContext.reset (
+                & ca_client_context::pDefaultService->contextCreate (
+                    this->mutex, this->cbMutex, *this ) );
+        }
+        else {
+            this->pServiceContext.reset ( new cac ( this->mutex, this->cbMutex, *this ) );
+        }
+    }
+
+    this->sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
+    if ( this->sock == INVALID_SOCKET ) {
+        char sockErrBuf[64];
+        epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
+        this->printFormated (
+            "ca_client_context: unable to create "
+            "datagram socket because = \"%s\"\n",
+            sockErrBuf );
+        throwWithLocation ( noSocket () );
+    }
+
+    {
+        osiSockIoctl_t yes = true;
+        int status = socket_ioctl ( this->sock,
+                                    FIONBIO, & yes);
+        if ( status < 0 ) {
+            char sockErrBuf[64];
+            epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
+            epicsSocketDestroy ( this->sock );
+            this->printFormated (
+                "%s: non blocking IO set fail because \"%s\"\n",
+                            __FILE__, sockErrBuf );
+            throwWithLocation ( noSocket () );
+        }
+    }
+
+    // force a bind to an unconstrained address so we can obtain
+    // the local port number below
+    {
+        osiSockAddr addr;
+        memset ( (char *)&addr, 0 , sizeof ( addr ) );
+        addr.ia.sin_family = AF_INET;
+        addr.ia.sin_addr.s_addr = htonl ( INADDR_ANY );
+        addr.ia.sin_port = htons ( PORT_ANY );
+        int status = bind (this->sock, &addr.sa, sizeof (addr) );
+        if ( status < 0 ) {
+            char sockErrBuf[64];
+            epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
+            epicsSocketDestroy (this->sock);
+            this->printFormated (
+                "CAC: unable to bind to an unconstrained "
+                "address because = \"%s\"\n",
+                sockErrBuf );
+            throwWithLocation ( noSocket () );
+        }
+    }
+
+    {
+        osiSockAddr tmpAddr;
+        osiSocklen_t saddr_length = sizeof ( tmpAddr );
+        int status = getsockname ( this->sock, & tmpAddr.sa, & saddr_length );
+        if ( status < 0 ) {
+            char sockErrBuf[64];
+            epicsSocketConvertErrnoToString ( sockErrBuf, sizeof ( sockErrBuf ) );
+            epicsSocketDestroy ( this->sock );
+            this->printFormated ( "CAC: getsockname () error was \"%s\"\n", sockErrBuf );
+            throwWithLocation ( noSocket () );
+        }
+        if ( tmpAddr.sa.sa_family != AF_INET) {
+            epicsSocketDestroy ( this->sock );
+            this->printFormated ( "CAC: UDP socket was not inet addr family\n" );
+            throwWithLocation ( noSocket () );
+        }
+        this->localPort = htons ( tmpAddr.ia.sin_port );
+    }
+
+    std::auto_ptr < CallbackGuard > pCBGuard;
+    if ( ! enablePreemptiveCallback ) {
+        pCBGuard.reset ( new CallbackGuard ( this->cbMutex ) );
+    }
+
+    // multiple steps ensure exception safety
+    this->pCallbackGuard = pCBGuard;
+}
+
+ca_client_context::~ca_client_context ()
+{
+    if ( this->fdRegFunc ) {
+        ( *this->fdRegFunc )
+            ( this->fdRegArg, this->sock, false );
+    }
+    epicsSocketDestroy ( this->sock );
+
+    osiSockRelease ();
+
+    // force a logical shutdown order
+    // so that the cac class does not hang its
+    // receive threads during their shutdown sequence
+    // and so that classes using this classes mutex
+    // are destroyed before the mutex is destroyed
+    if ( this->pCallbackGuard.get() ) {
+        epicsGuardRelease < epicsMutex > unguard ( *this->pCallbackGuard );
+        this->pServiceContext.reset ( 0 );
+    }
+    else {
+        this->pServiceContext.reset ( 0 );
+    }
+}
+
+void ca_client_context::destroyGetCopy (
+    epicsGuard < epicsMutex > & guard, getCopy & gc )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    gc.~getCopy ();
+    this->getCopyFreeList.release ( & gc );
+}
+
+void ca_client_context::destroyGetCallback (
+    epicsGuard < epicsMutex > & guard, getCallback & gcb )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    gcb.~getCallback ();
+    this->getCallbackFreeList.release ( & gcb );
+}
+
+void ca_client_context::destroyPutCallback (
+    epicsGuard < epicsMutex > & guard, putCallback & pcb )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    pcb.~putCallback ();
+    this->putCallbackFreeList.release ( & pcb );
+}
+
+void ca_client_context::destroySubscription (
+    epicsGuard < epicsMutex > & guard, oldSubscription & os )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    os.~oldSubscription ();
+    this->subscriptionFreeList.release ( & os );
+}
+
+void ca_client_context::changeExceptionEvent (
+    caExceptionHandler * pfunc, void * arg )
+{
+    epicsGuard < epicsMutex > guard ( this->mutex );
+    this->ca_exception_func = pfunc;
+    this->ca_exception_arg = arg;
+// should block here until releated callback in progress completes
+}
+
+void ca_client_context::replaceErrLogHandler (
+    caPrintfFunc * ca_printf_func )
+{
+    epicsGuard < epicsMutex > guard ( this->mutex );
+    if ( ca_printf_func ) {
+        this->pVPrintfFunc = ca_printf_func;
+    }
+    else {
+        this->pVPrintfFunc = epicsVprintf;
+    }
+// should block here until releated callback in progress completes
+}
+
+void ca_client_context::registerForFileDescriptorCallBack (
+    CAFDHANDLER *pFunc, void *pArg )
+{
+    epicsGuard < epicsMutex > guard ( this->mutex );
+    this->fdRegFunc = pFunc;
+    this->fdRegArg = pArg;
+    this->fdRegFuncNeedsToBeCalled = true;
+    if ( pFunc ) {
+        // the receive thread might already be blocking
+        // w/o having sent the wakeup message
+        this->_sendWakeupMsg ();
+    }
+// should block here until releated callback in progress completes
+}
+
+int ca_client_context :: printFormated (
+    const char *pformat, ... ) const
+{
+    va_list theArgs;
+    int status;
+
+    va_start ( theArgs, pformat );
+
+    status = this->ca_client_context :: varArgsPrintFormated ( pformat, theArgs );
+
+    va_end ( theArgs );
+
+    return status;
+}
+
+int ca_client_context :: varArgsPrintFormated (
+    const char *pformat, va_list args ) const
+{
+    caPrintfFunc * pFunc;
+    {
+        epicsGuard < epicsMutex > guard ( this->mutex );
+        pFunc = this->pVPrintfFunc;
+    }
+    if ( pFunc ) {
+        return ( *pFunc ) ( pformat, args );
+    }
+    else {
+        return :: vfprintf ( stderr, pformat, args );
+    }
+}
+
+void ca_client_context::exception (
+    epicsGuard < epicsMutex > & guard, int stat, const char * pCtx,
+        const char * pFile, unsigned lineNo )
+{
+    struct exception_handler_args args;
+    caExceptionHandler * pFunc = this->ca_exception_func;
+    void * pArg = this->ca_exception_arg;
+    {
+        epicsGuardRelease < epicsMutex > unguard ( guard );
+        // NOOP if they disable exceptions
+        if ( pFunc ) {
+            args.chid = NULL;
+            args.type = TYPENOTCONN;
+            args.count = 0;
+            args.addr = NULL;
+            args.stat = stat;
+            args.op = CA_OP_OTHER;
+            args.ctx = pCtx;
+            args.pFile = pFile;
+            args.lineNo = lineNo;
+            args.usr = pArg;
+            ( *pFunc ) ( args );
+        }
+        else {
+            this->signal ( stat, pFile, lineNo, pCtx );
+        }
+    }
+}
+
+void ca_client_context::exception (
+    epicsGuard < epicsMutex > & guard, int status, const char * pContext,
+    const char * pFileName, unsigned lineNo, oldChannelNotify & chan,
+    unsigned type, arrayElementCount count, unsigned op )
+{
+    struct exception_handler_args args;
+    caExceptionHandler * pFunc = this->ca_exception_func;
+    void * pArg = this->ca_exception_arg;
+    {
+        epicsGuardRelease < epicsMutex > unguard ( guard );
+        // NOOP if they disable exceptions
+        if ( pFunc ) {
+            args.chid = &chan;
+            args.type = type;
+            args.count = count;
+            args.addr = NULL;
+            args.stat = status;
+            args.op = op;
+            args.ctx = pContext;
+            args.pFile = pFileName;
+            args.lineNo = lineNo;
+            args.usr = pArg;
+            ( *pFunc ) ( args );
+        }
+        else {
+            this->signal ( status, pFileName, lineNo,
+                "op=%u, channel=%s, type=%s, count=%lu, ctx=\"%s\"",
+                op, ca_name ( &chan ),
+                dbr_type_to_text ( static_cast <int> ( type ) ),
+                count, pContext );
+        }
+    }
+}
+
+void ca_client_context::signal ( int ca_status, const char * pfilenm,
+                     int lineno, const char * pFormat, ... )
+{
+    va_list theArgs;
+    va_start ( theArgs, pFormat );
+    this->vSignal ( ca_status, pfilenm, lineno, pFormat, theArgs);
+    va_end ( theArgs );
+}
+
+void ca_client_context :: vSignal (
+    int ca_status, const char *pfilenm,
+        int lineno, const char *pFormat, va_list args )
+{
+    static const char *severity[] =
+    {
+        "Warning",
+        "Success",
+        "Error",
+        "Info",
+        "Fatal",
+        "Fatal",
+        "Fatal",
+        "Fatal"
+    };
+
+    this->printFormated ( "CA.Client.Exception...............................................\n" );
+
+    this->printFormated ( "    %s: \"%s\"\n",
+        severity[ CA_EXTRACT_SEVERITY ( ca_status ) ],
+        ca_message ( ca_status ) );
+
+    if  ( pFormat ) {
+        this->printFormated ( "    Context: \"" );
+        this->varArgsPrintFormated ( pFormat, args );
+        this->printFormated ( "\"\n" );
+    }
+
+    if ( pfilenm ) {
+        this->printFormated ( "    Source File: %s line %d\n",
+            pfilenm, lineno );
+    }
+
+    epicsTime current = epicsTime::getCurrent ();
+    char date[64];
+    current.strftime ( date, sizeof ( date ), "%a %b %d %Y %H:%M:%S.%f");
+    this->printFormated ( "    Current Time: %s\n", date );
+
+    /*
+     *  Terminate execution if unsuccessful
+     */
+    if( ! ( ca_status & CA_M_SUCCESS ) &&
+        CA_EXTRACT_SEVERITY ( ca_status ) != CA_K_WARNING ){
+        errlogFlush ();
+        abort ();
+    }
+
+    this->printFormated ( "..................................................................\n" );
+}
+
+void ca_client_context::show ( unsigned level ) const
+{
+    epicsGuard < epicsMutex > guard ( this->mutex );
+
+    ::printf ( "ca_client_context at %p pndRecvCnt=%u ioSeqNo=%u\n",
+        static_cast <const void *> ( this ),
+        this->pndRecvCnt, this->ioSeqNo );
+
+    if ( level > 0u ) {
+        this->pServiceContext->show ( guard, level - 1u );
+        ::printf ( "\tpreemptive callback is %s\n",
+            this->pCallbackGuard.get() ? "disabled" : "enabled" );
+        ::printf ( "\tthere are %u unsatisfied IO operations blocking ca_pend_io()\n",
+                this->pndRecvCnt );
+        ::printf ( "\tthe current io sequence number is %u\n",
+                this->ioSeqNo );
+        ::printf ( "IO done event:\n");
+        this->ioDone.show ( level - 1u );
+        ::printf ( "Synchronous group identifier hash table:\n" );
+        this->sgTable.show ( level - 1u );
+    }
+}
+
+void ca_client_context::attachToClientCtx ()
+{
+    assert ( ! epicsThreadPrivateGet ( caClientContextId ) );
+    epicsThreadPrivateSet ( caClientContextId, this );
+}
+
+void ca_client_context::incrementOutstandingIO (
+    epicsGuard < epicsMutex > & guard, unsigned ioSeqNoIn )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    if ( this->ioSeqNo == ioSeqNoIn ) {
+        assert ( this->pndRecvCnt < UINT_MAX );
+        this->pndRecvCnt++;
+    }
+}
+
+void ca_client_context::decrementOutstandingIO (
+    epicsGuard < epicsMutex > & guard, unsigned ioSeqNoIn )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    if ( this->ioSeqNo == ioSeqNoIn ) {
+        assert ( this->pndRecvCnt > 0u );
+        this->pndRecvCnt--;
+        if ( this->pndRecvCnt == 0u ) {
+            this->ioDone.signal ();
+        }
+    }
+}
+
+// !!!! This routine is only visible in the old interface - or in a new ST interface.
+// !!!! In the old interface we restrict thread attach so that calls from threads
+// !!!! other than the initializing thread are not allowed if preemptive callback
+// !!!! is disabled. This prevents the preemptive callback lock from being released
+// !!!! by other threads than the one that locked it.
+//
+int ca_client_context::pendIO ( const double & timeout )
+{
+    // prevent recursion nightmares by disabling calls to
+    // pendIO () from within a CA callback.
+    if ( epicsThreadPrivateGet ( caClientCallbackThreadId ) ) {
+        return ECA_EVDISALLOW;
+    }
+
+    int status = ECA_NORMAL;
+    epicsTime beg_time = epicsTime::getCurrent ();
+    double remaining = timeout;
+
+    epicsGuard < epicsMutex > guard ( this->mutex );
+
+    this->flush ( guard );
+
+    while ( this->pndRecvCnt > 0 ) {
+        if ( remaining < CAC_SIGNIFICANT_DELAY ) {
+            status = ECA_TIMEOUT;
+            break;
+        }
+
+        {
+            epicsGuardRelease < epicsMutex > unguard ( guard );
+            this->blockForEventAndEnableCallbacks ( this->ioDone, remaining );
+        }
+
+        double delay = epicsTime::getCurrent () - beg_time;
+        if ( delay < timeout ) {
+            remaining = timeout - delay;
+        }
+        else {
+            remaining = 0.0;
+        }
+    }
+
+    this->ioSeqNo++;
+    this->pndRecvCnt = 0u;
+
+    return status;
+}
+
+// !!!! This routine is only visible in the old interface - or in a new ST interface.
+// !!!! In the old interface we restrict thread attach so that calls from threads
+// !!!! other than the initializing thread are not allowed if preemptive callback
+// !!!! is disabled. This prevents the preemptive callback lock from being released
+// !!!! by other threads than the one that locked it.
+//
+int ca_client_context::pendEvent ( const double & timeout )
+{
+    // prevent recursion nightmares by disabling calls to
+    // pendIO () from within a CA callback.
+    if ( epicsThreadPrivateGet ( caClientCallbackThreadId ) ) {
+        return ECA_EVDISALLOW;
+    }
+
+    epicsTime current = epicsTime::getCurrent ();
+
+    {
+        epicsGuard < epicsMutex > guard ( this->mutex );
+        this->flush ( guard );
+    }
+
+    // process at least once if preemptive callback is disabled
+    if ( this->pCallbackGuard.get() ) {
+        epicsGuardRelease < epicsMutex > cbUnguard ( *this->pCallbackGuard );
+        epicsGuard < epicsMutex > guard ( this->mutex );
+
+        //
+        // This is needed because in non-preemptive callback mode
+        // legacy applications that use file descriptor managers
+        // will register for ca receive thread activity and keep
+        // calling ca_pend_event until all of the socket data has
+        // been read. We must guarantee that other threads get a
+        // chance to run if there is data in any of the sockets.
+        //
+        if ( this->fdRegFunc ) {
+            epicsGuardRelease < epicsMutex > unguard ( guard );
+
+            // remove short udp message sent to wake
+            // up a file descriptor manager
+            osiSockAddr tmpAddr;
+            osiSocklen_t addrSize = sizeof ( tmpAddr.sa );
+            char buf = 0;
+            int status = 0;
+            do {
+                status = recvfrom ( this->sock, & buf, sizeof ( buf ),
+                        0, & tmpAddr.sa, & addrSize );
+            } while ( status > 0 );
+        }
+        while ( this->callbackThreadsPending > 0 ) {
+            epicsGuardRelease < epicsMutex > unguard ( guard );
+            this->callbackThreadActivityComplete.wait ( 30.0 );
+        }
+        this->noWakeupSincePend = true;
+    }
+
+    double elapsed = epicsTime::getCurrent() - current;
+    double delay;
+
+    if ( timeout > elapsed ) {
+        delay = timeout - elapsed;
+    }
+    else {
+        delay = 0.0;
+    }
+
+    if ( delay >= CAC_SIGNIFICANT_DELAY ) {
+        if ( this->pCallbackGuard.get() ) {
+            epicsGuardRelease < epicsMutex > unguard ( *this->pCallbackGuard );
+            epicsThreadSleep ( delay );
+        }
+        else {
+            epicsThreadSleep ( delay );
+        }
+    }
+
+    return ECA_TIMEOUT;
+}
+
+void ca_client_context::blockForEventAndEnableCallbacks (
+    epicsEvent & event, const double & timeout )
+{
+    if ( this->pCallbackGuard.get() ) {
+        epicsGuardRelease < epicsMutex > unguard ( *this->pCallbackGuard );
+        event.wait ( timeout );
+    }
+    else {
+        event.wait ( timeout );
+    }
+}
+
+void ca_client_context::callbackProcessingInitiateNotify ()
+{
+    // if preemptive callback is enabled then this is a noop
+    if ( this->pCallbackGuard.get() ) {
+        bool sendNeeded = false;
+        {
+            epicsGuard < epicsMutex > guard ( this->mutex );
+            this->callbackThreadsPending++;
+            if ( this->fdRegFunc && this->noWakeupSincePend ) {
+                this->noWakeupSincePend = false;
+                sendNeeded = true;
+            }
+        }
+        if ( sendNeeded ) {
+            _sendWakeupMsg ();
+        }
+    }
+}
+
+void ca_client_context :: _sendWakeupMsg ()
+{
+    // send short udp message to wake up a file descriptor manager
+    // when a message arrives
+    osiSockAddr tmpAddr;
+    tmpAddr.ia.sin_family = AF_INET;
+    tmpAddr.ia.sin_addr.s_addr = htonl ( INADDR_LOOPBACK );
+    tmpAddr.ia.sin_port = htons ( this->localPort );
+    char buf = 0;
+    sendto ( this->sock, & buf, sizeof ( buf ),
+            0, & tmpAddr.sa, sizeof ( tmpAddr.sa ) );
+}
+
+void ca_client_context::callbackProcessingCompleteNotify ()
+{
+    // if preemptive callback is enabled then this is a noop
+    if ( this->pCallbackGuard.get() ) {
+        bool signalNeeded = false;
+        {
+            epicsGuard < epicsMutex > guard ( this->mutex );
+            if ( this->callbackThreadsPending <= 1 ) {
+                if ( this->callbackThreadsPending == 1 ) {
+                    this->callbackThreadsPending = 0;
+                    signalNeeded = true;
+                }
+            }
+            else {
+                this->callbackThreadsPending--;
+            }
+        }
+        if ( signalNeeded ) {
+            this->callbackThreadActivityComplete.signal ();
+        }
+    }
+}
+
+cacChannel & ca_client_context::createChannel (
+    epicsGuard < epicsMutex > & guard, const char * pChannelName,
+    cacChannelNotify & chan, cacChannel::priLev pri )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    return this->pServiceContext->createChannel (
+        guard, pChannelName, chan, pri );
+}
+
+void ca_client_context::flush ( epicsGuard < epicsMutex > & guard )
+{
+    this->pServiceContext->flush ( guard );
+}
+
+unsigned ca_client_context::circuitCount () const
+{
+    epicsGuard < epicsMutex > guard ( this->mutex );
+    return this->pServiceContext->circuitCount ( guard );
+}
+
+unsigned ca_client_context::beaconAnomaliesSinceProgramStart () const
+{
+    epicsGuard < epicsMutex > guard ( this->mutex );
+    return this->pServiceContext->beaconAnomaliesSinceProgramStart ( guard );
+}
+
+void ca_client_context::installCASG (
+    epicsGuard < epicsMutex > & guard, CASG & sg )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    this->sgTable.idAssignAdd ( sg );
+}
+
+void ca_client_context::uninstallCASG (
+    epicsGuard < epicsMutex > & guard, CASG & sg )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    this->sgTable.remove ( sg );
+}
+
+CASG * ca_client_context::lookupCASG (
+    epicsGuard < epicsMutex > & guard, unsigned idIn )
+{
+    guard.assertIdenticalMutex ( this->mutex );
+    CASG * psg = this->sgTable.lookup ( idIn );
+    if ( psg ) {
+        if ( ! psg->verify ( guard ) ) {
+            psg = 0;
+        }
+    }
+    return psg;
+}
+
+void ca_client_context::selfTest () const
+{
+    epicsGuard < epicsMutex > guard ( this->mutex );
+    this->sgTable.verify ();
+    this->pServiceContext->selfTest ( guard );
+}
+
+epicsMutex & ca_client_context::mutexRef () const
+{
+    return this->mutex;
+}
+
+cacContext & ca_client_context::createNetworkContext (
+    epicsMutex & mutexIn, epicsMutex & cbMutexIn )
+{
+    return * new cac ( mutexIn, cbMutexIn, *this );
+}
+
+void ca_client_context::installDefaultService ( cacService & service )
+{
+    epicsThreadOnce ( & cacOnce, cacOnceFunc, 0 );
+
+    epicsGuard < epicsMutex > guard ( *ca_client_context::pDefaultServiceInstallMutex );
+    if ( ca_client_context::pDefaultService ) {
+        throw std::logic_error
+            ( "CA in-memory service already installed and can't be replaced");
+    }
+    ca_client_context::pDefaultService = & service;
+}
+
+void epicsShareAPI caInstallDefaultService ( cacService & service )
+{
+    ca_client_context::installDefaultService ( service );
+}
+
+epicsShareFunc int epicsShareAPI ca_clear_subscription ( evid pMon )
+{
+    oldChannelNotify & chan = pMon->channel ();
+    ca_client_context & cac = chan.getClientCtx ();
+    // !!!! the order in which we take the mutex here prevents deadlocks
+    {
+        epicsGuard < epicsMutex > guard ( cac.mutex );
+        try {
+            // if this stalls out on a live circuit then an exception
+            // can be forthcoming which we must ignore as the clear
+            // request must always be successful
+            chan.eliminateExcessiveSendBacklog ( guard );
+        }
+        catch ( cacChannel::notConnected & ) {
+            // intentionally ignored
+        }
+    }
+    if ( cac.pCallbackGuard.get() &&
+        cac.createdByThread == epicsThreadGetIdSelf () ) {
+      epicsGuard < epicsMutex > guard ( cac.mutex );
+      pMon->cancel ( *cac.pCallbackGuard.get(), guard );
+    }
+    else {
+      //
+      // we will definately stall out here if all of the
+      // following are true
+      //
+      // o user creates non-preemtive mode client library context
+      // o user doesnt periodically call a ca function
+      // o user calls this function from an auxiillary thread
+      //
+      CallbackGuard cbGuard ( cac.cbMutex );
+      epicsGuard < epicsMutex > guard ( cac.mutex );
+      pMon->cancel ( cbGuard, guard );
+    }
+    return ECA_NORMAL;
+}
+
+void ca_client_context :: eliminateExcessiveSendBacklog (
+    epicsGuard < epicsMutex > & guard, cacChannel & chan )
+{
+    if ( chan.requestMessageBytesPending ( guard ) >
+            ca_client_context :: flushBlockThreshold ) {
+        if ( this->pCallbackGuard.get() &&
+            this->createdByThread == epicsThreadGetIdSelf () ) {
+            // we need to be very careful about lock hierarchy
+            // inversion in this situation
+            epicsGuardRelease < epicsMutex > unguard ( guard );
+            {
+                epicsGuardRelease < epicsMutex > cbunguard (
+                    * this->pCallbackGuard.get() );
+                {
+                    epicsGuard < epicsMutex > nestedGuard ( this->mutex );
+                    chan.flush ( nestedGuard );
+                }
+            }
+        }
+        else {
+            chan.flush ( guard );
+        }
+    }
+}