removed unused vxWorks version defaults

Clear EPICS_DEV_SNAPSHOT flag for tagging.

.appveyor.yml

@@ -48,6 +48,7 @@ environment:
     TOOLCHAIN: 2017
   - TOOLCHAIN: cygwin
   - TOOLCHAIN: mingw
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 # Platform: architecture
 platform:
@@ -60,6 +61,10 @@ matrix:
   # VS Express installs don't have the 64 bit compiler
   - platform: x64
     TOOLCHAIN: 10.0
+  # Cygwin static-debug has compiler problems
+  - configuration: static-debug
+    TOOLCHAIN: cygwin
+
 
 #---------------------------------#
 #     building & testing          #
@@ -81,6 +86,9 @@ test_script:
 
 notifications:
 
-  - provider: Slack
-    incoming_webhook:
-      secure: RYOm3FIUYeZGjWKaeTVKwq+C3fzK54AKwbmAoECED45mex3lN+8HmrC845a6mg9xPUJ/ND51RopWVaKDD9/UzaM0SO195RQLKqUTIUafiuM=
+  - provider: Email
+    to:
+      - core-talk@aps.anl.gov
+    on_build_success: false
+
+  - provider: GitHubPullRequest

.ci/appveyor-make.bat

@@ -42,13 +42,13 @@ if "%TOOLCHAIN%"=="mingw" (
     set "MAKE=mingw32-make"
     if "%OS%"=="64BIT" (
         set "EPICS_HOST_ARCH=windows-x64-mingw"
-        set "INCLUDE=C:\tools\mingw64\include;%INCLUDE%"
-        set "PATH=C:\tools\mingw64\bin;%PATH%"
+        set "INCLUDE=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include;%INCLUDE%"
+        set "PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%"
         echo [INFO] MinGW Toolchain 64bit
     ) else (
         set "EPICS_HOST_ARCH=win32-x86-mingw"
-        set "INCLUDE=C:\tools\mingw32\include;%INCLUDE%"
-        set "PATH=C:\tools\mingw32\bin;%PATH%"
+        set "INCLUDE=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include;%INCLUDE%"
+        set "PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%"
         echo [INFO] MinGW Toolchain 32bit
     )
     echo [INFO] Compiler Version

.ci/appveyor-prepare.bat

@@ -55,16 +55,9 @@ if "%TOOLCHAIN%"=="mingw" (
     ) || (
         echo [INFO] EPICS set up for optimized build
     )
-    if "%OS%"=="64BIT" (
-        echo [INFO] Installing MinGW 64bit
-        cinst mingw || cinst mingw
-    ) else (
-        echo [INFO] Installing MinGW 32bit
-        cinst mingw --x86 || cinst mingw --x86
-    )
 )
 
-echo [INFO] Installing Make 4.1
-curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
+echo [INFO] Installing Make 4.2.1 from ANL web site
+curl -fsS --retry 3 -o C:\tools\make-4.2.1.zip https://epics.anl.gov/download/tools/make-4.2.1-win64.zip
 cd \tools
-"C:\Program Files\7-Zip\7z" e make-4.1.zip
+"C:\Program Files\7-Zip\7z" e make-4.2.1.zip

.ci/travis-build.sh

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

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

.tools/make-tar.sh

@@ -16,27 +16,53 @@ PREFIX="$3"
 if ! [ "$TOPREV" ]
 then
    cat <<EOF >&2
-usage: $0 [rev] [outfile.tar.gz] [prefix/]
+usage: $0 <rev> [<outfile> [<prefix>]]
 
   <rev> may be any git revision spec. (tag, branch, or commit id).
 
-  Output file may be .tar.gz, .tar.bz2, or any extension supported by "tar -a".
-  If output file name is omitted, "base-<rev>.tar.gz" will be used.
-  If <prefix> is omitted, the default prefix is "base-<rev>/".
+  If provided, <outfile> must end with ".tar", ".tar.gz" or ".tar.bz2".
+  If <outfile> is omitted, "base-<rev>.tar.gz" will be used.
+  If provided, <prefix> must end with "/".  If <prefix> is omitted,
+  the default is "base-<rev>/".
 EOF
    exit 1
 fi
 
-[ "$FINALTAR" ] || FINALTAR="base-$TOPREV.tar.gz"
-[ "$PREFIX" ] || PREFIX="base-$TOPREV/"
+case "$FINALTAR" in
+"")
+  TAROPT=-z
+  FINALTAR="base-$TOPREV.tar.gz"
+  ;;
+*.tar)
+  TAROPT=""
+  ;;
+*.tar.gz)
+  TAROPT=-z
+  ;;
+*.tar.bz2)
+  TAROPT=-j
+  ;;
+*)
+  die "outfile must end with '.tar.gz' or '.tar.bz2'"
+  ;;
+esac
 
 case "$PREFIX" in
-*/) ;;
-*)  die "Prefix must end with '/'";;
+"")
+  PREFIX="base-$TOPREV/"
+  ;;
+*/)
+  ;;
+*)
+  die "Prefix must end with '/'"
+  ;;
 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
@@ -94,13 +120,11 @@ then
 fi
 
 # Use the filtered list to build the final tar
-#  The -a option chooses compression automatically based on output file name.
-
-tar -C "$TDIR"/tar --files-from="$TDIR"/list.2 -caf "$FINALTAR"
+tar -c $TAROPT -C "$TDIR"/tar -T "$TDIR"/list.2 -f "$FINALTAR"
 
 echo "Wrote $FINALTAR"
 
-tar -taf "$FINALTAR" > "$TDIR"/list.3
+tar -t $TAROPT -f "$FINALTAR" > "$TDIR"/list.3
 
 # make sure we haven't picked up anything extra
 if ! diff -u "$TDIR"/list.2 "$TDIR"/list.3

.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,23 +24,30 @@ 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
+OPT_CFLAGS_YES = -O3 -g
 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_YES = -O3 -g
 OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
+CODE_LDFLAGS += $(ASAN_LDFLAGS_$(ENABLE_ASAN))
 
 PIPE_CFLAGS_YES_YES = -pipe
 PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))

configure/CONFIG_BASE

@@ -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 = 3
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
-# Not included if zero
-EPICS_PATCH_LEVEL = 2
+# Not included in the official EPICS version number if zero
+EPICS_PATCH_LEVEL = 0
 
-# 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

@@ -76,10 +76,14 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Make echo output - suppress echoing if make's '-s' flag is set
+# Silencing the build - suppress messages during 'make -s'
 NOP = :
-ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
-QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
+ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MFLAGS)),-q,)
+
+#-------------------------------------------------------
+# Convert 'make -q' flag into '-i' for genVersionHeader.pl
+QUESTION_FLAG := $(if $(findstring q,$(MFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -89,7 +93,7 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
-#Directories for libraries
+# Directories for libraries
 SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
 
 #-------------------------------------------------------

configure/CONFIG_SITE_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
 
 #---------------------------------------------------------------
 # Do not build anything if current path matches SKIP_BUILD
@@ -202,7 +205,7 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	$(CONVERTRELEASE) checkRelease
+	+$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
@@ -273,15 +276,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
@@ -378,14 +379,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)
@@ -409,7 +413,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
@@ -548,7 +552,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)
@@ -557,5 +561,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))), \

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.RHEL7-x86_64

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

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

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

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.SL6-x86

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

configure/os/CONFIG.Common.SL6-x86_64

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

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

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

configure/os/CONFIG.Common.UnixCommon

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

configure/os/CONFIG.Common.eldk42-ppc4xxFP

@@ -14,9 +14,9 @@ GNU_DIR=$(ELDK)/usr
 # This cross tool chain is installed in a somehow weired way
 # Without the following lines it does not work on RHEL7
 # but it worked on SL6
-ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2 
-ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux 
-ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward 
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/powerpc-linux
+ARCH_DEP_CXXFLAGS += -I $(ELDK)/$(GNU_TARGET)/usr/include/c++/4.2.2/backward
 
 ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/lib
 ARCH_DEP_LDFLAGS += -Wl,-rpath-link,$(ELDK)/$(GNU_TARGET)/usr/lib

configure/os/CONFIG.Common.eldk51-ppc4xxSF

@@ -3,8 +3,6 @@
 # Include definitions common to all Linux targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
-COMMANDLINE_LIBRARY = READLINE
-
 ARCH_CLASS = ppc
 
 SDK = eldk

configure/os/CONFIG.Common.eldk52-e500v2

@@ -3,8 +3,6 @@
 # Include definitions common to all Linux targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
-COMMANDLINE_LIBRARY = READLINE
-
 ARCH_CLASS = ppc
 
 SDK = eldk

configure/os/CONFIG.Common.eldk53-ppc4xxFP

@@ -3,8 +3,6 @@
 # Include definitions common to all Linux targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
-COMMANDLINE_LIBRARY = READLINE
-
 ARCH_CLASS = ppc
 
 SDK = eldk

configure/os/CONFIG.Common.fslqoriq20-e6500_64

@@ -3,8 +3,6 @@
 # Include definitions common to all Linux targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
-COMMANDLINE_LIBRARY = READLINE
-
 ARCH_CLASS = ppc
 
 SDK = fslsdk

configure/os/CONFIG.Common.raspbian-arm

@@ -8,7 +8,7 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
 # Using readline:
 # Due to missing/messed up libs in the toolchain, readline needs copies of
-# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs 
+# libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
 # /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
 # $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
 # and manually created links libtinfo.so.5 and libreadline.so.
@@ -18,8 +18,6 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 # Also copy /usr/include/readline/ directory from some readline 6 installation
 # to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/
 
-COMMANDLINE_LIBRARY = READLINE
-
 ARCH_CLASS = arm
 
 SDK_DIR = /opt/raspberrypi/arm-bcm2708

configure/os/CONFIG.Common.vxWorks-ppc603

@@ -13,7 +13,7 @@ CMPLR_SUFFIX = ppc
 ARCH_CLASS = ppc
 
 # Architecture specific build flags
-ARCH_DEP_CPPFLAGS = -DCPU=PPC603  
+ARCH_DEP_CPPFLAGS = -DCPU=PPC603
 ARCH_DEP_CFLAGS = -mcpu=603 -mstrict-align
 
 GNU_TARGET = powerpc-wrs-vxworks

configure/os/CONFIG.Common.vxWorksCommon

@@ -63,7 +63,6 @@ VXWORKS_MAJOR_VERSION = $(basename $(basename $(VXWORKS_VERSION)))
 
 # These are needed for vxWorks 6.x; the GNU toolset version number
 # is in the path to the compiler tools:
-VX_GNU_VERSION_5   = 2.96
 VX_GNU_VERSION_6.0 = 3.3.2
 VX_GNU_VERSION_6.1 = 3.3.2
 VX_GNU_VERSION_6.2 = 3.3.2
@@ -74,17 +73,9 @@ VX_GNU_VERSION_6.6 = 4.1.2
 VX_GNU_VERSION_6.7 = 4.1.2
 VX_GNU_VERSION_6.8 = 4.1.2
 VX_GNU_VERSION_6.9 = 4.3.3
-VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
-VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
 
 VX_GNU_MAJOR_VERSION = $(basename $(basename $(VX_GNU_VERSION)))
-VX_GNU_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(VX_GNU_VERSION)))
-
-# gcc version before 3.4 are "old" and need special treatment
-VX_OLD_GCC_2   = OLD
-VX_OLD_GCC_3.3 = OLD
-VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
-VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
 
 #--------------------------------------------------
 # Fix old Linux WIND_HOST_TYPE
@@ -94,21 +85,14 @@ endif
 
 #--------------------------------------------------
 # vxWorks directory definitions
-VX_DIR_5 = $(WIND_BASE)
-VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
-VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
+VX_DIR = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
 
-VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
-VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
-GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
-TARGET_CPPFLAGS = -isystem $(VX_DIR)/target/h
+GNU_TARGET_INCLUDE_DIR = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
 
 #--------------------------------------------------
 # vxWorks GNU directories
 
-GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
-GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
-GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+GNU_DIR = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
 
 #--------------------------------------------------
 # This finds nm on any supported VxWorks version
@@ -149,23 +133,12 @@ OPT_CXXFLAGS_YES = -O2
 # code flags
 CODE_CFLAGS =
 #
-# For gcc versions before 3.4 we need this g++ compiler flag
-# However WindRiver says gcc 3.3 does not need it any more
-# which would allow to build vxWorks 6 without this flag.
-# Maybe we can live without it at the penalty of larger code.
-# See vxWorks 5 docs/gnu2.96+ppc/gcc.html
-# chapter 4.5 "Where's the Template?"
-CODE_CXXFLAGS_OLD = -fno-implicit-templates
-CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC))
-
-#--------------------------------------------------
-# Modules we cannot build with old compiler
-
-PV_MODULES = pv% normativeTypes
-SKIP_BUILDS_5 = $(PV_MODULES)
-SKIP_BUILDS_OLD = $(PV_MODULES)
-SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
-SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))
+# For vxWorks versions before 6.3 we need this g++ compiler flag
+CODE_CXXFLAGS_6.0 = -fno-implicit-templates
+CODE_CXXFLAGS_6.1 = -fno-implicit-templates
+CODE_CXXFLAGS_6.2 = -fno-implicit-templates
+CODE_CXXFLAGS_6 = $(CODE_CXXFLAGS_$(VXWORKS_VERSION))
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VXWORKS_MAJOR_VERSION))
 
 #--------------------------------------------------
 # no shared libs for vxWorks
@@ -173,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.Common.yocto21-aarch64

@@ -3,8 +3,6 @@
 # Include definitions common to all Linux targets
 include $(CONFIG)/os/CONFIG.Common.linuxCommon
 
-COMMANDLINE_LIBRARY = READLINE
-
 ARCH_CLASS = arm64
 
 SDK = petalinux

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

@@ -12,5 +12,5 @@ CC = $(GNU_BIN)/$(CMPLR_PREFIX)gcc44
 CCC = $(GNU_BIN)/$(CMPLR_PREFIX)g++44
 
 TARGET_CPPFLAGS = -isystem /usr/lib/x86_64-redhat-linux6E/include
-TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib 
+TARGET_LDFLAGS = -L /usr/lib/x86_64-redhat-linux6E/lib
 LINK.cpp += --as-needed -lc -lm -lrt -lpthread -lreadline -ltinfo

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_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.UnixCommon

@@ -0,0 +1,2 @@
+SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)

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.Common.linuxCommon

@@ -0,0 +1 @@
+COMMANDLINE_LIBRARY = READLINE

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -2,25 +2,58 @@
 #
 # Site specific definitions for vxWorks target builds.
 
-# Compiler options can vary with the vxWorks version number, so we
-# need to know that.  Do not include any third-level digits.
+#### Fixes for CONFIG.Common.vxWorksCommon  #######
 
-# Note: vxWorks 5.4.x and 5.5.x (Tornado 2.x) are not supported.
-# VxWorks 6.0 through 6.5 use older, untested versions of GCC.
+# These are needed for vxWorks 6.x; the GNU toolset version number
+# is in the path to the compiler tools:
+VX_GNU_VERSION_5   = 2.96
+VX_GNU_VERSION_6 = $(VX_GNU_VERSION_$(VXWORKS_VERSION))
+VX_GNU_VERSION = $(VX_GNU_VERSION_$(VXWORKS_MAJOR_VERSION))
+VX_GNU_MINOR_VERSION = $(basename $(patsubst $(VX_GNU_MAJOR_VERSION).%,%,$(VX_GNU_VERSION)))
 
-#VXWORKS_VERSION = 6.6
-#VXWORKS_VERSION = 6.7
-#VXWORKS_VERSION = 6.8
-VXWORKS_VERSION = 6.9
+# gcc version before 3.4 are "old" and need special treatment
+VX_OLD_GCC_2   = OLD
+VX_OLD_GCC_3.3 = OLD
+VX_OLD_GCC_3   = $(VX_OLD_GCC_3.$(VX_GNU_MINOR_VERSION))
+VX_OLD_GCC = $(VX_OLD_GCC_$(VX_GNU_MAJOR_VERSION))
 
+# vxWorks directory definitions
+VX_DIR_5 = $(WIND_BASE)
+VX_DIR_6 = $(WIND_BASE)/vxworks-$(VXWORKS_VERSION)
+VX_DIR = $(VX_DIR_$(VXWORKS_MAJOR_VERSION))
 
-# Sites may override the following path for a particular host
-# architecture by adding it to an appropriate
-# CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
+VX_INCLUDE_DIRS_5 = $(VX_DIR)/target/h
+VX_INCLUDE_DIRS_6 = $(VX_DIR)/target/h $(VX_DIR)/target/h/wrn/coreip
+GNU_TARGET_INCLUDE_DIR = $(VX_INCLUDE_DIRS_$(VXWORKS_MAJOR_VERSION))
+TARGET_CPPFLAGS = -isystem $(VX_DIR)/target/h
+
+# vxWorks GNU directories
+
+GNU_DIR_5 = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+GNU_DIR_6 = $(WIND_BASE)/gnu/$(VX_GNU_VERSION)-vxworks-$(VXWORKS_VERSION)/$(WIND_HOST_TYPE)
+GNU_DIR = $(GNU_DIR_$(VXWORKS_MAJOR_VERSION))
+
+# Operating system flags
+OP_SYS_CFLAGS += -fno-strict-aliasing
+
+# For gcc versions before 3.4 we need this g++ compiler flag
+# However WindRiver says gcc 3.3 does not need it any more
+# which would allow to build vxWorks 6 without this flag.
+# Maybe we can live without it at the penalty of larger code.
+# See vxWorks 5 docs/gnu2.96+ppc/gcc.html
+# chapter 4.5 "Where's the Template?"
+CODE_CXXFLAGS_OLD = -fno-implicit-templates
+CODE_CXXFLAGS = $(CODE_CXXFLAGS_$(VX_OLD_GCC))
 
 # WIND_BASE is where you installed the Wind River software.
-
-#WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
-#WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
 WIND_BASE = /afs/psi.ch/project/vxworks/VxWorks$(VXWORKS_VERSION)
+
+#--------------------------------------------------
+# Modules we cannot build with old compiler
+
+PV_MODULES = pv% normativeTypes
+SKIP_BUILDS_5 = $(PV_MODULES)
+SKIP_BUILDS_OLD = $(PV_MODULES)
+SKIP_BUILDS_6 = $(SKIP_BUILDS_$(VX_OLD_GCC))
+SKIP_BUILDS = $(SKIP_BUILDS_$(VXWORKS_MAJOR_VERSION))
+

configure/os/CONFIG_SITE.linux-x86.Common

@@ -1,9 +1,12 @@
-INSTALL_LOCATION=/usr/local/epics/base-7.0.1
-#EPICS_SITE_VERSION:=$(shell date +%Y-%m-%d)
+INSTALL_LOCATION=/usr/local/epics/base-$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
+EPICS_SITE_VERSION:=$(shell date +%Y-%m-%d)
 
 GNU_HOST_ARCH=i686
 GNU_HOST_OS=linux
 
+# LD_LIBRARY_PATH may cause problems for eldk53-ppc4xxFP
+LD_LIBRARY_PATH=
+
 # vxWorks 5.5 for MVxxxx boards
 CROSS_COMPILER_TARGET_ARCHS += T2-ppc604
 
@@ -27,7 +30,7 @@ CROSS_COMPILER_TARGET_ARCHS += eldk52-e500v2
 
 # DeltaTau PowerPMAC
 CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
-#CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
+CROSS_COMPILER_TARGET_ARCHS += eldk53-ppc4xxFP
 
 # Test other vxWorks versions
 #CROSS_COMPILER_TARGET_ARCHS += V66-ppc603

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.3</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS 7.0.1: Known Problems</h1>
+<h1 style="text-align: center">EPICS 7.0.3: 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.3 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.3</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,24 +1,24 @@
                            Installation Instructions
 
-                           EPICS Base Release 7.0.1.1
+                            EPICS Base Release 7.0.3
 
    --------------------------------------------------------------------------
 
   Table of Contents
 
-     * What is EPICS base?
-     * What is new in this release?
-     * Copyright
-     * Supported platforms
-     * Supported compilers
-     * Software requirements
-     * Host system storage requirements
-     * Documentation
-     * Directory Structure
-     * Build related components
-     * Building EPICS base (Unix and Win32)
-     * Example application and extension
-     * Multiple host platforms
+     * What is EPICS base?
+     * What is new in this release?
+     * Copyright
+     * Supported platforms
+     * Supported compilers
+     * Software requirements
+     * Host system storage requirements
+     * Documentation
+     * Directory Structure
+     * Build related components
+     * Building EPICS base (Unix and Win32)
+     * Example application and extension
+     * Multiple host platforms
 
    --------------------------------------------------------------------------
 
@@ -164,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.3</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</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.3</h1>
 
 <!-- Insert new items immediately below this template ...
 
@@ -18,15 +30,130 @@
 
 -->
 
-<h3>Skipping build of modules and re-enabling vxWorks 5</h3>
+<h3>epicsTimeGetCurrent() optimization</h3>
+
+<p>Add a fast path to epicsTimeGetCurrent() and related calls
+in the common case where only the default OS current time provider is
+registered.  This path does not take the global mutex guarding
+the time providers list, potentially reducing lock contention.</p>
+
+<h3>dbEvent tweak Queue size</h3>
+
+<p>The size of the queue used by dbEvent to push monitor updates
+has been slightly increased based on DBR_TIME_DOUBLE to better fill
+an ethernet frame.  This may result in slightly fewer, but larger
+frames being sent.</p>
+
+<h3>mbbo/mbbiDirect number of bits as precision</h3>
+
+<p>Report NOBT as &quot;precision&quot; through the dbAccess API.
+This is not accessible through CA, but is planned to be used through
+QSRV.</p>
+
+<h1 align="center">EPICS Release 7.0.2.2</h1>
+
+<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>
 
-<p>Any module can be skipped during the build for a given architecture by setting
-the Makfile variable <tt>SKIP_BUILDS</tt> to a list of patterns matching the
-module directories to skip. For example to skip building any pvAccess related
-modules set <code>SKIP_BUILDS=pv%&nbsp;normativeTypes</code> in the
-CONFIG.Common.&lt;arch&gt; file for that architecture.
-The builds for vxWorks 5 and up to 6.2 do that.
-</p>
 
 <h3>Git Branches Recombined</h3>
 
@@ -38,6 +165,7 @@ 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>
@@ -102,9 +230,139 @@ 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>
 
@@ -122,15 +380,18 @@ 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 extended to 32 bit</h3>
+<h3>Record types mbbiDirect and mbboDirect upgraded to 32 bit</h3>
 
-<p>The VAL fields of mbbiDirect and mbboDirect records have
-been extended from <tt>DBF_USHORT</tt> (16 bit) to <tt>DBF_LONG</tt> (32 bit).
-New bit fields <tt>B10</tt>...<tt>B1F</tt> have been added.</p>
+<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 which accesses the bit fields can test if the macro
-<tt>mbbiDirectRecord1BF</tt> or <tt>mbboDirectRecord1BF</tt> is
-defined. Device support which only accesses RVAL needs no modification.</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>
 
@@ -772,11 +1033,94 @@ 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>Cleaning up with Multiple CA contexts in a Process</h3>
+
+<p>Bruno Martins reported a problem with the CA client library at shutdown in a
+process that uses multiple CA client contexts. The first context that triggers
+the CA client exit handler prevents any others from being able to clean up
+because it resets the ID of an internal epicsThreadPrivate variable which is
+shared by all clients. This action has been removed from the client library,
+which makes cleanup of clients like this possible.</p>
+
+<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
@@ -808,15 +1152,84 @@ 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">

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>
@@ -116,80 +126,81 @@ made.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Website Manager</td>
-      <td>Create a release milestone on Launchpad if necessary and set the
-        expected release date. Note that pre-release and release-candidate
-        versions do not appear on Launchpad, only the final release.</td>
+      <td>Create a release milestone on Launchpad. If a target release date is
+        known set "Date Targeted" to the expected release date. Note that
+        pre-release and release-candidate versions should not get Launchpad
+        milestones, only the final release.</td>
       </tr>
     <tr>
       <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.3-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R7.1.1-rc<i>n</i></tt>
+            <tt>R7.0.3-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.3-rc1' R7.0.3-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.3-rc1 base-7.0.3-rc1.tar.gz base-7.0.3-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.3-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 +258,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,101 +274,170 @@ 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.3' R7.0.3</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.3 base-7.0.3.tar.gz base-7.0.3/
           </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.3.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>
+      <th colspan="3">Publish to epics.anl.gov</th>
+      </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>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>
-      </tr>
-    <tr>
-      <th colspan="3">Publish and Announce it</th>
-      </tr>
-    <tr>
-      <td>&nbsp;</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>
-      </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>
+      <th colspan="3">Publish to epics-controls</th>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Website Manager</td>
+      <td>Upload the tar file and its <tt>.asc</tt> signature file to the
+        epics-controls web-server [ToDo: ssh-key, location]</td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Website Manager</td>
+      <td>Follow instructions on
+        <a href="https://epics-controls.org/resources-and-support/documents/epics-website-documentation/adding-a-page-for-a-new-release/">
+        Add a page for a new release</a> to create a new release webpage (not
+        required for a patch release though, just edit the existing page).</td>
+      </tr>
+
+    <tr>
+      <th colspan="3">Publish to Launchpad</th>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Website Manager</td>
+      <td>Go to the Launchpad milestone for this release. Click the Create
+        release button and add the release date. Put a URL for the release page
+        in the Release notes box, and click the Create release button. Upload
+        the tar file and its <tt>.asc</tt> signature file to the new Launchpad
+        release page.</td>
+      </tr>
+    <tr>
+      <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>
+      </tr>
+
+    <tr>
+      <th colspan="3">Make Announcement</th>
+      </tr>
+    <tr>
+      <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
@@ -36,23 +37,10 @@ pva2pva_DEPEND_DIRS = pvAccess
 SUBMODULES += example
 example_DEPEND_DIRS = pva2pva pvaClient
 
+SUBMODULES += pcas
+pcas_DEPEND_DIRS = ca
+
 # Allow sites to add extra submodules
 -include Makefile.local
 
-# 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/configure/CONFIG_CA_VERSION

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

modules/ca/src/client/CAref.html

@@ -3143,7 +3143,8 @@ indicating the current state of the channel.</p>
 <dl>
   <dt><code>COUNT</code></dt>
     <dd>The element count to be read from the specified channel. A count of
-      zero means use the current element count from the server.</dd>
+      zero means use the current element count from the server, effectively
+      resulting in a variable size array subscription.</dd>
 </dl>
 <dl>
   <dt><code>CHID</code></dt>

modules/ca/src/client/Makefile

@@ -126,7 +126,7 @@ EXPANDVARS += EPICS_CA_DEVELOPMENT_FLAG
 EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))")
 
 # shared library ABI version.
-SHRLIB_VERSION = 4.13.1
+SHRLIB_VERSION = $(EPICS_CA_MAJOR_VERSION).$(EPICS_CA_MINOR_VERSION).$(EPICS_CA_MAINTENANCE_VERSION)
 
 include $(TOP)/configure/RULES
 

modules/ca/src/client/ca_client_context.cpp

@@ -45,20 +45,12 @@ 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;
@@ -67,6 +59,8 @@ cacService * ca_client_context::pDefaultService = 0;
 epicsMutex * ca_client_context::pDefaultServiceInstallMutex;
 
 ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
+    mutex(__FILE__, __LINE__),
+    cbMutex(__FILE__, __LINE__),
     createdByThread ( epicsThreadGetIdSelf () ),
     ca_exception_func ( 0 ), ca_exception_arg ( 0 ),
     pVPrintfFunc ( errlogVprintf ), fdRegFunc ( 0 ), fdRegArg ( 0 ),

modules/ca/src/client/oldAccess.h

@@ -289,7 +289,6 @@ private:
 };
 
 extern "C" void cacOnceFunc ( void * );
-extern "C" void cacExitHandler ( void *);
 
 struct ca_client_context : public cacContextNotify
 {
@@ -429,7 +428,6 @@ private:
     ca_client_context & operator = ( const ca_client_context & );
 
     friend void cacOnceFunc ( void * );
-    friend void cacExitHandler ( void *);
     static cacService * pDefaultService;
     static epicsMutex * pDefaultServiceInstallMutex;
     static const unsigned flushBlockThreshold;

modules/ca/src/client/repeaterSubscribeTimer.cpp

@@ -37,6 +37,7 @@ repeaterSubscribeTimer::repeaterSubscribeTimer (
     epicsMutex & cbMutexIn, cacContextNotify & ctxNotifyIn ) :
     timer ( queueIn.createTimer () ), iiu ( iiuIn ), 
         cbMutex ( cbMutexIn ),ctxNotify ( ctxNotifyIn ),
+        stateMutex(__FILE__, __LINE__),
         attempts ( 0 ), registered ( false ), once ( false )
 {
 }

modules/ca/src/client/udpiiu.cpp

@@ -193,7 +193,7 @@ udpiiu::udpiiu (
 
 #ifdef IP_MULTICAST_TTL
     {
-        int ttl;
+        osiSockOptMcastTTL_t ttl;
         long val;
         if(envGetLongConfigParam(&EPICS_CA_MCAST_TTL, &val))
             val =1;
@@ -961,7 +961,7 @@ bool udpiiu::pushDatagramMsg ( epicsGuard < epicsMutex > & guard,
 
 udpiiu :: SearchDestUDP :: SearchDestUDP ( 
     const osiSockAddr & destAddr, udpiiu & udpiiuIn ) :
-    _destAddr ( destAddr ), _udpiiu ( udpiiuIn )
+    _lastError (0u), _destAddr ( destAddr ), _udpiiu ( udpiiuIn )
 {
 }
 
@@ -976,6 +976,13 @@ void udpiiu :: SearchDestUDP :: searchRequest (
         int status = sendto ( _udpiiu.sock, const_cast<char *>(pBuf), bufSizeAsInt, 0, 
                 & _destAddr.sa, sizeof ( _destAddr.sa ) );
         if ( status == bufSizeAsInt ) {
+            if ( _lastError ) {
+                char buf[64];
+                sockAddrToDottedIP ( &_destAddr.sa, buf, sizeof ( buf ) );
+                errlogPrintf (
+                    "CAC: ok sending UDP msg to %s\n", buf);
+            }
+            _lastError = 0;
             break;
         }
         if ( status >= 0 ) {
@@ -1002,7 +1009,9 @@ void udpiiu :: SearchDestUDP :: searchRequest (
             else if ( localErrno == SOCK_EBADF ) {
                 break;
             }
-            else {
+            else if ( localErrno == _lastError) {
+                break;
+            } else {
                 char sockErrBuf[64];
                 epicsSocketConvertErrnoToString ( 
                     sockErrBuf, sizeof ( sockErrBuf ) );
@@ -1011,6 +1020,8 @@ void udpiiu :: SearchDestUDP :: searchRequest (
                 errlogPrintf (
                     "CAC: error = \"%s\" sending UDP msg to %s\n",
                     sockErrBuf, buf);
+
+                _lastError = localErrno;
                 break;
             }
         }

modules/ca/src/client/udpiiu.h

@@ -123,6 +123,7 @@ private:
         void show ( 
             epicsGuard < epicsMutex > &, unsigned level ) const;
     private:
+        int _lastError;
         osiSockAddr _destAddr;
         udpiiu & _udpiiu;
     };

modules/ca/src/perl/Makefile

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

modules/ca/src/template/top/caPerlApp/caget.pl

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

modules/ca/src/tools/caget.c

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

modules/ca/src/tools/cainfo.c

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

modules/ca/src/tools/camonitor.c

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

modules/ca/src/tools/caput.c

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

modules/database/configure/CONFIG

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

modules/database/configure/CONFIG_DATABASE_VERSION

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

modules/database/src/ioc/Makefile

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

modules/database/src/ioc/as/asDbLib.c

@@ -240,6 +240,10 @@ int astac(const char *pname,const char *user,const char *location)
     char	*puser;
     char	*plocation;
 
+    if (!pname || !user || !location){
+        printf("Usage: astac \"record name\", \"user\", \"host\"\n");
+        return(1);
+    }
     paddr = dbCalloc(1,sizeof(DBADDR) + sizeof(ASCLIENTPVT));
     pasclientpvt = (ASCLIENTPVT *)(paddr + 1);
     status=dbNameToAddr(pname,paddr);

modules/database/src/ioc/db/Makefile

@@ -35,7 +35,6 @@ INC += dbTest.h
 INC += dbCaTest.h
 INC += db_test.h
 INC += db_field_log.h
-INC += initHooks.h
 INC += recGbl.h
 INC += dbIocRegister.h
 INC += chfPlugin.h
@@ -63,7 +62,7 @@ DBDINC += menuScan
 DBDINC += dbCommon
 
 dbMenusPod = $(notdir $(wildcard ../db/menu*.dbd.pod))
-HTMLS += $(patsubst %.dbd.pod,%.html,$(menusPod))
+HTMLS += $(patsubst %.dbd.pod,%.html,$(dbMenusPod))
 
 dbCore_SRCS += dbLock.c
 dbCore_SRCS += dbAccess.c
@@ -87,7 +86,6 @@ dbCore_SRCS += recGbl.c
 dbCore_SRCS += callback.c
 dbCore_SRCS += dbCa.c
 dbCore_SRCS += dbCaTest.c
-dbCore_SRCS += initHooks.c
 dbCore_SRCS += cvtBpt.c
 dbCore_SRCS += dbContext.cpp
 dbCore_SRCS += dbChannelIO.cpp

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

@@ -54,7 +54,8 @@ typedef struct cbQueueSet {
     epicsEventId semWakeUp;
     epicsRingPointerId queue;
     int queueOverflow;
-    int shutdown;
+    int queueOverflows;
+    int shutdown; // use atomic
     int threadsConfigured;
     int threadsRunning;
 } cbQueueSet;
@@ -70,12 +71,15 @@ epicsExportAddress(int,callbackParallelThreadsDefault);
 /* Timer for Delayed Requests */
 static epicsTimerQueueId timerQueue;
 
-/* Shutdown handling */
-enum ctl {ctlInit, ctlRun, ctlPause, ctlExit};
-static volatile enum ctl cbCtl;
-static epicsEventId startStopEvent;
+enum cbState_t {
+    cbInit,  /* before callbackInit() and after callbackCleanup() */
+    cbRun,   /* after callbackInit() and before callbackStop() */
+    cbStop,  /* after callbackStop() and before callbackCleanup() */
+};
 
-static int callbackIsInit;
+static int cbState; // holdscbState_t, use atomic ops
+
+static epicsEventId startStopEvent;
 
 /* Static data */
 static char *threadNamePrefix[NUM_CALLBACK_PRIORITIES] = {
@@ -95,7 +99,7 @@ static int priorityValue[NUM_CALLBACK_PRIORITIES] = {0, 1, 2};
 
 int callbackSetQueueSize(int size)
 {
-    if (callbackIsInit) {
+    if (epicsAtomicGetIntT(&cbState)!=cbInit) {
         fprintf(stderr, "Callback system already initialized\n");
         return -1;
     }
@@ -103,9 +107,54 @@ int callbackSetQueueSize(int size)
     return 0;
 }
 
+int callbackQueueStatus(const int reset, callbackQueueStats *result)
+{
+    int ret;
+    if (epicsAtomicGetIntT(&cbState)==cbInit) return -1;
+    if (result) {
+        int prio;
+        result->size = callbackQueueSize;
+        for(prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+            epicsRingPointerId qId = callbackQueue[prio].queue;
+            result->numUsed[prio] = epicsRingPointerGetUsed(qId);
+            result->maxUsed[prio] = epicsRingPointerGetHighWaterMark(qId);
+            result->numOverflow[prio] = epicsAtomicGetIntT(&callbackQueue[prio].queueOverflows);
+        }
+        ret = 0;
+    } else {
+        ret = -2;
+    }
+    if (reset) {
+        int prio;
+        for(prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+            epicsRingPointerResetHighWaterMark(callbackQueue[prio].queue);
+        }
+    }
+    return ret;
+}
+
+void callbackQueueShow(const int reset)
+{
+    callbackQueueStats stats;
+    if (callbackQueueStatus(reset, &stats) == -1) {
+        fprintf(stderr, "Callback system not initialized, yet. Please run "
+            "iocInit before using this command.\n");
+    } else {
+        int prio;
+        printf("PRIORITY  HIGH-WATER MARK  ITEMS IN Q  Q SIZE  %% USED  Q OVERFLOWS\n");
+        for (prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+            double qusage = 100.0 * stats.numUsed[prio] / stats.size;
+            printf("%8s  %15d  %10d  %6d  %6.1f  %11d\n",
+                   threadNamePrefix[prio], stats.maxUsed[prio],
+                   stats.numUsed[prio], stats.size, qusage,
+                   stats.numOverflow[prio]);
+        }
+    }
+}
+
 int callbackParallelThreads(int count, const char *prio)
 {
-    if (callbackIsInit) {
+    if (epicsAtomicGetIntT(&cbState)!=cbInit) {
         fprintf(stderr, "Callback system already initialized\n");
         return -1;
     }
@@ -161,7 +210,7 @@ static void callbackTask(void *arg)
     taskwdInsert(0, NULL, NULL);
     epicsEventSignal(startStopEvent);
 
-    while(!mySet->shutdown) {
+    while(!epicsAtomicGetIntT(&mySet->shutdown)) {
         void *ptr;
         if (epicsRingPointerIsEmpty(mySet->queue))
             epicsEventMustWait(mySet->semWakeUp);
@@ -184,11 +233,10 @@ void callbackStop(void)
 {
     int i;
 
-    if (cbCtl == ctlExit) return;
-    cbCtl = ctlExit;
+    if (epicsAtomicCmpAndSwapIntT(&cbState, cbRun, cbStop)!=cbRun) return;
 
     for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
-        callbackQueue[i].shutdown = 1;
+        epicsAtomicSetIntT(&callbackQueue[i].shutdown, 1);
         epicsEventSignal(callbackQueue[i].semWakeUp);
     }
 
@@ -206,6 +254,10 @@ void callbackCleanup(void)
 {
     int i;
 
+    if(epicsAtomicCmpAndSwapIntT(&cbState, cbStop, cbInit)!=cbStop) {
+        fprintf(stderr, "callbackCleanup() but not stopped\n");
+    }
+
     for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
         cbQueueSet *mySet = &callbackQueue[i];
 
@@ -215,7 +267,6 @@ void callbackCleanup(void)
     }
 
     epicsTimerQueueRelease(timerQueue);
-    callbackIsInit = 0;
     memset(callbackQueue, 0, sizeof(callbackQueue));
 }
 
@@ -225,15 +276,14 @@ void callbackInit(void)
     int j;
     char threadName[32];
 
-    if (callbackIsInit) {
-        errlogMessage("Warning: callbackInit called again before callbackCleanup\n");
+    if (epicsAtomicCmpAndSwapIntT(&cbState, cbInit, cbRun)!=cbInit) {
+        fprintf(stderr, "Warning: callbackInit called again before callbackCleanup\n");
         return;
     }
-    callbackIsInit = 1;
 
     if(!startStopEvent)
         startStopEvent = epicsEventMustCreate(epicsEventEmpty);
-    cbCtl = ctlRun;
+
     timerQueue = epicsTimerQueueAllocate(0, epicsThreadPriorityScanHigh);
 
     for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
@@ -290,6 +340,7 @@ int callbackRequest(CALLBACK *pcallback)
     if (!pushOK) {
         epicsInterruptContextMessage(fullMessage[priority]);
         mySet->queueOverflow = TRUE;
+        epicsAtomicIncrIntT(&mySet->queueOverflows);
         return S_db_bufFull;
     }
     epicsEventSignal(mySet->semWakeUp);

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

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

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

@@ -34,7 +34,7 @@
 #include "errlog.h"
 #include "errMdef.h"
 
-#define epicsExportSharedSymbols
+#include "epicsExport.h" /* #define epicsExportSharedSymbols */
 #include "caeventmask.h"
 #include "callback.h"
 #include "dbAccessDefs.h"
@@ -65,6 +65,9 @@
 epicsShareDef struct dbBase *pdbbase = 0;
 epicsShareDef volatile int interruptAccept=FALSE;
 
+epicsShareDef int dbAccessDebugPUTF = 0;
+epicsExportAddress(int, dbAccessDebugPUTF);
+
 /* Hook Routines */
 
 epicsShareDef DB_LOAD_RECORDS_HOOK_ROUTINE dbLoadRecordsHook = NULL;
@@ -446,22 +449,6 @@ int dbGetFieldIndex(const struct dbAddr *paddr)
     return paddr->pfldDes->indRecordType;
 }
 
-/*
- *  Process a record if its scan field is passive.
- *     Will notify if processing is complete by callback.
- *       (only if you are interested in completion)
- */
-long dbScanPassive(dbCommon *pfrom, dbCommon *pto)
-{
-    /* if not passive just return success */
-    if (pto->scan != 0)
-        return 0;
-
-    if (pfrom && pfrom->ppn)
-        dbNotifyAdd(pfrom,pto);
-    return dbProcess(pto);
-}
-
 /*
  *   Process the record.
  *     1.  Check for breakpoints.
@@ -527,7 +514,8 @@ long dbProcess(dbCommon *precord)
         unsigned short monitor_mask;
 
         if (*ptrace)
-            printf("%s: Active %s\n", context, precord->name);
+            printf("%s: dbProcess of Active '%s' with RPRO=%d\n",
+                context, precord->name, precord->rpro);
 
         /* raise scan alarm after MAX_LOCK times */
         if ((precord->stat == SCAN_ALARM) ||
@@ -556,7 +544,8 @@ long dbProcess(dbCommon *precord)
     /* if disabled check disable alarm severity and return success */
     if (precord->disa == precord->disv) {
         if (*ptrace)
-            printf("%s: Disabled %s\n", context, precord->name);
+            printf("%s: dbProcess of Disabled '%s'\n",
+                context, precord->name);
 
         /*take care of caching and notifyCompletion*/
         precord->rpro = FALSE;
@@ -593,7 +582,7 @@ long dbProcess(dbCommon *precord)
     }
 
     if (*ptrace)
-        printf("%s: Process %s\n", context, precord->name);
+        printf("%s: dbProcess of '%s'\n", context, precord->name);
 
     /* process record */
     status = prset->process(precord);
@@ -612,6 +601,31 @@ all_done:
     return status;
 }
 
+long dbEntryToAddr(const DBENTRY *pdbentry, DBADDR *paddr)
+{
+    dbFldDes *pflddes = pdbentry->pflddes;
+    short dbfType = pflddes->field_type;
+
+    paddr->precord = pdbentry->precnode->precord;
+    paddr->pfield = pdbentry->pfield;
+    paddr->pfldDes = pflddes;
+    paddr->no_elements = 1;
+    paddr->field_type  = dbfType;
+    paddr->field_size  = pflddes->size;
+    paddr->special     = pflddes->special;
+    paddr->dbr_field_type = mapDBFToDBR[dbfType];
+
+    if (paddr->special == SPC_DBADDR) {
+        const rset *prset = dbGetRset(paddr);
+
+        /* Let record type modify paddr */
+        if (prset && prset->cvt_dbaddr) {
+            return prset->cvt_dbaddr(paddr);
+        }
+    }
+    return 0;
+}
+
 /*
  *  Fill out a database structure (*paddr) for
  *    a record given by the name "pname."
@@ -622,9 +636,7 @@ all_done:
 long dbNameToAddr(const char *pname, DBADDR *paddr)
 {
     DBENTRY dbEntry;
-    dbFldDes *pflddes;
     long status = 0;
-    short dbfType;
 
     if (!pname || !*pname || !pdbbase)
         return S_db_notFound;
@@ -639,46 +651,28 @@ long dbNameToAddr(const char *pname, DBADDR *paddr)
         status = dbGetAttributePart(&dbEntry, &pname);
     if (status) goto finish;
 
-    pflddes = dbEntry.pflddes;
-    dbfType = pflddes->field_type;
-
-    paddr->precord = dbEntry.precnode->precord;
-    paddr->pfield = dbEntry.pfield;
-    paddr->pfldDes = pflddes;
-    paddr->no_elements = 1;
-    paddr->field_type  = dbfType;
-    paddr->field_size  = pflddes->size;
-    paddr->special     = pflddes->special;
-    paddr->dbr_field_type = mapDBFToDBR[dbfType];
-
-    if (paddr->special == SPC_DBADDR) {
-        rset *prset = dbGetRset(paddr);
-
-        /* Let record type modify paddr */
-        if (prset && prset->cvt_dbaddr) {
-            status = prset->cvt_dbaddr(paddr);
-            if (status)
-                goto finish;
-            dbfType = paddr->field_type;
-        }
-    }
+    status = dbEntryToAddr(&dbEntry, paddr);
+    if (status) goto finish;
 
     /* Handle field modifiers */
     if (*pname++ == '$') {
+        short dbfType = paddr->field_type;
+
         /* Some field types can be accessed as char arrays */
         if (dbfType == DBF_STRING) {
             paddr->no_elements = paddr->field_size;
             paddr->field_type = DBF_CHAR;
             paddr->field_size = 1;
             paddr->dbr_field_type = DBR_CHAR;
-        } else if (dbfType >= DBF_INLINK && dbfType <= DBF_FWDLINK) {
+        }
+        else if (dbfType >= DBF_INLINK && dbfType <= DBF_FWDLINK) {
             /* Clients see a char array, but keep original dbfType */
             paddr->no_elements = PVLINK_STRINGSZ;
             paddr->field_size = 1;
             paddr->dbr_field_type = DBR_CHAR;
-        } else {
+        }
+        else {
             status = S_dbLib_fieldNotFound;
-            goto finish;
         }
     }
 
@@ -690,7 +684,7 @@ finish:
 void dbInitEntryFromAddr(struct dbAddr *paddr, DBENTRY *pdbentry)
 {
     struct dbCommon *prec = paddr->precord;
-    dbCommonPvt *ppvt = CONTAINER(prec, dbCommonPvt, common);
+    dbCommonPvt *ppvt = dbRec2Pvt(prec);
 
     memset((char *)pdbentry,'\0',sizeof(DBENTRY));
 
@@ -704,7 +698,7 @@ void dbInitEntryFromAddr(struct dbAddr *paddr, DBENTRY *pdbentry)
 
 void dbInitEntryFromRecord(struct dbCommon *prec, DBENTRY *pdbentry)
 {
-    dbCommonPvt *ppvt = CONTAINER(prec, dbCommonPvt, common);
+    dbCommonPvt *ppvt = dbRec2Pvt(prec);
 
     memset((char *)pdbentry,'\0',sizeof(DBENTRY));
 
@@ -713,6 +707,18 @@ void dbInitEntryFromRecord(struct dbCommon *prec, DBENTRY *pdbentry)
     pdbentry->precnode = ppvt->recnode;
 }
 
+struct link* dbGetDevLink(struct dbCommon* prec)
+{
+    DBLINK *plink = 0;
+    DBENTRY entry;
+    dbInitEntryFromRecord(prec, &entry);
+    if(dbFindField(&entry, "INP")==0 || dbFindField(&entry, "OUT")==0) {
+        plink = (DBLINK*)entry.pfield;
+    }
+    dbFinishEntry(&entry);
+    return plink;
+}
+
 long dbValueSize(short dbr_type)
 {
     /* sizes for value associated with each DBR request type */
@@ -1049,7 +1055,7 @@ static long dbPutFieldLink(DBADDR *paddr,
         return S_db_badDbrtype;
     }
 
-    status = dbParseLink(pstring, pfldDes->field_type, &link_info, 0);
+    status = dbParseLink(pstring, pfldDes->field_type, &link_info);
     if (status)
         return status;
 
@@ -1222,8 +1228,8 @@ long dbPutField(DBADDR *paddr, short dbrType,
              precord->scan == 0 &&
              dbrType < DBR_PUT_ACKT)) {
             if (precord->pact) {
-                if (precord->tpro)
-                    printf("%s: Active %s\n",
+                if (dbAccessDebugPUTF && precord->tpro)
+                    printf("%s: dbPutField to Active '%s', setting RPRO=1\n",
                         epicsThreadGetNameSelf(), precord->name);
                 precord->rpro = TRUE;
             } else {
@@ -1356,4 +1362,3 @@ done:
     paddr->pfield = pfieldsave;
     return status;
 }
-

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

@@ -34,6 +34,7 @@ extern "C" {
 
 epicsShareExtern struct dbBase *pdbbase;
 epicsShareExtern volatile int interruptAccept;
+epicsShareExtern int dbAccessDebugPUTF;
 
 /*  The database field and request types are defined in dbFldTypes.h*/
 /* Data Base Request Options	*/
@@ -203,6 +204,8 @@ struct dbr_alDouble     {DBRalDouble};
 #define S_db_notInit    (M_dbAccess|67) /*Not initialized*/
 #define S_db_bufFull    (M_dbAccess|68) /*Buffer full*/
 
+struct dbEntry;
+
 epicsShareFunc long dbPutSpecial(struct dbAddr *paddr,int pass);
 epicsShareFunc rset * dbGetRset(const struct dbAddr *paddr);
 epicsShareFunc long dbPutAttribute(
@@ -212,8 +215,29 @@ epicsShareFunc int dbGetFieldIndex(const struct dbAddr *paddr);
 epicsShareFunc long dbScanPassive(
     struct dbCommon *pfrom,struct dbCommon *pto);
 epicsShareFunc long dbProcess(struct dbCommon *precord);
-epicsShareFunc long dbNameToAddr(
-    const char *pname,struct dbAddr *);
+epicsShareFunc long dbNameToAddr(const char *pname, struct dbAddr *paddr);
+
+/** Initialize DBADDR from a dbEntry
+ * Also handles SPC_DBADDR processing. This is really an internal
+ * routine for use by dbNameToAddr() and dbChannelCreate().
+ */
+epicsShareFunc long dbEntryToAddr(const struct dbEntry *pdbentry,
+    struct dbAddr *paddr);
+
+/** Initialize DBENTRY from a valid dbAddr*
+ * Constant time equivalent of dbInitEntry() then dbFindRecord(),
+ * and finally dbFollowAlias().
+ */
+epicsShareFunc void dbInitEntryFromAddr(struct dbAddr *paddr,
+    struct dbEntry *pdbentry);
+
+/** Initialize DBENTRY from a valid record (dbCommon*)
+ * Constant time equivalent of dbInitEntry() then dbFindRecord(),
+ * and finally dbFollowAlias() when no field is specified.
+ */
+epicsShareFunc void dbInitEntryFromRecord(struct dbCommon *prec,
+    struct dbEntry *pdbentry);
+
 epicsShareFunc devSup* dbDTYPtoDevSup(dbRecordType *prdes, int dtyp);
 epicsShareFunc devSup* dbDSETtoDevSup(dbRecordType *prdes, struct dset *pdset);
 epicsShareFunc long dbGetField(

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

@@ -703,7 +703,12 @@ static long doLocked(struct link *plink, dbLinkUserCallback rtn, void *priv)
     caLink *pca;
     long status;
 
-    pcaGetCheck
+    assert(plink);
+    if (plink->type != CA_LINK) return -1;
+    pca = (caLink *)plink->value.pv_link.pvt;
+    assert(pca);
+    epicsMutexMustLock(pca->lock);
+    assert(pca->plink);
     status = rtn(plink, priv);
     epicsMutexUnlock(pca->lock);
     return status;
@@ -842,6 +847,7 @@ static void eventCallback(struct event_handler_args arg)
     struct dbr_time_double *pdbr_time_double;
     dbCaCallback monitor = 0;
     void *userPvt = 0;
+    int doScan = 1;
 
     assert(pca);
     epicsMutexMustLock(pca->lock);
@@ -872,10 +878,13 @@ static void eventCallback(struct event_handler_args arg)
         memcpy(pca->pgetString, dbr_value_ptr(arg.dbr, arg.type), size);
         pca->gotInString = TRUE;
     } else switch (arg.type){
+    case DBR_TIME_ENUM:
+        /* Disable the record scan if we also have a string monitor */
+        doScan = !(plink->value.pv_link.pvlMask & pvlOptInpString);
+        /* fall through */
     case DBR_TIME_STRING: 
     case DBR_TIME_SHORT: 
     case DBR_TIME_FLOAT:
-    case DBR_TIME_ENUM:
     case DBR_TIME_CHAR:
     case DBR_TIME_LONG:
     case DBR_TIME_DOUBLE:
@@ -893,7 +902,7 @@ static void eventCallback(struct event_handler_args arg)
     pca->sevr = pdbr_time_double->severity;
     pca->stat = pdbr_time_double->status;
     memcpy(&pca->timeStamp, &pdbr_time_double->stamp, sizeof(epicsTimeStamp));
-    if (precord) {
+    if (doScan && precord) {
         struct pv_link *ppv_link = &plink->value.pv_link;
 
         if ((ppv_link->pvlMask & pvlOptCP) ||

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

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