Release R7.0.8.1

The handling of N-to-M array compression was broken with the addition
of the partial buffer option, which broke the bounds check that was
being used.

Note that this also makes the partial buffer option more consistent;
if, for example, you have
```
record(compress, foo) {
  field(ALG, "N to 1 Average")
  field(INP, "bar NPP")
  field(NSAM, 2)
  field(N, 2)
  field(PBUF, YES)
}
```
(with `bar` having, e.g. length 3), then this will now behave as
expected on both of the samples.

.appveyor.yml

@@ -25,17 +25,6 @@ init:
 # Set clone depth (do not fetch complete history)
 clone_depth: 5
 
-# Skipping commits affecting only specific files
-skip_commits:
-  files:
-    - 'documentation/*'
-    - 'startup/*'
-    - '.github/*'
-    - '.tools/*'
-    - '.gitattributes'
-    - '**/*.html'
-    - '**/*.md'
-
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
@@ -67,6 +56,8 @@ environment:
   - CMP: vs2010
   - CMP: gcc
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    # TODO: static linking w/ readline isn't working.  Bypass auto-detect
+    COMMANDLINE_LIBRARY: EPICS
 
 # Platform: processor architecture
 platform:

.appveyor/epics-base-7.yml

@@ -32,17 +32,6 @@ init:
 # Set clone depth (do not fetch complete history)
 clone_depth: 5
 
-# Skipping commits affecting only specific files
-skip_commits:
-  files:
-    - 'documentation/*'
-    - 'startup/*'
-    - '.github/*'
-    - '.tools/*'
-    - '.gitattributes'
-    - '**/*.html'
-    - '**/*.md'
-
 #---------------------------------#
 #   build matrix configuration    #
 #---------------------------------#
@@ -73,6 +62,9 @@ environment:
   - CMP: vs2012
   - CMP: vs2010
   - CMP: gcc
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    # TODO: static linking w/ readline isn't working.  Bypass auto-detect
+    COMMANDLINE_LIBRARY: EPICS
 
 # Platform: processor architecture
 platform:

.editorconfig

@@ -0,0 +1,8 @@
+# Documentation for this file: https://EditorConfig.org
+
+root = true
+
+# Unix-style newlines ending every file,
+# as some compilers complain about files not ending in newline
+[*]
+insert_final_newline = true

.github/workflows/check-editorconfig.yml

@@ -0,0 +1,13 @@
+name: Check EditorConfig
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  editorconfig:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: EditorConfig-Action
+        uses: greut/eclint-action@v0

.github/workflows/ci-scripts-build.yml

@@ -15,6 +15,7 @@ on:
       - 'startup/*'
       - '.appveyor/*'
       - '.tools/*'
+      - '.lgtm.yml'
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
@@ -24,9 +25,11 @@ on:
       - 'startup/*'
       - '.appveyor/*'
       - '.tools/*'
+      - '.lgtm.yml'
       - '.gitattributes'
       - '**/*.html'
       - '**/*.md'
+  workflow_dispatch:
 
 env:
     SETUP_PATH: .ci-local:.ci
@@ -34,16 +37,14 @@ env:
     EPICS_TEST_IMPRECISE_TIMING: YES
 
 jobs:
-  build-base:
+  native:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     # Set environment variables from matrix parameters
     env:
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
-      WINE: ${{ matrix.wine }}
-      RTEMS: ${{ matrix.rtems }}
-      RTEMS_TARGET: ${{ matrix.rtems_target }}
+      CI_CROSS_TARGETS: ${{ matrix.cross }}
       EXTRA: ${{ matrix.extra }}
       TEST: ${{ matrix.test }}
     strategy:
@@ -51,16 +52,35 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
+          - os: ubuntu-22.04
+            cmp: gcc-12
+            name: "Ub-22 gcc-12 c++20 Werror"
+            # Turn all warnings into errors,
+            # except for those we could not fix (yet).
+            # Remove respective -Wno-error=... flag once it is fixed.
+            extra: "CMD_CXXFLAGS=-std=c++20
+                    CMD_CPPFLAGS='-fdiagnostics-color
+                                  -Werror
+                                  -Wno-error=deprecated-declarations
+                                  -Wno-error=stringop-truncation
+                                  -Wno-error=restrict
+                                  -Wno-error=sizeof-pointer-memaccess
+                                  -Wno-error=nonnull
+                                  -Wno-error=dangling-pointer
+                                  -Wno-error=format-overflow
+                                  -Wno-error=format-security
+                                  -Wno-error=stringop-overread'"
+
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            wine: "64"
+            cross: "windows-x64-mingw"
             name: "Ub-20 gcc-9 + MinGW"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
-            wine: "64"
+            cross: "windows-x64-mingw"
             name: "Ub-20 gcc-9 + MinGW, static"
 
           - os: ubuntu-20.04
@@ -69,10 +89,16 @@ jobs:
             extra: "CMD_CXXFLAGS=-std=c++11"
             name: "Ub-20 gcc-9 C++11, static"
 
-          - os: ubuntu-16.04
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: static
+            extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
+            name: "Ub-20 gcc-9 unsigned char"
+
+          - os: ubuntu-20.04
             cmp: clang
             configuration: default
-            name: "Ub-16 clang-9"
+            name: "Ub-20 clang-10"
 
           - os: ubuntu-20.04
             cmp: clang
@@ -83,96 +109,42 @@ jobs:
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-pc686-qemu
-            test: NO
+            cross: "RTEMS-pc686-qemu@5"
             name: "Ub-20 gcc-9 + RT-5.1 pc686"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-beatnik
+            cross: "RTEMS-beatnik@5"
             test: NO
             name: "Ub-20 gcc-9 + RT-5.1 beatnik"
 
-          # Only build one RTEMS target per CPU family
-          # unless it's running the tests
-          #
-          # - os: ubuntu-20.04
-          #   cmp: gcc
-          #   configuration: default
-          #   rtems: "5"
-          #   rtems_target: RTEMS-mvme3100
-          #   test: NO
-          #   name: "Ub-20 gcc-9 + RT-5.1 mvme3100"
-          #
-          # - os: ubuntu-20.04
-          #   cmp: gcc
-          #   configuration: default
-          #   rtems: "5"
-          #   rtems_target: RTEMS-qoriq_e500
-          #   test: NO
-          #   name: "Ub-20 gcc-9 + RT-5.1 qoriq_e500"
-
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-xilinx_zynq_a9_qemu
+            cross: "RTEMS-xilinx_zynq_a9_qemu@5"
             test: NO
             name: "Ub-20 gcc-9 + RT-5.1 xilinx_zynq_a9_qemu"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "5"
-            rtems_target: RTEMS-uC5282
+            cross: "RTEMS-uC5282@5"
             test: NO
             name: "Ub-20 gcc-9 + RT-5.1 uC5282"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "4.10"
             name: "Ub-20 gcc-9 + RT-4.10"
-            rtems_target: RTEMS-pc386-qemu
+            cross: "RTEMS-pc386-qemu@4.10"
+            test: NO
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            rtems: "4.9"
             name: "Ub-20 gcc-9 + RT-4.9"
-            rtems_target: RTEMS-pc386-qemu
-
-          - os: ubuntu-16.04
-            cmp: gcc-4.8
-            utoolchain: "4.8"
-            configuration: default
-            name: "Ub-16 gcc-4.8"
-
-          - os: ubuntu-16.04
-            cmp: gcc-4.9
-            utoolchain: "4.9"
-            configuration: default
-            name: "Ub-16 gcc-4.9"
-
-          - os: ubuntu-20.04
-            cmp: gcc-8
-            utoolchain: "8"
-            configuration: default
-            name: "Ub-20 gcc-8"
-
-          - os: ubuntu-20.04
-            cmp: gcc-9
-            utoolchain: "9"
-            configuration: default
-            name: "Ub-20 gcc-9"
-
-          - os: ubuntu-20.04
-            cmp: clang
-            configuration: default
-            name: "Ub-20 clang-10"
+            cross: "RTEMS-pc386-qemu@4.9"
 
           - os: macos-latest
             cmp: clang
@@ -181,13 +153,15 @@ jobs:
 
           - os: windows-2019
             cmp: vs2019
-            configuration: default
+            configuration: debug
             name: "Win2019 MSC-19"
+            extra: "CMD_CXXFLAGS=-analysis"
 
           - os: windows-2019
             cmp: vs2019
-            configuration: static
+            configuration: static-debug
             name: "Win2019 MSC-19, static"
+            extra: "CMD_CXXFLAGS=-analysis"
 
           - os: windows-2019
             cmp: vs2019
@@ -199,8 +173,28 @@ jobs:
             configuration: default
             name: "Win2019 mingw"
 
+          # Cross builds
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-aarch64"
+            cross: linux-aarch64
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-arm gnueabi"
+            cross: linux-arm@arm-linux-gnueabi
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-arm gnueabihf"
+            cross: linux-arm@arm-linux-gnueabihf
+
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -210,14 +204,90 @@ jobs:
         sudo apt-get update
         sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
       if: runner.os == 'Linux'
-    - name: "apt-get install ${{ matrix.cmp }}"
+    - name: Prepare and compile dependencies
+      run: python .ci/cue.py prepare
+    - name: Build main module
+      run: python .ci/cue.py build
+    - name: Run main module tests
+      run: python .ci/cue.py -T 60M test
+    - name: Upload tapfiles Artifact
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v3
+      with:
+        name: tapfiles ${{ matrix.name }}
+        path: '**/O.*/*.tap'
+        if-no-files-found: ignore
+    - name: Collect and show test results
+      if: ${{ always() }}
+      run: python .ci/cue.py -T 5M test-results
+
+  docker:
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ matrix.image }}
+    # Set environment variables from matrix parameters
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+      EXTRA: ${{ matrix.extra }}
+      TEST: ${{ matrix.test }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # Job names also name artifacts, character limitations apply
+        include:
+          - name: "CentOS-7"
+            image: centos:7
+            cmp: gcc
+            configuration: default
+
+          - name: "Fedora-33"
+            image: fedora:33
+            cmp: gcc
+            configuration: default
+
+          - name: "Fedora-latest"
+            image: fedora:latest
+            cmp: gcc
+            configuration: default
+
+    steps:
+    - name: "Build newer Git"
+      # actions/checkout@v2 wants git >=2.18
+      # centos:7 has 1.8
+      if: matrix.image=='centos:7'
       run: |
-        sudo apt-get update
-        sudo apt-get -y install software-properties-common
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get -y install g++-${{ matrix.utoolchain }}
-      if: matrix.utoolchain
+        yum -y install curl make gcc curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker
+        curl https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.29.0.tar.gz | tar -xz
+        cd git-*
+        make -j2 prefix=/usr/local all
+        make prefix=/usr/local install
+        cd ..
+        rm -rf git-*
+        type -a git
+        git --version
+    - name: "Redhat setup"
+      run: |
+        dnfyum() {
+            dnf -y "$@" || yum -y "$@"
+            return $?
+        }
+        dnfyum install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
+        git --version || dnfyum install git
+        # rather than just bite the bullet and link python3 -> python,
+        # people would rather just break all existing scripts...
+        [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python
+        python --version
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@master
+      if: matrix.image!='centos:7'
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@node16
+      if: matrix.image=='centos:7'
     - name: Prepare and compile dependencies
       run: python .ci/cue.py prepare
     - name: Build main module
@@ -226,7 +296,7 @@ jobs:
       run: python .ci/cue.py -T 20M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'

.gitignore

@@ -11,8 +11,10 @@
 /modules/Makefile.local
 O.*/
 /QtC-*
+/.qtc_*
 /.vscode/
 *.orig
 *.log
 .*.swp
 .DS_Store
+.iocsh_history

.lgtm.yml

@@ -0,0 +1,50 @@
+# Configuration for lgtm.com
+#
+
+path_classifiers:
+  test:
+    - exclude: /
+    - test
+    - "modules/*/test*"
+  library:
+    - modules/libcom/src/yacc
+    - modules/libcom/src/flex
+  template:
+    - src/template
+    - modules/ca/src/template
+    - modules/database/src/template
+
+extraction:
+  cpp:
+    prepare:
+      packages:
+        - "libreadline-dev"
+    index:
+      build_command:
+        - "g++ --version"
+        - "make --version"
+        - "perl --version"
+        - "make -sj2 || echo '*** Build failed, ignored for lgtm ***'"
+
+  python:
+    index:
+      include:
+        - src/tools
+
+  # Interpreted languages to be excluded
+  javascript:
+    index:
+      exclude:
+        - "*"
+
+  # Compiled languages to be excluded
+  java:
+    index:
+      build_command: "echo No Java code in this project"
+  csharp:
+    index:
+      build_command: "echo No C# code in this project"
+  go:
+    index:
+      build_command: "echo No Go code in this project"
+

.tools/make-tar.sh

@@ -20,9 +20,9 @@ maybedie() {
 
 usage() {
    cat <<EOF >&2
-usage: $0 [-v] [-s] <rev> [<outfile> [<prefix>]]
+usage: $0 [-v] [-d] <rev> [<outfile> [<prefix>]]
 
-  <rev> may be any git revision spec. (tag, branch, or commit id).
+  <rev> may be any git revision spec. (tag or, using -d, branch or commit id).
 
   If provided, <outfile> must end with ".tar", ".tar.gz" or ".tar.bz2".
   If <outfile> is omitted, "base-<rev>.tar.gz" will be used.
@@ -140,10 +140,12 @@ sed \
   -e '/\/\.ci-local\//d' \
   -e '/\/\.tools\//d' \
   -e '/\/jenkins\//d' \
-  -e '/\/\.git/d' \
+  -e '/\/\.github\//d' \
+  -e '/\/\.gitmodules$/d' \
   -e '/\/\.hgtags$/d' \
   -e '/\/\.cproject$/d' \
   -e '/\/\.project$/d' \
+  -e '/\/\.lgtm\.yml$/d' \
   -e '/\/\.travis\.yml$/d' \
   -e '/\/\.appveyor\.yml$/d' \
   -e '/\/\.readthedocs\.yml$/d' \

configure/CONFIG

@@ -34,6 +34,11 @@ ifeq ($(origin EPICS_HOST_ARCH), undefined)
   EHA :=
 endif
 
+# Make Perl hash iteration reproducible.
+# See: https://reproducible-builds.org/docs/stable-outputs/
+#
+export PERL_HASH_SEED = 0
+
 -include $(CONFIG)/RELEASE
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH)
 -include $(CONFIG)/RELEASE.$(EPICS_HOST_ARCH).Common

configure/CONFIG.gnuCommon

@@ -47,6 +47,7 @@ OPT_CXXFLAGS_NO = -g
 
 CODE_LDFLAGS = $(PROF_CXXFLAGS_$(PROFILE)) $(GPROF_CXXFLAGS_$(GPROF))
 CODE_LDFLAGS += $(ASAN_LDFLAGS_$(ENABLE_ASAN))
+OPT_LDFLAGS_NO = -g
 
 PIPE_CFLAGS_YES_YES = -pipe
 PIPE_CFLAGS = $(PIPE_CFLAGS_$(GCC_PIPE)_$(GNU))

configure/CONFIG_BASE

@@ -38,10 +38,16 @@ TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
 FIND_TOOL = $(firstword $(wildcard $(TOOLS)/$(1) \
     $(TOP)/src/tools/$(1)) $(EPICS_BASE)/src/tools/$(1))
 
+#---------------------------------------------------------------
+# Find Perl modules for dependencies
+FIND_PM = $(wildcard $(EPICS_BASE)/lib/perl/$(1))
+
 #---------------------------------------------------------------
 # EPICS Base build tools and tool flags
 
-PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.pl
+PODTOHTML_pl     = $(TOOLS)/podToHtml.pl
+PODTOHTML_dep    = $(PODTOHTML_pl) $(call FIND_PM,EPICS/PodHtml.pm)
+PODTOHTML        = $(PERL) $(PODTOHTML_pl)
 CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
 FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
 GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG) $(QUESTION_FLAG)

configure/CONFIG_BASE_VERSION

@@ -48,11 +48,11 @@ EPICS_VERSION = 7
 EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 6
+EPICS_MODIFICATION = 8
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included in the official EPICS version number if zero
-EPICS_PATCH_LEVEL = 0
+EPICS_PATCH_LEVEL = 1
 
 # Immediately after an official release the EPICS_PATCH_LEVEL is incremented
 # and the -DEV suffix is added (similar to the Maven -SNAPSHOT versions)

configure/CONFIG_CA_VERSION

@@ -2,7 +2,7 @@
 
 EPICS_CA_MAJOR_VERSION = 4
 EPICS_CA_MINOR_VERSION = 14
-EPICS_CA_MAINTENANCE_VERSION = 0
+EPICS_CA_MAINTENANCE_VERSION = 4
 
 # Development flag, set to zero for release versions
 

configure/CONFIG_COMMON

@@ -56,6 +56,7 @@ GNU_DIR = /usr
 # Directories
 
 INSTALL_LOCATION            = $(TOP)
+INSTALL_ABSOLUTE            = $(abspath $(INSTALL_LOCATION))
 
 INSTALL_LOCATION_LIB        = $(INSTALL_LOCATION)/lib
 INSTALL_LOCATION_BIN        = $(INSTALL_LOCATION)/bin
@@ -71,23 +72,31 @@ INSTALL_DBD                 = $(INSTALL_LOCATION)/dbd
 INSTALL_DB                  = $(INSTALL_LOCATION)/db
 INSTALL_CONFIG              = $(INSTALL_LOCATION)/configure
 
-FINAL_LOCATION = $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION))
+#-------------------------------------------------------
+# These are default settings that may be overridden later
 
-# Directory for OS independant build created files
-COMMON_DIR = ../O.Common
+# Eventual install path (to be compiled into binaries)
+FINAL_LOCATION              = $(INSTALL_ABSOLUTE)
 
-# IOC's absolute path to $(TOP), may be overridden inside the application
-IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
+# IOC's view of install path
+IOCS_APPL_TOP               = $(INSTALL_ABSOLUTE)
 
 #-------------------------------------------------------
-# Silencing the build - suppress messages during 'make -s'
+# How to portably check the flags to make
+makeflags := $(firstword $(filter-out -,$(filter-out --%,$(MAKEFLAGS))))
+define checkflags
+  make-$1 := $(findstring $1,$(makeflags))
+endef
+# This is extensible to most single letter flags:
+$(foreach flag,s q, $(eval $(call checkflags,$(flag))))
+
+# Silent builds - suppress messages during 'make -s'
 NOP = :
-ECHO = @$(if $(filter -s,$(MFLAGS)),$(NOP),echo)
-QUIET_FLAG := $(if $(filter -s,$(MFLAGS)),-q,)
+ECHO = @$(if $(make-s),$(NOP),echo)
+QUIET_FLAG := $(if $(make-s),-q,)
 
-#-------------------------------------------------------
 # Convert 'make -q' flag into '-i' for genVersionHeader.pl
-QUESTION_FLAG := $(if $(filter -q,$(MFLAGS)),-i,)
+QUESTION_FLAG := $(if $(make-q),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -133,6 +142,8 @@ LIB_SUFFIX =
 SHRLIB_PREFIX = $(LIB_PREFIX)
 DLLSTUB_PREFIX = $(LIB_PREFIX)
 DLLSTUB_SUFFIX = $(LIB_SUFFIX)
+LOADABLE_SHRLIB_PREFIX = $(SHRLIB_PREFIX)
+LOADABLE_SHRLIB_SUFFIX = $(SHRLIB_SUFFIX)
 
 BUILDLIB_PREFIX_YES = $(DLLSTUB_PREFIX)
 BUILDLIB_PREFIX_NO  = $(LIB_PREFIX)
@@ -153,12 +164,14 @@ CMPLR_SRC_DIRS += . $(foreach dir, .. $(SRC_DIRS), \
 ALL_SRC_DIRS = $(CMPLR_SRC_DIRS) $(OS_SRC_DIRS) $(GENERIC_SRC_DIRS)
 
 #--------------------------------------------------
+# Directory for OS independant build created files
+COMMON_DIR = ../O.Common
+
 # compile line include directories
-INSTALL_INCLUDES += \
-       -I$(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS) \
-       -I$(INSTALL_INCLUDE)/os/$(OS_CLASS) \
-       -I$(INSTALL_INCLUDE)
-SRC_INCLUDES = -I$(COMMON_DIR) $(addprefix -I, $(wildcard $(ALL_SRC_DIRS)))
+INSTALL_INCLUDE_DIRS = $(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS) \
+        $(INSTALL_INCLUDE)/os/$(OS_CLASS) $(INSTALL_INCLUDE)
+INSTALL_INCLUDES += $(addprefix -I, $(INSTALL_INCLUDE_DIRS))
+SRC_INCLUDES = $(addprefix -I, $(COMMON_DIR) $(wildcard $(ALL_SRC_DIRS)))
 
 #--------------------------------------------------
 # Target filename definitions
@@ -172,23 +185,27 @@ TESTSHRLIBNAME = $(TESTSHRLIBNAME_$(SHARED_LIBRARIES))
 #--------------------------------------------------
 # obj files
 
-TARGET_OBJS =  $($*_LDOBJS) $(addsuffix $(OBJ),$(basename $($*_OBJS) $($*_SRCS)))
+TARGET_OBJS = $($*_LDOBJS) $(addsuffix $(OBJ), \
+    $(basename $($*_OBJS) $($*_SRCS)))
 
-PRODUCT_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
+PRODUCT_OBJS = $(addsuffix $(OBJ), \
+    $(basename $(SRCS) $(USR_SRCS) $(PROD_SRCS) $(USR_OBJS) $(PROD_OBJS)))
 PROD_LD_OBJS = $(TARGET_OBJS) $(PRODUCT_OBJS)
 
-LIBRARY_OBJS = $(addsuffix $(OBJ),$(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
+LIBRARY_OBJS = $(addsuffix $(OBJ), \
+    $(basename $(SRCS) $(USR_SRCS) $(LIB_SRCS) $(LIBSRCS) $(USR_OBJS) $(LIB_OBJS)))
 LIBRARY_LD_OBJS = $(TARGET_OBJS) $(LIBRARY_OBJS)
 
 #--------------------------------------------------
 # Windows resource files
 
-TARGET_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $($*_RCS))),)
+TARGET_RESS = $(if $(RES), $(addsuffix $(RES), $(basename $($*_RCS))))
 
-PROD_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(PROD_RCS))),)
+PROD_RESS = $(if $(RES), $(addsuffix $(RES), $(basename $(RCS) $(PROD_RCS))))
 PROD_LD_RESS = $(TARGET_RESS) $(PROD_RESS)
 
-LIBRARY_RESS = $(if $(RES),$(addsuffix $(RES),$(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS))),)
+LIBRARY_RESS = $(if $(RES), $(addsuffix $(RES), \
+    $(basename $(RCS) $(LIB_RCS) $(LIBRARY_RCS))))
 LIBRARY_LD_RESS = $(TARGET_RESS) $(LIBRARY_RESS)
 
 #--------------------------------------------------
@@ -257,6 +274,7 @@ WARN_CXXFLAGS = $(WARN_CXXFLAGS_$($(BUILD_CLASS)_WARN))
 OPT_CPPFLAGS = $(OPT_CPPFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CFLAGS = $(OPT_CFLAGS_$($(BUILD_CLASS)_OPT))
 OPT_CXXFLAGS = $(OPT_CXXFLAGS_$($(BUILD_CLASS)_OPT))
+OPT_LDFLAGS = $(OPT_LDFLAGS_$($(BUILD_CLASS)_OPT))
 
 # Static build flags
 STATIC_CFLAGS = $(STATIC_CFLAGS_$(STATIC_BUILD))
@@ -265,19 +283,19 @@ STATIC_LDFLAGS = $(STATIC_LDFLAGS_$(STATIC_BUILD))
 STATIC_LDLIBS = $(STATIC_LDLIBS_$(STATIC_BUILD))
 
 #--------------------------------------------------
-# cflags for shared library src files (from SHRLIB_CFLAGS)
-LIBRARY_SRCS=$(basename $(foreach lib,$(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY),$($(lib)_OBJSNAME) $(LIBRARY_OBJS)))
-LIBRARY_SRC_CFLAGS=$($(patsubst $*,SHRLIB,$(findstring $*,$(LIBRARY_SRCS)))_CFLAGS)
+# cflags for shared library src files
+LIBRARY_SRCS = $(basename $(foreach lib, \
+    $(LIBRARY) $(TESTLIBRARY) $(LOADABLE_LIBRARY), \
+    $($(lib)_OBJSNAME) $(LIBRARY_OBJS)))
+LIBRARY_SRC_CFLAGS = $(if $(findstring $*, $(LIBRARY_SRCS)), $(SHRLIB_CFLAGS))
 
 #--------------------------------------------------
-# prefix, suffix, and ldflags for loadable shared libraries
-TARGET_LIB_LDFLAGS=$($(patsubst $*,LOADABLE_,$(findstring $*,$(LOADABLE_LIBRARY)))SHRLIB_LDFLAGS)
-LOADABLE_SHRLIB_PREFIX=$(SHRLIB_PREFIX)
-LOADABLE_SHRLIB_SUFFIX=$(SHRLIB_SUFFIX)
+# ldflags for loadable and shared libraries
+TARGET_LIB_LDFLAGS = $(if $(findstring $*, $(LOADABLE_LIBRARY)), \
+    $(LOADABLE_SHRLIB_LDFLAGS), $(SHRLIB_LDFLAGS))
 
 #--------------------------------------------------
 # Command-line input support default
-COMMANDLINE_LIBRARY = EPICS
 OP_SYS_LDLIBS += $(LDLIBS_$(COMMANDLINE_LIBRARY))
 OP_SYS_LDFLAGS += $(LDFLAGS_$(COMMANDLINE_LIBRARY))
 RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
@@ -285,31 +303,31 @@ RUNTIME_LDFLAGS += $(RUNTIME_LDFLAGS_$(COMMANDLINE_LIBRARY))
 #--------------------------------------------------
 # Flags
 
-INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES)\
- $(TARGET_INCLUDES) $(USR_INCLUDES) $(CMD_INCLUDES) $(OP_SYS_INCLUDES)\
- $($(BUILD_CLASS)_INCLUDES)
+INCLUDES = -I. $(SRC_INCLUDES) $(INSTALL_INCLUDES) $(RELEASE_INCLUDES) \
+    $(TARGET_INCLUDES) $(USR_INCLUDES) $(CMD_INCLUDES) $(OP_SYS_INCLUDES) \
+    $($(BUILD_CLASS)_INCLUDES)
 
-CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS)\
- $(DEBUG_CFLAGS) $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS)\
- $(USR_CFLAGS) $(CMD_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS)\
- $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
+CFLAGS = $($(BUILD_CLASS)_CFLAGS) $(POSIX_CFLAGS) $(OPT_CFLAGS) \
+    $(DEBUG_CFLAGS) $(PIPE_CFLAGS) $(WARN_CFLAGS) $(TARGET_CFLAGS) \
+    $(USR_CFLAGS) $(CMD_CFLAGS) $(ARCH_DEP_CFLAGS) $(CODE_CFLAGS) \
+    $(STATIC_CFLAGS) $(OP_SYS_CFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS)\
- $(DEBUG_CXXFLAGS) $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS)\
- $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS)\
- $(STATIC_CXXFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
+CXXFLAGS = $($(BUILD_CLASS)_CXXFLAGS) $(POSIX_CXXFLAGS) $(OPT_CXXFLAGS) \
+    $(DEBUG_CXXFLAGS) $(PIPE_CFLAGS) $(WARN_CXXFLAGS) $(TARGET_CXXFLAGS) \
+    $(USR_CXXFLAGS) $(CMD_CXXFLAGS) $(ARCH_DEP_CXXFLAGS) $(CODE_CXXFLAGS) \
+    $(STATIC_CXXFLAGS) $(OP_SYS_CXXFLAGS) $(LIBRARY_SRC_CFLAGS)
 
-LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS)\
- $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS)\
- $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
+LDFLAGS = $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(USR_LDFLAGS) $(CMD_LDFLAGS) \
+    $(POSIX_LDFLAGS) $(ARCH_DEP_LDFLAGS) $(DEBUG_LDFLAGS) $(OP_SYS_LDFLAGS) \
+    $($(BUILD_CLASS)_LDFLAGS) $(RUNTIME_LDFLAGS) $(CODE_LDFLAGS)
 
-LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS)\
- $(GNU_LDLIBS_$(GNU))
+LDLIBS = $(POSIX_LDLIBS) $(ARCH_DEP_LDLIBS) $(DEBUG_LDLIBS) $(OP_SYS_LDLIBS) \
+    $(GNU_LDLIBS_$(GNU))
 
-CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS)\
- $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS)\
- $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS)\
- $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) $(API_CPPFLAGS)
+CPPFLAGS = $($(BUILD_CLASS)_CPPFLAGS) $(POSIX_CPPFLAGS) $(OPT_CPPFLAGS) \
+    $(DEBUG_CPPFLAGS) $(WARN_CPPFLAGS) $(BASE_CPPFLAGS) $(TARGET_CPPFLAGS) \
+    $(USR_CPPFLAGS) $(CMD_CPPFLAGS) $(ARCH_DEP_CPPFLAGS) $(OP_SYS_CPPFLAGS) \
+    $(OP_SYS_INCLUDE_CPPFLAGS) $(CODE_CPPFLAGS) $(API_CPPFLAGS)
 
 #--------------------------------------------------
 # ar definition default
@@ -396,7 +414,7 @@ INSTALL_DOCS = $(DOCS:%= $(INSTALL_DOC)/%)
 INSTALL_HTMLS = $(HTMLS:%= $(INSTALL_HTML)/$(HTMLS_DIR)/%)
 
 INSTALL_TEMPLATE = $(addprefix $(INSTALL_TEMPLATES_SUBDIR)/, \
-                   $(subst $(CONFIG),top/configure,$(TEMPLATES)))
+    $(subst $(CONFIG),top/configure,$(TEMPLATES)))
 INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%)
 
 INSTALL_BIN_INSTALLS = $(addprefix $(INSTALL_BIN)/,$(notdir $(BIN_INSTALLS)))
@@ -431,42 +449,41 @@ INSTALL_INC += $(foreach inc, $(INC), \
         $(CMPLR_INSTALL_INC) \
         $(OS_INSTALL_INC) \
         $(GENERIC_INSTALL_INC) \
-        $(GENERATED_INSTALL_INC) ) )
-INSTALL_INC += $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INC_$(OS_CLASS)) )
+        $(GENERATED_INSTALL_INC)))
+INSTALL_INC += $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INC_$(OS_CLASS)))
 
 #
 # Rule 0
 #
-CMPLR_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/, $(INSTALL_INC_jjj) )
-INSTALL_INC_jjj = $(foreach dir, $(CMPLR_SRC_DIRS), $(INSTALL_INC_iii)  )
-INSTALL_INC_iii = $(subst $(dir)/, , $(INSTALL_INC_hhh) )
-INSTALL_INC_hhh = $(wildcard $(addsuffix /$(inc), $(dir)) )
+CMPLR_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/compiler/$(CMPLR_CLASS)/, \
+    $(foreach dir, $(CMPLR_SRC_DIRS), \
+        $(subst $(dir)/,, $(wildcard $(addsuffix /$(inc), $(dir))))))
 
 #
 # Rule 1
 #
-OS_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, $(INSTALL_INC_ggg) )
-INSTALL_INC_ggg = $(foreach dir, $(OS_SRC_DIRS), $(INSTALL_INC_fff)  )
-INSTALL_INC_fff = $(subst $(dir)/, , $(INSTALL_INC_eee) )
-INSTALL_INC_eee = $(wildcard $(addsuffix /$(inc), $(dir)) )
+OS_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/os/$(OS_CLASS)/, \
+    $(foreach dir, $(OS_SRC_DIRS), \
+        $(subst $(dir)/,, $(wildcard $(addsuffix /$(inc), $(dir))))))
 
 #
 # Rule 2
 #
-GENERIC_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/, $(INSTALL_INC_ccc) )
-INSTALL_INC_ccc = $(foreach dir, .. $(SRC_DIRS), $(INSTALL_INC_bbb)  )
-INSTALL_INC_bbb = $(subst $(dir)/, , $(INSTALL_INC_aaa) )
-INSTALL_INC_aaa = $(wildcard $(addsuffix /$(inc), $(dir)) )
+GENERIC_INSTALL_INC = $(addprefix $(INSTALL_INCLUDE)/, \
+    $(foreach dir, .. $(SRC_DIRS), \
+        $(subst $(dir)/,, $(wildcard $(addsuffix /$(inc), $(dir))))))
 
 #
 # Rule 3
 #
 GENERATED_INSTALL_INC = $(INSTALL_INCLUDE)/$(inc)
 
-COMMON_INC += $(filter $(COMMON_DIR)/%, $(foreach file, $(INC), \
-    $(firstword  $(SOURCE_INC) $(COMMON_DIR)/$(file) ) ) )
-SOURCE_INC = $(wildcard $(file) $(SOURCE_INC_bbb) )
-SOURCE_INC_bbb = $(foreach dir, $(ALL_SRC_DIRS), $(SOURCE_INC_aaa)  )
-SOURCE_INC_aaa = $(addsuffix /$(file), $(dir) )
+#---------------------------------------------------------------
+# Files listed in INC that must first be created in O.Common
+COMMON_INC += $(filter $(COMMON_DIR)/%, \
+    $(foreach file, $(INC), \
+        $(firstword $(wildcard $(file) \
+            $(foreach dir, $(ALL_SRC_DIRS), \
+                $(addsuffix /$(file), $(dir)))) $(COMMON_DIR)/$(file))))
 
 endif

configure/CONFIG_DATABASE_MODULE

@@ -5,22 +5,28 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Set EPICS_DATABASE if necessary
-ifndef EPICS_DATABASE
-  EPICS_DATABASE = $(if $(BUILDING_DATABASE),$(INSTALL_LOCATION),$(EPICS_BASE))
+# Installed perl scripts and dependent modules that have
+# a significant effect on the script's output
+DBDEXPAND_pl      = $(EPICS_BASE_HOST_BIN)/dbdExpand.pl
+DBDTORECTYPEH_pl  = $(EPICS_BASE_HOST_BIN)/dbdToRecordtypeH.pl
+DBDTORECTYPEH_dep = $(DBDTORECTYPEH_pl) $(call FIND_PM,DBD/Rec*.pm)
+DBDTOMENUH_pl     = $(EPICS_BASE_HOST_BIN)/dbdToMenuH.pl
+DBDTOMENUH_dep    = $(DBDTOMENUH_pl) $(call FIND_PM,DBD/Menu.pm)
+DBDTOHTML_pl      = $(EPICS_BASE_HOST_BIN)/dbdToHtml.pl
+DBDTOHTML_dep     = $(DBDTOHTML_pl) $(call FIND_PM,EPICS/Pod*Html.pm)
+REGRECDEVDRV_pl   = $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl
+REGRECDEVDRV_dep  = $(REGRECDEVDRV_pl)
 
-  # Paths to tools built here
-  EPICS_DATABASE_HOST_BIN = $(EPICS_DATABASE)/bin/$(EPICS_HOST_ARCH)
-endif
+# Commands for running scripts in recipes
+DBEXPAND                   = $(PERL) $(DBDEXPAND_pl)
+DBTORECORDTYPEH            = $(PERL) $(DBDTORECTYPEH_pl)
+DBTOMENUH                  = $(PERL) $(DBDTOMENUH_pl)
+DBDTOHTML                  = $(PERL) $(DBDTOHTML_pl)
+REGISTERRECORDDEVICEDRIVER = $(PERL) $(REGRECDEVDRV_pl)
 
-# Set location of locally-built tools
-MAKEBPT                    = $(EPICS_DATABASE_HOST_BIN)/makeBpt$(HOSTEXE)
-DBEXPAND                   = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdExpand.pl
-DBTORECORDTYPEH            = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToRecordtypeH.pl
-DBTOMENUH                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToMenuH.pl
-DBDTOHTML                  = $(PERL) $(EPICS_DATABASE_HOST_BIN)/dbdToHtml.pl
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(EPICS_DATABASE_HOST_BIN)/registerRecordDeviceDriver.pl
-MSI3_15                    = $(EPICS_DATABASE_HOST_BIN)/msi$(HOSTEXE)
+# Installed binary executables, quoted for running on Windows
+MAKEBPT = "$(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)"
+MSI3_15 = "$(EPICS_BASE_HOST_BIN)/msi$(HOSTEXE)"
 
 # Libraries needed to link a basic IOC
 EPICS_BASE_IOC_LIBS = dbRecStd dbCore ca Com

configure/CONFIG_DATABASE_VERSION

@@ -1,8 +1,8 @@
 # Version number for the database APIs and shared library
 
 EPICS_DATABASE_MAJOR_VERSION = 3
-EPICS_DATABASE_MINOR_VERSION = 20
-EPICS_DATABASE_MAINTENANCE_VERSION = 0
+EPICS_DATABASE_MINOR_VERSION = 23
+EPICS_DATABASE_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions
 

configure/CONFIG_LIBCOM_MODULE

@@ -5,9 +5,10 @@
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-# Set location of locally generated tools
-YACC = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/antelope$(HOSTEXE)
-LEX = $(abspath $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH))/e_flex$(HOSTEXE) \
+# Our locally-built tools
+# Windows can need these paths to be quoted
+YACC = "$(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)"
+LEX  = "$(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE)" \
         -S$(EPICS_BASE)/include/flex.skel.static
 
 # Default stack size for osiThread

configure/CONFIG_LIBCOM_VERSION

@@ -1,8 +1,8 @@
 # Version number for the libcom APIs and shared library
 
 EPICS_LIBCOM_MAJOR_VERSION = 3
-EPICS_LIBCOM_MINOR_VERSION = 20
-EPICS_LIBCOM_MAINTENANCE_VERSION = 0
+EPICS_LIBCOM_MINOR_VERSION = 23
+EPICS_LIBCOM_MAINTENANCE_VERSION = 1
 
 # Development flag, set to zero for release versions
 

configure/Makefile

@@ -34,5 +34,9 @@ CFG += TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A)
 
 include $(TOP)/configure/RULES
 
+ifeq ($(GNU),YES)
+  # Pass compiler flags to preprocessor to enable _FORTIFY_SOURCE
+  TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): CPPFLAGS += $(CFLAGS)
+endif
 TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): toolchain.c
 	$(PREPROCESS.cpp)

configure/RULES.Db

@@ -17,7 +17,7 @@ TEMPL_SUFFIX ?= .template
 # vpath
 
 vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
-vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
+vpath %.pod $(USR_VPATH) $(SRC_DIRS) .. $(dir $(DBD))
 vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %.vdb $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
@@ -217,32 +217,32 @@ realclean: clean
 #---------------------------------------------------------------
 # Dependency files
 
-%Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
+%Record.h$(DEP): $(COMMON_DIR)/%Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%Record.h$(DEP): %Record.dbd
+%Record.h$(DEP): %Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%Record.h$(DEP): ../%Record.dbd
+%Record.h$(DEP): ../%Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-menu%.h$(DEP): $(COMMON_DIR)/menu%.dbd
+menu%.h$(DEP): $(COMMON_DIR)/menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-menu%.h$(DEP): menu%.dbd
+menu%.h$(DEP): menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-menu%.h$(DEP): ../menu%.dbd
+menu%.h$(DEP): ../menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
@@ -261,7 +261,7 @@ menu%.h$(DEP): ../menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-%.dbd$(DEP):
+%.dbd$(DEP): $($*_DBD)
 	@$(RM) $@
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
@@ -330,32 +330,32 @@ $(INSTALL_DB)/%$(TEMPL_SUFFIX): ../%$(TEMPL_SUFFIX)
 #---------------------------------------------------------------
 # INC files
 
-$(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd
+$(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%Record.h: %Record.dbd
+$(COMMON_DIR)/%Record.h: %Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%Record.h: ../%Record.dbd
+$(COMMON_DIR)/%Record.h: ../%Record.dbd $(DBDTORECTYPEH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd
+$(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/menu%.h: menu%.dbd
+$(COMMON_DIR)/menu%.h: menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/menu%.h: ../menu%.dbd
+$(COMMON_DIR)/menu%.h: ../menu%.dbd $(DBDTOMENUH_dep)
 	@$(RM) $(notdir $@)
 	$(DBTOMENUH) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
@@ -366,6 +366,7 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 # DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data
+	$(ECHO) "Converting data from $<"
 	@$(RM) $(notdir $@)
 	$(MAKEBPT) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
@@ -399,7 +400,7 @@ $(COMMON_DBDCATS):$(COMMON_DIR)/%.dbd:
 	$(DBDCAT_COMMAND)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.dbd:
+$(COMMON_DIR)/%.dbd: $($*_DBD)
 	$(ECHO) "Creating dbd file $(notdir $@)"
 	@$(RM) $(notdir $@)
 	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $($*_DBD)
@@ -429,33 +430,33 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 #---------------------------------------------------------------
 # HTML files
 
-$(COMMON_DIR)/%.html: %.dbd.pod
+$(COMMON_DIR)/%.html: %.dbd.pod $(DBDTOHTML_pl)
 	@$(RM) $(notdir $@)
 	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pod
+$(COMMON_DIR)/%.html: %.pod $(PODTOHTML_dep)
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pm
+$(COMMON_DIR)/%.html: %.pm $(PODTOHTML_dep)
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pm
+$(COMMON_DIR)/%.html: ../%.pm $(PODTOHTML_dep)
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -o $(notdir $@) $<
 	@$(MKDIR) $(dir $@)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pl
+$(COMMON_DIR)/%.html: ../%.pl $(PODTOHTML_dep)
 	@$(RM) $(notdir $@)
 	$(PODTOHTML) -s -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-.PRECIOUS: $(COMMON_DIR)/%.html %.html
+.PRECIOUS: $(COMMON_DIR)/%.html
 
 #---------------------------------------------------------------
 # DB files
@@ -526,16 +527,19 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 #---------------------------------------------------------------
 # register record,device,driver support
 
-%_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd
+%_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd $(REGRECDEVDRV_dep)
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
+            $< $(basename $@) $(IOCS_APPL_TOP)
 
-%_registerRecordDeviceDriver.cpp: %.dbd
+%_registerRecordDeviceDriver.cpp: %.dbd $(REGRECDEVDRV_dep)
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
+            $< $(basename $@) $(IOCS_APPL_TOP)
 
-%_registerRecordDeviceDriver.cpp: ../%.dbd
+%_registerRecordDeviceDriver.cpp: ../%.dbd $(REGRECDEVDRV_dep)
 	@$(RM) $@
-	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ $< $(basename $@) $(IOCS_APPL_TOP)
+	$(REGISTERRECORDDEVICEDRIVER) $(REGRDDFLAGS) -o $@ \
+            $< $(basename $@) $(IOCS_APPL_TOP)
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp

configure/RULES_BUILD

@@ -207,7 +207,7 @@ endif
 checkRelease:
 	+$(CONVERTRELEASE) checkRelease
 warnRelease:
-	$(CONVERTRELEASE) checkRelease
+	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
 	$(info Warning: RELEASE file consistency checks have been disabled)
@@ -373,23 +373,25 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 # Automated testing
 
 runtests: run-tap-tests
-run-tap-tests: $(TESTSCRIPTS.t)
+run-tap-tests: | build
 ifneq ($(TESTSCRIPTS.t),)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE) $^"
-	@$(PROVE) $^ || $(PROVE_FAILURE)
+	$(ECHO) "$(PROVE) $(TESTSCRIPTS.t)"
+	@$(PROVE) $(TESTSCRIPTS.t) || $(PROVE_FAILURE)
 endif
 endif
 
 tapfiles: $(TAPFILES)
 junitfiles: $(JUNITFILES)
+# prevent deletion of partial output from failing tests
+.PRECIOUS: $(TAPFILES) $(JUNITFILES)
 
 test-results: tap-results
 tap-results: $(TAPFILES)
 ifneq ($(strip $(TAPFILES)),)
 ifdef RUNTESTS_ENABLED
-	$(ECHO) "$(PROVE.tap) $^"
-	@$(PROVE.tap) $^ || $(PROVE_FAILURE)
+	$(ECHO) "$(PROVE.tap) $(TAPFILES)"
+	@$(PROVE.tap) $(TAPFILES) || $(PROVE_FAILURE)
 endif
 
 CURRENT_TAPFILES := $(wildcard $(TAPFILES))
@@ -405,7 +407,7 @@ ifneq ($(CURRENT_JUNITFILES),)
 endif
 
 # A .tap file is the output from running the associated test script
-$(TAPFILES.t): %.tap: %.t
+$(TAPFILES.t): %.tap: %.t | build
 ifdef RUNTESTS_ENABLED
 	$(ECHO) "$(PERL) $< -tap > $@"
 	@$(PERL) $< -tap > $@ || $(TAPFILE_FAILURE)
@@ -530,11 +532,11 @@ endif # LOADABLE_SHRLIB_SUFFIX
 ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $(abspath $< $(@D))
 endif
 
 $(INSTALL_INCLUDE)/%: $(COMMON_DIR)/%
@@ -561,6 +563,10 @@ $(INSTALL_DOC)/%: ../%
 	$(ECHO) "Installing doc $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(INSTALL_DOC)
 
+$(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
+	$(ECHO) "Installing generated html $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: %
 	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -569,10 +575,6 @@ $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
 	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
-$(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
-	$(ECHO) "Installing generated html $@"
-	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
-
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

configure/RULES_COMMON

@@ -27,7 +27,7 @@ $(foreach file,$(MAKEFILE_LIST), \
 
 PRINT_Var = $(@:PRINT.%=%)
 PRINT.%:
-	@echo $(PRINT_Var) = '$($(PRINT_Var))'
+	@+echo $(PRINT_Var) = '$($(PRINT_Var))'
 
 .PHONY: PRINT PRINT.%
 

configure/RULES_EXPAND

@@ -47,7 +47,7 @@ vpath %@ $(USR_VPATH) $(ALL_SRC_DIRS)
 #        INC += myVersion.h
 
 # Default settings
-EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl
+EXPAND_TOOL ?= $(PERL) $(TOOLS)/expandVars.pl $(QUIET_FLAG)
 
 EXPANDARCH = -a $(T_A)
 EXPANDFLAGS += -t $(INSTALL_LOCATION)
@@ -55,22 +55,17 @@ EXPANDFLAGS += $(addprefix -D ,$(EXPAND_VARS) $($@_EXPAND_VARS))
 EXPANDFLAGS += $(foreach var, $(EXPAND_ME) $($@_EXPAND_ME), \
     -D$(var)="$(strip $($(var)))")
 
-# The names of files to be expanded must end with '@'
+# Output files
 EXPANDED = $(EXPAND:%@=%)
-EXPANDED_COM = $(EXPAND_COMMON:%@=%)
-EXPANDED_COMMON = $(EXPANDED_COM:%=$(COMMON_DIR)/%)
+EXPANDED_COMMON = $(EXPAND_COMMON:%@=$(COMMON_DIR)/%)
 
 $(EXPANDED): %: %@
 	$(ECHO) "Expanding $< to $@"
-	@$(RM) $@
 	$(EXPAND_TOOL) $(EXPANDARCH) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
 
-$(EXPANDED_COM): %: %@
+$(EXPANDED_COMMON): $(COMMON_DIR)/%: %@
 	$(ECHO) "Expanding $< to $(COMMON_DIR)/$@"
-	@$(RM) $@
 	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@
-$(EXPANDED_COMMON): $(COMMON_DIR)/%: %
-	@$(MV) $< $@
 
 clean: expand_clean
 

configure/RULES_MODULES

@@ -22,13 +22,14 @@
 #    7. Submodules must have a configure/CONFIG_SITE file that contains
 #           -include $(TOP)/../CONFIG_SITE.local
 
-# Add checked-out submodules to DIRS
-LIVE_SUBMODULES = $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
-DIRS += $(LIVE_SUBMODULES)
+# Add checked-out submodules to DIRS, unless INSTALL_LOCATION is empty
+LIVE_SUBMODULES = $(subst /Makefile,, \
+    $(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+live = $(if $(wildcard $(INSTALL_CONFIG)/RULES_TOP),LIVE,DEAD)
+DIRS += $($(live)_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
@@ -38,14 +39,13 @@ all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
 # Convenience target
 RELEASE.host: $(RELEASE_LOCAL)
 
-$(RELEASE_LOCAL): Makefile CONFIG_SITE.local
+$(RELEASE_LOCAL): Makefile $(CONFIG)/CONFIG_SITE \
+    $(wildcard $(CONFIG)/CONFIG_SITE.local)
 	$(ECHO) Creating $@ with
-	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)"
-	@echo $(PARENT_MODULE) = $(INSTALL_LOCATION_ABS)> $@
-realclean:
-	$(RM) $(wildcard RELEASE.*.local)
+	$(ECHO) "    $(PARENT_MODULE) = $(INSTALL_ABSOLUTE)"
+	@echo $(PARENT_MODULE) = $(INSTALL_ABSOLUTE)> $@
 
-.PHONY: RELEASE.host realclean
+.PHONY: RELEASE.host
 
 # Testing: Combine test failure logs from the live submodules
 TESTS_FAILED_LOGS = $(wildcard $(addsuffix /$(TESTS_FAILED_LOG), \

configure/RULES_TOP

@@ -23,35 +23,42 @@ ifndef DISABLE_TOP_RULES
   # Rules for a regular application top directory
   #
 
-distclean: realclean cvsclean realuninstall
+  # When run by 'make distclean' the realuninstall target also
+  # removes any modules/RELEASE.<host>.local files
+  distclean: realclean cvsclean realuninstall
 
-realuninstall: uninstallDirs
+  realuninstall: uninstallDirs
 	$(RMDIR) $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB)
+  ifeq (modules,$(filter modules,$(DIRS)))
+    ifeq (distclean,$(filter distclean,$(MAKECMDGOALS)))
+	$(RM) $(wildcard modules/RELEASE.*.local)
+    endif
+  endif
 
-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)
-endif
-uninstallDirs: | clean
+  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)
+  endif
+  uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 
   # Remove the bin and lib directories if they have no sub-directories
   #
-EMPTY_INSTALL_DIRS = \
-    $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
-    $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
-uninstall: archuninstall uninstallDirs | clean
+  EMPTY_INSTALL_DIRS = \
+      $(if $(wildcard $(INSTALL_LOCATION_BIN)/*),,$(INSTALL_LOCATION_BIN)) \
+      $(if $(wildcard $(INSTALL_LOCATION_LIB)/*),,$(INSTALL_LOCATION_LIB))
+  uninstall: archuninstall uninstallDirs
 	$(RMDIR) $(EMPTY_INSTALL_DIRS)
 
-archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
+  archuninstall: $(addprefix uninstall$(DIVIDER),$(BUILD_ARCHS))
 
-uninstall$(DIVIDER)%: | clean
+  uninstall$(DIVIDER)%:
 	$(RMDIR) $(addsuffix /$(subst uninstall$(DIVIDER),,$@), \
 	    $(INSTALL_LOCATION_BIN) $(INSTALL_LOCATION_LIB))
 
-# Only run this at the top of the parent
-runtests test-results:
+  # Only run this at the top of the parent
+  runtests test-results:
 	@$(SHOWTESTFAILURES)
 
 else
@@ -76,7 +83,6 @@ help:
 	@echo "     inc            - Installs header, dbd and html files"
 	@echo "     build          - Builds and installs all targets"
 	@echo "     install        - Builds and installs all targets"
-	@echo "     buildInstall   - Same as install (deprecated)"
 	@echo "     clean          - Removes the O.<arch> dirs created by running make"
 	@echo "                      In O.<arch> dir, clean removes build created files"
 	@echo "     realclean      - Removes ALL O.<arch> dirs"
@@ -101,7 +107,8 @@ ifndef DISABLE_TOP_RULES
 	@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 "     distclean      - Does realclean cvsclean realuninstall and deletes any"
+	@echo "                      generated modules/RELEASE.<host>.local files"
 endif
 	@echo "     help           - Prints this list of valid make targets "
 	@echo "Object targets are supported by the O.<arch> level Makefile .e.g"

configure/os/CONFIG.Common.RTEMS

@@ -77,7 +77,10 @@ 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 $(filter -s,$(MFLAGS)),$(NOP),echo)
+ECHO = @$(if $(make-s),$(NOP),echo)
+
+# Originally set in os/CONFIG.UnixCommon.Common
+MKDIR = mkdir -p
 
 #--------------------------------------------------
 # Although RTEMS uses gcc, it wants to use gcc its own way

configure/os/CONFIG.Common.RTEMS-mvme2700

@@ -11,14 +11,15 @@ MUNCH_SUFFIX = .boot
 define MUNCH_CMD
 	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary -R .comment -S $< rtems
 	gzip -f9 rtems
-	$(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -o $@ \
+	$(RTEMS_TOOLS)/bin/$(LD_FOR_TARGET) -o $@.elf \
 		 $(PROJECT_RELEASE)/lib/bootloader.o \
 		--just-symbols=$< \
 		-b binary rtems.gz \
-                --no-warn-mismatch \
+		--no-warn-mismatch \
 		-T $(PROJECT_RELEASE)/lib/ppcboot.lds \
 		-Map $<.map
-	rm -f rtems.gz
+	$(RTEMS_TOOLS)/bin/$(OBJCOPY_FOR_TARGET) -O binary $@.elf $@
+	rm -f rtems.gz $@.elf
 endef
 
 include $(CONFIG)/os/CONFIG.Common.RTEMS

configure/os/CONFIG.Common.RTEMS-qoriq_e500

@@ -22,7 +22,7 @@ ARCH_DEP_CFLAGS += -DRTEMS_HAS_ALTIVEC
 #OP_SYS_LDLIBS += -lbspExt #does not use posix stuff ... want to ignore
 OP_SYS_LDLIBS += -Wl,--gc-sections
 #ARCH_DEP_LDFLAGS = -mcpu=8540 -meabi -msdata=sysv -mstrict-align -mspe -mabi=spe -mfloat-gprs=double 
-ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/powerpc-rtems5/qoriq_e500/lib  
+ARCH_DEP_LDFLAGS = -L$(RTEMS_BASE)/$(GNU_TARGET)$(RTEMS_VERSION)/$(RTEMS_BSP)/lib
 
 MUNCH_SUFFIX = .img
 MUNCHNAME = $(PRODNAME:%$(EXE)=%$(MUNCH_SUFFIX))

configure/os/CONFIG.Common.UnixCommon

@@ -56,7 +56,7 @@ SHRLIB_LDLIBS = $(addprefix -l, $($*_LDLIBS) $(LIB_LIBS) $(USR_LIBS)) \
 
 SHRLIB_DEPLIB_DIRS = $(foreach word, \
     $(sort $(INSTALL_LIB)/ $(dir $($*_DEPLIBS) $(SHRLIB_DEPLIBS))), \
-    $(shell $(FULLPATHNAME) $(word)))
+    $(abspath $(word)))
 
 SHRLIBDIR_LDFLAGS += $(SHRLIB_DEPLIB_DIRS:%=-L%)
 
@@ -85,7 +85,7 @@ PROD_LDLIBS += $($(firstword $(LDLIBS_STATIC_$(STATIC_BUILD)) \
 
 PROD_DEPLIB_DIRS = $(foreach word, \
     $(sort $(INSTALL_LIB)/ $(dir $($*_DEPLIBS) $(PROD_DEPLIBS))), \
-    $(shell $(FULLPATHNAME) $(word)))
+    $(abspath $(word)))
 
 PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%)
 

configure/os/CONFIG.Common.freebsdCommon

@@ -7,6 +7,10 @@
 
 # Include definitions common to all Unix targets
 include $(CONFIG)/os/CONFIG.Common.UnixCommon
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
 
 OS_CLASS = freebsd
 

configure/os/CONFIG.Common.iosCommon

@@ -77,7 +77,7 @@ OP_SYS_LDFLAGS += -dynamic -Z -L$(SDK_DIR)/usr/lib -L$(SDK_DIR)/usr/lib/system
 # Shared libraries
 SHRLIB_VERSION = $(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION)
 SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined suppress \
-       -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
+       -install_name $(abspath $(INSTALL_LIB))/$@ \
        -compatibility_version $(EPICS_VERSION).$(EPICS_REVISION) \
        -current_version $(SHRLIB_VERSION)
 SHRLIB_SUFFIX_BASE = .dylib

configure/os/CONFIG.Common.vxWorks-e500v2

@@ -0,0 +1,21 @@
+# CONFIG.Common.vxWorks-e500v2
+#
+# Definitions for vxWorks-e500v2 target archs (MVME2500)
+# Sites may override these definitions in CONFIG_SITE.Common.vxWorks-e500v2
+#-------------------------------------------------------
+
+# Include definitions common to all vxWorks target archs
+include $(CONFIG)/os/CONFIG.Common.vxWorksCommon
+
+# Vx GNU cross compiler suffix
+CMPLR_SUFFIX = ppc
+
+ARCH_CLASS = ppc
+
+# Architecture specific build flags
+ARCH_DEP_CFLAGS += -te500v2 -mhard-float
+ARCH_DEP_CPPFLAGS += -DCPU=PPC85XX
+ARCH_DEP_CFLAGS += -DCPU_VARIANT=_ppc85XX_e500v2
+ARCH_DEP_CFLAGS += -mlongcall
+
+GNU_TARGET = powerpc-wrs-vxworks

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

@@ -12,7 +12,7 @@ ARCH_CLASS = x86
 POSIX = NO
 
 #  Definitions used when COMMANDLINE_LIBRARY is READLINE
-LDLIBS_READLINE = -lreadline -lcurses
+LDLIBS_READLINE = -lreadline -ltermcap
 
 ARCH_DEP_CFLAGS += -m32
 ARCH_DEP_LDFLAGS += -m32

configure/os/CONFIG.darwinCommon.darwinCommon

@@ -66,8 +66,8 @@ GNU = NO
 #
 # Darwin shared libraries
 #
-SHRLIB_LDFLAGS = -dynamiclib -flat_namespace -undefined dynamic_lookup \
-    -install_name $(shell $(FULLPATHNAME) $(INSTALL_LIB))/$@ \
+SHRLIB_LDFLAGS = -dynamiclib -flat_namespace \
+    -install_name $(abspath $(INSTALL_LIB))/$@ \
     $(addprefix -compatibility_version , $(SHRLIB_VERSION)) \
     $(addprefix -current_version , $(SHRLIB_VERSION))
 SHRLIB_SUFFIX_BASE = .dylib

configure/os/CONFIG.freebsd-x86.Common

@@ -5,3 +5,4 @@
 
 #Include definitions common to unix hosts
 include $(CONFIG)/os/CONFIG.UnixCommon.Common
+CMPLR_CLASS = clang

configure/os/CONFIG.freebsd-x86.freebsd-x86

@@ -2,6 +2,7 @@
 # Definitions for freebsd-x86 host - freebsd-x86 target builds
 # Sites may override these definitions in CONFIG_SITE.freebsd-x86.freebsd-x86
 #-------------------------------------------------------
+GNU_DIR=/usr/local
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon

configure/os/CONFIG.freebsd-x86_64.freebsd-x86_64

@@ -2,6 +2,7 @@
 # Definitions for freebsd-x86_64 host - freebsd-x86_64 target builds
 # Sites may override these definitions in CONFIG_SITE.freebsd-x86_64.freebsd-x86_64
 #-------------------------------------------------------
+GNU_DIR=/usr/local
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon

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

@@ -6,3 +6,8 @@
 
 # Include common gnu compiler definitions
 include $(CONFIG)/CONFIG.gnuCommon
+
+STATIC_LDFLAGS_YES= -Wl,-Bstatic
+STATIC_LDFLAGS_NO=
+STATIC_LDLIBS_YES= -Wl,-Bdynamic
+STATIC_LDLIBS_NO=

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

@@ -21,4 +21,4 @@ LOADABLE_SHRLIB_LDFLAGS = -shared \
 GNU_LDLIBS_YES =
 
 # Link with system libraries
-OP_SYS_LDLIBS = -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp
+OP_SYS_LDLIBS += -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp

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

@@ -32,4 +32,4 @@ LOADABLE_SHRLIB_LDFLAGS = -shared \
 GNU_LDLIBS_YES =
 
 # Link with system libraries
-OP_SYS_LDLIBS = -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp
+OP_SYS_LDLIBS += -lpsapi -lws2_32 -ladvapi32 -luser32 -lkernel32 -lwinmm -ldbghelp

configure/os/CONFIG_SITE.Common.linux-aarch64

@@ -34,5 +34,6 @@
 # WARNING: Variables that are set in $(CONFIG)/CONFIG.gnuCommon cannot be
 # overridden in this file for native builds, e.g. variables such as
 #    OPT_CFLAGS_YES, WARN_CFLAGS, SHRLIB_LDFLAGS
-# They must be set in CONFIG_SITE.linux-aarch64.linux-aarch64 instead.
+# They must be set in CONFIG_SITE.linux-aarch64.linux-aarch64 or for
+# cross-builds in CONFIG_SITE.<host-arch>.linux-aarch64 instead.
 

configure/os/CONFIG_SITE.Common.linux-arm

@@ -15,11 +15,6 @@
 #    to inform the system of the shared library location.
 
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(firstword $(READLINE_DIR) $(GNU_DIR))/include/readline/readline.h), \
-  READLINE, EPICS))
-
 # If libreadline needs additional libraries to be linked with it, try
 # uncommenting each of the lines below in turn, starting with the top
 # one and working downwards, until the build succeeds. Do a 'make rebuild'

configure/os/CONFIG_SITE.Common.linux-microblaze

@@ -12,10 +12,6 @@
 GNU_DIR = /usr/local/vw/microblaze-2.0/microblazeel-unknown-linux-gnu
 
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
-
 # If libreadline needs additional libraries to be linked with it, try
 # uncommenting each of the lines below in turn, starting with the top
 # one and working downwards, until the build succeeds. Do a 'make rebuild'

configure/os/CONFIG_SITE.Common.linux-x86

@@ -15,10 +15,6 @@
 #    to inform the system of the shared library location.
 
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
-
 # If libreadline needs additional libraries to be linked with it, try
 # uncommenting each of the lines below in turn, starting with the top
 # one and working downwards, until the build succeeds. Do a 'make rebuild'

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -15,10 +15,6 @@
 #    to inform the system of the shared library location.
 
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
-
 # If libreadline needs additional libraries to be linked with it, try
 # uncommenting each of the lines below in turn, starting with the top
 # one and working downwards, until the build succeeds. Do a 'make rebuild'

configure/os/CONFIG_SITE.Common.linux-xscale_be

@@ -3,11 +3,6 @@
 # Site-specific settings for the linux-xscale_be target
 
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(firstword $(READLINE_DIR) $(GNU_DIR))/include/readline/readline.h), \
-  READLINE, EPICS))
-
 # If libreadline needs additional libraries to be linked with it, try
 # uncommenting each of the lines below in turn, starting with the top
 # one and working downwards, until the build succeeds. Do a 'make rebuild'

configure/os/CONFIG_SITE.darwinCommon.darwinCommon

@@ -3,21 +3,27 @@
 # Site specific definitions for darwin builds
 #-------------------------------------------------------
 
-# Note the dir/firstword/wildcard functions below are used
-# to avoid warnings about missing directories.
+# These settings are designed for users of Homebrew.
+# Users of other third-party package managers are welcome to
+# provide patches appropriate for their manager.
+ifneq (,$(wildcard /opt/homebrew))
+  # Default location on aarch64
+  HOMEBREW_DIR = /opt/homebrew
+else ifneq (,$(wildcard /usr/local/Homebrew))
+  # Default location on x86_64
+  HOMEBREW_DIR = /usr/local
+else ifneq (,$(wildcard /opt/local/include/readline))
+  # MacPorts
+  READLINE_DIR = /opt/local
+endif
 
-# Mix-and-match of different package systems is probably not advisable,
-# but you can try that if you like...
-
-# Uncomment these definitions when using Homebrew packages:
-#OP_SYS_INCLUDES += -I/usr/local/include
-#OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /usr/local/lib/*))))
-
-# Uncomment these definitions when using DarwinPorts packages:
-#OP_SYS_INCLUDES += -I/opt/local/include
-#OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /opt/local/lib/*))))
-
-# Uncomment these definitions when using Fink packages:
-#OP_SYS_INCLUDES += -I/sw/include
-#OP_SYS_LDFLAGS += $(addprefix -L,$(dir $(firstword $(wildcard /sw/lib/*))))
+# Look for Homebrew's readline
+ifneq (,$(wildcard $(HOMEBREW_DIR)/opt/readline))
+  READLINE_DIR = $(HOMEBREW_DIR)/opt/readline
+endif
 
+# Use GNU readline if it's avaiilable
+ifneq (,$(wildcard $(READLINE_DIR)/include/readline/readline.h))
+  INCLUDES_READLINE = -I$(READLINE_DIR)/include
+  LDFLAGS_READLINE = -L$(READLINE_DIR)/lib
+endif

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

@@ -1,6 +1,6 @@
-# CONFIG_SITE.linux-x86.linux-aarch64
+# CONFIG_SITE.linux-x86_64.linux-aarch64
 #
-# Site specific definitions for linux-x86 host - linux-aarch64 target builds
+# Site specific definitions for linux-x86_64 host - linux-aarch64 target builds
 #-------------------------------------------------------
 
 # Set GNU crosscompiler target name

configure/toolchain.c

@@ -35,3 +35,20 @@ OS_API = posix
 OS_API = score
 #  endif
 #endif
+
+#ifdef __has_include
+#  if defined(__rtems__) && __RTEMS_MAJOR__<5 && __has_include(<libtecla.h>)
+COMMANDLINE_LIBRARY ?= LIBTECLA
+#  elif __has_include(<readline/readline.h>)
+COMMANDLINE_LIBRARY ?= READLINE
+#  else
+COMMANDLINE_LIBRARY ?= EPICS
+#  endif
+#else
+COMMANDLINE_LIBRARY ?= $(strip $(if $(wildcard $(if $(GNU_DIR),$(GNU_DIR)/include/readline/readline.h)), READLINE, EPICS))
+#endif
+
+#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE>2
+OP_SYS_CPPFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+#endif
+

documentation/ComponentReference.pod

@@ -0,0 +1,170 @@
+=head1 EPICS Component Reference Manual
+
+This document provides reference information about the record types,
+menus, link types and channel filters included with EPICS Base.
+
+Many details about the record and menu definitions are derived automatically
+from the source code at build time.
+
+
+=head2 Introduction and IOC Concepts
+
+These links point to an external website where introductory and overview
+documentation is now being published.
+
+=over
+
+=item * L<Introduction to EPICS|https://docs.epics-controls.org/en/latest/guides/EPICS_Intro.html>
+
+=item * L<Process Database Concepts|https://docs.epics-controls.org/en/latest/guides/EPICS_Process_Database_Concepts.html>
+
+=back
+
+
+=head2 Record Type Definitions
+
+These sections describe common aspects of the record types:
+
+=over
+
+=item * L<Fields Common to All Record Types|dbCommonRecord>
+
+=item * L<Fields Common to Input Record Types|dbCommonInput>
+
+=item * L<Fields Common to Output Record Types|dbCommonOutput>
+
+=back
+
+
+These are the record types supplied with EPICS Base:
+
+=over
+
+=item * L<Analog Array Input Record (aai)|aaiRecord>
+
+=item * L<Analog Array Output Record (aao)|aaoRecord>
+
+=item * L<Analog Input Record (ai)|aiRecord>
+
+=item * L<Analog Output Record (ao)|aoRecord>
+
+=item * L<Array Subroutine Record (aSub)|aSubRecord>
+
+=item * L<Binary Input Record (bi)|biRecord>
+
+=item * L<Binary Output Record (bo)|boRecord>
+
+=item * L<Calculation Output Record (calcout)|calcoutRecord>
+
+=item * L<Calculation Record (calc)|calcRecord>
+
+=item * L<Compression Record (compress)|compressRecord>
+
+=item * L<Data Fanout Record (dfanout)|dfanoutRecord>
+
+=item * L<Event Record (event)|eventRecord>
+
+=item * L<Fanout Record (fanout)|fanoutRecord>
+
+=item * L<Histogram Record (histogram)|histogramRecord>
+
+=item * L<64-bit Integer Input Record (int64in)|int64inRecord>
+
+=item * L<64-bit Integer Output Record (int64out)|int64outRecord>
+
+=item * L<Long Input Record (longin)|longinRecord>
+
+=item * L<Long Output Record (longout)|longoutRecord>
+
+=item * L<Long String Input Record (lsi)|lsiRecord>
+
+=item * L<Long String Output Record (lso)|lsoRecord>
+
+=item * L<Multi-Bit Binary Input Direct Record (mbbiDirect)|mbbiDirectRecord>
+
+=item * L<Multi-Bit Binary Input Record (mbbi)|mbbiRecord>
+
+=item * L<Multi-Bit Binary Output Direct Record (mbboDirect)|mbboDirectRecord>
+
+=item * L<Multi-Bit Binary Output Record (mbbo)|mbboRecord>
+
+=item * L<Permissive Record (permissive)|permissiveRecord>
+
+=item * L<Printf Record (printf)|printfRecord>
+
+=item * L<Select Record (sel)|selRecord>
+
+=item * L<Sequence Record (seq)|seqRecord>
+
+=item * L<State Record (state)|stateRecord>
+
+=item * L<String Input Record (stringin)|stringinRecord>
+
+=item * L<String Output Record (stringout)|stringoutRecord>
+
+=item * L<Sub-Array Record (subArray)|subArrayRecord>
+
+=item * L<Subroutine Record (sub)|subRecord>
+
+=item * L<Waveform Record (waveform)|waveformRecord>
+
+=back
+
+
+=head2 Menu Definitions
+
+Menu field choices are documented with the record type that defines them, or
+here for the global menus that are used by multiple record types:
+
+=over
+
+=item * L<Alarm Severity Menu|menuAlarmSevr>
+
+=item * L<Alarm Status Menu|menuAlarmStat>
+
+=item * L<Analog Conversions Menu|menuConvert>
+
+=item * L<Field Type Menu|menuFtype>
+
+=item * L<Invalid Value Output Action Menu|menuIvoa>
+
+=item * L<Output Mode Select Menu|menuOmsl>
+
+=item * L<Process at iocInit Menu|menuPini>
+
+=item * L<Post Monitors Menu|menuPost>
+
+=item * L<Priority Menu|menuPriority>
+
+=item * L<Scan Menu|menuScan>
+
+=item * L<Simulation Mode Menu|menuSimm>
+
+=item * L<YesE<sol>No Menu|menuYesNo>
+
+=back
+
+
+=head2 Other Components
+
+EPICS Base also comes with extensible sets of server Channel Filters and IOC
+Database Link types, which are documented here:
+
+=over
+
+=item * L<Channel Filters|filters>
+
+=item * L<IOC Database Link Types|links>
+
+=back
+
+
+=head2 Corrections and Updates
+
+Corrections to these documents can be submitted as patch files to the EPICS
+core developers, or as GitHub  pull requests to the 7.0 branch of Base.
+These document sources can be found under `modules/database/src` tree, mostly
+in the `std/rec` and `ioc/db` directories in files with extension `.dbd.pod`.
+The documentation source format is a combination of the EPICS DBD file format
+with an extended version of Perl's POD (plain old documentation); run `perldoc
+pod` for details of POD.

documentation/Doxyfile@

@@ -762,7 +762,6 @@ WARN_LOGFILE           =
 INPUT                  = ../mainpage.dox \
                          ../RELEASE_NOTES.md \
                          ../README.md \
-                         ../RecordReference.md \
                          @TOP@/include
 
 # This tag can be used to specify the character encoding of the source files
@@ -2300,7 +2299,7 @@ PLANTUML_JAR_PATH      =
 # Minimum value: 0, maximum value: 10000, default value: 50.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_GRAPH_MAX_NODES    = 50
+DOT_GRAPH_MAX_NODES    = 100
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
 # generated by dot. A depth value of 3 means that only nodes reachable from the

documentation/Makefile

@@ -1,24 +1,24 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-ifeq ($(T_A),$(EPICS_HOST_ARCH))
-
-DOXYGEN=doxygen
-
 EXPAND = Doxyfile@
-
 EXPAND_ME += EPICS_VERSION
 EXPAND_ME += EPICS_REVISION
 EXPAND_ME += EPICS_MODIFICATION
 EXPAND_ME += EPICS_PATCH_LEVEL
 EXPAND_ME += OS_CLASS CMPLR_CLASS
 
+HTMLS += ComponentReference.html
+
+TARGETS += doxygen
+
+DOXYGEN = doxygen
 ME = documentation/O.$(T_A)/html
 GH_FILES = $(ME)/ $(ME)/.nojekyll $(ME)/*.* $(ME)/*/*.*
 
-install: doxygen
+include $(TOP)/configure/RULES
 
-doxygen: Doxyfile ../mainpage.dox
+doxygen: Doxyfile ../mainpage.dox $(INSTALL_HTMLS)
 	$(DOXYGEN)
 	rsync -av $(TOP)/html/ html/
 
@@ -29,7 +29,3 @@ commit: doxygen
 	(cd $(TOP) && $(CURDIR)/../commit-gh.sh $(GH_FILES))
 
 .PHONY: commit
-
-endif # EPICS_HOST_ARCH
-
-include $(TOP)/configure/RULES

documentation/README.md

@@ -1,6 +1,6 @@
 # Installation Instructions {#install}
 
-## EPICS Base Release 7.0.5
+## EPICS Base Release 7.0.x
 
 -----
 
@@ -74,7 +74,7 @@ is older but does still work.
 
 #### Perl
 
-You must have Perl version 5.10 or later installed. The EPICS
+You must have Perl version 5.10.1 or later installed. The EPICS
 configuration files do not specify the perl full pathname, so the perl
 executable must be found through your normal search path.
 
@@ -387,7 +387,7 @@ install directories.
 
 EPICS executables and perl scripts are installed into the
 `$(INSTALL_LOCATION)/bin/<arch>` directories. Libraries are installed
-into $`(INSTALL_LOCATION)/lib/<arch>`. The default definition for
+into `$(INSTALL_LOCATION)/lib/<arch>`. The default definition for
 `$(INSTALL_LOCATION)` is `$(TOP)` which is the root directory in the
 distribution directory structure, `base`. Intermediate object files
 are stored in `O.<arch>` source subdirectories during the build

documentation/RELEASE_NOTES.md

@@ -2,14 +2,576 @@
 
 These release notes describe changes that have been made since the previous
 release of this series of EPICS Base. **Note that changes which were merged up
-from commits to the 3.15 branch are not described at the top of this file but
-lower down, under the 3.15 release to which they were originally committed.**
-Thus it is important to read more than just the first section to understand
-everything that has changed in each release.
+from commits to the 3.15 branch are described
+[further down this file](#changes-incorporated-from-the-315-branch)
+under the 3.15 release to which they were originally committed.** Thus it is
+important to read more than just the first section to understand everything that
+has changed in each release.
 
 The PVA submodules each have their own individual sets of release notes which
-should also be read to understand what has changed since earlier releases.
+should also be read to understand what has changed since earlier releases:
 
+- [normativeTypes](https://github.com/epics-base/normativeTypesCPP/blob/master/documentation/RELEASE_NOTES.md)
+- [pvAccess](http://epics-base.github.io/pvAccessCPP/pvarelease_notes.html)
+- [pvData](http://epics-base.github.io/pvDataCPP/release_notes.html)
+- [pvDatabase](https://github.com/epics-base/pvDatabaseCPP/blob/master/documentation/RELEASE_NOTES.md)
+- [pva2pva](https://epics-base.github.io/pva2pva/release_notes.html)
+- [pvaClient](https://github.com/epics-base/pvaClientCPP/blob/master/documentation/RELEASE_NOTES.md)
+
+## EPICS Release 7.0.8.1
+
+### Limit to `_FORTIFY_SOURCE=2`
+
+GCC versions 12 and beyond and glibc have added some aggressive runtime
+checks for buffer overflows in libc functions at runtime, and the
+[Ubuntu 2024.04](https://wiki.ubuntu.com/ToolChain/CompilerFlags) release
+increased their default gcc fortification level from 2 to 3.
+This has started causing EPICS Base builds to fail on that version, and
+other OS releases may make that configuration change with similar results.
+This release detects a compiler configured with `_FORTIFY_SOURCE=3` and
+overrides it to 2.
+Later releases of Base will adjust the code, providing information to the
+compiler to avoid triggering these incorrect protections.
+
+### Fix issue with compress record
+
+In Base 7.0.8, an update to the compress record was added to allow for certain
+algorithms to use partially filled buffers in their computations. Unfortunately,
+this broke the behaviour of the records in certain cases. This has been fixed.
+
+### Various minor changes
+
+These included fixing minor memory leaks and documentation corrections. The
+`SIZV` field of lsi, lso and printf record VAL fields now can't exceed 32767
+characters, to match an internal limit.
+
+### `epicsSocketAccept()` now returns `SOCKET`, not `int`
+
+This might have some effect on downstream modules still using `int`, but the
+OS-specific osdSock.h headers which osiSock.h includes have all declared
+`SOCKET` (in most casese as a typedef for `int`) for many releases.
+This change removes a compiler warning on WIN32.
+Further details and the discussion about this change can be found
+[here](https://github.com/epics-base/epics-base/pull/458).
+
+### `dbLoadRecords` allows macros with default values
+
+Previously the parser assumed that files containing macro substitutions were
+bad if no macro definitions were provided; that assumption was made incorrect
+once macro substitutions were allowed to provide a default value.
+
+### Hostname length limit in CA removed
+
+Before this release, the CA client library only handled hostnames in address
+list environment variables up to 255 characters long.
+This limit has been removed.
+
+-----
+
+## EPICS Release 7.0.8
+
+### bi "Raw Soft Channel" use MASK
+
+If MASK is non-zero, The raw device support will now apply MASK to the
+value read into RVAL.
+eg. allows extraction of a bit from an input integer.
+
+```
+record(longin, "integer") {
+    field(VAL, "0xff")
+}
+record(bi, "bit1") {
+    field(DESC, "extract bit 1")
+    field(DTYP, "Raw Soft Channel")
+    field(INP , "integer")
+    field(MASK, "0x2")
+    field(ZNAM, "Clear")
+    field(ONAM, "Set")
+}
+```
+
+### ANSI escapes in stderr
+
+ANSI escape charactor sequences may now be printed to the stderr stream.
+These escapes will appear in logs captured from that stream.
+Tools which parse and/or render these logs may need to be adjusted to
+either strip out the escapes, or to translate them into markup.
+(see [ansi2html](https://pypi.org/project/ansi2html/) for example)
+
+### Allow explicit append with `dbRecordsOnceOnly!=0`
+
+Previously setting `dbRecordsOnceOnly!=0` prevented any further changes to a record via a .db file.  eg.
+
+```
+record(ai, "myrec") {}
+```
+
+`dbRecordsOnceOnly!=0` previously disallowed appending fields with either form:
+
+```
+record("*", "myrec") {} # error
+record(ai, "myrec") {}  # error
+```
+
+Beginning with this release, `dbRecordsOnceOnly!=0` allows appending when explicitly intended (when record type is `"*"`).
+
+```
+record("*", "myrec") {} # allowed
+record(ai, "myrec") {}  # error
+```
+
+### Add `$EPICS_CLI_TIMEOUT`
+
+Add support for CA tools timeout from environment variable `$EPICS_CLI_TIMEOUT`
+which sets the default the default timeout for `caget` et al.
+The `-w` argument continues to take precedence.
+
+### Fixed leak from a non-EPICS thread on WIN32
+
+On Windows targets, if a thread not created by `epicsThreadCreate*()` directly
+or indirectly calls an `epicsThread*()` function, a specific tracking struct
+is allocated.  Prior to this release the allocation would not be `free()`d,
+resulting in a memory leak.
+
+A similar issue on POSIX targets was previously fixed.
+
+### Change compiler for FreeBSD to clang
+
+The default compiler for FreeBSD targets changes from GCC to clang.
+
+### Expose `dbCreateAlias` in IOC shell
+
+Add a new IOC shell command `dbCreateAlias` allow record aliases to be added.
+Intended for use before `iocInit`.  eg. to add an alias "bar" for a record "foo".
+
+```
+dbLoadRecords("some.db") # includes: record(ai, "foo") { ...
+dbCreateAlias("foo", "bar")
+iocInit()
+```
+
+### dbEvent eventsRemaining missed on cancel
+
+In some cases, RSRV may queue a subscription update, but not flush it.
+This partially addresses this issue.
+
+### subRecord on bad INP links
+
+Previously, if a subRecord has an invalid `INP*` link, it was silently failing
+(and not running the proc function).  Now the the status code returned by the
+subroutine is returned from `dbProcess()`.
+
+### COMMANDLINE\_LIBRARY fallback to GNU\_DIR
+
+Fall back to the previous behavior when searching for `readline.h` with older compilers.
+
+### Search for readline installed via HomeBrew.
+
+Look for `/opt/local/include/readline` on OSX.
+
+### Always stop worker threads
+
+The SCAN and callback threads are now stopped during normal IOC shutdown.
+
+### Allow runtime bypass of free list allocator
+
+The environment variable `$EPICS_FREELIST_BYPASS` may be set to `YES` to cause the `freeListLib` functions to always call directly to `malloc()`/`free()`.  May be useful when troubleshooting some kinds of memory allocation bugs which would otherwise be "hidden".  eg. use-after-free data races.  This may also improve the results of dynamic analysis tools which are not aware of this internal free list.
+
+### `compress` record enhancement
+
+The compress record now supports the use of partially-filled buffers when using
+any of the N-to-one algorithms. This is achieved by setting the new field `PBUF`
+to `YES`.
+
+### Extended timestamp channel filter
+
+The `"ts"` filter can now retrieve the record's timestamp in several numeric
+and string formats, some of which support full nanosecond precision.
+
+    Hal$ caget -a test:channel
+    test:channel                   2021-03-11 18:23:48.265386 42
+    Hal$ caget -f9 'test:channel.{"ts": {"num": "dbl"}}'
+    test:channel.{"ts": {"num": "dbl"}} 984331428.265386105
+    Hal$ caget 'test:channel.{"ts": {"str": "iso"}}'
+    test:channel.{"ts": {"str": "iso"}} 2021-03-11T18:23:48.265386+0100
+    Hal$ caget -f1 'test:channel.{"ts": {"num": "ts"}}'
+    test:channel.{"ts": {"num": "ts"}} 2 984331428.0 265386163.0
+
+More information is included in the filters documentation, which can be found in
+the `html/filters.html` document that is generated during the build
+
+### Allow adding new error symbols at any time
+
+`errSymbolAdd` can now be called after early initialization.
+
+### Add conditional output (OOPT) to the longout record
+
+The longout record can now be configured using its new OOPT and OOCH fields
+to (not) write to its output link depending on the contents of VAL, in a
+similar manner to the calcout record. More information can be found on the
+reference page for the longout record type that accompanies this release.
+
+This functionality was suggested in
+[lp# 1398215](https://bugs.launchpad.net/epics-base/+bug/1398215) and may
+be added to other output record types if the community finds it useful,
+please send feedback about the feature to tech-talk.
+
+### IOC Shell
+
+#### Tab completion
+
+When built with optional GNU libreadline support, the interactive IOC shell
+will perform tab completion for command names as well as for some arguments
+of the built-in commands. For example, the record name argument of `dbpr`,
+and the path name argument of `cd`.
+
+Externally defined commands have a limited ability to opt into completion by
+using the new `iocshArgStringRecord` and `iocshArgStringPath` argument types.
+Both function identically to `iocshArgString` but indicate how to suggest
+completion strings.
+
+Builds on macOS (`darwin-x86` or `darwin-aarch64` targets) normally use Apple's
+libedit library in readline compatibility mode, which doesn't support the tab
+completion API that GNU readline provides. You can use Homebrew or some other
+third-party package manager to install the GNU readline package, then edit the
+`configure/os/CONFIG_SITE.darwinCommon.darwinCommon` file to have EPICS use the
+real thing to get tab completion in the IOC shell. The default settings in that
+file currently look for and use a Homebrew-installed readline if present.
+
+#### Persist history
+
+Attempt to read and write command to a file (`./.iocsh_history` by default).
+Name may be overwritten with by setting `$EPICS_IOCSH_HISTFILE` to an
+alternate path, or disabled by setting to an empty string.
+
+#### Changes to help output
+
+Rework the `help` command output to improve formatting and readability,
+and include a visual marker (a line of underlines) between different help commands.
+
+### Add FMOD as CALC Expression
+
+The floating point modulo function `FMOD(NUM,DEN)` has been added to the CALC
+expression engine and is available to all software using that (calc and calcout
+record types, access security library and some extensions).
+
+-----
+
+## EPICS Release 7.0.7
+
+### Doxygen Annotations
+
+Thanks to several attendees at the 2022 EPICS Codeathon the number of header
+files with Doxygen annotations in the EPICS Core has again increased.
+
+### Build System updates
+
+The top-level make targets `uninstall`, `archuninstall` and similar no
+longer trigger the `clean` target which empties build directories, this
+was a bug introduced in 7.0.5.
+
+The `make distclean` target now properly deletes the generated file(s)
+`modules/RELEASE.<host>.local` which are essential to build the external
+submodules under the `modules` directory, and should not crash if the
+build is configured with `INSTALL_LOCATION` pointing to an empty external directory (i.e. if you run `make distclean` twice in succession). When
+`INSTALL_LOCATION` is set in the files `configure/CONFIG_SITE` or
+`configure/CONFIG_SITE.local` the `modules/RELEASE.<host>.local` file
+will now be regenerated in case the install path has been modified.
+
+Note that passing `INSTALL_LOCATION=<path>` on the make command-line will
+only work if you have run `make distclean` immediately beforehand, as the
+`modules/RELEASE.<host>.local` file must be recreated using the new path.
+
+### Enhancements to `capr.pl`
+
+The `capr.pl` script can now display records from older Base versions to
+which fields have since been added, and shows long strings and array data
+up to 10 elements, use the new `-n` option to increase that number.
+The script is fully event-driven and prints all the field data received by
+the end of the CA wait time (`-w` option which defaults to 2 seconds).
+The interest level can now be specified using the `-l` option before the
+PV name, and the new `-D` flag outputs debugging information.
+
+### Time Synchronization on VxWorks
+
+VxWorks 6.9 can do its own OS clock time synchronization, if it has been
+configured by setting `SNTPC_PRIMARY_IPV4_ADDR`. Since EPICS 3.15.3 the
+IOC time support code has checked for the existence of the VxWorks time
+synchronization task and avoided starting the EPICS one if the OS task
+exists and the OS clock gives a "recent" time (i.e. after when EPICS was
+compiled), unless the environment variable `EPICS_TS_FORCE_NTPTIME` is
+also set. However a logic error in that code required the environment
+variable to be set in more cases than it should have.
+
+This error has been fixed and the IOC should work normally if the VxWorks
+task is configured and running. The `TIMEZONE` value for the year is also
+now calculated at initialization in this configuration, previously it was
+only done when the IOC synchronzation task was used. Setting the above
+environment variable will now cause the IOC support code to shut down the
+VxWorks synchronization thread (if running) before starting the EPICS one.
+
+Running the iocsh command `ClockTime_Report` now shows whether the VxWorks
+task is running as well as giving the state of the IOC synchronization task.
+The `ClockTime_Init` command can also be used to stop or restart the IOC
+time synchronization task while the IOC is running, depending on the `0` or
+`1` parameter passed to it. This last change also applies to RTEMS IOCs.
+
+### Incompatible change to `struct db_field_log`
+
+This change may cause channel filters which manipulate array updates
+to fail to compile.
+
+To avoid potential speculation issues arising from overlapping code pointers
+with data values, `union dbfl_ref` is modified to remove the `dtor` member.
+`dtor` is moved out into the enclosing `struct db_field_log`.
+
+So eg. using a `db_field_log* p`, the expression `p->u.r.dtor` must be
+changed to `(p)->dtor`.
+
+### Fix undef ts on first camonitor update of NORD from waveformRecord
+
+The order over operations when processing a waveformRecord is adjusted
+so that updates to NORD is posted with the correct timestamp.
+
+### Automatic COMMANDLINE_LIBRARY w/ newer compilers
+
+When built with a compiler supporting `__has_include<>`, the presence
+of the `<readline/readline.h>` will be used to automatically determine
+a default value for `COMMANDLINE_LIBRARY`.
+
+Mingw builds with readline support now link `-ltermcap` instead of `-lcurses`.
+
+This should not effect sites which set explicitly set `COMMANDLINE_LIBRARY`
+as the only definition in Base now has the form `COMMANDLINE_LIBRARY ?= ...`.
+
+### Perl CA support for empty long strings
+
+The Perl CA bindings have been fixed to handle zero-length long string data
+properly.
+
+### `aao` gains `OMSL` and `DOL`
+
+The `aao` record types gains the same `DOL` functionality found
+in other output record types (`ao`, `longout`, etc.)
+
+### Server exports `RSRV_SERVER_PORT`
+
+During `iocInit()`, the environment variable `RSRV_SERVER_PORT` is set
+with the TCP port number selected.
+
+### `dbdExpand.pl` sorts all items by name
+
+DBD files generated by the `dbdExpand.pl` script are now sorted within each
+item type by the primary name of the item. The result should resolve any
+issues with reproducable builds. No option is provided to prevent the sorting,
+previously the order was essentially random and varied each time.
+
+### `dbExpand.pl` sorts records by name
+
+Records are now output by this program in order, sorted by name. The new flag
+`-s` can be given to output the records in the same order they were read in,
+instead of sorting them.
+
+Note that there are currently no build rules provided with Base which make use
+of this program.
+
+### Simulation Mode RAW Support for Output Record Types
+
+SIMM=RAW support has been added for the relevant output record types
+(ao, bo, mbbo, mbboDirect).
+RAW simulation mode will have those records do the appropriate conversion
+and write RVAL to the location pointed to by SIOL.
+
+### Fixed leak from a non-EPICS thread
+
+On some targets, if a thread not created by `epicsThreadCreate*()` directly
+or indirectly calls an `epicsThread*()` function, a specific tracking struct
+is allocated.
+
+Prior to this release, on POSIX and WIN32 targets, this
+struct would not be `free()`d, resulting in a memory leak.
+
+This release fixed the leak on POSIX targets.
+
+See the associated github [issue 241](https://github.com/epics-base/epics-base/issues/241)
+for WIN32 status.
+
+### Fixed leak from a non-EPICS thread
+
+On some targets, if a thread not created by `epicsThreadCreate*()` directly
+or indirectly calls an `epicsThread*()` function, a specific tracking struct
+is allocated.
+
+Prior to this release, on POSIX and WIN32 targets, this
+allocation would not be `free()`d, resulting in a memory leak.
+
+This release fixed the leak on POSIX and WIN32 targets (excluding
+MSVC before vs2012, and the WINE runtime).
+
+### Fixed leak from a non-EPICS thread
+
+On some targets, if a thread not created by `epicsThreadCreate*()` directly
+or indirectly calls an `epicsThread*()` function, a specific tracking struct
+is allocated.
+
+Prior to this release, on POSIX and WIN32 targets, this
+struct would not be `free()`d, resulting in a memory leak.
+
+This release fixed the leak on POSIX targets.
+
+See the associated github [issue 241](https://github.com/epics-base/epics-base/issues/241)
+for WIN32 status.
+
+### Fix `CHECK_RELEASE = WARN`
+
+This now works again, it was broken in 2019 (7.0.3.1) by an errant commit.
+
+### Document `DISP` as design-time field
+
+The DISP field can be set to a non-zero value to prevent records being changed
+from outside the IOC (this is ancient behavior), but has never been documented
+as being usable at design-time (DCT=Yes in the Record Reference tables). This
+has now been changed.
+
+### Make `epicsInt8` signed on all architectures
+
+The `epicsInt8` and thus `DBF_CHAR` types have always been unsigned on
+architectures where `char` is unsigned, for example on many PowerPC CPU
+architectures. This was counter-intuitive, and resulted in IOC behavior
+differing between architectures when converting `DBF_CHAR` values into a
+signed integer or floating point type.
+
+**WARNING**: This fix may change behavior of existing databases on target
+architectures with unsigned `char` (mainly PowerPC) when using input links to
+read from `CHAR` arrays. Architectures with signed `char` (usually x86) should
+be unaffected, although some compilers might generate new warnings.
+
+### Allow hexadecimal and octal numbers in hardware links
+
+[GH:213](https://github.com/epics-base/epics-base/pull/213)
+
+Several types of hardware links (`VME_IO`, `CAMAC_IO`, etc) now accept
+hexadecimal and octal numbers. (Hexadecimal numbers had already been valid
+up to EPICS R3.15.) This change may introduce incompatibilities when using
+numbers with leading `0` as they will now be parsed as octal.
+
+### Fix embedded implementations of `epicsEvent`
+
+[GH:202](https://github.com/epics-base/epics-base/issues/202) and
+[GH:206](https://github.com/epics-base/epics-base/pull/206)
+
+Heinz Junkes provided a new implementation of the `epicsEvent` API suitable for
+RTEMS Posix targets (RTEMS 5.1 and later). In review a few issues related to
+overflow of timeout values surfaced in this and other embedded implementations,
+and these were also been fixed in this Pull Request. The API documentation for
+this and some other routines has also been updated.
+
+### Breakpoint Table Names
+
+The names of breakpoint tables were made unnecessarily strict when DBD file
+processing was moved to Perl for the 3.15 release series. Table names may now
+contain the special characters `_` `-` `:` `;` `.` `[` `]` `<` `>` in addition
+to letters and digits.
+
+### Fix for `undefined` in configure/RELEASE files
+
+Prevents `Use of uninitialized value` warnings from convertRelease.pl.
+
+### Colorized Messages for errlog
+
+Many internal error messages now emit ANSI escape sequences to highlight the
+words "ERROR" and "WARNING" in an attempt to make occurrences more noticeable
+during IOC startup.
+
+The macros `ERL_ERROR` and `ERL_WARNING` are defined for external usage,
+and expand as string constants.  eg.
+
+```c
+#include <errlog.h>
+#ifndef ERL_ERROR
+#  define ERL_ERROR "ERROR"
+#endif
+void fn() {
+   ...
+   errlogPrintf(ERL_ERROR ": something bad happens :(\n");
+```
+
+ANSI escapes are automatically removed from errlog output not destined
+for a terminal.  For example, for logClient, if stderr is redirected,
+or if unsupported (`$TERM` not set, or Windows < 10).
+
+### `dbnd` filter pass through `DBE_ALARM|DBE_PROPERTY`
+
+The `dbnd` server side filter now passes through alarm and property
+change events, even when not exceeding the deadband.
+
+-----
+
+## EPICS Release 7.0.6.1
+
+### `mbboDirectRecord` enhancements
+
+The bit fields `B0` - `B1F` of this record are now always updated and have a
+monitor posted when the `VAL` field is set and the record processed. It is now
+possible to initialize the record's value by setting the bit fields inside a
+database file as long as no other method was used to initialize it (suc as
+setting `VAL` directly, using `DOL`, or by an initial readback from device
+support). A new internal field `OBIT` was added to store information about
+monitors posted on the bit fields.
+
+### Minimum Perl Version is now 5.10.1
+
+Some scripts now make use of features that were introduced to this Perl version
+that was released in 2009.
+
+### DB Links to `DBF_MENU` fields fixed
+
+[GH:183](https://github.com/epics-base/epics-base/issues/183)
+These were broken in a previous release, but now work again.
+
+### Long String access to CALC fields fixed
+
+[GH:194](https://github.com/epics-base/epics-base/issues/194)
+This was broken in a previous release, but now works again.
+
+### Minor Changes
+
++ Many code comments have been spell-checked and corrected.
++ Passing a `-DDEBUG` compiler flag no longer breaks the build.
++ Parallel builds of RTEMS-mvme2100 and RTEMS-mvme2700 targets now work.
++ Illegal characters seen in JSON strings in a database file should now get a
+better error message.
+
+### Other Launchpad Bugs and GitHub Issues Fixed
+
++ [lp:1938459](https://bugs.launchpad.net/epics-base/+bug/1938459)
+  [GH:191](https://github.com/epics-base/epics-base/pull/191) int64in only
+  checks lower 32 bits for change
++ [lp:1941875](https://bugs.launchpad.net/epics-base/+bug/1941875) Buggy
+  warning message "Record/Alias name '...' should not contain non-printable ...
++ [GH:187](https://github.com/epics-base/epics-base/issues/187) waveformRecord
+  missing PACT=true?
++ [GH:189](https://github.com/epics-base/epics-base/pull/189) Fix a couple
+  memory leaks and a segfault
++ [GH:200](https://github.com/epics-base/epics-base/pull/200) and
+  [GH:201](https://github.com/epics-base/epics-base/pull/201) Fix timers on MS
+  Windows for non-EPICS threads
+
+### Compiler interface for epicsAtomic tidied up
+
+[GH:192](https://github.com/epics-base/epics-base/pull/192)
+Both GCC and CLANG compiler intrisics used for the epicsAtomic APIs have been revised; implementations using CLANG should now run faster as they now use the compiler's built-in atomic functions instead of taking a mutex.
+
+### The epicsTime code has been reimplemented
+
+[GH:185](https://github.com/epics-base/epics-base/pull/185)
+This was done to simplify the code and may have improved performance slightly for some uses. Support for the old NTP-specific `struct l_fp` has been dropped but all other routines and methods of the `class epicsTime` function as before.
+
+### Updates to Record Reference documentation
+
+Many of the built-in record types have had improvements to their documentation with additional fields added to the tables, rewrites of descriptions and links to other documents added or fixed.
+
+-----
 
 ## EPICS Release 7.0.6
 
@@ -304,10 +866,10 @@ broken.
 
 This fixes [lauchpad bug #1896295](https://bugs.launchpad.net/bugs/1896295).
 
-### Support for Apple M1 (arm64) Processors
+### Support for Apple M1/M2 (arm64) Processors
 
 Thanks to Jeong Han Lee this release comes with build support for Apple's new
-M1 CPUs running macOS, using the target name `darwin-aarch64`.
+M1/M2 CPUs running macOS, using the target name `darwin-aarch64`.
 
 It should also be possible to build universal binaries containing code for
 both the Intel and arm64 processors under either target name: In the
@@ -1323,7 +1885,7 @@ editing and history. This functionality has now been restored, see Launchpad
 ### Constant link types
 
 Constant links can now hold 64-bit integer values, either as scalars or
-arrays. Only base 10 is supported by the JSON parser though, the JSON standard
+    arrays. Only base 10 is supported by the JSON parser though, the JSON standard
 doesn't allow for hexadecimal numbers.
 
 ### Upgraded the YAJL JSON Library
@@ -1921,6 +2483,24 @@ header and removed the need for dbScan.c to reach into the internals of its
 
 ## Changes from the 3.15 branch since 3.15.9
 
+### Support for Apple M1/M2 (arm64) Processors
+
+Thanks to Jeong Han Lee this release comes with build support for Apple's new
+M1/M2 CPUs running macOS, using the target name `darwin-aarch64`.
+
+### Set thread names on Windows
+
+On MS Windows, epicsThread names are made available to the OS and debugger
+using `SetThreadDescription()` if available as well as using the older
+exception mechanism.
+
+### Fix timers on MS Windows for non-EPICS threads
+
+The waitable timer changes in 3.15.9 broke calls to `epicsThreadSleep()` and
+similar routines that used timers (including `ca_pend_event()`) when made from
+threads that were not started using the epicsThread APIs.
+[This problem](https://github.com/epics-base/epics-base/pull/200)
+[has now been fixed](https://github.com/epics-base/epics-base/pull/201).
 
 ## Changes made between 3.15.8 and 3.15.9
 

documentation/RecordReference.md

@@ -1,74 +0,0 @@
-# Record Reference Documentation  {#recordrefmanual}
-
-The documentation below for the record types and menus included with Base was
-converted from the old EPICS Wiki pages and updated. This list only includes the
-record types supplied with Base. The first two links below are to an external
-website where these original reference chapters are now being published.
-
-* [Introduction to EPICS](https://docs.epics-controls.org/en/latest/guides/EPICS_Intro.html)
-* [Process Database Concepts](https://docs.epics-controls.org/en/latest/guides/EPICS_Process_Database_Concepts.html)
-* [Fields Common to All Record Types](dbCommonRecord.html)
-* [Fields Common to Input Record Types](dbCommonInput.html)
-* [Fields Common to Output Record Types](dbCommonOutput.html)
-
-## Record Types
-
-* [Analog Array Input Record (aai)](aaiRecord.html)
-* [Analog Array Output Record (aao)](aaoRecord.html)
-* [Analog Input Record (ai)](aiRecord.html)
-* [Analog Output Record (ao)](aoRecord.html)
-* [Array Subroutine Record (aSub)](aSubRecord.html)
-* [Binary Input Record (bi)](biRecord.html)
-* [Binary Output Record (bo)](boRecord.html)
-* [Calculation Output Record (calcout)](calcoutRecord.html)
-* [Calculation Record (calc)](calcRecord.html)
-* [Compression Record (compress)](compressRecord.html)
-* [Data Fanout Record (dfanout)](dfanoutRecord.html)
-* [Event Record (event)](eventRecord.html)
-* [Fanout Record (fanout)](fanoutRecord.html)
-* [Histogram Record (histogram)](histogramRecord.html)
-* [64bit Integer Input Record (int64in)](int64inRecord.html)
-* [64bit Integer Output Record (int64out)](int64outRecord.html)
-* [Long Input Record (longin)](longinRecord.html)
-* [Long Output Record (longout)](longoutRecord.html)
-* [Long String Input Record (lsi)](lsiRecord.html)
-* [Long String Output Record (lso)](lsoRecord.html)
-* [Multi-Bit Binary Input Direct Record (mbbiDirect)](mbbiDirectRecord.html)
-* [Multi-Bit Binary Input Record (mbbi)](mbbiRecord.html)
-* [Multi-Bit Binary Output Direct Record (mbboDirect)](mbboDirectRecord.html)
-* [Multi-Bit Binary Output Record (mbbo)](mbboRecord.html)
-* [Permissive Record (permissive)](permissiveRecord.html)
-* [Printf Record (printf)](printfRecord.html)
-* [Select Record (sel)](selRecord.html)
-* [Sequence Record (seq)](seqRecord.html)
-* [State Record (state)](stateRecord.html)
-* [String Input Record (stringin)](stringinRecord.html)
-* [String Output Record (stringout)](stringoutRecord.html)
-* [Sub-Array Record (subArray)](subArrayRecord.html)
-* [Subroutine Record (sub)](subRecord.html)
-* [Waveform Record (waveform)](waveformRecord.html)
-
-## Menu Definitions
-
-* [Alarm Severity Menu](menuAlarmSevr.html)
-* [Alarm Status Menu](menuAlarmStat.html)
-* [Analog Conversions Menu](menuConvert.html)
-* [Field Type Menu](menuFtype.html)
-* [Invalid Value Output Action Menu](menuIvoa.html)
-* [Output Mode Select Menu](menuOmsl.html)
-* [Process at iocInit Menu](menuPini.html)
-* [Post Monitors Menu](menuPost.html)
-* [Priority Menu](menuPriority.html)
-* [Scan Menu](menuScan.html)
-* [Simulation Mode Menu](menuSimm.html)
-* [Yes/No Menu](menuYesNo.html)
-
-## Corrections and Updates
-
-Corrections to these documents can be submitted as patch files to the EPICS core
-developers, or as merge requests or pull requests to the 7.0 branch of Base.
-The document sources can be found in the `modules/database/src/std/rec` and
-`modules/database/src/ioc/db` directories in files with extension `.dbd.pod`.
-The documentation source format is a combination of the EPICS DBD file format
-with an extended version of Perl's POD (plain old documentation); run `perldoc
-pod` for details of POD.

documentation/ReleaseChecklist.html

@@ -37,40 +37,25 @@ 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
-problems that must be fixed before release. New versions should be made at about
-2-weekly intervals after the <tt>-pre1</tt> release, and designated as either
-pre-release or release candidate versions by the Release Manager. Release
-candidates are announced to the whole community via the tech-talk mailing list,
-pre-releases are announced to to the developers via the core-talk list. After a
-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>
+<p>We used to have one written down here, but we weren't following it very
+closely so now the decision to make a new release is taken during the Core
+Developers bi-weekly meetings in an informal manner. The steps detailed below
+were written to remind Andrew (or anyone else who does the release) about
+everything that has to be done since it's so easy to miss steps.</p>
 
 <h3>Roles</h3>
 
 <p>The following roles are used below:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong> ()</dt>
+  <dt><strong>Release Manager</strong></dt>
     <dd>Responsible for managing and tagging the release</dd>
-  <dt><strong>Platform Developers</strong> (optional)</dt>
-    <dd>Responsible for individual operating system platforms</dd>
+  <dt><strong>Core Developers</strong></dt>
+    <dd>Responsible for maintaining the EPICS software</dd>
   <dt><strong>Application Developers</strong></dt>
     <dd>Responsible for support modules that depend on EPICS Base.</dd>
-  <dt><strong>Website Manager</strong> (Andrew Johnson)</dt>
-    <dd>Responsible for the EPICS website</dd>
+  <dt><strong>Website Editors</strong></dt>
+    <dd>Responsible for the EPICS websites</dd>
 </dl>
 
 <form>
@@ -87,23 +72,22 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Email all developers about the upcoming release and ask for a list
-        of remaining tasks that must be finished.</td>
+      <td>Notify core developers about the upcoming release and ask about any
+        remaining tasks that must be finished.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>All developers</td>
       <td>Check the bug tracker for any outstanding items and handle
-        appropriately. All bugs that have been fixed should have been marked
-        as Fix Committed.</td>
+        appropriately.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Set the Feature Freeze date, by which time all Git commits for
-        enhancements and new functionality should have been completed. After
-        this date, commits should only be made to fix problems that show up
-        during testing.</td>
+      <td>Set a Feature Freeze date, by which time all Git branches for
+        enhancements and new functionality should have been merged. After this
+        date, commits and merges should only be made to fix problems that show
+        up during testing.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
@@ -111,9 +95,8 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
         &amp; all developers</td>
       <td>Ensure that documentation will be updated before the release date:
         <ul>
-          <li>Application Developers Guide</li>
           <li>Release Notes</li>
-          <li>Known Problems</li>
+          <li>Doxygen annotations</li>
           <li>Other documents</li>
         </ul>
       </td>
@@ -121,91 +104,8 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Review and update this checklist for the upcoming release.</td>
-      </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Website Manager</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><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><input type="checkbox"></td>
-      <td>Release Manager</td>
-      <td>Tag the module in Git, using these tag conventions:
-        <ul>
-          <li>
-            <tt>R7.0.5-pre<i>n</i></tt>
-            &mdash; pre-release tag
-            </li>
-          <li>
-            <tt>R7.0.5-rc<i>n</i></tt>
-            &mdash; release candidate tag
-            </li>
-          </ul>
-        <blockquote><tt>
-          cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for 7.0.5-rc1' R7.0.5-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><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.0<br />
-          ./.tools/make-tar.sh R7.0.5-rc1 base-7.0.5-rc1.tar.gz base-7.0.5-rc1/
-          </tt></blockquote>
-        Create a GPG signature file of the tarfile as follows:
-        <blockquote><tt>
-          gpg --armor --sign --detach-sig base-7.0.5-rc1.tar.gz
-          </tt></blockquote>
-        </td>
-      </tr>
-    <tr>
-      <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><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><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><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
-        versions should use the page and URL for the final release version
-        number.</td>
+      <td>Review and update this checklist for the upcoming release.
+        Update the release version number in the tags and messages below.</td>
       </tr>
     <tr>
       <th colspan="3">Testing</th>
@@ -213,7 +113,7 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
     <tr>
       <td>&nbsp;</td>
       <td>Platform Developers</td>
-      <td>Run the built-in test programs on all available host platforms using
+      <td>Run the internal test programs on all available host platforms using
         <blockquote><tt>
           make -s runtests
         </tt></blockquote></td>
@@ -250,11 +150,9 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <td>Release Manager</td>
       <td>Check that documentation has been updated:
         <ul>
-          <li><a href="https://launchpad.net/epics-appdev">Application
-            Developers Guide</a></li>
           <li>Release Notes</li>
-          <li>Known Problems (hopefully empty)</li>
-          <li>Other documents (converting...)</li>
+          <li>Doxygen annotations</li>
+          <li>Other documents</li>
           </ul>
         </td>
       </tr>
@@ -265,10 +163,8 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
     </tr>
     <tr>
       <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
-        new issues being reported.</td>
+      <td>Core Developers</td>
+      <td>Reach a consensus that the software is ready to release.</td>
       </tr>
     <tr>
       <th colspan="3">Creating the final release version</th>
@@ -277,9 +173,12 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
       <td>
-        <p>For each external submodule in turn (assuming it has not been tagged
-          yet):</p>
+        <p><b>For each external submodule</b> in turn (assuming it has not been
+          tagged yet):</p>
         <ol>
+          <li><tt>git grep UNRELEASED</tt> and insert the module version to any
+            doxygen annotations that have a <tt>@since UNRELEASED</tt> comment.
+            Commit (don't push yet).</li>
           <li>Check that the module's Release Notes have been updated to cover
             all changes; add items as necessary, and set the module version
             number and release date if appropriate. Convert to HTML and view in
@@ -288,27 +187,29 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
               cd base-7.0/modules/&lt;module&gt;/documentation<br />
               pandoc -f gfm -t html -o RELEASE_NOTES.html RELEASE_NOTES.md
               </tt></blockquote>
-            Commit changes (don't push yet).</li>
+            Commit these changes (don't push).</li>
 
           <li>Edit the module's release version file
-            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and its top-level
-            <tt>Doxyfile</tt>; set the <tt>DEVELOPMENT_FLAG</tt> value to 0 and
-            remove <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string.
-            Commit changes (don't push).</li>
+            <tt>configure/CONFIG_<i>module</i>_VERSION</tt> and the
+            <tt>Doxyfile</tt>s in the top-level and/or documentation
+            directories. In these, set <tt>DEVELOPMENT_FLAG</tt> to 0 and remove
+            <tt>-dev</tt> from the <tt>PROJECT_NUMBER</tt> string. Commit these
+            changes (don't push).</li>
 
           <li>Tag the module:
             <blockquote><tt>
-              git tag -m 'ANJ: Tag for EPICS 7.0.5' &lt;module-version&gt;
+              git tag -m 'ANJ: Tag for EPICS 7.0.8.1' &lt;module-version&gt;
               </tt></blockquote>
             </li>
 
           <li>Update the git submodule on the Base-7.0 branch to the
-            newly-tagged version, but don't commit yet:
+            newly-tagged version, check the module's status matches the tag:
             <blockquote><tt>
               cd base-7.0/modules<br />
               git add &lt;module&gt;<br />
               git submodule status --cached
               </tt></blockquote>
+            Don't commit the submodule updates yet.
             </li>
 
           <li>Edit the module's release version file
@@ -318,7 +219,8 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
             <tt>PROJECT_NUMBER</tt> string, appending <tt>-dev</tt> to the new
             module version number. Commit changes.</li>
 
-          <li>Push commits and the new tag to the submodule's GitHub repository:
+          <li>Push commits and the new tag to the submodule's GitHub repository
+            (assumed to be the <tt>upstream</tt> remote):
             <blockquote><tt>
               cd base-7.0/modules/&lt;module&gt;<br />
               git push --follow-tags upstream master
@@ -326,15 +228,24 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
             </li>
 
           </ol>
-        <p>Commit all the submodule updates to the 7.0 branch.</p>
+        <p><b>After all submodules complete</b> commit the submodule updates
+          which were added for each submodule in step 4 above to the 7.0 branch
+          (don't push). After committing, make sure that the output from
+          <tt>git submodule status --cached</tt> only shows the appropriate
+          version tags in the right-most parenthesized column with no
+          <tt>-<i>n</t>-g<i>xxxxxxx</i></tt> suffix.</p>
         </td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
       <td>Release Manager</td>
 
-      <td>Edit the main EPICS Base version file and the built-in module version
-        files:
+      <td>
+        <p><tt>git grep UNRELEASED</tt> and insert the release version to any
+          doxygen annotations that have a <tt>@since UNRELEASED</tt> comment.
+          Commit (don't push).</p>
+        <p>Edit the main EPICS Base version file and the built-in module version
+        files:</p>
         <ul>
           <li><tt>configure/CONFIG_BASE_VERSION</tt></li>
           <li><tt>configure/CONFIG_LIBCOM_VERSION</tt></li>
@@ -346,6 +257,9 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
           <tt>PATCH_LEVEL</tt> value should have been incremented after the
           previous release tag was applied. Set all <tt>DEVELOPMENT_FLAG</tt>
           values to 0 and <tt>EPICS_DEV_SNAPSHOT</tt> to the empty string.</p>
+        <p>Edit the headings in the Release Notes to show the appropriate
+          version number and remove the warning about this being an unreleased
+          version of EPICS.</p>
         <p>Commit these changes (don't push).</p>
         </td>
       </tr>
@@ -355,10 +269,9 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <td>Tag the epics-base module in Git:
         <blockquote><tt>
           cd base-7.0<br />
-          git tag -m 'ANJ: Tagged for release' R7.0.5
+          git tag -m 'ANJ: Tagged for release' R7.0.8.1
           </tt></blockquote>
-        <p>Don't push these commits or the new tag to the Launchpad repository
-          yet.</p>
+        <p>Don't push to GitHub yet.</p>
         </td>
       </tr>
     <tr>
@@ -376,6 +289,9 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
           release by incrementing the MAINTENANCE_VERSION or PATCH_LEVEL value
           in each file. Set all <tt>DEVELOPMENT_FLAG</tt> values to 1 and
           <tt>EPICS_DEV_SNAPSHOT</tt> to "-DEV".</p>
+        <p>Set up the headings in the Release Notes for the next release
+          version number and restore the warning about this being an unreleased
+          version of EPICS.</p>
         <p>Commit these changes (don't push).</p>
         </td>
       </tr>
@@ -387,12 +303,12 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
         files and directories that are only used for continuous integration:
         <blockquote><tt>
           cd base-7.0<br />
-          ./.tools/make-tar.sh R7.0.5 ../base-7.0.5.tar.gz base-7.0.5/
+          ./.tools/make-tar.sh R7.0.8.1 ../base-7.0.8.1.tar.gz base-7.0.8.1/
           </tt></blockquote>
         Create a GPG signature file of the tarfile as follows:
         <blockquote><tt>
           cd ..<br />
-          gpg --armor --sign --detach-sig base-7.0.5.tar.gz
+          gpg --armor --sign --detach-sig base-7.0.8.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -400,8 +316,9 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       <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. When this succeeds the commits and new git
-        tag can be pushed to the Launchpad repository:
+        least one supported platform. If this succeeds the commits and new git
+        tag can be pushed to the GitHub repository's 7.0 branch (assumed to be
+        the <tt>upstream</tt> remote):
         <blockquote><tt>
           git push --follow-tags upstream 7.0
           </tt></blockquote>
@@ -412,58 +329,58 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Release Manager</td>
+      <td>Website Editor</td>
       <td>Copy the tarfile and its signature to the Base download area of the
         website.</td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Website Manager</td>
+      <td>Website Editor</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><input type="checkbox"></td>
-      <td>Website Manager</td>
+      <td>Website Editor</td>
       <td>Update the webpage for the new release with links to the release
         documents and tar file.</td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Website Manager</td>
+      <td>Website Editor</td>
       <td>Add the new release tar file to the website Base download index
         page.</td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Website Manager</td>
+      <td>Website Editor</td>
       <td>Link to the release webpage from other relevent areas of the
         website - update front page and sidebars.</td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Website Manager</td>
+      <td>Website Editor</td>
       <td>Add an entry to the website News page, linking to the new version
         webpage.</td>
       </tr>
 
     <tr>
-      <th colspan="3">Publish to epics-controls</th>
+      <th colspan="3">Publish to epics-controls.org</th>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Website Manager</td>
+      <td>Website Editor</td>
       <td>Upload the tar file and its <tt>.asc</tt> signature file to the
         epics-controls web-server.
         <blockquote><tt>
-          scp base-7.0.5.tar.gz base-7.0.5.tar.gz.asc epics-controls:download/base<br />
+          scp base-7.0.8.1.tar.gz base-7.0.8.1.tar.gz.asc epics-controls:download/base<br />
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td><input type="checkbox"></td>
-      <td>Website Manager</td>
+      <td>Website Editor</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
@@ -474,22 +391,22 @@ starting at <a href="#ReleaseApproval">Release Approval</a>.</p>
       </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>
+      <th colspan="3">Publish to GitHub</th>
       </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>
+      <td>Go to the GitHub
+        <a href="https://github.com/epics-base/epics-base/releases/new?tag=R7.0.8.1">
+          Create release from tag R7.0.8.1</a> page.
+        Upload the tar file and its <tt>.asc</tt> signature file to the new
+        GitHub release page.</td>
+      </tr>
+    <tr>
+      <td><input type="checkbox"></td>
+      <td>Release Manager</td>
+      <td>We used to close out bug reports in Launchpad at release-time, this
+        would be the time to do that if we have an equivalent on GitHub.</td>
       </tr>
 
     <tr>

documentation/mainpage.dox

@@ -5,11 +5,11 @@ Documentation index
 
 @li @ref releasenotes
 @li @ref install
-@li @ref recordrefmanual
+@li <a href="ComponentReference.html">EPICS Component Reference Manual</a>
+@li <a href="filters.html">Field Modifiers and Channel Filters</a>
+@li <a href="links.html">Extensible IOC Database Links</a>
 @li <a href="CAref.html">Channel Access Reference Manual</a>
-@li <a href="filters.html">Server Side Filters Reference</a>
 @li <a href="msi.html">msi: Macro Substitution and Include Tool</a>
-@li <a href="links.html">JSON Link Types</a>
 @li <a href="CA.html">Perl 5 Interface to Channel Access</a>
 
 */

modules/CONFIG_SITE.local

@@ -2,6 +2,16 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
+#
+#   modules/CONFIG_SITE.local
+#
+# Despite the .local in its name, this file *is* included in EPICS Base
+# sources and should *not* be modified by sites. This trick is necessary
+# to allow external submodules to be placed inside the modules directory
+# without having to modify them, as long as their configure/CONFIG_SITE
+# file includes the standard line
+#       -include $(TOP)/../CONFIG_SITE.local
+# that causes this file to be read in during submodule builds.
 
 # The name our submodules know us by:
 PARENT_MODULE = EPICS_BASE

modules/Makefile

@@ -34,9 +34,6 @@ pvDatabase_DEPEND_DIRS = pvAccess
 SUBMODULES += pva2pva
 pva2pva_DEPEND_DIRS = pvAccess
 
-SUBMODULES += example
-example_DEPEND_DIRS = pva2pva pvaClient
-
 # Allow sites to add extra submodules
 -include Makefile.local
 

modules/ca/src/client/access.cpp

@@ -88,7 +88,7 @@ const char * ca_message_text []
 "Bad event subscription (monitor) identifier",
 "Remote channel has new network address",
 "New or resumed network connection",
-"Specified task isnt a member of a CA context",
+"Specified task isn't a member of a CA context",
 "Attempt to use defunct CA feature failed",
 
 "The supplied string is empty",
@@ -324,7 +324,7 @@ int epicsStdCall ca_create_channel (
         *chanptr = pChanNotify;
         pChanNotify->initiateConnect ( guard );
         // no need to worry about a connect preempting here because
-        // the connect sequence will not start untill initiateConnect()
+        // the connect sequence will not start until initiateConnect()
         // is called
     }
     catch ( cacChannel::badString & ) {
@@ -384,9 +384,9 @@ int epicsStdCall ca_clear_channel ( chid pChan )
         // we will definately stall out here if all of the
         // following are true
         //
-        // o user creates non-preemtive mode client library context
+        // o user creates non-preemptive mode client library context
         // o user doesnt periodically call a ca function
-        // o user calls this function from an auxiillary thread
+        // o user calls this function from an auxiliary thread
         //
         CallbackGuard cbGuard ( cac.cbMutex );
         epicsGuard < epicsMutex > guard ( cac.mutex );
@@ -720,7 +720,7 @@ int epicsStdCall ca_context_status ( ca_client_context * pcac, unsigned level )
 /*
  * ca_current_context ()
  *
- * used when an auxillary thread needs to join a CA client context started
+ * used when an auxiliary thread needs to join a CA client context started
  * by another thread
  */
 // extern "C"
@@ -740,7 +740,7 @@ struct ca_client_context * epicsStdCall ca_current_context ()
 /*
  * ca_attach_context ()
  *
- * used when an auxillary thread needs to join a CA client context started
+ * used when an auxiliary thread needs to join a CA client context started
  * by another thread
  */
 // extern "C"

modules/ca/src/client/acctst.c

@@ -494,7 +494,7 @@ void verifyConnectionHandlerConnect ( appChan *pChans, unsigned chanCount,
 /*
  * verifyBlockingConnect ()
  *
- * 1) verify that we dont print a disconnect message when
+ * 1) verify that we don't print a disconnect message when
  * we delete the last channel
  *
  * 2) verify that we delete the connection to the IOC
@@ -645,7 +645,7 @@ void verifyBlockingConnect ( appChan *pChans, unsigned chanCount,
         status = ca_pend_io ( 1e-16 );
         if ( status == ECA_TIMEOUT ) {
             /*
-             * we end up here if the channel isnt on the same host
+             * we end up here if the channel isn't on the same host
              */
             epicsThreadSleep ( 0.1 );
             ca_poll ();
@@ -1112,7 +1112,7 @@ void verifyHighThroughputRead ( chid chan, unsigned interestLevel )
     unsigned i;
 
     /*
-     * verify we dont jam up on many uninterrupted
+     * verify we don't jam up on many uninterrupted
      * solicitations
      */
     if ( ca_read_access (chan) ) {
@@ -1152,7 +1152,7 @@ void verifyHighThroughputWrite ( chid chan, unsigned interestLevel  )
 }
 
 /*
- * verify we dont jam up on many uninterrupted
+ * verify we don't jam up on many uninterrupted
  * get callback requests
  */
 void verifyHighThroughputReadCallback ( chid chan, unsigned interestLevel )
@@ -1181,7 +1181,7 @@ void verifyHighThroughputReadCallback ( chid chan, unsigned interestLevel )
 }
 
 /*
- * verify we dont jam up on many uninterrupted
+ * verify we don't jam up on many uninterrupted
  * put callback request
  */
 void verifyHighThroughputWriteCallback ( chid chan, unsigned interestLevel )
@@ -1239,7 +1239,7 @@ void verifyBadString ( chid chan, unsigned interestLevel  )
         verify ( status == ECA_NORMAL );
         if ( strcmp ( stimStr, respStr ) ) {
             printf (
-    "Test fails if stim \"%s\" isnt roughly equiv to resp \"%s\"\n",
+    "Test fails if stim \"%s\" isn't roughly equiv to resp \"%s\"\n",
                 stimStr, respStr);
         }
         showProgressEnd ( interestLevel );
@@ -1395,7 +1395,7 @@ static void multiSubscrDestroyNoLateCallbackThread ( void * pParm )
 
         /*
          * raise the priority of the current thread hoping to improve our
-         * likelyhood of detecting a bug
+         * likelihood of detecting a bug
          */
         priorityOfTestThread = epicsThreadGetPrioritySelf ();
         epicsThreadSetPriority ( epicsThreadGetIdSelf(), epicsThreadPriorityHigh );
@@ -1445,7 +1445,7 @@ static void multiSubscrDestroyNoLateCallbackThread ( void * pParm )
 }
 
 /*
- * verify that, in a preemtive callback mode client, a subscription callback never
+ * verify that, in a preemptive callback mode client, a subscription callback never
  * comes after the subscription is destroyed
  */
 static void multiSubscrDestroyNoLateCallbackTest ( const char *pName, unsigned interestLevel )
@@ -1563,7 +1563,7 @@ void multiSubscriptionDeleteTest ( chid chan, unsigned interestLevel  )
 /*
  * singleSubscriptionDeleteTest
  *
- * verify that we dont fail when we repeatedly create
+ * verify that we don't fail when we repeatedly create
  * and delete only one subscription with a high level of
  * traffic on it
  */
@@ -1617,7 +1617,7 @@ void singleSubscriptionDeleteTest ( chid chan, unsigned interestLevel  )
 /*
  * channelClearWithEventTrafficTest
  *
- * verify that we can delete a channel that has subcriptions
+ * verify that we can delete a channel that has subscriptions
  * attached with heavy update traffic
  */
 void channelClearWithEventTrafficTest ( const char *pName, unsigned interestLevel )
@@ -2481,7 +2481,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
     showProgress ( interestLevel );
 
     /*
-     * attempt to uncover problems where the last event isnt sent
+     * attempt to uncover problems where the last event isn't sent
      * and hopefully get into a flow control situation
      */
     prevPassCount = 0u;
@@ -2522,7 +2522,7 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
             ca_poll (); /* emulate typical GUI */
             for ( j = 0; j < NELEMENTS ( test ); j++ ) {
                 /*
-                 * we shouldnt see old monitors because
+                 * we shouldn't see old monitors because
                  * we resubscribed
                  */
                 verify ( test[j].count <= i + 2 );
@@ -2575,7 +2575,8 @@ void monitorUpdateTest ( chid chan, unsigned interestLevel )
     SEVCHK ( ca_get ( DBR_FLOAT, chan, &temp ), NULL );
     SEVCHK ( ca_pend_io ( timeoutToPendIO ), NULL );
 
-    /* printf ( "flow control bypassed %u events\n", flowCtrlCount ); */
+    if (0)
+        printf ( "flow control bypassed %u events\n", flowCtrlCount );
 
     showProgressEnd ( interestLevel );
 }
@@ -3016,7 +3017,7 @@ void testMultithreadSubscr ( void * pParm )
 }
 
 /*
- * test installation of subscriptions similar to usage paterns
+ * test installation of subscriptions similar to usage patterns
  * employed by modern versions of the sequencer
  */
 void verifyMultithreadSubscr ( const char * pName, unsigned interestLevel )
@@ -3111,7 +3112,7 @@ void fdManagerVerify ( const char * pName, unsigned interestLevel )
     status = ca_flush_io ();
     verify ( status == ECA_NORMAL );
 
-    /* look for infinite loop in fd manager schedualing */
+    /* look for infinite loop in fd manager scheduling */
     epicsTimeGetCurrent ( & begin );
     eventCount = 0u;
     while ( 1 ) {
@@ -3175,7 +3176,7 @@ void verifyConnectWithDisconnectedChannels (
      * we should be able to connect to a valid
      * channel within a reasonable delay even
      * though there is one permanently
-     * diasconnected channel
+     * disconnected channel
      */
     status = ca_pend_io ( timeoutToPendIO );
     verify ( status == ECA_NORMAL );
@@ -3491,7 +3492,7 @@ int acctst ( const char * pName, unsigned interestLevel, unsigned channelCount,
 
     /*
      * CA pend event delay accuracy test
-     * (CA asssumes that search requests can be sent
+     * (CA assumes that search requests can be sent
      * at least every 25 mS on all supported os)
      */
     printf ( "\n" );

modules/ca/src/client/acctstRegister.cpp

@@ -32,7 +32,13 @@ static const iocshArg    *acctstArgs[] =
     &acctstArg3,
     &acctstArg4
 };
-static const iocshFuncDef acctstFuncDef = {"acctst", 5, acctstArgs};
+static const iocshFuncDef acctstFuncDef = {
+    "acctst",
+    5,
+    acctstArgs,
+    "Execute a Channel Access regression test.\n\n"
+    "For more information, see the 'acctst' documentation in the Channel Access reference.\n",
+};
 
 
 /* Wrapper called by iocsh, selects the argument types that print needs */

modules/ca/src/client/bhe.cpp

@@ -130,8 +130,8 @@ bool bhe::updatePeriod (
     guard.assertIdenticalMutex ( this->mutex );
 
     //
-    // this block is enetered if the beacon was created as a side effect of
-    // creating a connection and so we dont yet know the first beacon time
+    // this block is entered if the beacon was created as a side effect of
+    // creating a connection and so we don't yet know the first beacon time
     // and  sequence number
     //
     if ( this->timeStamp == epicsTime () ) {
@@ -154,7 +154,7 @@ bool bhe::updatePeriod (
         return false;
     }
 
-    // 1) detect beacon duplications due to redundant routes
+    // 1) detect beacon duplication due to redundant routes
     // 2) detect lost beacons due to input queue overrun or damage
     if ( CA_V410 ( protocolRevision ) ) {
         unsigned beaconSeqAdvance;
@@ -175,7 +175,7 @@ bool bhe::updatePeriod (
 
         // throw out sequence numbers that jump forward by only a few numbers
         // (this situation is probably caused by a duplicate route
-        // or a beacon due to input queue overun)
+        // or a beacon due to input queue overrun)
         if ( beaconSeqAdvance > 1 &&  beaconSeqAdvance < 4 ) {
             logBeaconDiscard ( beaconSeqAdvance, currentTime );
             return false;
@@ -244,8 +244,8 @@ bool bhe::updatePeriod (
         /*
          * Is this an IOC seen because of an IOC reboot
          * (beacon come at a higher rate just after the
-         * IOC reboots). Lower tolarance here because we
-         * dont have to worry about lost beacons.
+         * IOC reboots). Lower tolerance here because we
+         * don't have to worry about lost beacons.
          *
          * It may be possible to get false triggers here
          * if the client is busy, but this does not cause

modules/ca/src/client/caProto.h

@@ -58,8 +58,8 @@
 #define CA_REPEATER_PORT        (CA_PORT_BASE+CA_MAJOR_PROTOCOL_REVISION*2u+1u)
 
 /*
- * 1500 (max of ethernet and 802.{2,3} MTU) - 20(IP) - 8(UDP)
- * (the MTU of Ethernet is currently independent of its speed varient)
+ * 1500 (max of Ethernet and 802.{2,3} MTU) - 20(IP) - 8(UDP)
+ * (the MTU of Ethernet is currently independent of its speed variant)
  */
 #define ETHERNET_MAX_UDP        ( 1500u - 20u - 8u )
 #define MAX_UDP_RECV            ( 0xffff + 16u ) /* allow large frames to be received in the future */
@@ -117,7 +117,7 @@ typedef ca_uint32_t     caResId;
 
 /*
  * for use with search and not_found (if search fails and
- * its not a broadcast tell the client to look elesewhere)
+ * its not a broadcast tell the client to look elsewhere)
  */
 #define DOREPLY     10u
 #define DONTREPLY   5u
@@ -176,7 +176,7 @@ typedef struct ca_hdr {
 struct  mon_info {
     ca_float32_t    m_lval;     /* low delta */
     ca_float32_t    m_hval;     /* high delta */
-    ca_float32_t    m_toval;    /* period btween samples */
+    ca_float32_t    m_toval;    /* period between samples */
     ca_uint16_t     m_mask;     /* event select mask */
     ca_uint16_t     m_pad;      /* extend to 32 bits */
 };

modules/ca/src/client/ca_client_context.cpp

@@ -224,7 +224,7 @@ void ca_client_context::changeExceptionEvent (
     epicsGuard < epicsMutex > guard ( this->mutex );
     this->ca_exception_func = pfunc;
     this->ca_exception_arg = arg;
-// should block here until releated callback in progress completes
+// should block here until related callback in progress completes
 }
 
 void ca_client_context::replaceErrLogHandler (
@@ -237,7 +237,7 @@ void ca_client_context::replaceErrLogHandler (
     else {
         this->pVPrintfFunc = epicsVprintf;
     }
-// should block here until releated callback in progress completes
+// should block here until related callback in progress completes
 }
 
 void ca_client_context::registerForFileDescriptorCallBack (
@@ -252,7 +252,7 @@ void ca_client_context::registerForFileDescriptorCallBack (
         // w/o having sent the wakeup message
         this->_sendWakeupMsg ();
     }
-// should block here until releated callback in progress completes
+// should block here until related callback in progress completes
 }
 
 int ca_client_context :: printFormated (
@@ -392,9 +392,19 @@ void ca_client_context :: vSignal (
     }
 
     epicsTime current = epicsTime::getCurrent ();
-    char date[64];
-    current.strftime ( date, sizeof ( date ), "%a %b %d %Y %H:%M:%S.%f");
-    this->printFormated ( "    Current Time: %s\n", date );
+    try {
+        char date[64];
+        current.strftime ( date, sizeof ( date ), "%a %b %d %Y %H:%M:%S.%f");
+        this->printFormated ( "    Current Time: %s\n", date );
+    }
+    catch ( std::exception & except ) {
+        errlogPrintf (
+            "CA client library thread \"%s\" caught C++ exception \"%s\"\n",
+            epicsThreadGetNameSelf (), except.what () );
+        epicsTimeStamp now = current;
+        this->printFormated ( "    Current Time: %u.%u\n",
+                now.secPastEpoch, now.nsec );
+    }
 
     /*
      *  Terminate execution if unsuccessful
@@ -768,9 +778,9 @@ LIBCA_API int epicsStdCall ca_clear_subscription ( evid pMon )
       // we will definately stall out here if all of the
       // following are true
       //
-      // o user creates non-preemtive mode client library context
+      // o user creates non-preemptive mode client library context
       // o user doesnt periodically call a ca function
-      // o user calls this function from an auxiillary thread
+      // o user calls this function from an auxiliary thread
       //
       CallbackGuard cbGuard ( cac.cbMutex );
       epicsGuard < epicsMutex > guard ( cac.mutex );

modules/ca/src/client/cac.cpp

@@ -25,6 +25,7 @@
 #include <stdexcept>
 #include <string> // vxWorks 6.0 requires this include
 
+#include "epicsStdio.h"
 #include "dbDefs.h"
 #include "epicsGuard.h"
 #include "epicsVersion.h"
@@ -285,7 +286,7 @@ cac::~cac ()
     // this blocks until the UDP thread exits so that
     // it will not sneak in any new clients
     //
-    // lock intentionally not held here so that we dont deadlock
+    // lock intentionally not held here so that we don't deadlock
     // waiting for the UDP thread to exit while it is waiting to
     // get the lock.
     {
@@ -312,7 +313,7 @@ cac::~cac ()
     //
     // wait for all tcp threads to exit
     //
-    // this will block for oustanding sends to go out so dont
+    // this will block for outstanding sends to go out so don't
     // hold a lock while waiting
     //
     {
@@ -411,7 +412,7 @@ void cac::show (
 
     ::printf ( "Channel Access Client Context at %p for user %s\n",
         static_cast <const void *> ( this ), this->pUserName );
-    // this also supresses the "defined, but not used"
+    // this also suppresses the "defined, but not used"
     // warning message
     ::printf ( "\trevision \"%s\"\n", pVersionCAC );
 
@@ -1008,7 +1009,7 @@ bool cac::defaultExcep (
     char buf[512];
     char hostName[64];
     iiu.getHostName ( guard, hostName, sizeof ( hostName ) );
-    sprintf ( buf, "host=%s ctx=%.400s", hostName, pCtx );
+    epicsSnprintf( buf, sizeof(buf), "host=%s ctx=%.400s", hostName, pCtx );
     this->notify.exception ( guard, status, buf, 0, 0u );
     return true;
 }
@@ -1312,7 +1313,7 @@ void cac::pvMultiplyDefinedNotify ( msgForMultiplyDefinedPV & mfmdpv,
     const char * pChannelName, const char * pAcc, const char * pRej )
 {
     char buf[256];
-    sprintf ( buf, "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
+    epicsSnprintf( buf, sizeof(buf), "Channel: \"%.64s\", Connecting to: %.64s, Ignored: %.64s",
             pChannelName, pAcc, pRej );
     {
         callbackManager mgr ( this->notify, this->cbMutex );

modules/ca/src/client/cadef.h

@@ -129,7 +129,7 @@ typedef unsigned CA_SYNC_GID;
 #define CA_OP_CONN_UP       6
 #define CA_OP_CONN_DOWN     7
 
-/* depricated */
+/* deprecated */
 #define CA_OP_SEARCH        2
 
 /*
@@ -464,7 +464,7 @@ LIBCA_API int epicsStdCall ca_array_get_callback
 /*  Specify a function to be executed whenever significant changes      */
 /*  occur to a channel.                                                 */
 /*  NOTES:                                                              */
-/*  1)  Evid may be omited by passing a NULL pointer                    */
+/*  1)  Evid may be omitted by passing a NULL pointer                    */
 /*                                                                      */
 /*  2)  An array count of zero specifies the native db count            */
 /*                                                                      */
@@ -559,19 +559,19 @@ LIBCA_API chid epicsStdCall ca_evid_to_chid ( evid id );
 /*
  * ca_pend_event()
  *
- * timeOut  R   wait for this delay in seconds
+ * timeout  R   wait for this delay in seconds
  */
-LIBCA_API int epicsStdCall ca_pend_event (ca_real timeOut);
+LIBCA_API int epicsStdCall ca_pend_event (ca_real timeout);
 #define ca_poll() ca_pend_event(1e-12)
 
 /*
  * ca_pend_io()
  *
- * timeOut  R   wait for this delay in seconds but return early
+ * timeout  R   wait for this delay in seconds but return early
  *              if all get requests (or search requests with null
  *              connection handler pointer have completed)
  */
-LIBCA_API int epicsStdCall ca_pend_io (ca_real timeOut);
+LIBCA_API int epicsStdCall ca_pend_io (ca_real timeout);
 
 /* calls ca_pend_io() if early is true otherwise ca_pend_event() is called */
 LIBCA_API int epicsStdCall ca_pend (ca_real timeout, int early);
@@ -837,7 +837,7 @@ LIBCA_API double epicsStdCall ca_beacon_period (chid chan);
 LIBCA_API double epicsStdCall ca_receive_watchdog_delay (chid chan);
 
 /*
- * used when an auxillary thread needs to join a CA client context started
+ * used when an auxiliary thread needs to join a CA client context started
  * by another thread
  */
 LIBCA_API struct ca_client_context * epicsStdCall ca_current_context ();

modules/ca/src/client/casw.cpp

@@ -188,7 +188,7 @@ int main ( int argc, char ** argv )
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
             epicsSocketDestroy ( sock );
-            errlogPrintf ("casw: error from recv was = \"%s\"\n",
+            errlogPrintf ("casw: " ERL_ERROR " from recv was = \"%s\"\n",
                 sockErrBuf );
             return -1;
         }
@@ -224,7 +224,7 @@ int main ( int argc, char ** argv )
                  *   always set this field to INADDR_ANY
                  *
                  * clients always assume that if this
-                 * field is set to something that isnt INADDR_ANY
+                 * field is set to something that isn't INADDR_ANY
                  * then it is the overriding IP address of the server.
                  */
                 ina.sin_family = AF_INET;
@@ -235,7 +235,7 @@ int main ( int argc, char ** argv )
                 }
                 else {
                     /*
-                     * old servers dont supply this and the
+                     * old servers don't supply this and the
                      * default port must be assumed
                      */
                     ina.sin_port = htons ( serverPort );

modules/ca/src/client/catime.c

@@ -450,7 +450,7 @@ void timeIt ( tf *pfunc, ti *pItems, unsigned iterations,
     epicsTimeStamp      end_time;
     epicsTimeStamp      start_time;
     double              delay;
-    unsigned            inlineIter;
+    unsigned            inlineIter = 0;
 
     epicsTimeGetCurrent ( &start_time );
     (*pfunc) ( pItems, iterations, &inlineIter );

modules/ca/src/client/comBuf.cpp

@@ -45,7 +45,7 @@ bool comBuf::flushToWire ( wireSendAdapter & wire, const epicsTime & currentTime
     return true;
 }
 
-// throwing the exception from a function that isnt inline
+// throwing the exception from a function that isn't inline
 // shrinks the GNU compiled object code
 void comBuf::throwInsufficentBytesException ()
 {

modules/ca/src/client/comBuf.h

@@ -88,6 +88,7 @@ public:
     bool push ( const T & value );
     template < class T >
     unsigned push ( const T * pValue, unsigned nElem );
+    unsigned push ( const char * pValue, unsigned nElem );
     unsigned push ( const epicsInt8 * pValue, unsigned nElem );
     unsigned push ( const epicsUInt8 * pValue, unsigned nElem );
     unsigned push ( const epicsOldString * pValue, unsigned nElem );
@@ -208,6 +209,11 @@ inline unsigned comBuf :: push ( const epicsUInt8 *pValue, unsigned nElem )
     return copyInBytes ( pValue, nElem );
 }
 
+inline unsigned comBuf :: push ( const char *pValue, unsigned nElem )
+{
+    return copyInBytes ( pValue, nElem );
+}
+
 inline unsigned comBuf :: push ( const epicsOldString * pValue, unsigned nElem )
 {
     unsigned index = this->nextWriteIndex;

modules/ca/src/client/comQueRecv.cpp

@@ -46,7 +46,7 @@ void comQueRecv::clear ()
     this->nBytesPending = 0u;
 }
 
-unsigned comQueRecv::copyOutBytes ( epicsInt8 *pBuf, unsigned nBytes )
+unsigned comQueRecv::copyOutBytes ( char *pBuf, unsigned nBytes )
 {
     unsigned totalBytes = 0u;
     do {
@@ -196,7 +196,7 @@ epicsUInt16 comQueRecv::popUInt16 ()
     if ( ! pComBuf ) {
         comBuf::throwInsufficentBytesException ();
     }
-    // try first for all in one buffer efficent version
+    // try first for all in one buffer efficient version
     epicsUInt16 tmp = 0;
     comBuf::popStatus status = pComBuf->pop ( tmp );
     if ( status.success ) {
@@ -215,7 +215,7 @@ epicsUInt32 comQueRecv::popUInt32 ()
     if ( ! pComBuf ) {
         comBuf::throwInsufficentBytesException ();
     }
-    // try first for all in one buffer efficent version
+    // try first for all in one buffer efficient version
     epicsUInt32 tmp = 0;
     comBuf::popStatus status = pComBuf->pop ( tmp );
     if ( status.success ) {
@@ -230,7 +230,7 @@ epicsUInt32 comQueRecv::popUInt32 ()
 
 bool comQueRecv::popOldMsgHeader ( caHdrLargeArray & msg )
 {
-    // try first for all in one buffer efficent version
+    // try first for all in one buffer efficient version
     comBuf * pComBuf = this->bufs.first ();
     if ( ! pComBuf ) {
         return false;

modules/ca/src/client/comQueRecv.h

@@ -33,7 +33,7 @@ public:
     comQueRecv ( comBufMemoryManager & );
     ~comQueRecv ();
     unsigned occupiedBytes () const;
-    unsigned copyOutBytes ( epicsInt8 *pBuf, unsigned nBytes );
+    unsigned copyOutBytes ( char *pBuf, unsigned nBytes );
     unsigned removeBytes ( unsigned nBytes );
     void pushLastComBufReceived ( comBuf & );
     void clear ();

modules/ca/src/client/comQueSend.cpp

@@ -27,17 +27,17 @@
 // 1) Allow sufficent headroom so that users will be able to perform
 // a reasonable amount of IO within CA callbacks without experiencing
 // a push/pull deadlock. If a potential push/pull deadlock situation
-// occurs then detect and avoid it and provide diagnotic to the user
+// occurs then detect and avoid it and provide diagnostic to the user
 // via special status.
-// 2) Return status to the user when there is insufficent memory to
+// 2) Return status to the user when there is insufficient memory to
 // queue a complete message.
 // 3) return status to the user when a message cant be flushed because
 // a connection dropped.
-// 4) Do not allocate too much memory in exception situatons (such as
+// 4) Do not allocate too much memory in exception situations (such as
 // after a circuit disconnect).
 // 5) Avoid allocating more memory than is absolutely necessary to meet
 // the above requirements.
-// 6) Message fragments must never be sent to the IOC when there isnt
+// 6) Message fragments must never be sent to the IOC when there isn't
 // enough memory to queue part of a message (we also must not force
 // a disconnect because the client is starved for memory).
 // 7) avoid the need to check status for each byte pushed into the
@@ -45,7 +45,7 @@
 //
 // Implementation:
 // 1) When queuing a complete message, first test to see if a flush is
-// required. If it is a receive thread scheduals the flush with the
+// required. If it is a receive thread schedules the flush with the
 // send thread, and otherwise directly execute the system call. The
 // send thread must run at a higher priority than the receive thread
 // if we are to minimize memory consumption.
@@ -58,9 +58,9 @@
 //      a) A user is queuing more requests that demand a response from a
 //      callback than are removed by the response that initiated the
 //      callback, and this situation persists for many callbacks until
-//      all buffering in the system is exausted.
+//      all buffering in the system is exhausted.
 //      b) A user is queuing many requests that demand a response from one
-//      callback until all buffering in the system is exausted.
+//      callback until all buffering in the system is exhausted.
 //      c) Some combination of both (a) nad (b).
 //
 //

modules/ca/src/client/convert.cpp

@@ -35,7 +35,7 @@
 #include "caerr.h"
 
 /*
- * NOOP if this isnt required
+ * NOOP if this isn't required
  */
 #ifdef EPICS_CONVERSION_REQUIRED
 
@@ -326,7 +326,7 @@ arrayElementCount   num         /* number of values     */
 **      int  encode;            boolean, if true vax to ieee
 **                           else ieee to vax
 **
-**  converts fields ofstruct in HOST format to ieee format
+**  converts fields of struct in HOST format to ieee format
 **     or
 **  converts fields of struct in NET format to fields with HOST
 **      format
@@ -1022,7 +1022,7 @@ arrayElementCount   num         /* number of values     */
 **      int  encode;            boolean, if true vax to ieee
 **                           else ieee to vax
 **
-**  converts fields ofstruct in HOST format to ieee format
+**  converts fields of struct in HOST format to ieee format
 **     or
 **  converts fields of struct in NET format to fields with HOST
 **      format
@@ -1056,7 +1056,7 @@ arrayElementCount   num         /* number of values     */
 /****************************************************************************
 **  cvrt_sts_long(s,d)
 **
-**  converts fields ofstruct in HOST format to ieee format
+**  converts fields of struct in HOST format to ieee format
 **     or
 **  converts fields of struct in NET format to fields with HOST
 **      format
@@ -1118,7 +1118,7 @@ arrayElementCount   num         /* number of values     */
 /****************************************************************************
 **  cvrt_time_short(s,d)
 **
-**  converts fields ofstruct in HOST format to ieee format
+**  converts fields of struct in HOST format to ieee format
 **     or
 **  converts fields of struct in NET format to fields with HOST
 **      format
@@ -1239,7 +1239,7 @@ arrayElementCount   num         /* number of values     */
 /****************************************************************************
 **  cvrt_sts_char(s,d)
 **
-**  converts fields ofstruct in HOST format to ieee format
+**  converts fields of struct in HOST format to ieee format
 **     or
 **  converts fields of struct in NET format to fields with HOST
 **      format
@@ -1274,7 +1274,7 @@ arrayElementCount   num         /* number of values     */
 /****************************************************************************
 **  cvrt_time_long(s,d)
 **
-**  converts fields ofstruct in HOST format to ieee format
+**  converts fields of struct in HOST format to ieee format
 **     or
 **  converts fields of struct in NET format to fields with HOST
 **      format
@@ -1325,7 +1325,7 @@ arrayElementCount   num         /* number of values     */
     for(i=0; i<num; i++){
         *pDest = dbr_ntohs( *pSrc );
         /*
-         * dont increment these inside the MACRO
+         * don't increment these inside the MACRO
          */
         pDest++;
         pSrc++;

modules/ca/src/client/db_access.h

@@ -123,7 +123,7 @@ typedef epicsOldString dbr_class_name_t;
 LIBCA_API extern const int epicsTypeToDBR_XXXX [lastEpicsType+1];
 
 /*
- * The DBR_XXXX types are indicies into this array
+ * The DBR_XXXX types are indices into this array
  */
 LIBCA_API extern const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1];
 

modules/ca/src/client/hostNameCache.cpp

@@ -53,7 +53,7 @@ void hostNameCache::transactionComplete ( const char * pHostNameIn )
 {
     epicsGuard < epicsMutex > guard ( this->mutex );
     // a few legacy clients have a direct pointer to this buffer so we
-    // set the entrire string to nill terminators before we start copying
+    // set the entire string to nill terminators before we start copying
     // in the name (this reduces the chance that another thread will see
     // garbage characters).
     size_t newNameLen = strlen ( pHostNameIn );

modules/ca/src/client/iocinf.cpp

@@ -21,6 +21,9 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include <vector>
+#include <exception>
+
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
@@ -28,6 +31,7 @@
 
 #include "envDefs.h"
 #include "epicsAssert.h"
+#include "epicsString.h"
 #include "epicsStdioRedirect.h"
 #include "errlog.h"
 #include "osiWireFormat.h"
@@ -35,39 +39,6 @@
 #include "addrList.h"
 #include "iocinf.h"
 
-/*
- * getToken()
- */
-static char *getToken ( const char **ppString, char *pBuf, unsigned bufSIze )
-{
-    bool tokenFound = false;
-    const char *pToken;
-    unsigned i;
-
-    pToken = *ppString;
-    while ( isspace (*pToken) && *pToken ){
-        pToken++;
-    }
-
-    for ( i=0u; i<bufSIze; i++ ) {
-        if ( isspace (pToken[i]) || pToken[i]=='\0' ) {
-            pBuf[i] = '\0';
-            *ppString = &pToken[i];
-            if ( i != 0 ) {
-                tokenFound = true;
-            }
-            break;
-        }
-        pBuf[i] = pToken[i];
-    }
-
-    if ( tokenFound ) {
-        pBuf[bufSIze-1] = '\0';
-        return pBuf;
-    }
-    return NULL;
-}
-
 /*
  * addAddrToChannelAccessAddressList ()
  */
@@ -77,9 +48,7 @@ extern "C" int epicsStdCall addAddrToChannelAccessAddressList
 {
     osiSockAddrNode *pNewNode;
     const char *pStr;
-    const char *pToken;
     struct sockaddr_in addr;
-    char buf[32u]; /* large enough to hold an IP address */
     int status, ret = -1;
 
     pStr = envGetConfigParamPtr (pEnv);
@@ -87,31 +56,45 @@ extern "C" int epicsStdCall addAddrToChannelAccessAddressList
         return ret;
     }
 
-    while ( ( pToken = getToken (&pStr, buf, sizeof (buf) ) ) ) {
-        status = aToIPAddr ( pToken, port, &addr );
-        if (status<0) {
-            fprintf ( stderr, "%s: Parsing '%s'\n", __FILE__, pEnv->name);
-            fprintf ( stderr, "\tBad internet address or host name: '%s'\n", pToken);
-            continue;
+    try {
+        std::vector<char> scratch(pStr, pStr+strlen(pStr)+1); // copy chars and trailing nil
+
+        char *save = NULL;
+        for(const char *pToken = epicsStrtok_r(&scratch[0], " \t\n\r", &save);
+            pToken;
+            pToken = epicsStrtok_r(NULL, " \t\n\r", &save))
+        {
+            if(!pToken[0]) {
+                continue;
+            }
+
+            status = aToIPAddr ( pToken, port, &addr );
+            if (status<0) {
+                fprintf ( stderr, "%s: Parsing '%s'\n", __FILE__, pEnv->name);
+                fprintf ( stderr, "\tBad internet address or host name: '%s'\n", pToken);
+                continue;
+            }
+
+            if ( ignoreNonDefaultPort && ntohs ( addr.sin_port ) != port ) {
+                continue;
+            }
+
+            pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
+            if (pNewNode==NULL) {
+                fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
+                break;
+            }
+
+            pNewNode->addr.ia = addr;
+
+            /*
+             * LOCK applied externally
+             */
+            ellAdd (pList, &pNewNode->node);
+            ret = 0; /* success if anything is added to the list */
         }
-
-        if ( ignoreNonDefaultPort && ntohs ( addr.sin_port ) != port ) {
-            continue;
-        }
-
-        pNewNode = (osiSockAddrNode *) calloc (1, sizeof(*pNewNode));
-        if (pNewNode==NULL) {
-            fprintf ( stderr, "addAddrToChannelAccessAddressList(): no memory available for configuration\n");
-            break;
-        }
-
-        pNewNode->addr.ia = addr;
-
-        /*
-         * LOCK applied externally
-         */
-        ellAdd (pList, &pNewNode->node);
-        ret = 0; /* success if anything is added to the list */
+    } catch(std::exception&) { // only bad_alloc currently possible
+        ret = -1;
     }
 
     return ret;
@@ -189,7 +172,7 @@ extern "C" void epicsStdCall configureChannelAccessAddressList
     int             yes;
 
     /*
-     * dont load the list twice
+     * don't load the list twice
      */
     assert ( ellCount (pList) == 0 );
 

modules/ca/src/client/iocinf.h

@@ -56,7 +56,7 @@ static const double CA_CONN_VERIFY_PERIOD = 30.0; /* (sec) how often to request
  * monitor flow control
  *
  * turning this down effects maximum throughput
- * because we dont get an optimal number of bytes
+ * because we don't get an optimal number of bytes
  * per network frame
  */
 static const unsigned contiguousMsgCountWhichTriggersFlowControl = 10u;

modules/ca/src/client/msgForMultiplyDefinedPV.cpp

@@ -57,7 +57,7 @@ void msgForMultiplyDefinedPV::transactionComplete ( const char * pHostNameRej )
     // calls into cac for the notification
     // the msg object (= this) is being deleted as part of the notification
     this->cb.pvMultiplyDefinedNotify ( *this, this->channel, this->acc, pHostNameRej );
-    // !! dont touch 'this' pointer after this point because object has been deleted !!
+    // !! don't touch 'this' pointer after this point because object has been deleted !!
 }
 
 void * msgForMultiplyDefinedPV::operator new ( size_t size,

modules/ca/src/client/nciu.cpp

@@ -147,14 +147,14 @@ void nciu::connect ( unsigned nativeType,
             guard, this->accessRightState );
     }
 
-    // channel uninstal routine grabs the callback lock so
+    // channel uninstall routine grabs the callback lock so
     // a channel will not be deleted while a call back is
     // in progress
     //
     // the callback lock is also taken when a channel
     // disconnects to prevent a race condition with the
     // code below - ie we hold the callback lock here
-    // so a chanel cant be destroyed out from under us.
+    // so a channel cant be destroyed out from under us.
     this->notify().connectNotify ( guard );
 }
 

modules/ca/src/client/netIO.h

@@ -32,7 +32,7 @@
 // destructor is virtual (therefore it is protected).
 // I assume that SUNPRO will fix this in future versions.
 // With other compilers we get warnings (and
-// potential problems) if we dont make the baseNMIU
+// potential problems) if we don't make the baseNMIU
 // destructor virtual.
 #if defined ( __SUNPRO_CC ) && ( __SUNPRO_CC <= 0x540 )
 #   define NETIO_VIRTUAL_DESTRUCTOR

modules/ca/src/client/oldAccess.h

@@ -591,16 +591,16 @@ void ca_client_context :: whenThereIsAnExceptionDestroySyncGroupIO (
         io.destroy ( *this->pCallbackGuard.get(), guard );
     }
     else {
-        // dont reverse the lock hierarchy
+        // don't reverse the lock hierarchy
         epicsGuardRelease < epicsMutex > guardRelease ( guard );
         {
             //
             // we will definately stall out here if all of the
             // following are true
             //
-            // o user creates non-preemtive mode client library context
+            // o user creates non-preemptive mode client library context
             // o user doesnt periodically call a ca function
-            // o user calls this function from an auxiillary thread
+            // o user calls this function from an auxiliary thread
             //
             CallbackGuard cbGuard ( this->cbMutex );
             epicsGuard < epicsMutex > guard ( this->mutex );

modules/ca/src/client/oldChannelNotify.cpp

@@ -571,7 +571,7 @@ int epicsStdCall ca_create_subscription (
             oldSubscription  (
                 guard, *pChan, pChan->io, tmpType, count, mask,
                 pCallBack, pCallBackArg, monixptr );
-        // dont touch object created after above new because
+        // don't touch object created after above new because
         // the first callback might have canceled, and therefore
         // destroyed, it
         return ECA_NORMAL;

modules/ca/src/client/oldSubscription.cpp

@@ -41,7 +41,7 @@ oldSubscription::oldSubscription  (
         *pEventId = this;
     }
     io.subscribe ( guard, type, nElem, mask, *this, &this->id );
-    // Dont touch this pointer after this point because the
+    // Don't touch this pointer after this point because the
     // 1st update callback might cancel the subscription and
     // thereby destroy this object.
 }

modules/ca/src/client/repeater.cpp

@@ -79,7 +79,7 @@
 
 /*
  *  these can be external since there is only one instance
- *  per machine so we dont care about reentrancy
+ *  per machine so we don't care about reentrancy
  */
 static tsDLList < repeaterClient > client_list;
 
@@ -335,7 +335,7 @@ static void fanOut ( const osiSockAddr & from, const void * pMsg,
 
     while ( ( pclient = client_list.get () ) ) {
         theClients.add ( *pclient );
-        /* Dont reflect back to sender */
+        /* Don't reflect back to sender */
         if ( pclient->identicalAddress ( from ) ) {
             continue;
         }
@@ -392,7 +392,7 @@ static void register_new_client ( osiSockAddr & from,
          * repeater would not always allow the loopback address
          * as a local client address so current clients alternate
          * between the address of the first non-loopback interface
-         * found and the loopback addresss when subscribing with
+         * found and the loopback address when subscribing with
          * the CA repeater until all CA repeaters have been updated
          * to current code.
          */
@@ -452,7 +452,7 @@ static void register_new_client ( osiSockAddr & from,
     }
 
     /*
-     * send a noop message to all other clients so that we dont
+     * send a noop message to all other clients so that we don't
      * accumulate sockets when there are no beacons
      */
     caHdr noop;

modules/ca/src/client/searchTimer.cpp

@@ -279,8 +279,8 @@ epicsTimerNotify::expireStatus searchTimer::expire (
         if ( this->searchAttempts ) {
             char buf[64];
             currentTime.strftime ( buf, sizeof(buf), "%M:%S.%09f");
-            debugPrintf ( ("sent %u delay sec=%f Rts=%s\n",
-                nFrameSent, this->period(), buf ) );
+            debugPrintf ( ("sent %u delay Rts=%s\n",
+                nFrameSent, buf ) );
         }
 #   endif
 
@@ -317,7 +317,7 @@ void searchTimer :: show ( unsigned level ) const
 
 //
 // Reset the delay to the next search request if we get
-// at least one response. However, dont reset this delay if we
+// at least one response. However, don't reset this delay if we
 // get a delayed response to an old search request.
 //
 void searchTimer::uninstallChanDueToSuccessfulSearchResponse (

modules/ca/src/client/searchTimer.h

@@ -82,8 +82,8 @@ private:
     double framesPerTry; /* # of UDP frames per search try */
     double framesPerTryCongestThresh; /* one half N tries w congest */
     unsigned retry;
-    unsigned searchAttempts; /* num search tries after last timer experation */
-    unsigned searchResponses; /* num search resp after last timer experation */
+    unsigned searchAttempts; /* num search tries after last timer expiration */
+    unsigned searchResponses; /* num search resp after last timer expiration */
     const unsigned index;
     ca_uint32_t dgSeqNoAtTimerExpireBegin;
     ca_uint32_t dgSeqNoAtTimerExpireEnd;

modules/ca/src/client/syncgrp.cpp

@@ -82,9 +82,9 @@ extern "C" int epicsStdCall ca_sg_delete ( const CA_SYNC_GID gid )
           // we will definately stall out here if all of the
           // following are true
           //
-          // o user creates non-preemtive mode client library context
+          // o user creates non-preemptive mode client library context
           // o user doesnt periodically call a ca function
-          // o user calls this function from an auxiillary thread
+          // o user calls this function from an auxiliary thread
           //
           CallbackGuard cbGuard ( pcac->cbMutex );
           epicsGuard < epicsMutex > guard ( pcac->mutex );
@@ -106,9 +106,9 @@ void sync_group_reset ( ca_client_context & client, CASG & sg )
         // we will definately stall out here if all of the
         // following are true
         //
-        // o user creates non-preemtive mode client library context
+        // o user creates non-preemptive mode client library context
         // o user doesnt periodically call a ca function
-        // o user calls this function from an auxiillary thread
+        // o user calls this function from an auxiliary thread
         //
         CallbackGuard cbGuard ( client.cbMutex );
         epicsGuard < epicsMutex > guard ( client.mutex );
@@ -219,9 +219,9 @@ extern "C" int epicsStdCall ca_sg_test ( const CA_SYNC_GID gid )
               // we will definately stall out here if all of the
               // following are true
               //
-              // o user creates non-preemtive mode client library context
+              // o user creates non-preemptive mode client library context
               // o user doesnt periodically call a ca function
-              // o user calls this function from an auxiillary thread
+              // o user calls this function from an auxiliary thread
               //
               CallbackGuard cbGuard ( pcac->cbMutex );
               epicsGuard < epicsMutex > guard ( pcac->mutex );

modules/ca/src/client/tcpRecvWatchdog.cpp

@@ -176,7 +176,7 @@ void tcpRecvWatchdog::sendBacklogProgressNotify (
 {
     guard.assertIdenticalMutex ( this->mutex );
 
-    // We dont set "beaconAnomaly" to be false here because, after we see a
+    // We don't set "beaconAnomaly" to be false here because, after we see a
     // beacon anomaly (which could be transiently detecting a reboot) we will
     // not trust the beacon as an indicator of a healthy server until we
     // receive at least one message from the server.

modules/ca/src/client/tcpiiu.cpp

@@ -81,7 +81,7 @@ void tcpSendThread::run ()
 
         while ( true ) {
 
-            // dont wait if there is still labor to be done below
+            // don't wait if there is still labor to be done below
             if ( ! laborPending ) {
                 epicsGuardRelease < epicsMutex > unguard ( guard );
                 this->iiu.sendThreadFlushEvent.wait ();
@@ -124,7 +124,7 @@ void tcpSendThread::run ()
                 }
                 else {
                     // This wakes up the resp thread so that it can call
-                    // the connect callback. This isnt maximally efficent
+                    // the connect callback. This isn't maximally efficient
                     // but it has the excellent side effect of not requiring
                     // that the UDP thread take the callback lock. There are
                     // almost no V42 servers left at this point.
@@ -178,7 +178,7 @@ void tcpSendThread::run ()
                 char sockErrBuf[64];
                 epicsSocketConvertErrnoToString (
                     sockErrBuf, sizeof ( sockErrBuf ) );
-                errlogPrintf ("CAC TCP clean socket shutdown error was %s\n",
+                errlogPrintf ("CAC TCP clean socket shutdown " ERL_ERROR " was %s\n",
                     sockErrBuf );
             }
         }
@@ -194,7 +194,7 @@ void tcpSendThread::run ()
             char sockErrBuf[64];
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
-            errlogPrintf ("CAC TCP clean socket shutdown error was %s\n",
+            errlogPrintf ("CAC TCP clean socket shutdown " ERL_ERROR " was %s\n",
                 sockErrBuf );
         }
     }
@@ -204,7 +204,7 @@ void tcpSendThread::run ()
 
     while ( ! this->iiu.recvThread.exitWait ( 30.0 ) ) {
         // it is possible to get stuck here if the user calls
-        // ca_context_destroy() when a circuit isnt known to
+        // ca_context_destroy() when a circuit isn't known to
         // be unresponsive, but is. That situation is probably
         // rare, and the IP kernel might have a timeout for
         // such situations, nevertheless we will attempt to deal
@@ -283,7 +283,7 @@ unsigned tcpiiu::sendBytes ( const void *pBuf,
                 char sockErrBuf[64];
                 epicsSocketConvertErrnoToString (
                     sockErrBuf, sizeof ( sockErrBuf ) );
-                errlogPrintf ( "CAC: unexpected TCP send error: %s\n",
+                errlogPrintf ( "CAC: unexpected TCP send " ERL_ERROR ": %s\n",
                     sockErrBuf );
             }
 
@@ -322,7 +322,7 @@ void tcpiiu::recvBytes (
                 return;
             }
 
-            // if the circuit was locally aborted then supress
+            // if the circuit was locally aborted then suppress
             // warning messages about bad file descriptor etc
             if ( this->state != iiucs_connected &&
                     this->state != iiucs_clean_shutdown ) {
@@ -358,9 +358,9 @@ void tcpiiu::recvBytes (
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
 
-            // the replacable printf handler isnt called here
-            // because it reqires a callback lock which probably
-            // isnt appropriate here
+            // the replaceable printf handler isn't called here
+            // because it requires a callback lock which probably
+            // isn't appropriate here
             char name[64];
             this->hostNameCacheInstance.getName (
                 name, sizeof ( name ) );
@@ -535,11 +535,11 @@ void tcpRecvThread::run ()
             }
 
             //
-            // we dont feel comfortable calling this with a lock applied
+            // we don't feel comfortable calling this with a lock applied
             // (it might block for longer than we like)
             //
-            // we would prefer to improve efficency by trying, first, a
-            // recv with the new MSG_DONTWAIT flag set, but there isnt
+            // we would prefer to improve efficiency by trying, first, a
+            // recv with the new MSG_DONTWAIT flag set, but there isn't
             // universal support
             //
             bool bytesArePending = this->iiu.bytesArePendingInOS ();
@@ -957,7 +957,7 @@ void tcpiiu::initiateAbortShutdown (
             char sockErrBuf[64];
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
-            errlogPrintf ( "CAC TCP socket linger set error was %s\n",
+            errlogPrintf ( "CAC TCP socket linger set " ERL_ERROR " was %s\n",
                 sockErrBuf );
         }
         this->discardingPendingData = true;
@@ -988,7 +988,7 @@ void tcpiiu::initiateAbortShutdown (
                     char sockErrBuf[64];
                     epicsSocketConvertErrnoToString (
                         sockErrBuf, sizeof ( sockErrBuf ) );
-                    errlogPrintf ("CAC TCP socket shutdown error was %s\n",
+                    errlogPrintf ("CAC TCP socket shutdown " ERL_ERROR " was %s\n",
                         sockErrBuf );
                 }
             }
@@ -1002,7 +1002,7 @@ void tcpiiu::initiateAbortShutdown (
         };
 
         //
-        // wake up the send thread if it isnt blocking in send()
+        // wake up the send thread if it isn't blocking in send()
         //
         this->sendThreadFlushEvent.signal ();
         this->flushBlockEvent.signal ();
@@ -1058,7 +1058,7 @@ void tcpiiu::show ( unsigned level ) const
             this->_receiveThreadIsBusy );
     }
     if ( level > 2u ) {
-        ::printf ( "\tvirtual circuit socket identifier %d\n", this->sock );
+        ::printf ( "\tvirtual circuit socket identifier %d\n", (int)this->sock );
         ::printf ( "\tsend thread flush signal:\n" );
         this->sendThreadFlushEvent.show ( level-2u );
         ::printf ( "\tsend thread:\n" );
@@ -1580,7 +1580,7 @@ void tcpiiu::subscriptionRequest (
         maxBytes = MAX_TCP;
     }
     unsigned dataType = subscr.getType ( guard );
-    // data type bounds checked when sunscription created
+    // data type bounds checked when subscription created
     arrayElementCount maxElem = ( maxBytes - dbr_size[dataType] ) / dbr_value_size[dataType];
     if ( nElem > maxElem ) {
         throw cacChannel::msgBodyCacheTooSmall ();
@@ -1633,7 +1633,7 @@ void tcpiiu::subscriptionUpdateRequest (
         throw cacChannel::msgBodyCacheTooSmall ();
     }
     comQueSendMsgMinder minder ( this->sendQue, guard );
-    // nElem boounds checked above
+    // nElem bounds checked above
     this->sendQue.insertRequestHeader (
         CA_PROTO_READ_NOTIFY, 0u,
         static_cast < ca_uint16_t > ( dataType ),
@@ -1712,7 +1712,7 @@ void tcpiiu :: flush ( epicsGuard < epicsMutex > & guard )
     this->flushRequest ( guard );
     // the process thread is not permitted to flush as this
     // can result in a push / pull deadlock on the TCP pipe.
-    // Instead, the process thread scheduals the flush with the
+    // Instead, the process thread schedules the flush with the
     // send thread which runs at a higher priority than the
     // receive thread. The same applies to the UDP thread for
     // locking hierarchy reasons.
@@ -1817,7 +1817,7 @@ void tcpiiu::disconnectAllChannels (
     }
 
     while ( nciu * pChan = this->createRespPend.get () ) {
-        // we dont yet know the server's id so we cant
+        // we don't yet know the server's id so we cant
         // send a channel delete request and will instead
         // trust that the server can do the proper cleanup
         // when the circuit disconnects
@@ -1848,7 +1848,7 @@ void tcpiiu::disconnectAllChannels (
 
     while ( nciu * pChan = this->unrespCircuit.get () ) {
         // if we know that the circuit is unresponsive
-        // then we dont send a channel delete request and
+        // then we don't send a channel delete request and
         // will instead trust that the server can do the
         // proper cleanup when the circuit disconnects
         pChan->disconnectAllIO ( cbGuard, guard );
@@ -1883,7 +1883,7 @@ void tcpiiu::unlinkAllChannels (
     while ( nciu * pChan = this->createRespPend.get () ) {
         pChan->channelNode::listMember =
             channelNode::cs_none;
-        // we dont yet know the server's id so we cant
+        // we don't yet know the server's id so we cant
         // send a channel delete request and will instead
         // trust that the server can do the proper cleanup
         // when the circuit disconnects
@@ -1921,7 +1921,7 @@ void tcpiiu::unlinkAllChannels (
             channelNode::cs_none;
         pChan->disconnectAllIO ( cbGuard, guard );
         // if we know that the circuit is unresponsive
-        // then we dont send a channel delete request and
+        // then we don't send a channel delete request and
         // will instead trust that the server can do the
         // proper cleanup when the circuit disconnects
         pChan->serviceShutdownNotify ( cbGuard, guard );
@@ -1951,7 +1951,7 @@ void tcpiiu::installChannel (
     this->channelCountTot++;
     chan.channelNode::listMember = channelNode::cs_createReqPend;
     chan.searchReplySetUp ( *this, sidIn, typeIn, countIn, guard );
-    // The tcp send thread runs at apriority below the udp thread
+    // The tcp send thread runs at a priority below the udp thread
     // so that this will not send small packets
     this->sendThreadFlushEvent.signal ();
 }
@@ -2060,7 +2060,7 @@ bool tcpiiu::bytesArePendingInOS () const
     }
     return false;
 #else
-    osiSockIoctl_t bytesPending = 0; /* shut up purifys yapping */
+    osiSockIoctl_t bytesPending = 0; /* shut up Purify's yapping */
     int status = socket_ioctl ( this->sock,
                             FIONREAD, & bytesPending );
     if ( status >= 0 ) {

modules/ca/src/client/test/ca_test.c

@@ -279,7 +279,7 @@ skip_rest:
 
     /*
      * wait for the operation to complete
-     * (outstabnding decrements to zero)
+     * (outstanding decrements to zero)
      */
     while(ntries){
         ca_pend_event(1.0);

modules/ca/src/client/test_event.cpp

@@ -56,6 +56,7 @@ extern "C" void epicsStdCall ca_dump_dbr (
 
     if ( INVALID_DB_REQ ( type ) ) {
         printf ( "bad DBR type %ld\n", type );
+        return;
     }
 
     printf ( "%s\t", dbr_text[type] );

modules/ca/src/client/udpiiu.cpp

@@ -202,7 +202,7 @@ udpiiu::udpiiu (
             char sockErrBuf[64];
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
-            errlogPrintf("CAC: failed to set mcast ttl %d\n", ttl);
+            errlogPrintf("CAC: failed to set mcast ttl %d\n", (int)ttl);
         }
     }
 #endif
@@ -266,7 +266,7 @@ udpiiu::udpiiu (
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
             epicsSocketDestroy ( this->sock );
-            errlogPrintf ( "CAC: getsockname () error was \"%s\"\n", sockErrBuf );
+            errlogPrintf ( "CAC: getsockname () " ERL_ERROR " was \"%s\"\n", sockErrBuf );
             throwWithLocation ( noSocket () );
         }
         if ( tmpAddr.sa.sa_family != AF_INET) {
@@ -428,7 +428,7 @@ void udpRecvThread::run ()
                     char sockErrBuf[64];
                     epicsSocketConvertErrnoToString (
                         sockErrBuf, sizeof ( sockErrBuf ) );
-                    errlogPrintf ( "CAC: UDP recv error was \"%s\"\n",
+                    errlogPrintf ( "CAC: UDP recv " ERL_ERROR " was \"%s\"\n",
                         sockErrBuf );
                 }
             }
@@ -536,9 +536,9 @@ void epicsStdCall caRepeaterRegistrationMessage (
     if ( status < 0 ) {
         int errnoCpy = SOCKERRNO;
         /*
-         * Different OS return different codes when the repeater isnt running.
-         * Its ok to supress these messages because I print another warning message
-         * if we time out registerring with the repeater.
+         * Different OS return different codes when the repeater isn't running.
+         * Its ok to suppress these messages because I print another warning message
+         * if we time out registering with the repeater.
          *
          * Linux returns SOCK_ECONNREFUSED
          * Windows 2000 returns SOCK_ECONNRESET
@@ -549,7 +549,7 @@ void epicsStdCall caRepeaterRegistrationMessage (
             char sockErrBuf[64];
             epicsSocketConvertErrnoToString (
                 sockErrBuf, sizeof ( sockErrBuf ) );
-            fprintf ( stderr, "error sending registration message to CA repeater daemon was \"%s\"\n",
+            fprintf ( stderr, ERL_ERROR " sending registration message to CA repeater daemon was \"%s\"\n",
                 sockErrBuf );
         }
     }
@@ -673,7 +673,7 @@ bool udpiiu :: searchRespAction (
     const epicsTime & currentTime )
 {
     /*
-     * we dont currently know what to do with channel's
+     * we don't currently know what to do with channel's
      * found to be at non-IP type addresses
      */
     if ( addr.sa.sa_family != AF_INET ) {
@@ -762,7 +762,7 @@ bool udpiiu::beaconAction (
      *   always set this field to INADDR_ANY
      *
      * clients always assume that if this
-     * field is set to something that isnt INADDR_ANY
+     * field is set to something that isn't INADDR_ANY
      * then it is the overriding IP address of the server.
      */
     ina.sin_family = AF_INET;
@@ -772,7 +772,7 @@ bool udpiiu::beaconAction (
     }
     else {
         /*
-         * old servers dont supply this and the
+         * old servers don't supply this and the
          * default port must be assumed
          */
         ina.sin_port = htons ( this->serverPort );
@@ -813,13 +813,13 @@ bool udpiiu::exceptionRespAction (
 
     if ( msg.m_postsize > sizeof ( caHdr ) ){
         errlogPrintf (
-            "error condition \"%s\" detected by %s with context \"%s\" at %s\n",
+            ERL_ERROR " condition \"%s\" detected by %s with context \"%s\" at %s\n",
             ca_message ( msg.m_available ),
             name, reinterpret_cast <const char *> ( &reqMsg + 1 ), date );
     }
     else{
         errlogPrintf (
-            "error condition \"%s\" detected by %s at %s\n",
+            ERL_ERROR " condition \"%s\" detected by %s at %s\n",
             ca_message ( msg.m_available ), name, date );
     }
 
@@ -874,7 +874,7 @@ void udpiiu::postMsg (
         size = pCurMsg->m_postsize + sizeof ( *pCurMsg );
 
         /*
-         * dont allow msg body extending beyond frame boundary
+         * don't allow msg body extending beyond frame boundary
          */
         if ( size > blockSize ) {
             char buf[64];
@@ -1044,7 +1044,7 @@ void udpiiu :: SearchRespCallback :: notify (
         const osiSockAddr & addr, const epicsTime & currentTime )
 {
     /*
-     * we dont currently know what to do with channel's
+     * we don't currently know what to do with channel's
      * found to be at non-IP type addresses
      */
     if ( addr.sa.sa_family != AF_INET ) {
@@ -1119,7 +1119,7 @@ bool udpiiu :: datagramFlush (
 {
     guard.assertIdenticalMutex ( cacMutex );
 
-    // dont send the version header by itself
+    // don't send the version header by itself
     if ( this->nBytesInXmitBuf <= sizeof ( caHdr ) ) {
         return false;
     }

modules/ca/src/perl/Cap5.xs

@@ -12,6 +12,13 @@
  * here and just generates unnecessary compiler warnings. */
 #define REENTRINC
 
+/* Clang-12 and later generates many warnings about compound token */
+#ifdef __has_warning
+#  if __has_warning("-Wcompound-token-split-by-macro")
+#    pragma clang diagnostic ignored "-Wcompound-token-split-by-macro"
+#  endif
+#endif
+
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
@@ -201,6 +208,8 @@ SV * newSVdbr(struct event_handler_args *peha) {
     if (is_primitive) {
         if (value_type == DBR_CHAR) {
             /* Long string => Perl scalar */
+            if (peha->count == 0)
+                return newSVpvn(peha->dbr, 0);
             ((char *)peha->dbr) [peha->count - 1] = 0;
             return newSVpv(peha->dbr, 0);
         }
@@ -271,8 +280,12 @@ SV * newSVdbr(struct event_handler_args *peha) {
         char *str = dbr_value_ptr(peha->dbr, peha->type);
 
         /* Long string => Perl scalar */
-        str[peha->count - 1] = 0;
-        val = newSVpv(str, 0);
+        if (peha->count == 0)
+            val = newSVpvn(str, 0);
+        else {
+            str[peha->count - 1] = 0;
+            val = newSVpv(str, 0);
+        }
     } else if (peha->count == 1) {
         /* Single value => Perl scalar */
         val = newSVdbf(value_type,

modules/ca/src/perl/capr.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #*************************************************************************
-# Copyright (c) 2005 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2022 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # SPDX-License-Identifier: EPICS
 # EPICS BASE is distributed subject to a Software License Agreement found
@@ -14,26 +14,24 @@
 #
 #######################################################################
 
+use 5.10.1;
 use strict;
 
-use FindBin qw($Bin);
-use lib ("$Bin/../../lib/perl");
+use FindBin qw($RealBin);
+use lib ("$RealBin/../../lib/perl");
 
 use Getopt::Std;
-use EPICS::Path;
+use Cwd 'abs_path';
 use CA;
 
 ######### Globals ##########
 
-our ($opt_h, $opt_f, $opt_r);
-our $opt_d = $ENV{EPICS_CAPR_DBD_FILE} || "$Bin/../../dbd/softIoc.dbd";
-our $opt_w = 1;
+our ($opt_h, $opt_f, $opt_l, $opt_r, $opt_D);
+our $opt_d = $ENV{EPICS_CAPR_DBD_FILE} // abs_path("$RealBin/../../dbd/softIoc.dbd");
+our $opt_w = 2;
+our $opt_n = 10;
 
 my %record = ();    # Empty hash to put dbd data in
-my $iIdx = 0;       # Array indexes for interest, data type and base
-my $tIdx = 1;
-my $bIdx = 2;
-my %device = ();    # Empty hash to record which rec types have device support
 
 # EPICS field types
 my %fieldType = (
@@ -58,13 +56,14 @@ my %fieldType = (
 );
 
 # globals for sub caget
+my %connected;
+my $unconnected_count;
 my %callback_data;
-my %timed_out;
 my $callback_incomplete;
 
 ######### Main program ############
 
-HELP_MESSAGE() unless getopts('hd:f:rw:');
+HELP_MESSAGE() unless getopts('hDd:f:l:n:rw:');
 HELP_MESSAGE() if $opt_h;
 
 die "File $opt_d not found. (\"capr.pl -h\" gives help)\n"
@@ -76,7 +75,7 @@ print "Using $opt_d\n\n";
 # Print a list of record types
 if ($opt_r) {
     print ("Record types found:\n");
-    printList(0);
+    printList($opt_l);
     exit;
 }
 
@@ -100,7 +99,7 @@ if (@ARGV) {
     } else {
         # Drop any ".FIELD" part
         s/\. \w+ $//x;
-        printRecord($_, 0);
+        printRecord($_, $opt_l);
     }
 }
 
@@ -130,9 +129,11 @@ sub parseDbd {
     my $thisRecord;
     my $thisField;
     my $thisType;
+    my $thisSize = 0;
     my $field = {};
     my $interest = 0;
     my $thisBase = 'DECIMAL';
+    my $special = '';
 
     while (@dbd) {
         $_ = shift @dbd;
@@ -149,35 +150,47 @@ sub parseDbd {
             $thisField = $1;
             $thisType = $2;
             $isAfield = 1;
+            $thisSize = 1024 if $thisType =~ m/^ DBF_(IN|OUT|FWD)LINK $/x;
         }
         elsif ( m/interest \s* \( \s* (\w+) \s* \)/x ) {
             die "File format error at line $i of file\n    $opt_d\n"
                 unless $level == 2 && $isAfield;
             $interest = $1;
         }
+        elsif ( m/size \s* \( \s* ([0-9]+) \s* \)/x ) {
+            die "File format error at line $i of file\n    $opt_d\n"
+                unless $level == 2 && $isAfield;
+            $thisSize = $1;
+        }
+        elsif ( m/special \s* \( \s* (\w+) \s* \)/x ) {
+            die "File format error at line $i of file\n    $opt_d\n"
+                unless $level == 2 && $isAfield;
+            $special = $1;
+        }
         elsif ( m/base \s* \( \s* (\w+) \s* \)/x ) {
             die "File format error at line $i of file\n    $opt_d\n"
                 unless $level == 2 && $isAfield;
             $thisBase = $1;
         }
-        elsif ( m/device \s* \( (\w+) \s* ,/x ) {
-            die "File format error at line $i of file\n    $opt_d\n"
-                unless $level == 0;
-            $device{$1}++;
-        }
         if ( m/\{/ ) {
             $level++;
         }
         if ( m/\}/ ) {
             if ($level == 2 && $isAfield) {
-                my $params = [];
-                $params->[$iIdx] = $interest;
-                $params->[$tIdx] = $thisType;
-                $params->[$bIdx] = $thisBase;
+                my $params = {};
+                $params->{interest} = $interest;
+                $params->{dbfType} = $thisType;
+                $params->{base} = $thisBase;
+                $params->{special} = $special;
+                $params->{size} = $thisSize;
                 $field->{$thisField} = $params;
+
+                # Reset default values
                 $isAfield = 0;
-                $interest = 0;                      # reset default
-                $thisBase = 'DECIMAL';              # reset default
+                $interest = 0;
+                $thisBase = 'DECIMAL';
+                $special = '';
+                $thisSize = 0;
             }
             elsif ($level == 1 && $isArecord) {
                 $isArecord = 0;
@@ -207,21 +220,23 @@ sub getRecType {
 
 # Given the record type and field, returns the interest level, data type
 # and number base for the field
-# Usage: ($dataType, $interest, $base) = getFieldParams($recType, $field);
+# Usage: ($dataType, $interest, $base, $special, $size) = getFieldParams($recType, $field);
 sub getFieldParams {
     my ($recType, $field) = @_;
 
     my $params = $record{$recType}{$field} or
         die "Can't find params for $recType.$field";
-    exists($fieldType{$params->[$tIdx]})  ||
+    exists($fieldType{$params->{dbfType}})  ||
         die "Field data type $field for $recType not found in dbd file --";
-    exists($params->[$iIdx])  ||
+    exists($params->{interest})  ||
         die "Interest level for $field in $recType not found in dbd file --";
 
-    my $fType     = $fieldType{$params->[$tIdx]};
-    my $fInterest = $params->[$iIdx];
-    my $fBase     = $params->[$bIdx];
-    return ($fType, $fInterest, $fBase);
+    my $fType     = $fieldType{$params->{dbfType}};
+    my $fInterest = $params->{interest};
+    my $fBase     = $params->{base};
+    my $fSpecial  = $params->{special};
+    my $fSize     = $params->{size};
+    return ($fType, $fInterest, $fBase, $fSpecial, $fSize);
 }
 
 # Prints field name and data for given field. Formats output so
@@ -233,27 +248,37 @@ sub printField {
     my $screenWidth  = 80;
     my ($outStr, $wide);
 
-    my $field = "$fieldName:";
 
-    if ( $dataType eq 'DBF_STRING' ) {
-        $outStr = sprintf('%-5s %s', $field, $fieldData);
-    } elsif ( $base eq 'HEX' ) {
-         my $val = ( $dataType eq 'DBF_CHAR' ) ? ord($fieldData) : $fieldData;
-         $outStr = sprintf('%-5s 0x%x', $field, $val);
-    } elsif ( $dataType eq 'DBF_DOUBLE' || $dataType eq 'DBF_FLOAT' ) {
-        $outStr = sprintf('%-5s %.8f', $field, $fieldData);
-    } elsif ( $dataType eq 'DBF_CHAR' ) {
-        $outStr = sprintf('%-5s %d', $field, ord($fieldData));
-    } else {
-        # DBF_INT64, DBF_LONG, DBF_SHORT,
-        # DBF_UINT64, DBF_ULONG, DBF_USHORT, DBF_UCHAR,
-        $outStr = sprintf('%-5s %d', $field, $fieldData);
+    if (ref $fieldData eq 'ARRAY') {
+        my $elems = scalar @{$fieldData};
+        my $field = "$fieldName\[$elems\]:";
+        my $count = $elems > $opt_n ? $opt_n : $elems;
+        my @show = @{$fieldData}[0 .. $count - 1];
+        $outStr = sprintf('%-5s %s', $field, join(', ', @show));
+        $outStr .= ", ..." if $elems > $count;
+    }
+    else {
+        my $field = "$fieldName:";
+        if ( $dataType eq 'DBF_STRING' ) {
+            $outStr = sprintf('%-5s %s', $field, $fieldData);
+        } elsif ( $base eq 'HEX' ) {
+             my $val = ( $dataType eq 'DBF_CHAR' ) ? ord($fieldData) : $fieldData;
+             $outStr = sprintf('%-5s 0x%x', $field, $val);
+        } elsif ( $dataType eq 'DBF_DOUBLE' || $dataType eq 'DBF_FLOAT' ) {
+            $outStr = sprintf('%-5s %.8f', $field, $fieldData);
+        } elsif ( $dataType eq 'DBF_UCHAR' ) {
+            $outStr = sprintf('%-5s %d', $field, ord($fieldData));
+        } else {
+            # DBF_INT64, DBF_LONG, DBF_SHORT,
+            # DBF_UINT64, DBF_ULONG, DBF_USHORT, DBF_UCHAR,
+            $outStr = sprintf('%-5s %d', $field, $fieldData);
+        }
     }
 
     my $len = length($outStr);
-    if ($len <= 20) { $wide = 20; }
-    elsif ( $len <= 40 ) { $wide = 40; }
-    elsif ( $len <= 60 ) { $wide = 60; }
+    if ($len < 20) { $wide = 20; }
+    elsif ( $len < 40 ) { $wide = 40; }
+    elsif ( $len < 60 ) { $wide = 60; }
     else { $wide = 80;}
 
     my $pad = $wide - $len;
@@ -269,49 +294,64 @@ sub printField {
     return $col;
 }
 
-#  Query for a list of fields simultaneously.
-#  The results are filled in the the %callback_data global hash
-#  and the result of the operation is the number of read pvs
+#  Query the native values of a list of PVs simultaneously.
+#  The data is returned in the the %callback_data global hash.
+#  The return value is the number of read pvs
 #
 #  NOTE: Not re-entrant because results are written to global hash
 #        %callback_data
 #
 #  Usage: $fields_read = caget( @pvlist )
 sub caget {
-    my @chans = map { CA->new($_); } @_;
-
     #clear any previous results;
+    %connected = ();
+    $unconnected_count = scalar @_;
     %callback_data = ();
-    %timed_out = ();
+    $callback_incomplete = 0;
 
-    eval { CA->pend_io($opt_w); };
-    if ($@) {
-        if ($@ =~ m/^ECA_TIMEOUT/) {
-            my $name = $chans[0]->name;
-            my $err = (@chans > 1) ? 'some fields' : "'$name'";
-            print "Channel connect timed out: $err not found.\n";
-            foreach my $chan (@chans) {
-                $timed_out{$chan->name} = !$chan->is_connected;
-            }
-            @chans = grep { $_->is_connected } @chans;
-        } else {
-            die $@;
-        }
-    }
+    my @chans = map {
+        print "  Creating channel for $_\n" if $opt_D;
+        CA->new($_, \&canew_callback);
+    } @_;
+    my $channel_count = scalar @chans;
+    return 0 unless $channel_count gt 0;
 
-    map {
-        $_->get_callback(\&caget_callback, $_->field_type);
-    } @chans;
+    print "  $channel_count channels created.\n" if $opt_D;
 
-    my $fields_read = $callback_incomplete = @chans;
-    CA->pend_event(0.1)
-        while $callback_incomplete;
-    return $fields_read;
+    my $elapsed = 0;
+    do {
+        print "  Waiting for $unconnected_count channels to connect\n"
+            if $unconnected_count && $opt_D;
+        print "  Waiting for data from $callback_incomplete channels\n"
+            if $callback_incomplete && $opt_D;
+        CA->pend_event(0.1);
+        $elapsed += 0.1;
+    } until (($elapsed > $opt_w) or
+             (scalar %connected && $callback_incomplete == 0));
+    my $data_count = scalar keys %callback_data;
+    printf "  Got data from %d of %d channels\n", $data_count, $channel_count
+        if $opt_D;
+    return $data_count;
+}
+
+sub canew_callback {
+    my ($chan, $up) = @_;
+    return unless $up;
+    $connected{$chan->name} = $chan;
+    $unconnected_count--;
+    my $ftype = $chan->field_type;
+    my $count = $chan->element_count;
+    $ftype = 'DBR_LONG' if $ftype eq 'DBR_CHAR' && $count == 1;
+    print "  Getting ${\$chan->name} as $ftype\n" if $opt_D;
+    # We have to fetch all elements so we can show how many there are
+    $chan->get_callback(\&caget_callback, $ftype);
+    $callback_incomplete++;
 }
 
 sub caget_callback {
     my ($chan, $status, $data) = @_;
     die $status if $status;
+    print "  Got ${\$chan->name} = '$data'\n" if $opt_D;
     $callback_data{$chan->name} = $data;
     $callback_incomplete--;
 }
@@ -333,69 +373,83 @@ sub printRecord {
     my @ftypes = ();    #types, from parser
     my @bases = ();     #bases, from parser
     foreach my $field (sort keys %{$record{$recType}}) {
-        # Skip DTYP field if this rec type doesn't have device support defined
-        next if $field eq 'DTYP' && !exists($device{$recType});
-
-        my ($fType, $fInterest, $base) = getFieldParams($recType, $field);
-        # FIXME: Support waveform.VAL fields etc.
-        unless( $fType eq 'DBF_NOACCESS' ) {
-            if ($interest >= $fInterest ) {
-                my $fToGet = "$name.$field";
-                push @fields_pr, $field;
-                push @readlist, $fToGet;
-                push @ftypes, $fType;
-                push @bases, $base;
-            }
+        my ($fType, $fInterest, $base, $special, $size) =
+            getFieldParams($recType, $field);
+        next if $fInterest > $interest;
+        my $fToGet = "$name.$field";
+        if ($fType eq 'DBF_NOACCESS') {
+            next unless $special eq 'SPC_DBADDR';
+            $fType = 'DBF_STRING';
         }
+        elsif ($fType eq 'DBF_STRING' && $size >= 40) {
+            $fToGet .= '$';
+        }
+        push @fields_pr, $field;
+        push @readlist, $fToGet;
+        push @ftypes, $fType;
+        push @bases, $base;
     }
     my $fields_read = caget( @readlist );
 
+    my @missing;
+
     # print while iterating over lists gathered
     my $col = 0;
     for (my $i=0; $i < scalar @readlist; $i++) {
         my $field  = $fields_pr[$i];
         my $fToGet = $readlist[$i];
         my ($fType, $data, $base);
-        next if $timed_out{$fToGet};
+        push @missing, $field unless exists $callback_data{$fToGet};
+        next unless exists $callback_data{$fToGet};
         $fType  = $ftypes[$i];
         $base   = $bases[$i];
         $data   = $callback_data{$fToGet};
         $col = printField($field, $data, $fType, $base, $col);
     }
     print("\n");  # Final newline
+
+    printf "\nUnreadable fields: %s\n", join(', ', @missing) if @missing && $opt_D;
 }
 
 # Prints list of record types found in dbd file. If level > 0
-# then the fields of that record type, their interest levels and types are
-# also printed.
-# Diagnostic routine, usage: void printList(level);
+# then uses printRecordList to display all fields in each record type.
 sub printList {
     my $level = shift;
 
     foreach my $rkey (sort keys(%record)) {
-        print("  $rkey\n");
         if ($level > 0) {
-            foreach my $fkey (keys %{$record{$rkey}}) {
-                print("\tField $fkey - interest $record{$rkey}{$fkey}[$iIdx] ");
-                print("- type $record{$rkey}{$fkey}[$tIdx] ");
-                print("- base $record{$rkey}{$fkey}[$bIdx]\n");
-            }
+            printRecordList($rkey);
+        }
+        else {
+            print("  $rkey\n");
         }
     }
 }
 
-# Prints list of fields with interest levels for given record type
-# Diagnostic routine, usage: void printRecordList("recordType");
+# Prints list of fields and metadata for given record type
 sub printRecordList {
     my $type = shift;
 
     if (exists($record{$type}) ) {
         print("Record type - $type\n");
         foreach my $fkey (sort keys %{$record{$type}}) {
-            printf('%-8s', $fkey);
-            printf("  interest = $record{$type}{$fkey}[$iIdx]");
-            printf("    type = %-12s ",$record{$type}{$fkey}[$tIdx]);
-            print ("    base = $record{$type}{$fkey}[$bIdx]\n");
+            my $param = $record{$type}{$fkey};
+            my $dbfType = $param->{dbfType};
+            printf "  %-8s", $fkey;
+            printf "  interest = %d", $param->{interest};
+            printf "  type = %-12s", $dbfType;
+            if ($dbfType eq 'DBF_STRING') {
+                printf "    size = %s\n", $param->{size};
+            }
+            elsif ($dbfType =~ m/DBF_U?(CHAR|SHORT|INT|LONG|INT64)/) {
+                printf "    base = %s\n", $param->{base};
+            }
+            elsif ($dbfType eq 'DBF_NOACCESS') {
+                printf "    special = %s\n", $param->{special};
+            }
+            else {
+                print "\n";
+            }
         }
     }
     else {
@@ -411,16 +465,20 @@ sub HELP_MESSAGE {
         "       capr.pl [options] <record name> [<interest>]\n",
         "\n",
         "  -h Print this help message.\n",
+        "  -D Print debug messages.\n",
         "Channel Access options:\n",
         "  -w <sec>:  Wait time, specifies CA timeout, default is $opt_w second\n",
         "Database Definitions:\n",
         "  -d <file.dbd>: The file containing record type definitions.\n",
         "     This can be set using the EPICS_CAPR_DBD_FILE environment variable.\n",
-        "     Default: ", AbsPath($opt_d), "\n",
+        "     Default: ", abs_path($opt_d), "\n",
         "Output Options:\n",
         "  -r Lists all record types in the selected dbd file.\n",
-        "  -f <record type>: Lists all fields with their interest level, data type\n",
-        "     and number base for the given record_type.\n",
+        "  -f <record type>: Lists all fields with interest level, data type\n",
+        "     and other information for the given record_type.\n",
+        "  -l <interest>: interest level\n",
+        "  -n <elems>: Maximum number of array elements to display\n",
+        "     Default: $opt_n\n",
         "\n",
         "Base version: ", CA->version, "\n";
     exit 1;

modules/ca/src/tools/caget.c

@@ -256,7 +256,7 @@ static int caget (pv *pvs, int nPvs, RequestT request, OutputT format,
     for (n = 0; n < nPvs; n++) {
 
         switch (format) {
-        case plain:             /* Emulate old caget behaviour */
+        case plain:             /* Emulate old caget behavior */
             if (pvs[n].nElems <= 1 && fieldSeparator == ' ') printf("%-30s", pvs[n].name);
             else                                               printf("%s", pvs[n].name);
             printf("%c", fieldSeparator);
@@ -392,6 +392,8 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
+    use_ca_timeout_env ( &caTimeout);
+
     while ((opt = getopt(argc, argv, ":taicnhsSVe:f:g:l:#:d:0:w:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
@@ -437,8 +439,8 @@ int main (int argc, char *argv[])
             if(epicsScanDouble(optarg, &caTimeout) != 1)
             {
                 fprintf(stderr, "'%s' is not a valid timeout value "
-                        "- ignored. ('caget -h' for help.)\n", optarg);
-                caTimeout = DEFAULT_TIMEOUT;
+                        "- ignored, using '%.1f'. ('caget -h' for help.)\n",
+                        optarg, caTimeout);
             }
             break;
         case '#':               /* Array count */

modules/ca/src/tools/cainfo.c

@@ -141,6 +141,8 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
+    use_ca_timeout_env ( &caTimeout);
+
     while ((opt = getopt(argc, argv, ":nhVw:s:p:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
@@ -150,11 +152,16 @@ int main (int argc, char *argv[])
             printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
             return 0;
         case 'w':               /* Set CA timeout value */
+            /*
+             * epicsScanDouble is a macro defined as epicsParseDouble,
+             * (found in modules/libcom/src/misc) which will only
+             * change caTimeout here if it finds an acceptable value.
+             */
             if(epicsScanDouble(optarg, &caTimeout) != 1)
             {
                 fprintf(stderr, "'%s' is not a valid timeout value "
-                        "- ignored. ('cainfo -h' for help.)\n", optarg);
-                caTimeout = DEFAULT_TIMEOUT;
+                        "- ignored, using '%.1f'. ('cainfo -h' for help.)\n",
+                        optarg, caTimeout);
             }
             break;
         case 's':               /* ca_client_status interest level */

modules/ca/src/tools/camonitor.c

@@ -219,6 +219,8 @@ int main (int argc, char *argv[])
 
     LINE_BUFFER(stdout);        /* Configure stdout buffering */
 
+    use_ca_timeout_env ( &caTimeout);
+
     while ((opt = getopt(argc, argv, ":nhVm:sSe:f:g:l:#:0:w:t:p:F:")) != -1) {
         switch (opt) {
         case 'h':               /* Print usage */
@@ -251,11 +253,16 @@ int main (int argc, char *argv[])
             }
             break;
         case 'w':               /* Set CA timeout value */
+            /*
+             * epicsScanDouble is a macro defined as epicsParseDouble,
+             * (found in modules/libcom/src/misc) which will only
+             * change caTimeout here if it finds an acceptable value.
+             */
             if(epicsScanDouble(optarg, &caTimeout) != 1)
             {
                 fprintf(stderr, "'%s' is not a valid timeout value "
-                        "- ignored. ('camonitor -h' for help.)\n", optarg);
-                caTimeout = DEFAULT_TIMEOUT;
+                        "- ignored, using '%.1f'. ('camonitor -h' for help.)\n",
+                        optarg, caTimeout);
             }
             break;
         case '#':               /* Array count */