Clear version snapshot for final release

Also added symbol decorations for Windows builds.

.travis.yml

@@ -11,8 +11,8 @@ env:
   - CMPLR=clang STATIC=YES
   - WINE=32 TEST=NO STATIC=YES
   - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=NO
-  - RTEMS=4.9 TEST=NO
+  - RTEMS=4.10 TEST=YES
+  - RTEMS=4.9 TEST=YES
 addons:
   apt:
     packages:
@@ -25,8 +25,8 @@ addons:
     - flex
     - texinfo
     - install-info
+    - qemu-system-x86
 cache:
   directories:
    - $HOME/.cache
-install: sh ci/travis-prepare.sh </dev/null
 script: sh ci/travis-build.sh </dev/null

README

@@ -2,14 +2,14 @@
 EPICS Base - the central core of a control system toolkit
 ---------------------------------------------------------
 
-Copyright (c) 1991-2003 The University of Chicago, as Operator
-of Argonne National Laboratory.
+Copyright UChicago Argonne LLC, as Operator of Argonne
+National Laboratory.
 Copyright (c) 1991-2003 The Regents of the University of
 California, as Operator of Los Alamos National Laboratory.
 
-EPICS Base Versions 3.13.7 and higher are distributed
-subject to a Software License Agreement found in the
-file LICENSE that is included with this distribution.
+EPICS Base is distributed subject to a Software License
+Agreement found in the file LICENSE that is included with
+this distribution.
 
 ---------------------------------------------------------
 

appveyor.yml

@@ -46,8 +46,8 @@ environment:
   - TOOLCHAIN: 14.0
   - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     TOOLCHAIN: 2017
+  - TOOLCHAIN: cygwin
   - TOOLCHAIN: mingw
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 # Platform: architecture
 platform:
@@ -61,7 +61,6 @@ matrix:
   - platform: x64
     TOOLCHAIN: 10.0
 
-
 #---------------------------------#
 #     building & testing          #
 #---------------------------------#
@@ -81,9 +80,6 @@ test_script:
 
 notifications:
 
-  - provider: Email
-    to:
-      - core-talk@aps.anl.gov
-    on_build_success: false
-
-  - provider: GitHubPullRequest
+  - provider: Slack
+    incoming_webhook:
+      secure: RYOm3FIUYeZGjWKaeTVKwq+C3fzK54AKwbmAoECED45mex3lN+8HmrC845a6mg9xPUJ/ND51RopWVaKDD9/UzaM0SO195RQLKqUTIUafiuM=

ci/appveyor-make.bat

@@ -1,6 +1,6 @@
 :: Universal build script for AppVeyor (https://ci.appveyor.com/)
 :: Environment:
-::     TOOLCHAIN      -  toolchain version   [10.0/11.0/12.0/14.0/2017/mingw]
+::     TOOLCHAIN      -  toolchain version   [10.0/11.0/12.0/14.0/2017/cygwin/mingw]
 ::     CONFIGURATION  -  determines EPICS build   [dynamic/static]
 ::     PLATFORM       -  architecture   [x86/x64]
 ::
@@ -20,17 +20,35 @@ echo [INFO] Platform: %OS%
 set "MAKEARGS=-j2 -Otarget"
 if "%APPVEYOR_REPO_BRANCH%"=="3.14" set MAKEARGS=
 
+if "%TOOLCHAIN%"=="cygwin" (
+    set "MAKE=make"
+    if "%OS%"=="64BIT" (
+        set "EPICS_HOST_ARCH=cygwin-x86_64"
+        set "INCLUDE=C:\cygwin64\include;%INCLUDE%"
+        set "PATH=C:\cygwin64\bin;%PATH%"
+        echo [INFO] Cygwin Toolchain 64bit
+    ) else (
+        set "EPICS_HOST_ARCH=cygwin-x86"
+        set "INCLUDE=C:\cygwin\include;%INCLUDE%"
+        set "PATH=C:\cygwin\bin;%PATH%"
+        echo [INFO] Cygwin Toolchain 32bit
+    )
+    echo [INFO] Compiler Version
+    gcc -v
+    goto Finish
+)
+
 if "%TOOLCHAIN%"=="mingw" (
     set "MAKE=mingw32-make"
     if "%OS%"=="64BIT" (
         set "EPICS_HOST_ARCH=windows-x64-mingw"
-        set "INCLUDE=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\include;%INCLUDE%"
-        set "PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%"
+        set "INCLUDE=C:\tools\mingw64\include;%INCLUDE%"
+        set "PATH=C:\tools\mingw64\bin;%PATH%"
         echo [INFO] MinGW Toolchain 64bit
     ) else (
         set "EPICS_HOST_ARCH=win32-x86-mingw"
-        set "INCLUDE=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\include;%INCLUDE%"
-        set "PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%"
+        set "INCLUDE=C:\tools\mingw32\include;%INCLUDE%"
+        set "PATH=C:\tools\mingw32\bin;%PATH%"
         echo [INFO] MinGW Toolchain 32bit
     )
     echo [INFO] Compiler Version

ci/appveyor-prepare.bat

@@ -1,12 +1,12 @@
 :: Build script for AppVeyor (https://ci.appveyor.com/)
 :: Environment:
-::     TOOLCHAIN      -  Toolchain Version  [9.0/10.0/11.0/12.0/14.0/mingw]
+::     TOOLCHAIN      -  Toolchain Version  [9.0/10.0/11.0/12.0/14.0/cygwin/mingw]
 ::     CONFIGURATION  -  determines EPICS build  [dynamic/static, -debug]
 ::     PLATFORM       -  "x86" -> use 32bit architecture
 ::
 :: Prepares an Appveyor build by excuting the following steps
 ::     - Set up configure\CONFIG_SITE for static vs. dynamic build
-::     - Install Mingw  (TOOLCHAIN setting) in the in the appropriate flavor
+::     - Install Cygwin / Mingw  (TOOLCHAIN setting) in the in the appropriate flavor
 ::     - Download and install Make-4.1 from EPICS download page
 
 Setlocal EnableDelayedExpansion
@@ -16,6 +16,31 @@ if "%PLATFORM%"=="x86" set OS=32BIT
 
 echo [INFO] Platform: %OS%
 
+if "%TOOLCHAIN%"=="cygwin" (
+    echo.%CONFIGURATION% | findstr /C:"static">nul && (
+        echo SHARED_LIBRARIES=NO>> configure\CONFIG_SITE
+        echo STATIC_BUILD=YES>> configure\CONFIG_SITE
+        echo [INFO] EPICS set up for static build
+    ) || (
+        echo [INFO] EPICS set up for dynamic build
+    )
+    echo.%CONFIGURATION% | findstr /C:"debug">nul && (
+        echo HOST_OPT=NO>> configure\CONFIG_SITE
+        echo [INFO] EPICS set up for debug build
+    ) || (
+        echo [INFO] EPICS set up for optimized build
+    )
+    if "%OS%"=="64BIT" (
+        echo [INFO] Installing Cygwin 64bit and dependencies
+        @powershell -Command "(new-object net.webclient).DownloadFile('http://www.cygwin.com/setup-x86_64.exe', 'C:\cygwin64\setup-x86_64.exe')"
+        C:\cygwin64\setup-x86_64.exe -q -P "libreadline-devel,libncursesw-devel"
+    ) else (
+        echo [INFO] Installing Cygwin 32bit and dependencies
+        @powershell -Command "(new-object net.webclient).DownloadFile('http://www.cygwin.com/setup-x86.exe', 'C:\cygwin\setup-x86.exe')"
+        C:\cygwin\setup-x86.exe -q -P "libreadline-devel,libncursesw-devel"
+    )
+)
+
 if "%TOOLCHAIN%"=="mingw" (
     echo.%CONFIGURATION% | findstr /C:"static">nul && (
         echo SHARED_LIBRARIES=NO>> configure\CONFIG_SITE
@@ -30,9 +55,16 @@ if "%TOOLCHAIN%"=="mingw" (
     ) || (
         echo [INFO] EPICS set up for optimized build
     )
+    if "%OS%"=="64BIT" (
+        echo [INFO] Installing MinGW 64bit
+        cinst mingw || cinst mingw
+    ) else (
+        echo [INFO] Installing MinGW 32bit
+        cinst mingw --x86 || cinst mingw --x86
+    )
 )
 
-echo [INFO] Installing Make 4.2.1 from ANL web site
-curl -fsS --retry 3 -o C:\tools\make-4.2.1.zip https://epics.anl.gov/download/tools/make-4.2.1-win64.zip
+echo [INFO] Installing Make 4.1
+curl -fsS --retry 3 -o C:\tools\make-4.1.zip https://epics.anl.gov/download/tools/make-4.1-win64.zip
 cd \tools
-"C:\Program Files\7-Zip\7z" e make-4.2.1.zip
+"C:\Program Files\7-Zip\7z" e make-4.1.zip

ci/travis-build.sh

@@ -6,15 +6,6 @@ die() {
   exit 1
 }
 
-ticker() {
-  while true
-  do
-    sleep 60
-    date -R
-    [ -r "$1" ] && tail -n10 "$1"
-  done
-}
-
 CACHEKEY=1
 
 EPICS_HOST_ARCH=`perl src/tools/EpicsHostArch.pl`
@@ -62,23 +53,22 @@ if [ -n "$RTEMS" ]
 then
   echo "Cross RTEMS${RTEMS} for pc386"
   install -d /home/travis/.cache
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
-  | tar -C /home/travis/.cache -xj
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
+  | tar -C / -xmj
 
   sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' configure/os/CONFIG_SITE.Common.RTEMS
   cat << EOF >> configure/os/CONFIG_SITE.Common.RTEMS
 RTEMS_VERSION=$RTEMS
-RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
+RTEMS_BASE=/home/travis/.rtems
 EOF
   cat << EOF >> configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
+CROSS_COMPILER_RUNTEST_ARCHS += RTEMS-pc386-qemu
 EOF
 
   # find local qemu-system-i386
-  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
   echo -n "Using QEMU: "
   type qemu-system-i386 || echo "Missing qemu"
-  EXTRA=RTEMS_QEMU_FIXUPS=YES
 fi
 
 make -j2 $EXTRA

ci/travis-prepare.sh

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

configure/CONFIG_BASE

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

configure/CONFIG_BASE_VERSION

@@ -4,7 +4,7 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 #
 #  EPICS Version information
@@ -15,19 +15,30 @@
 # EPICS_SITE_VERSION is defined in CONFIG_SITE for sites that want a local
 # version number to be included in the reported version string.
 
-# In 3.15 we still define BASE_3_14 so "ifdef BASE_3_14" means
-# 3.14 or later, but "ifeq ($(BASE_3_14),YES)" means 3.14 only.
+# We define BASE_3_14 and BASE_3_15 as NO and BASE_3_16 as YES, so
+#   ifdef BASE_3_14
+#       true for 3.14 or later
+#   ifdef BASE_3_15
+#       true for 3.15 or later
+#   ifeq ($(BASE_3_14),YES)
+#       true for 3.14.x only
+#   ifeq ($(BASE_3_15),YES)
+#       true for 3.15 only
+#   ifeq ($(BASE_3_16),YES)
+#       true for 3.16 only.
+
 BASE_3_14 = NO
-BASE_3_15 = YES
+BASE_3_15 = NO
+BASE_3_16 = YES
 
 # EPICS_VERSION must be a number >0 and <256
 EPICS_VERSION = 3
 
 # EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 15
+EPICS_REVISION = 16
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 7
+EPICS_MODIFICATION = 2
 
 # EPICS_PATCH_LEVEL must be a number (win32 resource file requirement)
 # Not included if zero

configure/CONFIG_COMMON

@@ -38,10 +38,6 @@ BUILD_ARCHS = $(EPICS_HOST_ARCH) $(CROSS1) $(CROSS2)
 # otherwise override this in os/CONFIG_SITE.<host_arch>.Common
 PERL = perl -CSD
 
-#-------------------------------------------------------
-# dbst based database optimization default
-DB_OPT = NO
-
 #-------------------------------------------------------
 # Check configure/RELEASE file for consistency
 CHECK_RELEASE_YES = checkRelease
@@ -80,9 +76,14 @@ COMMON_DIR = ../O.Common
 IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 
 #-------------------------------------------------------
-# Make echo output - suppress echoing if make's '-s' flag is set
+# Silencing the build - suppress messages during 'make -s'
 NOP = :
 ECHO = @$(if $(findstring s,$(MFLAGS)),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MFLAGS)),-q,)
+
+#-------------------------------------------------------
+# Convert 'make -q' flag into '-i' for genVersionHeader.pl
+QUESTION_FLAG := $(if $(findstring q,$(MFLAGS)),-i,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -92,7 +93,7 @@ INSTALL_SHRLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_TCLLIB              = $(INSTALL_LOCATION_LIB)/$(T_A)
 INSTALL_BIN                 = $(INSTALL_LOCATION_BIN)/$(T_A)
 
-#Directories for libraries
+# Directories for libraries
 SHRLIB_SEARCH_DIRS          = $(INSTALL_LIB)
 
 #-------------------------------------------------------
@@ -332,6 +333,14 @@ COMPILE.cpp = $(CCC) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)
 # C preprocessor command
 PREPROCESS.cpp = $(CPP) $(CPPFLAGS) $(INCLUDES) $< > $@
 
+#--------------------------------------------------
+# genVersion header defaults
+
+# C macro name
+GENVERSIONMACRO = VCSVERSION
+# C macro default value (empty to use date+time)
+GENVERSIONDEFAULT =
+
 #--------------------------------------------------
 # Header dependency file generation
 

configure/CONFIG_ENV

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

configure/CONFIG_SITE_ENV

@@ -24,41 +24,40 @@
 
 #  Site-specific environment settings
 
-## Time service:
-# EPICS_TZ
-#       Local timezone rules for vxWorks and RTEMS. The value follows the Posix
-#       TZ environment variable's Mm.n.d/h format (see the IBM link below for
-#       details). If TZ hasn't already been set when the osdTime timeRegister()
-#       C++ static constructor runs, this parameter will be copied into the TZ
-#       environment variable. Once the OS clock has been synchronized to NTP the
-#       routine tz2timezone() will be run to convert TZ into the TIMEZONE
-#       variable format that VxWorks needs.
-#               https://developer.ibm.com/articles/au-aix-posix/
-
-# Japan Standard Time, no DST:
-#EPICS_TZ = "JST-9"
-
-# Central European (Summer) Time:
-#EPICS_TZ = "CET-1CEST,M3.5.0/2,M10.5.0/3"
-
-# Greenwich Mean/British Summer Time:
-#EPICS_TZ = "GMT0BST,M3.5.0/1,M10.5.0/2"
-
-# US Eastern Standard/Daylight Time:
-#EPICS_TZ = "EST5EDT,M3.2.0/2,M11.1.0/2"
-
-# US Central Standard/Daylight Time:
-EPICS_TZ = "CST6CDT,M3.2.0/2,M11.1.0/2"
-
-# US Mountain Standard/Daylight Time:
-#EPICS_TZ = "MST7MDT,M3.2.0/2,M11.1.0/2"
-
-# US Pacific Standard/Daylight Time:
-#EPICS_TZ = "PST8PDT,M3.2.0/2,M11.1.0/2"
-
-# US Hawaiian Standard Time, no DST:
-#EPICS_TZ = "HST10"
-
+# Time service:
+# EPICS_TIMEZONE
+#	Local timezone info for vxWorks and RTEMS.  The format is
+#	    <name>::<minutesWest>:<startDST>:<endDST>
+#	where <name> is only used by strftime() for %Z conversions,
+#	and <startDST> and <endDST> are mmddhh - that is month,day,hour
+#	e.g. for ANL in 2018: EPICS_TIMEZONE=CUS::360:031102:110402
+#	The future dates below assume the rules don't get changed;
+#	see http://www.timeanddate.com/time/dst/2018.html to check.
+#
+#	DST for 2018  US: Mar 11 - Nov 04
+#	              EU: Mar 25 - Oct 28
+EPICS_TIMEZONE = CUS::360:031102:110402
+#EPICS_TIMEZONE = MET::-60:032502:102803
+#
+#	DST for 2019  US: Mar 10 - Nov 03
+#	              EU: Mar 31 - Oct 27
+#EPICS_TIMEZONE = CUS::360:031002:110302
+#EPICS_TIMEZONE = MET::-60:033102:102703
+#
+#	DST for 2020  US: Mar 08 - Nov 01
+#	              EU: Mar 29 - Oct 25
+#EPICS_TIMEZONE = CUS::360:030802:110102
+#EPICS_TIMEZONE = MET::-60:032902:102503
+#
+#	DST for 2021  US: Mar 14 - Nov 07
+#	              EU: Mar 28 - Oct 31
+#EPICS_TIMEZONE = CUS::360:031402:110702
+#EPICS_TIMEZONE = MET::-60:032802:103103
+#
+#	DST for 2022  US: Mar 13 - Nov 06
+#	              EU: Mar 27 - Oct 30
+#EPICS_TIMEZONE = CUS::360:031302:110602
+#EPICS_TIMEZONE = MET::-60:032702:103003
 
 # EPICS_TS_NTP_INET
 #	NTP time server ip address for VxWorks and RTEMS.
@@ -70,8 +69,11 @@ EPICS_TS_NTP_INET=
 #	Prompt string
 # IOCSH_HISTSIZE
 #	Number of lines of command history to keep.
+# IOCSH_HISTEDIT_DISABLE
+# 	Prevents use of readline or equivalent if defined.
 IOCSH_PS1="epics> "
 IOCSH_HISTSIZE=50
+IOCSH_HISTEDIT_DISABLE=
 
 # Log Server:
 # EPICS_IOC_LOG_INET 

configure/RULES

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

configure/RULES.Db

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

configure/RULES.ioc

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

configure/RULES_ARCHS

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

configure/RULES_BUILD

@@ -6,11 +6,12 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in the file LICENSE that is included with this distribution.
 #*************************************************************************
+
+# RULES_BUILD
+
+# Rules for making things specified in a Makefile
 #
-#	Rules for making things specified in Makefile
-#
-#	we are in O.$(T_A), but most sources are elsewhere
-#
+# CWD is O.$(T_A), but most sources are elsewhere
 
 ifndef BASE_RULES_BUILD
 BASE_RULES_BUILD=1
@@ -42,6 +43,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_HOST)
 OBJS += $(OBJS_HOST)
 PROD += $(PROD_HOST)
 SCRIPTS += $(SCRIPTS_HOST)
+TARGETS += $(TARGETS_HOST)
 TESTLIBRARY += $(TESTLIBRARY_HOST)
 TESTSCRIPTS += $(TESTSCRIPTS_HOST)
 TESTPROD += $(TESTPROD_HOST)
@@ -53,6 +55,7 @@ LOADABLE_LIBRARY += $(LOADABLE_LIBRARY_IOC)
 OBJS += $(OBJS_IOC)
 PROD += $(PROD_IOC)
 SCRIPTS += $(SCRIPTS_IOC)
+TARGETS += $(TARGETS_IOC)
 TESTLIBRARY += $(TESTLIBRARY_IOC)
 TESTSCRIPTS += $(TESTSCRIPTS_IOC)
 TESTPROD += $(TESTPROD_IOC)
@@ -79,9 +82,9 @@ else
 host:
 endif
 
--include $(CONFIG)/RULES_FILE_TYPE
+include $(CONFIG)/RULES_FILE_TYPE
 
--include $(CONFIG)/RULES.Db
+include $(CONFIG)/RULES.Db
 
 #---------------------------------------------------------------
 # Include defines and rules for prod, library and test* targets
@@ -185,7 +188,7 @@ endif
 
 # RELEASE file consistency checking
 checkRelease:
-	$(CONVERTRELEASE) checkRelease
+	+$(CONVERTRELEASE) checkRelease
 warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
@@ -351,7 +354,7 @@ testspec: $(TESTSCRIPTS)
 test-results: tapfiles
 ifneq ($(TAPFILES),)
 ifdef RUNTESTS_ENABLED
-	$(PROVE) --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
+	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
 endif
 
 CURRENT_TAPFILES := $(wildcard $(TAPFILES))
@@ -387,7 +390,15 @@ endif
 # Generate a perl program to exec the real test binary.
 %.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
-	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl $(T_A) $(EPICS_HOST_ARCH) $@ $<
+
+#---------------------------------------------------------------
+# Generate header with version number from VCS
+
+ifneq ($(GENVERSION),)
+$(COMMON_DIR)/$(GENVERSION): FORCE
+	$(GENVERSIONHEADER) -t $(TOP) -N $(GENVERSIONMACRO) -V "$(GENVERSIONDEFAULT)" $@
+endif
 
 #---------------------------------------------------------------
 # Install rules for BIN_INSTALLS and LIB_INSTALLS
@@ -516,14 +527,18 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
--include $(CONFIG)/RULES_EXPAND
+include $(CONFIG)/RULES_EXPAND
 
 .PRECIOUS: %.i %.o %.c %.nm %.cpp %.cc
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
 .PHONY: runtests tapfiles clean-tests test-results junitfiles
-.PHONY: checkRelease warnRelease noCheckRelease
+.PHONY: checkRelease warnRelease noCheckRelease FORCE
 
+include $(CONFIG)/RULES_COMMON
+
+else
+    $(warning RULES_BUILD included more than once. \
+        Use 'make show-makefiles' to work out why.)
 endif # BASE_RULES_BUILD
-#	EOF RULES_BUILD

configure/RULES_COMMON

@@ -0,0 +1,35 @@
+#*************************************************************************
+# Copyright (c) 2018 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# These rules show the set of Makefiles, config files and
+# rules files loaded by GNUmake.
+
+# Protect against filenames containing colons (Windows)
+SAFE_MAKEFILES = $(subst :,__colon__,$(MAKEFILE_LIST))
+SHOW_MAKEFILES = $(SAFE_MAKEFILES:%=show-makefile.%)
+show-makefiles: $(SHOW_MAKEFILES)
+
+# The sort prevents warnings about duplicate targets:
+$(sort $(SHOW_MAKEFILES)): show-makefile.%:
+	@echo "    $(subst __colon__,:,$(@:show-makefile.%=%))"
+
+.PHONY: show-makefiles show-makefile.%
+
+# These rules support printing a Makefile variable values.
+# Many variables are only set inside an O.<arch> build directory.
+#   make PRINT.T_A
+
+PRINT_Var = $(@:PRINT.%=%)
+PRINT.%:
+	@echo $(PRINT_Var) = '$($(PRINT_Var))'
+
+.PHONY: PRINT PRINT.%
+
+
+#  User specific rules
+#
+-include $(HOME)/configure/RULES_USER

configure/RULES_DIRS

@@ -92,7 +92,4 @@ $(ARCHS) $(ACTIONS) $(actionArchTargets) :%: \
 .PHONY : $(dirActionArchTargets)
 .PHONY : $(actionArchTargets)
 
-
-#  User specific rules
-#
--include $(HOME)/configure/RULES_USER
+include $(CONFIG)/RULES_COMMON

configure/RULES_EXPAND

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

configure/RULES_FILE_TYPE

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

configure/RULES_OCTAVE

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

configure/RULES_TARGET

@@ -1,18 +1,13 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
-#
-#  RULES_TARGET
-#
-#  This file is to be maintained by the community.
-#
-#-----------------------------------------------------------------------
+
+# RULES_TARGET
 
 define TARGET_template
 $(1)_$(2) += $$(if $$(strip $$($(1)_$(2)_$$(OS_CLASS))), \

configure/os/CONFIG.Common.RTEMS

@@ -27,9 +27,13 @@ ifneq ($(CONFIG),$(TOP)/configure)
 -include $(TOP)/configure/CONFIG_SITE.Common.RTEMS
 endif
 
+#--------------------------------------------------
+# Set RTEMS_BSP from T_A if not already done
+RTEMS_BSP ?= $(subst RTEMS-,,$(T_A))
+
 #-------------------------------------------------------
 # Pick up the RTEMS tool/path definitions from the RTEMS BSP directory.
-include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(subst RTEMS-,,$(T_A))/Makefile.inc
+include $(RTEMS_BASE)/$(RTEMS_TARGET_CPU)-rtems$(RTEMS_VERSION)/$(RTEMS_BSP)/Makefile.inc
 include $(RTEMS_CUSTOM)
 include $(CONFIG.CC)
 

configure/os/CONFIG.Common.RTEMS-at91rm9200ek

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

configure/os/CONFIG.Common.RTEMS-beatnik

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

configure/os/CONFIG.Common.RTEMS-gen68360

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

configure/os/CONFIG.Common.RTEMS-mcp750

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

configure/os/CONFIG.Common.RTEMS-mvme167

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

configure/os/CONFIG.Common.RTEMS-mvme2100

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

configure/os/CONFIG.Common.RTEMS-mvme2700

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

configure/os/CONFIG.Common.RTEMS-mvme3100

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

configure/os/CONFIG.Common.RTEMS-mvme5500

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

configure/os/CONFIG.Common.RTEMS-pc386

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

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

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

configure/os/CONFIG.Common.RTEMS-psim

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

configure/os/CONFIG.Common.RTEMS-uC5282

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

configure/os/CONFIG.Common.vxWorksCommon

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

configure/os/CONFIG.UnixCommon.Common

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

configure/os/CONFIG.linux-386.Common

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

configure/os/CONFIG.linux-486.Common

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

configure/os/CONFIG.linux-586.Common

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

configure/os/CONFIG.linux-686.Common

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

configure/os/CONFIG.linux-x86.Common

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

configure/os/CONFIG.linux-x86_64.Common

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

configure/os/CONFIG_SITE.Common.RTEMS-pc386

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

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

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

configure/os/CONFIG_SITE.Common.linux-arm

@@ -1,35 +1,39 @@
 # CONFIG_SITE.Common.linux-arm
 #
-# Site-specific settings for the linux-arm target
+# Site Specific definitions for all linux-arm targets
+#-------------------------------------------------------
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
 # a) LD_LIBRARY_PATH must include the full absolute pathname to
 #    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
 #    executables.
-# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which
+# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which 
 #    will add the named directory to the list contained in the executables.
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
-# 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))
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+#COMMANDLINE_LIBRARY = READLINE
 
-# 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'
-# from the top of the Base tree after changing this setting.
-
-# Needs -lncurses:
+# Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
 
-# Needs -lcurses:
+# Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
+
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g

configure/os/CONFIG_SITE.Common.linux-cris

@@ -1,8 +1,9 @@
 # CONFIG_SITE.Common.linux-cris
 #
-# Site-specific settings for the linux-cris target
+# Site Specific definitions for linux-cris target
+# Only the local epics system manager should modify this file
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
@@ -14,21 +15,21 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
+# Depending on your version of Linux you may want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+#COMMANDLINE_LIBRARY = READLINE
 
-# 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'
-# from the top of the Base tree after changing this setting.
-
-# Needs -lncurses:
+# Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
 
-# Needs -lcurses:
+# Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
+
+OP_SYS_CFLAGS += -g
+

configure/os/CONFIG_SITE.Common.linux-microblaze

@@ -1,6 +1,7 @@
 # CONFIG_SITE.Common.linux-microblaze
 #
-# Site-specific settings for the linux-microblaze target
+# Site specific definitions for linux-microblaze target builds.
+#-------------------------------------------------------
 
 # The gnu tools for cross compiling for MicroBlaze (little endian)
 # on Linux can be downloaded from the Xilinx git server:
@@ -11,21 +12,3 @@
 
 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'
-# from the top of the Base tree after changing this setting.
-
-# Needs -lncurses:
-#COMMANDLINE_LIBRARY = READLINE_NCURSES
-
-# Needs -lcurses:
-#COMMANDLINE_LIBRARY = READLINE_CURSES
-
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS

configure/os/CONFIG_SITE.Common.linux-x86

@@ -1,8 +1,9 @@
 # CONFIG_SITE.Common.linux-x86
 #
-# Site-specific settings for the linux-x86 target
+# Site Specific definitions for linux-x86 target
+# Only the local epics system manager should modify this file
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
@@ -14,15 +15,14 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
-# 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'
-# from the top of the Base tree after changing this setting.
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+COMMANDLINE_LIBRARY = READLINE
 
 # Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
@@ -30,9 +30,6 @@ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
 # Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
-
 
 # Permit access to 64-bit file-systems
 OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
@@ -46,6 +43,14 @@ OP_SYS_CFLAGS += -D_FILE_OFFSET_BITS=64
 #CCC         = clang++
 
 
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+
+
 # Tune GNU compiler output for a specific 32-bit cpu-type
 # (e.g. generic, native, i386, i686, pentium2/3/4, prescott, k6, athlon etc.)
 GNU_TUNE_CFLAGS = -mtune=generic

configure/os/CONFIG_SITE.Common.linux-x86_64

@@ -1,8 +1,9 @@
 # CONFIG_SITE.Common.linux-x86_64
 #
-# Site-specific settings for the linux-x86_64 target
+# Site Specific definitions for linux-x86_64 target
+# Only the local epics system manager should modify this file
 
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
+# NOTE for SHARED_LIBRARIES: In most cases if this is set to YES the
 # shared libraries will be found automatically.  However if the .so
 # files are installed at a different path to their compile-time path
 # then in order to be found at runtime do one of these:
@@ -14,15 +15,14 @@
 # c) Add the runtime path to /etc/ld.so.conf and run ldconfig
 #    to inform the system of the shared library location.
 
+# Depending on your version of Linux you'll want one of the following
+# lines to enable command-line editing and history in iocsh.  If you're
+# not sure which, start with the top one and work downwards until the
+# build doesn't fail to link the readline library.  If none of them work,
+# comment them all out to build without readline support.
 
-# 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'
-# from the top of the Base tree after changing this setting.
+# No other libraries needed (recent Fedora, Ubuntu etc.):
+COMMANDLINE_LIBRARY = READLINE
 
 # Needs -lncurses (RHEL 5 etc.):
 #COMMANDLINE_LIBRARY = READLINE_NCURSES
@@ -30,9 +30,6 @@ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
 # Needs -lcurses (older versions)
 #COMMANDLINE_LIBRARY = READLINE_CURSES
 
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
-
 
 # Uncomment the followings lines to build with CLANG instead of GCC.
 #
@@ -42,6 +39,14 @@ COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
 #CCC         = clang++
 
 
+# It makes sense to include debugging symbols even in optimized builds
+# in case you want to attach gdb to the process or examine a core-dump.
+# This does cost disk space, but not memory as debug symbols are not
+# loaded into RAM when the binary is loaded.
+OPT_CFLAGS_YES += -g
+OPT_CXXFLAGS_YES += -g
+
+
 # Tune GNU compiler output for a specific 64-bit cpu-type
 # (e.g. generic, native, core2, nocona, k8, opteron, athlon64, barcelona etc.)
 GNU_TUNE_CFLAGS = -mtune=generic

configure/os/CONFIG_SITE.Common.linux-xscale_be

@@ -1,23 +1,4 @@
 # CONFIG_SITE.Common.linux-xscale_be
 #
-# 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'
-# from the top of the Base tree after changing this setting.
-
-# Needs -lncurses:
-#COMMANDLINE_LIBRARY = READLINE_NCURSES
-
-# Needs -lcurses:
-#COMMANDLINE_LIBRARY = READLINE_CURSES
-
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
+# Site specific definitions for all linux-xscale_be target builds.
+#-------------------------------------------------------

configure/os/CONFIG_SITE.Common.linuxCommon

@@ -1,11 +0,0 @@
-# CONFIG_SITE.Common.linuxCommon
-#
-# Site-specific settings for all linux targets
-
-
-# It makes sense to include debugging symbols even in optimized builds
-# in case you want to attach gdb to the process or examine a core-dump.
-# This does cost disk space, but not memory as debug symbols are not
-# loaded into RAM when the binary is loaded.
-OPT_CFLAGS_YES += -g
-OPT_CXXFLAGS_YES += -g

configure/os/CONFIG_SITE.Common.vxWorksCommon

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

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

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

documentation/KnownProblems.html

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

documentation/README.1st

@@ -0,0 +1,344 @@
+                           Installation Instructions
+
+                           EPICS Base Release 3.16.1
+
+   --------------------------------------------------------------------------
+
+  Table of Contents
+
+     * What is EPICS base?
+     * What is new in this release?
+     * Copyright
+     * Supported platforms
+     * Supported compilers
+     * Software requirements
+     * Host system storage requirements
+     * Documentation
+     * Directory Structure
+     * Build related components
+     * Building EPICS base (Unix and Win32)
+     * Example application and extension
+     * Multiple host platforms
+
+   --------------------------------------------------------------------------
+
+  What is EPICS base?
+
+     The Experimental Physics and Industrial Control Systems (EPICS) is an
+     extensible set of software components and tools with which application
+     developers can create a control system. This control system can be used
+     to control accelerators, detectors, telescopes, or other scientific
+     experimental equipment. EPICS base is the set of core software, i.e. the
+     components of EPICS without which EPICS would not function. EPICS base
+     allows an arbitrary number of target systems, IOCs (input/output
+     controllers), and host systems, OPIs (operator interfaces) of various
+     types.
+
+  What is new in this release?
+
+     Please check the RELEASE_NOTES file in the distribution for description
+     of changes and release migration details.
+
+  Copyright
+
+     Please review the LICENSE file included in the distribution for legal
+     terms of usage.
+
+  Supported platforms
+
+     The list of platforms supported by this version of EPICS base is given
+     in the configure/CONFIG_SITE file. If you are trying to build EPICS Base
+     on an unlisted host or for a different target machine you must have the
+     proper host/target cross compiler and header files, and you will have to
+     create and add the appropriate new configure files to the
+     base/configure/os/directory. You can start by copying existing
+     configuration files in the configure/os directory and then make changes
+     for your new platforms.
+
+  Supported compilers
+
+     This version of EPICS base has been built and tested using the host
+     vendor's C and C++ compilers, as well as the GNU gcc and g++ compilers.
+     The GNU cross-compilers work for all cross-compiled targets. You may
+     need the C and C++ compilers to be in your search path to do EPICS
+     builds; check the definitions of CC and CCC in
+     base/configure/os/CONFIG.<host>.<host> if you have problems.
+
+  Software requirements
+
+     GNU make
+     You must use the GNU version of make for EPICS builds, and we now
+     recommend version 4.1 or later (version 3.82 may work on Linux, but
+     doesn't on Windows).
+
+     Perl
+     You must have Perl version 5.8.1 or later installed. The EPICS
+     configuration files do not specify the perl full pathname, so the perl
+     executable must be found through your normal search path.
+
+     Unzip and tar (Winzip on WIN32 systems)
+     You must have tools available to unzip and untar the EPICS base
+     distribution file.
+
+     Target systems
+     EPICS supports IOCs running on embedded platforms such as VxWorks and
+     RTEMS built using a cross-compiler, and also supports soft IOCs running
+     as processes on the host platform.
+
+     vxWorks
+     You must have vxWorks 6 installed if any of your target systems are
+     vxWorks systems; the C++ compilers for vxWorks 5.x are now too old to
+     support. The vxWorks installation provides the cross-compiler and header
+     files needed to build for these targets. The absolute path to and the
+     version number of the vxWorks installation must be set in the
+     base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
+     target-specific overrides.
+
+     Consult the vxWorks 6.x EPICS web pages and the vxWorks documentation
+     for information about configuring your vxWorks operating system for use
+     with EPICS.
+
+     RTEMS
+     For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or
+     4.10. The newer 4.11 or 5.x releases are not supported yet.
+
+     Command-line editing libraries
+     GNU readline or other OS-specific libraries can be used by the IOC shell
+     to provide command line editing and history recall. The default setting
+     is different for each OS. On Linux the default is to use READLINE since
+     most distributions include it. On MacOS the default is also READLINE
+     since Apple provides a compatible library, although it isn't GNU. On
+     RTEMS we support GNU readline and Tecla, although the default is to use
+     neither since these have to be added to the RTEMS installation
+     separately. On vxWorks we support the built-in ledLib library.
+
+  Host system storage requirements
+
+     The compressed tar file is approximately 1.6 MB in size. The
+     distribution source tree takes up approximately 12 MB. Each host target
+     will need around 40 MB for build files, and each cross-compiled target
+     around 20 MB.
+
+  Documentation
+
+     EPICS documentation is available through the EPICS website at Argonne.
+
+     Release specific documentation can also be found in the
+     base/documentation directory of the distribution.
+
+  Directory Structure
+
+    Distribution directory structure:
+
+         base                    Root directory of the base distribution
+         base/configure          Operating system independent build config files
+         base/configure/os       Operating system dependent build config files
+         base/documentation      Distribution documentation
+         base/src                Source code in various subdirectories
+         base/startup            Scripts for setting up path and environment
+
+    Install directories created by the build:
+
+         bin                     Installed scripts and executables in subdirs
+         cfg                     Installed build configuration files
+         db                      Installed data bases
+         dbd                     Installed data base definitions
+         doc                     Installed documentation files
+         html                    Installed html documentation
+         include                 Installed header files
+         include/os              Installed os specific header files in subdirs
+         include/compiler        Installed compiler-specific header files
+         lib                     Installed libraries in arch subdirectories
+         lib/perl                Installed perl modules
+         templates               Installed templates
+
+  Build related components
+
+    base/documentation directory - contains setup, build, and install documents
+
+         README.1st           Instructions for setup and building epics base
+         README.html          html version of README.1st
+         README.darwin.html   Installation notes for Mac OS X (Darwin)
+         RELEASE_NOTES.html   Notes on release changes
+         KnownProblems.html   List of known problems and workarounds
+
+    base/startup directory - contains scripts to set environment and path
+
+         EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
+         unix.csh            C shell script to set path and env variables
+         unix.sh             Bourne shell script to set path and env variables
+         win32.bat           Bat file example to configure win32-x86 target
+         windows.bat         Bat file example to configure windows-x64 target
+
+    base/configure directory - contains build definitions and rules
+
+         CONFIG                Includes configure files and allows variable overrides
+         CONFIG.CrossCommon    Cross build definitions
+         CONFIG.gnuCommon      Gnu compiler build definitions for all archs
+         CONFIG_ADDONS         Definitions for <osclass> and DEFAULT options
+         CONFIG_APP_INCLUDE
+         CONFIG_BASE           EPICS base tool and location definitions
+         CONFIG_BASE_VERSION   Definitions for EPICS base version number
+         CONFIG_COMMON         Definitions common to all builds
+         CONFIG_ENV            Definitions of EPICS environment variables
+         CONFIG_FILE_TYPE
+         CONFIG_SITE           Site specific make definitions
+         CONFIG_SITE_ENV       Site defaults for EPICS environment variables
+         MAKEFILE              Installs CONFIG* RULES* creates
+         RELEASE               Location of external products
+         RULES                 Includes appropriate rules file
+         RULES.Db              Rules for database and database definition files
+         RULES.ioc             Rules for application iocBoot/ioc* directory
+         RULES_ARCHS           Definitions and rules for building architectures
+         RULES_BUILD           Build and install rules and definitions
+         RULES_DIRS            Definitions and rules for building subdirectories
+         RULES_EXPAND
+         RULES_FILE_TYPE
+         RULES_TARGET
+         RULES_TOP             Rules specific to a <top> dir (uninstall and tar)
+         Sample.Makefile       Sample makefile with comments
+
+    base/configure/os directory - contains os-arch specific definitions
+
+         CONFIG.<host>.<target>      Specific host-target build definitions
+         CONFIG.Common.<target>      Specific target definitions for all hosts
+         CONFIG.<host>.Common        Specific host definitions for all targets
+         CONFIG.UnixCommon.Common    Definitions for Unix hosts and all targets
+         CONFIG.Common.UnixCommon    Definitions for Unix targets and all hosts
+         CONFIG.Common.vxWorksCommon Specific host definitions for all vx targets
+         CONFIG_SITE.<host>.<target> Site specific host-target definitions
+         CONFIG_SITE.Common.<target> Site specific target defs for all hosts
+         CONFIG_SITE.<host>.Common   Site specific host defs for all targets
+
+  Building EPICS base (Unix and Win32)
+
+    Unpack file
+
+       Unzip and untar the distribution file. Use WinZip on Windows systems.
+
+    Set environment variables
+
+       Files in the base/startup directory have been provided to help set
+       required path and other environment variables.
+
+       EPICS_HOST_ARCH
+       Before you can build or use EPICS R3.15, the environment variable
+       EPICS_HOST_ARCH must be defined. A perl script EpicsHostArch.pl in the
+       base/startup directory has been provided to help set EPICS_HOST_ARCH.
+       You should have EPICS_HOST_ARCH set to your host operating system
+       followed by a dash and then your host architecture, e.g.
+       solaris-sparc. If you are not using the OS vendor's c/c++ compiler for
+       host builds, you will need another dash followed by the alternate
+       compiler name (e.g. "-gnu" for GNU c/c++ compilers on a solaris host
+       or "-mingw" for MinGW c/c++ compilers on a WIN32 host). See
+       configure/CONFIG_SITE for a list of supported EPICS_HOST_ARCH values.
+
+       PERLLIB
+       On WIN32, some versions of Perl require that the environment variable
+       PERLLIB be set to <perl directory location>.
+
+       PATH
+       As already mentioned, you must have the perl executable and you may
+       need C and C++ compilers in your search path. For building base you
+       also must have echo in your search path. For Unix host builds you also
+       need ln, cpp, cp, rm, mv, and mkdir in your search path and /bin/chmod
+       must exist. On some Unix systems you may also need ar and ranlib in
+       your path, and the C compiler may require as and ld in your path. On
+       solaris systems you need uname in your path.
+
+       LD_LIBRARY_PATH
+       R3.15 shared libraries and executables normally contain the full path
+       to any libraries they require. However, if you move the EPICS files or
+       directories from their build-time location then in order for the
+       shared libraries to be found at runtime LD_LIBRARY_PATH must include
+       the full pathname to $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when
+       invoking executables, or some equivalent OS-specific mechanism (such
+       as /etc/ld.so.conf on Linux) must be used. Shared libraries are now
+       built by default on all Unix type hosts.
+
+    Do site-specific build configuration
+
+       Site configuration
+       To configure EPICS, you may want to modify the default definitions in
+       the following files:
+
+         configure/CONFIG_SITE      Build choices. Specify target archs.
+         configure/CONFIG_SITE_ENV  Environment variable defaults
+         configure/RELEASE          TORNADO2 full path location
+
+       Host configuration
+       To configure each host system, you may override the default
+       definitions by adding a new file in the configure/os directory with
+       override definitions. The new file should have the same name as the
+       distribution file to be overridden except with CONFIG in the name
+       changed to CONFIG_SITE.
+
+         configure/os/CONFIG.<host>.<host>      Host build settings
+         configure/os/CONFIG.<host>.Common      Host common build settings
+
+       Target configuration
+       To configure each target system, you may override the default
+       definitions by adding a new file in the configure/os directory with
+       override definitions. The new file should have the same name as the
+       distribution file to be overridden except with CONFIG in the name
+       replaced by CONFIG_SITE. This step is necessary even if the host
+       system is the only target system.
+
+         configure/os/CONFIG.Common.<target>     Target common settings
+         configure/os/CONFIG.<host>.<target>     Host-target settings
+
+    Build EPICS base
+
+       After configuring the build you should be able to build EPICS base by
+       issuing the following commands in the distribution's root directory
+       (base):
+
+         gnumake clean uninstall
+         gnumake
+
+       The command "gnumake clean uninstall" will remove all files and
+       directories generated by a previous build. The command "gnumake" will
+       build and install everything for the configured host and targets.
+
+       It is recommended that you do a "gnumake clean uninstall" at the root
+       directory of an EPICS directory structure before each complete rebuild
+       to ensure that all components will be rebuilt.
+
+  Example application and extension
+
+     A perl tool, makeBaseApp.pl is included in the distribution file. This
+     script will create a sample application that can be built and then
+     executed to try out this release of base.
+
+     Instructions for building and executing the 3.15 example application can
+     be found in the section "Example Application" of Chapter 2, "Getting
+     Started", in the "IOC Application Developer's Guide" for this release.
+     The "Example IOC Application" section briefly explains how to create and
+     build an example application in a user created <top> directory. It also
+     explains how to run the example application on a vxWorks ioc or as a
+     process on the host system. By running the example application as a
+     host-based IOC, you will be able to quickly implement a complete EPICS
+     system and be able to run channel access clients on the host system.
+
+     A perl script, makeBaseExt.pl, is included in the distribution file.
+     This script will create a sample extension that can be built and
+     executed. The makeBaseApp.pl and makeBaseExt.pl scripts are installed
+     into the install location bin/<hostarch> directory during the base
+     build.
+
+  Multiple host platforms
+
+     You can build using a single EPICS directory structure on multiple host
+     systems and for multiple cross target systems. The intermediate and
+     binary files generated by the build will be created in separate
+     subdirectories and installed into the appropriate separate host/target
+     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 $(INSTALL_LOCATION) is $(TOP) which is the root directory in the
+     distribution directory structure, base. Created object files are stored
+     in O.<arch> source subdirectories, This allows objects for multiple
+     cross target architectures to be maintained at the same time. To build
+     EPICS base for a specific host/target combination you must have the
+     proper host/target C/C++ cross compiler and target header files and the
+     base/configure/os directory must have the appropriate configure files.

documentation/README.html

@@ -0,0 +1,382 @@
+<!DOCTYPE HTML>
+<!-- Generate the README.1st file from this file using:
+    elinks -dump -no-numbering -no-references -dump-width 80 README.html
+  -->
+<HTML>
+<HEAD>
+<TITLE>README - EPICS Base Installation Instructions</TITLE>
+</HEAD>
+<BODY>
+<CENTER>
+<H1>Installation Instructions</H1>
+<H2>EPICS Base Release 3.16.1</H2><BR>
+</CENTER>
+<HR>
+<H3> Table of Contents</H3>
+<UL>
+<LI><A HREF="#0_0_1"> What is EPICS base?</A></LI>
+<LI><A HREF="#0_0_2"> What is new in this release?</A></LI>
+<LI><A HREF="#0_0_3"> Copyright</A></LI>
+<LI><A HREF="#0_0_4"> Supported platforms</A></LI>
+<LI><A HREF="#0_0_5"> Supported compilers</A></LI>
+<LI><A HREF="#0_0_6"> Software requirements</A></LI>
+<LI><A HREF="#0_0_7"> Host system storage requirements</A></LI>
+<LI><A HREF="#0_0_8"> Documentation</A></LI>
+<LI><A HREF="#0_0_10"> Directory Structure</A></LI>
+<LI><A HREF="#0_0_11"> Build related components</A></LI>
+<LI><A HREF="#0_0_12"> Building EPICS base (Unix and Win32)</A></LI>
+<LI><A HREF="#0_0_13"> Example application and extension</A></LI>
+<LI><A HREF="#0_0_14"> Multiple host platforms</A></LI>
+</UL>
+<HR>
+
+<H3><A NAME="0_0_1"> What is EPICS base?</A></H3>
+<BLOCKQUOTE>The Experimental Physics and Industrial Control Systems
+ (EPICS) is an extensible set of software components and tools with
+ which application developers can create a control system. This control
+ system can be used to control accelerators, detectors, telescopes, or
+ other scientific experimental equipment. EPICS base is the set of core
+ software, i.e. the components of EPICS without which EPICS would not
+ function. EPICS base allows an arbitrary number of target systems, IOCs
+ (input/output controllers), and host systems, OPIs (operator
+ interfaces) of various types.</BLOCKQUOTE>
+
+<H3><A NAME="0_0_2"> What is new in this release?</A></H3>
+<BLOCKQUOTE> Please check the RELEASE_NOTES file in the distribution for
+ description of changes and release migration details.</BLOCKQUOTE>
+
+<H3><A NAME="0_0_3"> Copyright</A></H3>
+<BLOCKQUOTE>Please review the LICENSE file included in the
+ distribution for legal terms of usage.</BLOCKQUOTE>
+
+<H3><A NAME="0_0_4"> Supported platforms</A></H3>
+
+<BLOCKQUOTE>The list of platforms supported by this version of EPICS base
+ is given in the configure/CONFIG_SITE file. If you are trying to build
+ EPICS Base on an unlisted host or for a different target machine you
+ must have the proper host/target cross compiler and header files, and
+ you will have to create and add the appropriate new configure files to
+ the base/configure/os/directory. You can start by copying existing
+ configuration files in the configure/os directory and then make changes
+ for your new platforms.</BLOCKQUOTE>
+
+<H3><A NAME="0_0_5"> Supported compilers</A></H3>
+
+<BLOCKQUOTE>This version of EPICS base has been built and tested using the host
+ vendor's C and C++ compilers, as well as the GNU gcc and g++ compilers. The GNU
+ cross-compilers work for all cross-compiled targets. You may need the C and C++
+ compilers to be in your search path to do EPICS builds; check the definitions
+ of CC and CCC in base/configure/os/CONFIG.&lt;host&gt;.&lt;host&gt; if you have
+ problems.</BLOCKQUOTE>
+
+<H3><A NAME="0_0_6"> Software requirements</A></H3>
+
+<BLOCKQUOTE><B>GNU make</B><BR>
+ You must use the GNU version of make for EPICS builds, and we now recommend
+ version 4.1 or later (version 3.82 may work on Linux, but doesn't on Windows).
+
+<P><B>Perl</B><BR>
+ You must have Perl version 5.8.1 or later installed. The EPICS configuration
+ files do not specify the perl full pathname, so the perl executable must
+ be found through your normal search path.</P>
+
+<P><B>Unzip and tar (Winzip on WIN32 systems)</B><BR>
+ You must have tools available to unzip and untar the EPICS base
+ distribution file.</P>
+
+<P><B>Target systems</B><BR>
+ EPICS supports IOCs running on embedded platforms such as VxWorks
+ and RTEMS built using a cross-compiler, and also supports soft IOCs running
+ as processes on the host platform.</P>
+
+<P><B>vxWorks</B><BR>
+ You must have vxWorks 6 installed if any of your target systems are vxWorks
+ systems; the C++ compilers for vxWorks 5.x are now too old to support. The
+ vxWorks installation provides the cross-compiler and header files needed to
+ build for these targets. The absolute path to and the version number of the
+ vxWorks installation must be set in the
+ base/configure/os/CONFIG_SITE.Common.vxWorksCommon file or in one of its
+ target-specific overrides.</P>
+
+<P>Consult the <a href="https://epics.anl.gov/base/vxWorks6.php">vxWorks
+ 6.x</a> EPICS web pages and the vxWorks documentation for information
+ about configuring your vxWorks operating system for use with EPICS.</P>
+
+<P><B>RTEMS</B><BR>
+ For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or 4.10. The
+ newer 4.11 or 5.x releases are not supported yet.</P>
+
+<P><B>Command-line editing libraries</B><BR>
+
+ GNU readline or other OS-specific libraries can be used by the IOC shell to
+ provide command line editing and history recall. The default setting is
+ different for each OS. On Linux the default is to use READLINE since most
+ distributions include it. On MacOS the default is also READLINE since Apple
+ provides a compatible library, although it isn't GNU. On RTEMS we support GNU
+ readline and Tecla, although the default is to use neither since these have to
+ be added to the RTEMS installation separately. On vxWorks we support the
+ built-in ledLib library.</P>
+
+</BLOCKQUOTE>
+
+<H3><A NAME="0_0_7"> Host system storage requirements</A></H3>
+
+<BLOCKQUOTE>The compressed tar file is approximately 1.6 MB in size. The
+ distribution source tree takes up approximately 12 MB. Each host target will
+ need around 40 MB for build files, and each cross-compiled target around 20
+ MB.</BLOCKQUOTE>
+
+<H3><A NAME="0_0_8"> Documentation</A></H3>
+<BLOCKQUOTE>EPICS documentation is available through the
+ <a href="https://epics.anl.gov/">EPICS website</a> at Argonne.
+ <P>Release specific documentation can also be found in the base/documentation
+ directory of the distribution.</BLOCKQUOTE>
+
+<H3><A NAME="0_0_10"> Directory Structure</A></H3>
+<BLOCKQUOTE><H4>Distribution directory structure:</H4>
+
+<PRE>
+        base                    Root directory of the base distribution
+        base/configure          Operating system independent build config files
+        base/configure/os       Operating system dependent build config files
+        base/documentation      Distribution documentation
+        base/src                Source code in various subdirectories
+        base/startup            Scripts for setting up path and environment
+</PRE>
+
+<H4>Install directories created by the build:</H4>
+<PRE>
+        bin                     Installed scripts and executables in subdirs
+        cfg                     Installed build configuration files
+        db                      Installed data bases
+        dbd                     Installed data base definitions
+        doc                     Installed documentation files
+        html                    Installed html documentation
+        include                 Installed header files
+        include/os              Installed os specific header files in subdirs
+        include/compiler        Installed compiler-specific header files
+        lib                     Installed libraries in arch subdirectories
+        lib/perl                Installed perl modules
+        templates               Installed templates
+</PRE>
+</BLOCKQUOTE>
+
+<H3><A NAME="0_0_11"> Build related components</A></H3>
+<BLOCKQUOTE>
+
+<H4>base/documentation directory - contains setup, build, and install
+ documents</H4>
+ <PRE>
+        README.1st           Instructions for setup and building epics base
+        README.html          html version of README.1st
+        README.darwin.html   Installation notes for Mac OS X (Darwin)
+        RELEASE_NOTES.html   Notes on release changes
+        KnownProblems.html   List of known problems and workarounds
+</PRE>
+
+<H4>base/startup directory - contains scripts to set environment and path</H4>
+<PRE>
+        EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
+        unix.csh            C shell script to set path and env variables
+        unix.sh             Bourne shell script to set path and env variables
+        win32.bat           Bat file example to configure win32-x86 target
+        windows.bat         Bat file example to configure windows-x64 target
+</PRE>
+
+<H4>base/configure directory - contains build definitions and rules</H4>
+<PRE>
+        CONFIG                Includes configure files and allows variable overrides
+        CONFIG.CrossCommon    Cross build definitions
+        CONFIG.gnuCommon      Gnu compiler build definitions for all archs
+        CONFIG_ADDONS         Definitions for &lt;osclass&gt; and DEFAULT options
+        CONFIG_APP_INCLUDE
+        CONFIG_BASE           EPICS base tool and location definitions
+        CONFIG_BASE_VERSION   Definitions for EPICS base version number
+        CONFIG_COMMON         Definitions common to all builds
+        CONFIG_ENV            Definitions of EPICS environment variables
+        CONFIG_FILE_TYPE
+        CONFIG_SITE           Site specific make definitions
+        CONFIG_SITE_ENV       Site defaults for EPICS environment variables
+        MAKEFILE              Installs CONFIG* RULES* creates
+        RELEASE               Location of external products
+        RULES                 Includes appropriate rules file
+        RULES.Db              Rules for database and database definition files
+        RULES.ioc             Rules for application iocBoot/ioc* directory
+        RULES_ARCHS           Definitions and rules for building architectures
+        RULES_BUILD           Build and install rules and definitions
+        RULES_DIRS            Definitions and rules for building subdirectories
+        RULES_EXPAND
+        RULES_FILE_TYPE
+        RULES_TARGET
+        RULES_TOP             Rules specific to a &lt;top&gt; dir (uninstall and tar)
+        Sample.Makefile       Sample makefile with comments
+</PRE>
+
+<H4>base/configure/os directory - contains os-arch specific definitions</H4>
+<PRE>
+        CONFIG.&lt;host&gt;.&lt;target&gt;      Specific host-target build definitions
+        CONFIG.Common.&lt;target&gt;      Specific target definitions for all hosts
+        CONFIG.&lt;host&gt;.Common        Specific host definitions for all targets
+        CONFIG.UnixCommon.Common    Definitions for Unix hosts and all targets
+        CONFIG.Common.UnixCommon    Definitions for Unix targets and all hosts
+        CONFIG.Common.vxWorksCommon Specific host definitions for all vx targets
+        CONFIG_SITE.&lt;host&gt;.&lt;target&gt; Site specific host-target definitions
+        CONFIG_SITE.Common.&lt;target&gt; Site specific target defs for all hosts
+        CONFIG_SITE.&lt;host&gt;.Common   Site specific host defs for all targets
+</PRE>
+
+</BLOCKQUOTE>
+
+<H3><A NAME="0_0_12"> Building EPICS base (Unix and Win32)</A></H3>
+<BLOCKQUOTE>
+
+<H4> Unpack file</H4>
+<BLOCKQUOTE>
+Unzip and untar the distribution file. Use WinZip on Windows
+ systems.
+</BLOCKQUOTE>
+
+<H4>Set environment variables</H4>
+<BLOCKQUOTE>
+Files in the base/startup directory have been provided to
+ help set required path and other environment variables.
+
+<P><B>EPICS_HOST_ARCH</B><BR>
+ Before you can build or use EPICS R3.15, the environment variable
+ EPICS_HOST_ARCH must be defined. A perl script EpicsHostArch.pl in the
+ base/startup directory has been provided to help set EPICS_HOST_ARCH.
+ You should have EPICS_HOST_ARCH set to your host operating system
+ followed by a dash and then your host architecture, e.g. solaris-sparc.
+ If you are not using the OS vendor's c/c++ compiler for host builds,
+ you will need another dash followed by the alternate compiler name
+ (e.g. &quot;-gnu&quot; for GNU c/c++ compilers on a solaris host or &quot;-mingw&quot;
+ for MinGW c/c++ compilers on a WIN32 host). See configure/CONFIG_SITE
+ for a list of supported EPICS_HOST_ARCH values.</P>
+
+<P><B>PERLLIB</B><BR>
+ On WIN32, some versions of Perl require that the environment
+ variable PERLLIB be set to &lt;perl directory location&gt;.</P>
+
+<P><B>PATH</B><BR>
+ As already mentioned, you must have the perl executable and you may
+ need C and C++ compilers in your search path. For building base you
+ also must have echo in your search path. For Unix host builds you also
+ need ln, cpp, cp, rm, mv, and mkdir in your search path and /bin/chmod
+ must exist. On some Unix systems you may also need ar and ranlib in
+ your path, and the C compiler may require as and ld in your path. On
+ solaris systems you need uname in your path.</P>
+
+<P><B>LD_LIBRARY_PATH</B><BR>
+
+ R3.15 shared libraries and executables normally contain the full path
+ to any libraries they require.
+ However, if you move the EPICS files or directories from their build-time
+ location then in order for the shared libraries to be found at runtime
+ LD_LIBRARY_PATH must include the full pathname to
+ $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking executables, or
+ some equivalent OS-specific mechanism (such as /etc/ld.so.conf on Linux)
+ must be used.
+ Shared libraries are now built by default on all Unix type hosts.</P>
+</BLOCKQUOTE>
+
+<H4>Do site-specific build configuration</H4>
+<BLOCKQUOTE>
+
+<B>Site configuration</B><BR>
+ To configure EPICS, you may want to modify the default definitions
+ in the following files:
+<PRE>
+        configure/CONFIG_SITE      Build choices. Specify target archs.
+        configure/CONFIG_SITE_ENV  Environment variable defaults
+        configure/RELEASE          TORNADO2 full path location
+</PRE>
+
+<B> Host configuration</B><BR>
+ To configure each host system, you may override the default
+ definitions by adding a new file in the configure/os directory with
+ override definitions. The new file should have the same name as the
+ distribution file to be overridden except with CONFIG in the name
+ changed to CONFIG_SITE.
+
+<PRE>
+        configure/os/CONFIG.&lt;host&gt;.&lt;host&gt;      Host build settings
+        configure/os/CONFIG.&lt;host&gt;.Common      Host common build settings
+</PRE>
+
+<B>Target configuration</B><BR>
+ To configure each target system, you may override the default
+ definitions by adding a new file in the configure/os directory with
+ override definitions. The new file should have the same name as the
+ distribution file to be overridden except with CONFIG in the name
+ replaced by CONFIG_SITE. This step is necessary even if the host system
+ is the only target system.
+ <PRE>
+        configure/os/CONFIG.Common.&lt;target&gt;     Target common settings
+        configure/os/CONFIG.&lt;host&gt;.&lt;target&gt;     Host-target settings
+</PRE>
+</BLOCKQUOTE>
+
+<H4>Build EPICS base</H4>
+<BLOCKQUOTE>After configuring the build you should be able to build
+ EPICS base by issuing the following commands in the distribution's root
+ directory (base):
+ <PRE>
+        gnumake clean uninstall
+        gnumake
+</PRE>
+
+ The command &quot;gnumake clean uninstall&quot;
+ will remove all files and directories generated by a previous build.
+ The command &quot;gnumake&quot; will build and install everything for the
+ configured host and targets.
+
+<P> It is recommended that you do a &quot;gnumake clean uninstall&quot; at the
+ root directory of an EPICS directory structure before each complete
+ rebuild to ensure that all components will be rebuilt.
+</BLOCKQUOTE>
+</BLOCKQUOTE>
+
+<H3><A NAME="0_0_13"> Example application and extension</A></H3>
+<BLOCKQUOTE>A perl tool, makeBaseApp.pl is included in the distribution
+ file. This script will create a sample application that can be built
+ and then executed to try out this release of base.
+
+<P>
+ Instructions for building and executing the 3.15 example application
+ can be found in the section &quot;Example Application&quot; of Chapter 2,
+ &quot;Getting Started&quot;, in the &quot;IOC Application Developer's Guide&quot; for this
+ release. The &quot;Example IOC Application&quot; section briefly explains how to
+ create and build an example application in a user created &lt;top&gt;
+ directory. It also explains how to run the example application on a
+ vxWorks ioc or as a process on the host system.
+ By running the example application as a host-based IOC, you will be
+ able to quickly implement a complete EPICS system and be able to run channel
+ access clients on the host system.
+
+<P>
+ A perl script,
+ makeBaseExt.pl, is included in the distribution file. This script will
+ create a sample extension that can be built and executed. The
+ makeBaseApp.pl and makeBaseExt.pl scripts are installed into the
+ install location bin/&lt;hostarch&gt; directory during the base build.
+</BLOCKQUOTE>
+
+<H3><A NAME="0_0_14"> Multiple host platforms</A></H3>
+<BLOCKQUOTE>You can build using a single EPICS directory structure on
+ multiple host systems and for multiple cross target systems. The
+ intermediate and binary files generated by the build will be created in
+ separate subdirectories and installed into the appropriate separate
+ host/target install directories. EPICS executables and perl scripts are
+ installed into the <TT>$(INSTALL_LOCATION)/bin/&lt;arch&gt;</TT> directories.
+ Libraries are installed into $<TT>(INSTALL_LOCATION)/lib/&lt;arch&gt;</TT>.
+ The default definition for <TT>$(INSTALL_LOCATION)</TT> is <TT>$(TOP)</TT>
+ which is the root directory in the distribution directory structure,
+ base. Created object files are stored in O.&lt;arch&gt; source
+ subdirectories, This allows objects for multiple cross target
+ architectures to be maintained at the same time. To build EPICS base
+ for a specific host/target combination you must have the proper
+ host/target C/C++ cross compiler and target header files and the
+ base/configure/os directory must have the appropriate configure files.
+</BLOCKQUOTE>
+</BODY>
+</HTML>

documentation/README.md

@@ -1,373 +0,0 @@
-# Installation Instructions
-
-## EPICS Base Release 3.15.7
-
------
-
-### Table of Contents
-
-  - [What is EPICS base?](#0_0_1)
-  - [What is new in this release?](#0_0_2)
-  - [Copyright](#0_0_3)
-  - [Supported platforms](#0_0_4)
-  - [Supported compilers](#0_0_5)
-  - [Software requirements](#0_0_6)
-  - [Host system storage requirements](#0_0_7)
-  - [Documentation](#0_0_8)
-  - [Directory Structure](#0_0_10)
-  - [Build related components](#0_0_11)
-  - [Building EPICS base (Unix and Win32)](#0_0_12)
-  - [Example application and extension](#0_0_13)
-  - [Multiple host platforms](#0_0_14)
-
------
-
-### <span id="0_0_1">What is EPICS base?</span>
-
-The Experimental Physics and Industrial Control Systems (EPICS) is an
-extensible set of software components and tools with which application
-developers can create a control system. This control system can be
-used to control accelerators, detectors, telescopes, or other
-scientific experimental equipment. EPICS base is the set of core
-software, i.e. the components of EPICS without which EPICS would not
-function. EPICS base allows an arbitrary number of target systems,
-IOCs (input/output controllers), and host systems, OPIs (operator
-interfaces) of various types.
-
-### <span id="0_0_2">What is new in this release?</span>
-
-Please check the `RELEASE_NOTES` file in the distribution for
-description of changes and release migration details.
-
-### <span id="0_0_3">Copyright</span>
-
-Please review the LICENSE file included in the distribution for legal
-terms of usage.
-
-### <span id="0_0_4">Supported platforms</span>
-
-The list of platforms supported by this version of EPICS base is given
-in the `configure/CONFIG_SITE` file. If you are trying to build EPICS
-Base on an unlisted host or for a different target machine you must
-have the proper host/target cross compiler and header files, and you
-will have to create and add the appropriate new configure files to the
-base/configure/os/directory. You can start by copying existing
-configuration files in the configure/os directory and then make
-changes for your new platforms.
-
-### <span id="0_0_5">Supported compilers</span>
-
-This version of EPICS base has been built and tested using the host
-vendor's C and C++ compilers, as well as the GNU gcc and g++
-compilers. The GNU cross-compilers work for all cross-compiled
-targets. You may need the C and C++ compilers to be in your search
-path to do EPICS builds; check the definitions of CC and CCC in
-base/configure/os/CONFIG.&lt;host>.&lt;host> if you have problems.
-
-### <span id="0_0_6">Software requirements</span>
-
-**GNU make**
-You must use GNU make, gnumake, for any EPICS builds. Set your path so
-that a gnumake version 3.81 or later is available.
-
-**Perl**
-You must have Perl version 5.8.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.
-
-**Unzip and tar (Winzip on WIN32 systems)**
-You must have tools available to unzip and untar the EPICS base
-distribution file.
-
-**Target systems**
-EPICS supports IOCs running on embedded platforms such as VxWorks and
-RTEMS built using a cross-compiler, and also supports soft IOCs
-running as processes on the host platform.
-
-**vxWorks**
-You must have vxWorks 5.5.x or 6.x installed if any of your target
-systems are vxWorks systems; the C++ compiler for vxWorks 5.4 is now
-too old to support. The vxWorks installation provides the
-cross-compiler and header files needed to build for these targets. The
-absolute path to and the version number of the vxWorks installation
-must be set in the `base/configure/os/CONFIG_SITE.Common.vxWorksCommon`
-file or in one of its target-specific overrides.
-
-Consult the [vxWorks 5.x](https://epics.anl.gov/base/tornado.php) or
-[vxWorks 6.x](https://epics.anl.gov/base/vxWorks6.php) EPICS web pages
-about and the vxWorks documentation for information about configuring
-your vxWorks operating system for use with EPICS.
-
-**RTEMS**
-For RTEMS targets, you need RTEMS core and toolset version 4.9.2 or
-later.
-
-**GNU readline or Tecla library**
-GNU readline and Tecla libraries can be used by the IOC shell to
-provide command line editing and command line history recall and edit.
-GNU readline (or Tecla library) must be installed on your target
-system when `COMMANDLINE_LIBRARY` is set to READLINE (or TECLA) for
-that target. EPICS (EPICS shell) is the default specified in
-`CONFIG_COMMON`. A READLINE override is defined for linux-x86 in the
-EPICS distribution. Comment out `COMMANDLINE_LIBRARY=READLINE` in
-`configure/os/CONFIG_SITE.Common.linux-x86` if readline is not
-installed on linux-x86. Command-line editing and history will then be
-those supplied by the os. On vxWorks the ledLib command-line input
-library is used instead.
-
-### <span id="0_0_7">Host system storage requirements</span>
-
-The compressed tar file is approximately 1.6 MB in size. The
-distribution source tree takes up approximately 12 MB. Each host
-target will need around 40 MB for build files, and each cross-compiled
-target around 20 MB.
-
-### <span id="0_0_8">Documentation</span>
-
-EPICS documentation is available through the [EPICS
-website](https://epics.anl.gov/) at Argonne.
-
-Release specific documentation can also be found in the
-base/documentation directory of the distribution.
-
-### <span id="0_0_10">Directory Structure</span>
-
-#### Distribution directory structure:
-
-```
-        base                    Root directory of the base distribution
-        base/configure          Operating system independent build config files
-        base/configure/os       Operating system dependent build config files
-        base/documentation      Distribution documentation
-        base/src                Source code in various subdirectories
-        base/startup            Scripts for setting up path and environment
-```
-
-#### Install directories created by the build:
-
-```
-        bin                     Installed scripts and executables in subdirs
-        cfg                     Installed build configuration files
-        db                      Installed data bases
-        dbd                     Installed data base definitions
-        doc                     Installed documentation files
-        html                    Installed html documentation
-        include                 Installed header files
-        include/os              Installed os specific header files in subdirs
-        include/compiler        Installed compiler-specific header files
-        lib                     Installed libraries in arch subdirectories
-        lib/perl                Installed perl modules
-        templates               Installed templates
-```
-
-### <span id="0_0_11">Build related components</span>
-
-#### base/documentation directory - contains setup, build, and install documents
-
-```
-        README.md            Instructions for setup and building epics base
-        README.darwin.html   Installation notes for Mac OS X (Darwin)
-        RELEASE_NOTES.html   Notes on release changes
-        KnownProblems.html   List of known problems and workarounds
-```
-
-#### base/startup directory - contains scripts to set environment and path
-
-```
-        EpicsHostArch       Shell script to set EPICS_HOST_ARCH env variable
-        unix.csh            C shell script to set path and env variables
-        unix.sh             Bourne shell script to set path and env variables
-        win32.bat           Bat file example to configure win32-x86 target
-        windows.bat         Bat file example to configure windows-x64 target
-```
-
-#### base/configure directory - contains build definitions and rules
-
-```
-        CONFIG                Includes configure files and allows variable overrides
-        CONFIG.CrossCommon    Cross build definitions
-        CONFIG.gnuCommon      Gnu compiler build definitions for all archs
-        CONFIG_ADDONS         Definitions for &lt;osclass> and DEFAULT options
-        CONFIG_APP_INCLUDE
-        CONFIG_BASE           EPICS base tool and location definitions
-        CONFIG_BASE_VERSION   Definitions for EPICS base version number
-        CONFIG_COMMON         Definitions common to all builds
-        CONFIG_ENV            Definitions of EPICS environment variables
-        CONFIG_FILE_TYPE
-        CONFIG_SITE           Site specific make definitions
-        CONFIG_SITE_ENV       Site defaults for EPICS environment variables
-        MAKEFILE              Installs CONFIG* RULES* creates
-        RELEASE               Location of external products
-        RULES                 Includes appropriate rules file
-        RULES.Db              Rules for database and database definition files
-        RULES.ioc             Rules for application iocBoot/ioc* directory
-        RULES_ARCHS           Definitions and rules for building architectures
-        RULES_BUILD           Build and install rules and definitions
-        RULES_DIRS            Definitions and rules for building subdirectories
-        RULES_EXPAND
-        RULES_FILE_TYPE
-        RULES_TARGET
-        RULES_TOP             Rules specific to a &lt;top> dir (uninstall and tar)
-        Sample.Makefile       Sample makefile with comments
-```
-
-#### base/configure/os directory - contains os-arch specific definitions
-
-```
-        CONFIG.&lt;host>.&lt;target>      Specific host-target build definitions
-        CONFIG.Common.&lt;target>      Specific target definitions for all hosts
-        CONFIG.&lt;host>.Common        Specific host definitions for all targets
-        CONFIG.UnixCommon.Common    Definitions for Unix hosts and all targets
-        CONFIG.Common.UnixCommon    Definitions for Unix targets and all hosts
-        CONFIG.Common.vxWorksCommon Specific host definitions for all vx targets
-        CONFIG_SITE.&lt;host>.&lt;target> Site specific host-target definitions
-        CONFIG_SITE.Common.&lt;target> Site specific target defs for all hosts
-        CONFIG_SITE.&lt;host>.Common   Site specific host defs for all targets
-```
-
-### <span id="0_0_12">Building EPICS base (Unix and Win32)</span>
-
-#### Unpack file
-
-Unzip and untar the distribution file. Use WinZip on Windows
-systems.
-
-#### Set environment variables
-
-Files in the base/startup directory have been provided to help set
-required path and other environment variables.
-
-* `EPICS_HOST_ARCH`
-Before you can build or use EPICS R3.15, the environment variable
-`EPICS_HOST_ARCH` must be defined. A perl script EpicsHostArch.pl in
-the base/startup directory has been provided to help set
-`EPICS_HOST_ARCH.` You should have `EPICS_HOST_ARCH` set to your
-host operating system followed by a dash and then your host
-architecture, e.g. solaris-sparc. If you are not using the OS
-vendor's c/c++ compiler for host builds, you will need another dash
-followed by the alternate compiler name (e.g. "-gnu" for GNU c/c++
-compilers on a solaris host or "-mingw" for MinGW c/c++ compilers on
-a WIN32 host). See `configure/CONFIG_SITE` for a list of supported
-`EPICS_HOST_ARCH` values.
-
-* `PERLLIB`
-On WIN32, some versions of Perl require that the environment
-variable PERLLIB be set to &lt;perl directory location>.
-
-* `PATH`
-As already mentioned, you must have the perl executable and you may
-need C and C++ compilers in your search path. For building base you
-also must have echo in your search path. For Unix host builds you
-also need ln, cpp, cp, rm, mv, and mkdir in your search path and
-/bin/chmod must exist. On some Unix systems you may also need ar and
-ranlib in your path, and the C compiler may require as and ld in
-your path. On solaris systems you need uname in your path.
-
-* `LD_LIBRARY_PATH`
-R3.15 shared libraries and executables normally contain the full
-path to any libraries they require. However, if you move the EPICS
-files or directories from their build-time location then in order
-for the shared libraries to be found at runtime `LD_LIBRARY_PATH`
-must include the full pathname to
-`$(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH)` when invoking
-executables, or some equivalent OS-specific mechanism (such as
-/etc/ld.so.conf on Linux) must be used. Shared libraries are now
-built by default on all Unix type hosts.
-
-#### Do site-specific build configuration
-
-**Site configuration**
-To configure EPICS, you may want to modify the default definitions
-in the following files:
-
-```
-        configure/CONFIG_SITE      Build choices. Specify target archs.
-        configure/CONFIG_SITE_ENV  Environment variable defaults
-        configure/RELEASE          TORNADO2 full path location
-```
-
-**Host configuration**
-To configure each host system, you may override the default
-definitions by adding a new file in the configure/os directory with
-override definitions. The new file should have the same name as the
-distribution file to be overridden except with CONFIG in the name
-changed to `CONFIG_SITE`.
-
-```
-        configure/os/CONFIG.&lt;host>.&lt;host>      Host build settings
-        configure/os/CONFIG.&lt;host>.Common      Host common build settings
-```
-
-**Target configuration**
-To configure each target system, you may override the default
-definitions by adding a new file in the configure/os directory with
-override definitions. The new file should have the same name as the
-distribution file to be overridden except with CONFIG in the name
-replaced by `CONFIG_SITE`. This step is necessary even if the host
-system is the only target system.
-
-```
-        configure/os/CONFIG.Common.&lt;target>     Target common settings
-        configure/os/CONFIG.&lt;host>.&lt;target>     Host-target settings
-```
-
-#### Build EPICS base
-
-After configuring the build you should be able to build EPICS base
-by issuing the following commands in the distribution's root
-directory (base):
-
-```
-        gnumake clean uninstall
-        gnumake
-```
-
-The command "gnumake clean uninstall" will remove all files and
-directories generated by a previous build. The command "gnumake"
-will build and install everything for the configured host and
-targets.
-
-It is recommended that you do a "gnumake clean uninstall" at the
-root directory of an EPICS directory structure before each complete
-rebuild to ensure that all components will be rebuilt.
-
-### <span id="0_0_13">Example application and extension</span>
-
-A perl tool, makeBaseApp.pl is included in the distribution file. This
-script will create a sample application that can be built and then
-executed to try out this release of base.
-
-Instructions for building and executing the 3.15 example application
-can be found in the section "Example Application" of Chapter 2,
-"Getting Started", in the "IOC Application Developer's Guide" for this
-release. The "Example IOC Application" section briefly explains how to
-create and build an example application in a user created &lt;top>
-directory. It also explains how to run the example application on a
-vxWorks ioc or as a process on the host system. By running the example
-application as a host-based IOC, you will be able to quickly implement
-a complete EPICS system and be able to run channel access clients on
-the host system.
-
-A perl script, makeBaseExt.pl, is included in the distribution file.
-This script will create a sample extension that can be built and
-executed. The makeBaseApp.pl and makeBaseExt.pl scripts are installed
-into the install location bin/&lt;hostarch> directory during the base
-build.
-
-### <span id="0_0_14">Multiple host platforms</span>
-
-You can build using a single EPICS directory structure on multiple
-host systems and for multiple cross target systems. The intermediate
-and binary files generated by the build will be created in separate
-subdirectories and installed into the appropriate separate host/target
-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 `$(INSTALL_LOCATION)` is `$(TOP)` which is the root
-directory in the distribution directory structure, base. Created
-object files are stored in O.&lt;arch> source subdirectories, This
-allows objects for multiple cross target architectures to be
-maintained at the same time. To build EPICS base for a specific
-host/target combination you must have the proper host/target C/C++
-cross compiler and target header files and the base/configure/os
-directory must have the appropriate configure files.

documentation/ReleaseChecklist.html

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

src/Makefile

@@ -4,7 +4,7 @@
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
-# in the file LICENSE that is included with this distribution. 
+# in the file LICENSE that is included with this distribution.
 #*************************************************************************
 
 TOP = ..
@@ -72,9 +72,11 @@ std_DEPEND_DIRS = ioc libCom/RTEMS
 DIRS += std/filters/test
 std/filters/test_DEPEND_DIRS = std
 
+DIRS += std/link/test
+std/link/test_DEPEND_DIRS = std
+
 DIRS += std/rec/test
 std/rec/test_DEPEND_DIRS = std
 
 
 include $(TOP)/configure/RULES_DIRS
-

src/ca/client/CAref.html

@@ -314,11 +314,21 @@ is used.</p>
       <td>i &gt;= 16384</td>
       <td>16384</td>
     </tr>
+    <tr>
+      <td>EPICS_CA_AUTO_ARRAY_BYTES</td>
+      <td>{YES, NO}</td>
+      <td>YES</td>
+    </tr>
     <tr>
       <td>EPICS_CA_MAX_SEARCH_PERIOD</td>
       <td>r &gt; 60 seconds</td>
       <td>300</td>
     </tr>
+    <tr>
+      <td>EPICS_CA_MCAST_TTL</td>
+      <td>r &gt; 1</td>
+      <td>1</td>
+    </tr>
     <tr>
       <td>EPICS_TS_MIN_WEST</td>
       <td>-720 &lt; i &lt;720 minutes</td>
@@ -746,6 +756,12 @@ in the variable EPICS_TS_MIN_WEST.</p>
 
 <h3><a name="Configurin1">Configuring the Maximum Array Size</a></h3>
 
+<p>From version R3.16.1, the default setting of EPICS_CA_AUTO_ARRAY_BYTES=YES
+will cause the software to ignore EPICS_CA_MAX_ARRAY_BYTES and attempt to
+allocate network buffer space as needed by the particular client connection
+using malloc. Setting EPICS_CA_AUTO_ARRAY_BYTES=NO will configure the software
+to respect the EPICS_CA_MAX_ARRAY_BYTES setting as described below instead.</p>
+
 <p>Starting with version R3.14 the environment variable
 EPICS_CA_MAX_ARRAY_BYTES determines the size of the largest array that may pass
 through CA. Prior to this version only arrays smaller than 16k bytes could be
@@ -768,11 +784,7 @@ array larger than EPICS_CA_MAX_ARRAY_BYTES it will return ECA_TOLARGE.</p>
 by multiplying the number of elements by the size of a single element, but
 neglect to add additional bytes for the compound data types (for example
 DBR_GR_DOUBLE) commonly used by the more sophisticated client side
-applications. <em>Based on this confusion, one could arrive at the conclusion
-that EPICS_CA_MAX_ARRAY_BYTES might have been better named
-EPICS_CA_MAX_DATUM_BYTES, or that the software should be changed internally to
-round the users request up by the size of the maximum scalar datum (nothing has
-been done to address this issue so far).</em></p>
+applications.</p>
 
 <h3><a name="Configurin2">Configuring a CA Server</a></h3>
 
@@ -3137,8 +3149,7 @@ indicating the current state of the channel.</p>
 <dl>
   <dt><code>COUNT</code></dt>
     <dd>The element count to be read from the specified channel. A count of
-      zero means use the current element count from the server, effectively
-      resulting in a variable size array subscription.</dd>
+      zero means use the current element count from the server.</dd>
 </dl>
 <dl>
   <dt><code>CHID</code></dt>

src/ca/client/Makefile

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

src/ca/client/autoPtrDestroy.h

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

src/ca/client/caProto.h

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

src/ca/client/caRepeater.cpp

@@ -32,12 +32,10 @@
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
 #include "epicsAssert.h"
-#include "osiUnistd.h"
 #include "udpiiu.h"
 
 int main()
 {
-    chdir ( "/" );
     ca_repeater ();
     return ( 0 );
 }

src/ca/client/ca_client_context.cpp

@@ -45,12 +45,20 @@ static epicsThreadOnceId cacOnce = EPICS_THREAD_ONCE_INIT;
 
 const unsigned ca_client_context :: flushBlockThreshold = 0x58000;
 
+extern "C" void cacExitHandler ( void *)
+{
+    epicsThreadPrivateDelete ( caClientCallbackThreadId );
+    caClientCallbackThreadId = 0;
+    delete ca_client_context::pDefaultServiceInstallMutex;
+}
+
 // runs once only for each process
 extern "C" void cacOnceFunc ( void * )
 {
     caClientCallbackThreadId = epicsThreadPrivateCreate ();
     assert ( caClientCallbackThreadId );
     ca_client_context::pDefaultServiceInstallMutex = newEpicsMutex;
+    epicsAtExit ( cacExitHandler,0 );
 }
 
 extern epicsThreadPrivateId caClientContextId;
@@ -151,7 +159,7 @@ ca_client_context::ca_client_context ( bool enablePreemptiveCallback ) :
         this->localPort = htons ( tmpAddr.ia.sin_port );
     }
 
-    epics_auto_ptr < CallbackGuard > pCBGuard;
+    std::auto_ptr < CallbackGuard > pCBGuard;
     if ( ! enablePreemptiveCallback ) {
         pCBGuard.reset ( new CallbackGuard ( this->cbMutex ) );
     }

src/ca/client/cac.cpp

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

src/ca/client/cac.h

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

src/ca/client/nciu.h

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

src/ca/client/oldAccess.h

@@ -26,13 +26,14 @@
 #ifndef oldAccessh
 #define oldAccessh
 
+#include <memory>
+
 #ifdef epicsExportSharedSymbols
 #   define oldAccessh_restore_epicsExportSharedSymbols
 #   undef epicsExportSharedSymbols
 #endif
 
 #include "tsFreeList.h"
-#include "epicsMemory.h"
 #include "compilerDependencies.h"
 #include "osiSock.h"
 
@@ -288,6 +289,7 @@ private:
 };
 
 extern "C" void cacOnceFunc ( void * );
+extern "C" void cacExitHandler ( void *);
 
 struct ca_client_context : public cacContextNotify
 {
@@ -401,8 +403,8 @@ private:
     epicsEvent ioDone;
     epicsEvent callbackThreadActivityComplete;
     epicsThreadId createdByThread;
-    epics_auto_ptr < CallbackGuard > pCallbackGuard;
-    epics_auto_ptr < cacContext > pServiceContext;
+    std::auto_ptr < CallbackGuard > pCallbackGuard;
+    std::auto_ptr < cacContext > pServiceContext;
     caExceptionHandler * ca_exception_func;
     void * ca_exception_arg;
     caPrintfFunc * pVPrintfFunc;
@@ -427,6 +429,7 @@ private:
     ca_client_context & operator = ( const ca_client_context & );
 
     friend void cacOnceFunc ( void * );
+    friend void cacExitHandler ( void *);
     static cacService * pDefaultService;
     static epicsMutex * pDefaultServiceInstallMutex;
     static const unsigned flushBlockThreshold;

src/ca/client/perl/Makefile

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

src/ca/client/repeaterSubscribeTimer.cpp

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

src/ca/client/repeaterSubscribeTimer.h

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

src/ca/client/searchTimer.cpp

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

src/ca/client/tcpiiu.cpp

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

src/ca/client/templateInstances.cpp

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

src/ca/client/udpiiu.cpp

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

src/ca/client/udpiiu.h

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

src/ca/client/virtualCircuit.h

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

src/ca/legacy/gdd/Makefile

@@ -68,6 +68,7 @@ CLEANS += $(COMMON_DIR)/aitConvertGenerated.cc
 
 USR_CXXFLAGS_Linux = -fno-strict-aliasing
 USR_CXXFLAGS_RTEMS = -fno-strict-aliasing
+USR_CXXFLAGS_vxWorks = -fno-strict-aliasing
 
 ifeq ($(T_A),$(EPICS_HOST_ARCH))
   # genApps and aitGen are needed to finish libgdd

src/ca/legacy/pcas/build/Makefile

@@ -53,7 +53,6 @@ LIBSRCS += outBuf.cc
 LIBSRCS += casCtx.cc 
 LIBSRCS += casEventMask.cc
 LIBSRCS += ioBlocked.cc
-LIBSRCS += casBufferFactory.cc
 LIBSRCS += pvExistReturn.cc
 LIBSRCS += pvAttachReturn.cc
 LIBSRCS += caNetAddr.cc
@@ -73,14 +72,16 @@ LIBSRCS += casDGIntfIO.cc
 LIBSRCS += casStreamIO.cc
 LIBSRCS += ipIgnoreEntry.cc
 
+USR_CXXFLAGS_Linux = -fno-strict-aliasing
+USR_CXXFLAGS_RTEMS = -fno-strict-aliasing
+USR_CXXFLAGS_vxWorks = -fno-strict-aliasing
+
 # There is a bug in some vxWorks compilers that these work around:
 ifeq ($(VXWORKS_VERSION)$(filter -mcpu=604,$(ARCH_DEP_CFLAGS)), 6.6-mcpu=604)
   casDGIntfOS_CXXFLAGS = -fno-inline
   casStreamOS_CXXFLAGS = -fno-inline
 endif
 
-LIBSRCS_vxWorks += templateInstances.cpp
-
 LIBRARY = cas
 cas_LIBS = ca gdd Com
 cas_SYS_LIBS_WIN32 = ws2_32

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/ioc/as/Makefile

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

src/ioc/as/asDbLib.h

@@ -16,7 +16,7 @@
 #include "shareLib.h"
 
 typedef struct {
-    epicsCallback	callback;
+    CALLBACK	callback;
     long	status;
 } ASDBCALLBACK;
 

src/ioc/db/Makefile

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

src/ioc/db/callback.c

@@ -24,7 +24,6 @@
 #include "dbDefs.h"
 #include "epicsAtomic.h"
 #include "epicsEvent.h"
-#include "epicsExit.h"
 #include "epicsInterrupt.h"
 #include "epicsRingPointer.h"
 #include "epicsString.h"
@@ -55,6 +54,7 @@ typedef struct cbQueueSet {
     epicsEventId semWakeUp;
     epicsRingPointerId queue;
     int queueOverflow;
+    int queueOverflows;
     int shutdown;
     int threadsConfigured;
     int threadsRunning;
@@ -97,17 +97,62 @@ static int priorityValue[NUM_CALLBACK_PRIORITIES] = {0, 1, 2};
 int callbackSetQueueSize(int size)
 {
     if (callbackIsInit) {
-        errlogPrintf("Callback system already initialized\n");
+        fprintf(stderr, "Callback system already initialized\n");
         return -1;
     }
     callbackQueueSize = size;
     return 0;
 }
 
+int callbackQueueStatus(const int reset, callbackQueueStats *result)
+{
+    int ret;
+    if (!callbackIsInit) return -1;
+    if (result) {
+        int prio;
+        result->size = callbackQueueSize;
+        for(prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+            epicsRingPointerId qId = callbackQueue[prio].queue;
+            result->numUsed[prio] = epicsRingPointerGetUsed(qId);
+            result->maxUsed[prio] = epicsRingPointerGetHighWaterMark(qId);
+            result->numOverflow[prio] = epicsAtomicGetIntT(&callbackQueue[prio].queueOverflows);
+        }
+        ret = 0;
+    } else {
+        ret = -2;
+    }
+    if (reset) {
+        int prio;
+        for(prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+            epicsRingPointerResetHighWaterMark(callbackQueue[prio].queue);
+        }
+    }
+    return ret;
+}
+
+void callbackQueueShow(const int reset)
+{
+    callbackQueueStats stats;
+    if (callbackQueueStatus(reset, &stats) == -1) {
+        fprintf(stderr, "Callback system not initialized, yet. Please run "
+            "iocInit before using this command.\n");
+    } else {
+        int prio;
+        printf("PRIORITY  HIGH-WATER MARK  ITEMS IN Q  Q SIZE  %% USED  Q OVERFLOWS\n");
+        for (prio = 0; prio < NUM_CALLBACK_PRIORITIES; prio++) {
+            double qusage = 100.0 * stats.numUsed[prio] / stats.size;
+            printf("%8s  %15d  %10d  %6d  %6.1f  %11d\n",
+                   threadNamePrefix[prio], stats.maxUsed[prio],
+                   stats.numUsed[prio], stats.size, qusage,
+                   stats.numOverflow[prio]);
+        }
+    }
+}
+
 int callbackParallelThreads(int count, const char *prio)
 {
     if (callbackIsInit) {
-        errlogPrintf("Callback system already initialized\n");
+        fprintf(stderr, "Callback system already initialized\n");
         return -1;
     }
 
@@ -117,7 +162,7 @@ int callbackParallelThreads(int count, const char *prio)
         count = callbackParallelThreadsDefault;
     if (count < 1) count = 1;
 
-    if (!prio || strcmp(prio, "") == 0 || strcmp(prio, "*") == 0) {
+    if (!prio || *prio == 0 || strcmp(prio, "*") == 0) {
         int i;
 
         for (i = 0; i < NUM_CALLBACK_PRIORITIES; i++) {
@@ -126,30 +171,30 @@ int callbackParallelThreads(int count, const char *prio)
     }
     else {
         dbMenu *pdbMenu;
+        int i;
 
         if (!pdbbase) {
-            errlogPrintf("callbackParallelThreads: pdbbase not set\n");
+            fprintf(stderr, "callbackParallelThreads: pdbbase not set\n");
             return -1;
         }
+
         /* Find prio in menuPriority */
         pdbMenu = dbFindMenu(pdbbase, "menuPriority");
-        if (pdbMenu) {
-            int i, gotMatch = 0;
-
-            for (i = 0; i < pdbMenu->nChoice; i++) {
-                gotMatch = (epicsStrCaseCmp(prio, pdbMenu->papChoiceValue[i])==0) ? TRUE : FALSE;
-                if (gotMatch)
-                    break;
-            }
-            if (gotMatch) {
-                callbackQueue[i].threadsConfigured = count;
-                return 0;
-            }
-            else {
-                errlogPrintf("Unknown priority \"%s\"\n", prio);
-                return -1;
-            }
+        if (!pdbMenu) {
+            fprintf(stderr, "callbackParallelThreads: No Priority menu\n");
+            return -1;
         }
+
+        for (i = 0; i < pdbMenu->nChoice; i++) {
+            if (epicsStrCaseCmp(prio, pdbMenu->papChoiceValue[i]) == 0)
+                goto found;
+        }
+        fprintf(stderr, "callbackParallelThreads: "
+            "Unknown priority \"%s\"\n", prio);
+        return -1;
+
+found:
+        callbackQueue[i].threadsConfigured = count;
     }
     return 0;
 }
@@ -168,7 +213,7 @@ static void callbackTask(void *arg)
             epicsEventMustWait(mySet->semWakeUp);
 
         while ((ptr = epicsRingPointerPop(mySet->queue))) {
-            epicsCallback *pcallback = (epicsCallback *)ptr;
+            CALLBACK *pcallback = (CALLBACK *)ptr;
             if(!epicsRingPointerIsEmpty(mySet->queue))
                 epicsEventMustTrigger(mySet->semWakeUp);
             mySet->queueOverflow = FALSE;
@@ -268,7 +313,7 @@ void callbackInit(void)
 }
 
 /* This routine can be called from interrupt context */
-int callbackRequest(epicsCallback *pcallback)
+int callbackRequest(CALLBACK *pcallback)
 {
     int priority;
     int pushOK;
@@ -291,13 +336,14 @@ int callbackRequest(epicsCallback *pcallback)
     if (!pushOK) {
         epicsInterruptContextMessage(fullMessage[priority]);
         mySet->queueOverflow = TRUE;
+        epicsAtomicIncrIntT(&mySet->queueOverflows);
         return S_db_bufFull;
     }
     epicsEventSignal(mySet->semWakeUp);
     return 0;
 }
 
-static void ProcessCallback(epicsCallback *pcallback)
+static void ProcessCallback(CALLBACK *pcallback)
 {
     dbCommon *pRec;
 
@@ -308,14 +354,14 @@ static void ProcessCallback(epicsCallback *pcallback)
     dbScanUnlock(pRec);
 }
 
-void callbackSetProcess(epicsCallback *pcallback, int Priority, void *pRec)
+void callbackSetProcess(CALLBACK *pcallback, int Priority, void *pRec)
 {
     callbackSetCallback(ProcessCallback, pcallback);
     callbackSetPriority(Priority, pcallback);
     callbackSetUser(pRec, pcallback);
 }
 
-int  callbackRequestProcessCallback(epicsCallback *pcallback,
+int  callbackRequestProcessCallback(CALLBACK *pcallback,
     int Priority, void *pRec)
 {
     callbackSetProcess(pcallback, Priority, pRec);
@@ -324,11 +370,11 @@ int  callbackRequestProcessCallback(epicsCallback *pcallback,
 
 static void notify(void *pPrivate)
 {
-    epicsCallback *pcallback = (epicsCallback *)pPrivate;
+    CALLBACK *pcallback = (CALLBACK *)pPrivate;
     callbackRequest(pcallback);
 }
 
-void callbackRequestDelayed(epicsCallback *pcallback, double seconds)
+void callbackRequestDelayed(CALLBACK *pcallback, double seconds)
 {
     epicsTimerId timer = (epicsTimerId)pcallback->timer;
 
@@ -339,7 +385,7 @@ void callbackRequestDelayed(epicsCallback *pcallback, double seconds)
     epicsTimerStartDelay(timer, seconds);
 }
 
-void callbackCancelDelayed(epicsCallback *pcallback)
+void callbackCancelDelayed(CALLBACK *pcallback)
 {
     epicsTimerId timer = (epicsTimerId)pcallback->timer;
 
@@ -348,7 +394,7 @@ void callbackCancelDelayed(epicsCallback *pcallback)
     }
 }
 
-void callbackRequestProcessCallbackDelayed(epicsCallback *pcallback,
+void callbackRequestProcessCallbackDelayed(CALLBACK *pcallback,
     int Priority, void *pRec, double seconds)
 {
     callbackSetProcess(pcallback, Priority, pRec);