Set version snapshot to -rc1

Unify .gitignore files
Use 'make test-results' in travis-build scripts

.appveyor.yml

@@ -0,0 +1,86 @@
+# AppVeyor configuration for EPICS Base
+
+# Ralph Lange <ralph.lange@gmx.de>
+# Copyright (c) 2016-2017 ITER Organization
+
+# Version format
+version: base-{branch}-{build}
+
+#---------------------------------#
+#       repository cloning        #
+#---------------------------------#
+
+# Called at very beginning, before repo cloning
+init:
+  # Set autocrlf to make batch files work
+  - git config --global core.autocrlf true
+
+# Set clone depth (do not fetch complete history)
+clone_depth: 2
+
+# Skipping commits affecting only specific files
+skip_commits:
+  files:
+    - 'documentation/*'
+    - 'templates/*'
+    - '**/*.html'
+    - '**/*.md'
+
+#---------------------------------#
+#   build matrix configuration    #
+#---------------------------------#
+
+# Build Configurations: dll/static, regular/debug
+configuration:
+  - dynamic
+  - static
+  - dynamic-debug
+  - static-debug
+
+# Environment variables: compiler toolchain
+environment:
+  matrix:
+  - TOOLCHAIN: 9.0
+  - TOOLCHAIN: 10.0
+  - TOOLCHAIN: 11.0
+  - TOOLCHAIN: 12.0
+  - TOOLCHAIN: 14.0
+  - TOOLCHAIN: cygwin
+  - TOOLCHAIN: mingw
+
+# Platform: architecture
+platform:
+  - x86
+  - x64
+
+# Matrix configuration: allow specific failing jobs
+matrix:
+  exclude:
+  # VS Express installs don't have the 64 bit compiler
+  - platform: x64
+    TOOLCHAIN: 9.0
+  - platform: x64
+    TOOLCHAIN: 10.0
+
+#---------------------------------#
+#     building & testing          #
+#---------------------------------#
+
+install:
+  - cmd: .ci/appveyor-prepare.bat
+
+build_script:
+  - cmd: .ci/appveyor-make.bat
+
+test_script:
+  - cmd: .ci/appveyor-make.bat runtests
+
+#---------------------------------#
+#         notifications           #
+#---------------------------------#
+
+notifications:
+
+  - provider: Slack
+    incoming_webhook:
+      secure: RYOm3FIUYeZGjWKaeTVKwq+C3fzK54AKwbmAoECED45mex3lN+8HmrC845a6mg9xPUJ/ND51RopWVaKDD9/UzaM0SO195RQLKqUTIUafiuM=

.bzrignore

@@ -1,9 +0,0 @@
-./bin
-./lib
-./db
-./dbd
-./html
-./include
-./templates
-**/O.*
-./QtC-*

.ci/appveyor-make.bat

@@ -0,0 +1,118 @@
+:: Universal build script for AppVeyor (https://ci.appveyor.com/)
+:: Environment:
+::     TOOLCHAIN      -  toolchain version   [9.0/10.0/11.0/12.0/14.0/cygwin/mingw]
+::     CONFIGURATION  -  determines EPICS build   [dynamic/static]
+::     PLATFORM       -  architecture   [x86/x64]
+::
+:: All command line args are passed to make
+
+Setlocal EnableDelayedExpansion
+
+set "ST="
+if /i "%CONFIGURATION%"=="static" set ST=-static
+
+set OS=64BIT
+if "%PLATFORM%"=="x86" set OS=32BIT
+
+echo [INFO] Platform: %OS%
+
+:: Use parallel make, except for 3.14
+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:\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:\tools\mingw32\include;%INCLUDE%"
+        set "PATH=C:\tools\mingw32\bin;%PATH%"
+        echo [INFO] MinGW Toolchain 32bit
+    )
+    echo [INFO] Compiler Version
+    gcc -v
+    goto Finish
+)
+
+set "VSINSTALL=C:\Program Files (x86)\Microsoft Visual Studio %TOOLCHAIN%"
+set "MAKE=C:\tools\make"
+
+if "%OS%"=="64BIT" (
+    set EPICS_HOST_ARCH=windows-x64%ST%
+    if exist "%VSINSTALL%\VC\vcvarsall.bat" (
+        call "%VSINSTALL%\VC\vcvarsall.bat" amd64
+        where cl
+        if !ERRORLEVEL! NEQ 0 (
+            call "%VSINSTALL%\VC\vcvarsall.bat" x86_amd64
+            where cl
+            if !ERRORLEVEL! NEQ 0 goto MSMissing
+        )
+        goto MSFound
+    )
+    if exist "%VSINSTALL%\VC\bin\amd64\vcvars64.bat" (
+        call "%VSINSTALL%\VC\bin\amd64\vcvars64.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
+) else (
+    set EPICS_HOST_ARCH=win32-x86%ST%
+    if exist "%VSINSTALL%\VC\vcvarsall.bat" (
+        call "%VSINSTALL%\VC\vcvarsall.bat" x86
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )    
+    if exist "%VSINSTALL%\VC\bin\vcvars32.bat" (
+        call "%VSINSTALL%\VC\bin\vcvars32.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
+    if exist "%VSINSTALL%\Common7\Tools\vsvars32.bat" (
+        call "%VSINSTALL%\Common7\Tools\vsvars32.bat"
+        where cl
+        if !ERRORLEVEL! NEQ 0 goto MSMissing
+        goto MSFound
+    )
+)
+
+:MSMissing
+echo [INFO] Installation for MSVC Toolchain %TOOLCHAIN% / %OS% seems to be missing
+exit 1
+
+:MSFound
+echo [INFO] Microsoft Visual Studio Toolchain %TOOLCHAIN%
+echo [INFO] Compiler Version
+cl
+
+:Finish
+echo [INFO] EPICS_HOST_ARCH: %EPICS_HOST_ARCH%
+echo [INFO] Make version
+%MAKE% --version
+echo [INFO] Perl version
+perl --version
+
+%MAKE% %MAKEARGS% %*

.ci/appveyor-prepare.bat

@@ -0,0 +1,70 @@
+:: Build script for AppVeyor (https://ci.appveyor.com/)
+:: Environment:
+::     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 Cygwin / Mingw  (TOOLCHAIN setting) in the in the appropriate flavor
+::     - Download and install Make-4.1 from EPICS download page
+
+Setlocal EnableDelayedExpansion
+
+set OS=64BIT
+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
+        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 MinGW 64bit
+        cinst mingw || cinst mingw
+    ) else (
+        echo [INFO] Installing MinGW 32bit
+        cinst mingw --x86 || cinst mingw --x86
+    )
+)
+
+echo [INFO] Installing Make 4.1
+@powershell -Command "(new-object net.webclient).DownloadFile('https://www.aps.anl.gov/epics/download/tools/make-4.1-win64.zip', 'C:\tools\make-4.1.zip')"
+cd \tools
+"C:\Program Files\7-Zip\7z" e make-4.1.zip

.ci/checkout-modules.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Checkout submodules on their appropriate branches
+#
+
+git submodule foreach '\
+    git checkout `git config -f $toplevel/.gitmodules submodule.$name.branch` && \
+    git pull '

.ci/make-tar.sh

@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# Make tar for git repo w/ one level of sub modules.
+#
+set -e
+
+die() {
+  echo "$1" >&2
+  exit 1
+}
+
+TOPREV="$1"
+FINALTAR="$2"
+PREFIX="$3"
+
+if ! [ "$TOPREV" ]
+then
+   cat <<EOF >&2
+usage: $0 [rev] [outfile.tar.gz] [prefix/]
+
+  "<rev>" may be any git revision spec. (tag, branch, or commit id).
+
+  Output file may be .tar.gz, .tar.bz2, or any extension supported by "tar -a".
+  If output file name is omitted, then "<rev>.tar.gz" is the default.
+  If prefix is omitted, then the default is "<rev>/".
+EOF
+   exit 1
+fi
+
+[ "$FINALTAR" ] || FINALTAR="$TOPREV.tar.gz"
+[ "$PREFIX" ] || PREFIX="$TOPREV/"
+
+case "$PREFIX" in
+*/) ;;
+*)  die "Prefix must end with '/'";;
+esac
+
+# temporary directory w/ automatic cleanup
+TDIR=`mktemp -d`
+trap 'rm -rf "$TDIR"' EXIT INT QUIT TERM
+
+mkdir "$TDIR"/tar
+
+echo "Exporting revision $TOPREV as $FINALTAR with prefix $PREFIX"
+
+# Use git-archive to copy files at the given revision into our temp. dir.
+# Respects 'export-exclude' in .gitattributes files.
+
+git archive --prefix=$PREFIX $TOPREV | tar -C "$TDIR"/tar -x
+
+# use ls-tree instead of submodule-foreach to capture submodule revision associated with supermodule rev.
+#
+# sub-modules appear in tree as eg.:
+#  160000 commit c3a6cfcf0dad4a4eeecf59b474710d06ff3eb68a  modules/ca
+git ls-tree -r $TOPREV | awk '/^[0-9]+ commit / {print $3, $4}' | \
+while read HASH MODDIR
+do
+    echo "Visiting $HASH $MODDIR"
+    git -C $MODDIR archive --prefix=${PREFIX}${MODDIR}/ $HASH | tar -C "$TDIR"/tar -x
+done
+
+# make a list of files copied and filter out undesirables
+
+(cd "$TDIR"/tar && find . -mindepth 1 -not -type d) > "$TDIR"/list.1
+
+# Remove leading ./ from filenames
+sed -i -e 's|^\./||' "$TDIR"/list.1
+
+# Exclude files
+sed \
+  -e '/\/\.\?ci\//d' \
+  -e '/\/jenkins\//d' \
+  -e '/\/\.git/d' \
+  -e '/\/\.project$/d' \
+  -e '/\/\.travis\.yml$/d' \
+  -e '/\/\.appveyor\.yml$/d' \
+  "$TDIR"/list.1 > "$TDIR"/list.2
+
+if ! diff -U 0 "$TDIR"/list.1 "$TDIR"/list.2
+then
+    echo "Excluding the files shown above"
+fi
+
+# Use the filtered list to build the final tar
+#  The -a option chooses compression automatically based on output file name.
+
+tar -C "$TDIR"/tar --files-from="$TDIR"/list.2 -caf "$FINALTAR"
+
+echo "Wrote $FINALTAR"
+
+tar -taf "$FINALTAR" > "$TDIR"/list.3
+
+# make sure we haven't picked up anything extra
+if ! diff -u "$TDIR"/list.2 "$TDIR"/list.3
+then
+    echo "Oops! Tarfile diff against plan shown above"
+fi

.ci/travis-build.sh

@@ -0,0 +1,90 @@
+#!/bin/sh
+set -e -x
+
+die() {
+  echo "$1" >&2
+  exit 1
+}
+
+ticker() {
+  while true
+  do
+    sleep 60
+    date -R
+    [ -r "$1" ] && tail -n10 "$1"
+  done
+}
+
+CACHEKEY=1
+
+EPICS_HOST_ARCH=`sh startup/EpicsHostArch`
+
+[ -e configure/os/CONFIG_SITE.Common.linux-x86 ] || die "Wrong location: $PWD"
+
+case "$CMPLR" in
+clang)
+  echo "Host compiler is clang"
+  cat << EOF >> configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
+GNU         = NO
+CMPLR_CLASS = clang
+CC          = clang
+CCC         = clang++
+EOF
+  ;;
+*) echo "Host compiler is default";;
+esac
+
+if [ "$STATIC" = "YES" ]
+then
+  echo "Build static libraries/executables"
+  cat << EOF >> configure/CONFIG_SITE
+SHARED_LIBRARIES=NO
+STATIC_BUILD=YES
+EOF
+fi
+
+# requires wine and g++-mingw-w64-i686
+if [ "$WINE" = "32" ]
+then
+  echo "Cross mingw32"
+  sed -i -e '/CMPLR_PREFIX/d' configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
+  cat << EOF >> configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
+CMPLR_PREFIX=i686-w64-mingw32-
+EOF
+  cat << EOF >> configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
+EOF
+fi
+
+# set RTEMS to eg. "4.9" or "4.10"
+# requires qemu, bison, flex, texinfo, install-info
+if [ -n "$RTEMS" ]
+then
+  echo "Cross RTEMS${RTEMS} for pc386"
+  install -d /home/travis/.cache
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
+  | tar -C /home/travis/.cache -xj
+
+  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
+EOF
+  cat << EOF >> configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+EOF
+
+  # find local qemu-system-i386
+  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
+  echo -n "Using QEMU: "
+  type qemu-system-i386 || echo "Missing qemu"
+  EXTRA=RTEMS_QEMU_FIXUPS=YES
+fi
+
+make -j2 $EXTRA
+
+if [ "$TEST" != "NO" ]
+then
+   make -j2 tapfiles
+   make -s test-results
+fi

.ci/travis-prepare.sh

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

.gitattributes

@@ -0,0 +1,4 @@
+.ci/          export-ignore
+.appveyor.yml export-ignore
+.travis.yml   export-ignore
+README        export-subst

.gitignore

@@ -0,0 +1,16 @@
+/cfg/
+/bin/
+/lib/
+/db/
+/dbd/
+/html/
+/include/
+/templates/
+/configure/*.local
+/modules/RELEASE.local
+/modules/Makefile.local
+O.*/
+/QtC-*
+*.orig
+*.log
+.*.swp

.gitmodules

@@ -0,0 +1,36 @@
+[submodule "modules/libcom"]
+    path = modules/libcom
+    url = ./
+    branch = libcom/master
+[submodule "modules/database"]
+    path = modules/database
+    url = ./
+    branch = database/master
+[submodule "modules/ca"]
+    path = modules/ca
+    url = ./
+    branch = ca/master
+[submodule "modules/pvData"]
+    path = modules/pvData
+    url = https://github.com/epics-base/pvDataCPP
+    branch = master
+[submodule "modules/pvAccess"]
+    path = modules/pvAccess
+    url = https://github.com/epics-base/pvAccessCPP
+    branch = master
+[submodule "modules/normativeTypes"]
+    path = modules/normativeTypes
+    url = https://github.com/epics-base/normativeTypesCPP
+    branch = master
+[submodule "modules/pvaClient"]
+    path = modules/pvaClient
+    url = https://github.com/epics-base/pvaClientCPP
+    branch = master
+[submodule "modules/pvDatabase"]
+    path = modules/pvDatabase
+    url = https://github.com/epics-base/pvDatabaseCPP
+    branch = master
+[submodule "modules/pva2pva"]
+    path = modules/pva2pva
+    url = https://github.com/epics-base/pva2pva
+    branch = master

.travis.yml

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

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 file LICENSE that is included with this distribution. 
+# in file LICENSE that is included with this distribution.
 #*************************************************************************
 
 TOP = .
@@ -14,8 +14,12 @@ include $(TOP)/configure/CONFIG
 TOOLS = $(TOP)/src/tools
 
 DIRS += configure src
-
 src_DEPEND_DIRS = configure
 
-include $(TOP)/configure/RULES_TOP
+DIRS += test
+test_DEPEND_DIRS = src
 
+DIRS += modules
+modules_DEPEND_DIRS = src
+
+include $(TOP)/configure/RULES_TOP

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.
 
 ---------------------------------------------------------
 
@@ -22,3 +22,6 @@ training materials, additional components, links to other
 websites etc. is available on the EPICS home page at
 	http://www.aps.anl.gov/epics/
 
+$Format:%cD$
+$Format:%H$
+https://code.launchpad.net/epics-base

configure/CONFIG

@@ -73,17 +73,17 @@ ifdef T_A
   #
   -include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).$(T_A)
 
+  #  Site specific target and host-target definitions and overrides
+  #
+  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
+  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
   #  RELEASE file specific definitions
   #
   ifneq ($(CONFIG),$(TOP)/configure)
     -include $(CONFIG)/CONFIG_APP_INCLUDE
   endif
 
-  #  Site specific target and host-target definitions
-  #
-  -include $(CONFIG)/os/CONFIG_SITE.Common.$(T_A)
-  -include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
-
 endif # ifdef T_A
 
 

configure/CONFIG.CrossCommon

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

configure/CONFIG_BASE

@@ -3,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
-# in file LICENSE that is included with this distribution. 
+# 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)
@@ -18,17 +17,6 @@ ifdef T_A
   EPICS_BASE_BIN    = $(EPICS_BASE)/bin/$(T_A)
 endif
 
-#---------------------------------------------------------------
-# Epics base Ioc libraries 
-
-EPICS_BASE_IOC_LIBS += dbRecStd dbCore ca Com 
-
-#---------------------------------------------------------------
-# Epics base Host libraries 
-
-EPICS_BASE_HOST_LIBS += cas gdd
-EPICS_BASE_HOST_LIBS += ca Com
-
 #---------------------------------------------------------------
 # Version number for base shared libraries (and win32 products)
 
@@ -39,17 +27,6 @@ ifdef BASE_TOP
   PROD_VERSION = $(EPICS_VERSION).$(EPICS_REVISION)
 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))
-
 #---------------------------------------------------------------
 # Where to find the installed build tools
 #   Windows does not like commands with relative paths starting ../
@@ -59,59 +36,21 @@ 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
-DBTORECORDTYPEH            = $(PERL) $(TOOLS)/dbdToRecordtypeH.pl
-DBTOMENUH                  = $(PERL) $(TOOLS)/dbdToMenuH.pl
-REGISTERRECORDDEVICEDRIVER = $(PERL) $(TOOLS)/registerRecordDeviceDriver.pl
-CONVERTRELEASE             = $(PERL) $(call FIND_TOOL,convertRelease.pl)
-FULLPATHNAME               = $(PERL) $(TOOLS)/fullPathName.pl
+PODTOHTML        = $(PERL) $(TOOLS)/podToHtml.pl
+CONVERTRELEASE   = $(PERL) $(call FIND_TOOL,convertRelease.pl)
+FULLPATHNAME     = $(PERL) $(TOOLS)/fullPathName.pl
+TAPTOJUNIT       = $(PERL) $(TOOLS)/tap-to-junit-xml.pl
+GENVERSIONHEADER = $(PERL) $(TOOLS)/genVersionHeader.pl $(QUIET_FLAG)
 
-#-------------------------------------------------------
+#---------------------------------------------------------------
 # tools for installing libraries and products
-INSTALL_QUIETLY := $(if $(findstring s,$(MAKEFLAGS)),-q,)
-INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(INSTALL_QUIETLY)
+INSTALL = $(PERL) $(TOOLS)/installEpics.pl $(QUIET_FLAG)
 INSTALL_PRODUCT = $(INSTALL)
 INSTALL_LIBRARY = $(INSTALL)
 
 #---------------------------------------------------------------
-# tools for making header dependancies and variable replacement
-MKMF                       = $(PERL) $(TOOLS)/mkmf.pl
-REPLACEVAR                 = $(PERL) $(TOOLS)/replaceVAR.pl
-
-#---------------------------------------------------------------
-# private versions of lex/yacc from EPICS
-EYACC = $(TOOLS)/antelope$(HOSTEXE)
-ELEX = $(TOOLS)/e_flex$(HOSTEXE) -S$(EPICS_BASE)/include/flex.skel.static
-
-YACC  = $(EYACC)
-LEX   = $(ELEX)
-
-#---------------------------------------------------------------
-# Our use of msi is incompatible with older versions
-
-MSI3_15 = $(EPICS_BASE_HOST_BIN)/msi
-
-#---------------------------------------------------------------
-# External tools and tool flags - must be in path or defined in application
-
-ADL2DL ?= adl2dl
-
-# sch2edif compiler and flags
-SCH2EDIF = sch2edif
-SCH2EDIF_PATH =
-SCH2EDIF_SYSFLAGS = -n -ap -p.+..+$(SCH2EDIF_PATH)+$(CAPFAST_TEMPLATES)/sym+
-SCH2EDIF_FLAGS =
- 
-# e2db and flags
-#    - again there is an assumption where edb.def is installed.
-E2DB ?= e2db
-E2DB_SYSFLAGS = -ate -d $(CAPFAST_TEMPLATES)/edb.def
-E2DB_FLAGS =
-
-DBST ?= dbst
-
-
-
+# tools for making header dependencies and variable replacement
+MKMF       = $(PERL) $(TOOLS)/mkmf.pl
+REPLACEVAR = $(PERL) $(TOOLS)/replaceVAR.pl

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,31 @@
 # 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 = NO
+BASE_7_0  = YES
 
 # EPICS_VERSION must be a number >0 and <256
-EPICS_VERSION = 3
+EPICS_VERSION = 7
 
 # EPICS_REVISION must be a number >=0 and <256
-EPICS_REVISION = 15
+EPICS_REVISION = 0
 
 # EPICS_MODIFICATION must be a number >=0 and <256
-EPICS_MODIFICATION = 5
+EPICS_MODIFICATION = 1
 
 # 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
@@ -83,6 +79,7 @@ IOCS_APPL_TOP               = $(shell $(FULLPATHNAME) $(INSTALL_LOCATION))
 # Make echo output - suppress echoing if make's '-s' flag is set
 NOP = :
 ECHO = @$(if $(findstring s,$(patsubst T_A=%,,$(MAKEFLAGS))),$(NOP),echo)
+QUIET_FLAG := $(if $(findstring s,$(MAKEFLAGS)),-q,)
 
 #-------------------------------------------------------
 ifdef T_A
@@ -332,6 +329,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=""
@@ -45,6 +47,9 @@ EPICS_CAS_SERVER_PORT=
 EPICS_CAS_INTF_ADDR_LIST=""
 EPICS_CAS_IGNORE_ADDR_LIST=""
 
+# Servers to disable
+EPICS_IOC_IGNORE_SERVERS=""
+
 # Log Server:
 # EPICS_IOC_LOG_PORT Log server port number etc.
 EPICS_IOC_LOG_PORT=7004

configure/CONFIG_SITE

@@ -117,11 +117,10 @@ CROSS_COMPILER_TARGET_ARCHS=
 #  configure/os/CONFIG_SITE.<host>.Common files instead.
 CROSS_COMPILER_HOST_ARCHS=
 
-#  The 'make runtests' and 'make tapfiles' build targets normally only run
+#  The 'runtests', 'tapfiles' and 'junitfiles' make targets normally only run
 #  self-tests for the EPICS_HOST_ARCH architecture. If the host can execute
 #  the self-test programs for any other cross-built architectures such as
-#  a -debug architecture, those architectures can be named here.
-#
+#  a -debug architecture, those architectures must be named in this variable:
 CROSS_COMPILER_RUNTEST_ARCHS=
 
 # Build shared libraries (DLLs on Windows).
@@ -175,3 +174,5 @@ GCC_PIPE = NO
 #  run at build-time, e.g. set the LD_LIBRARY_PATH environment variable.
 LINKER_USE_RPATH = YES
 
+# Overrides for the settings above may appear in a CONFIG_SITE.local file
+-include $(CONFIG)/CONFIG_SITE.local

configure/CONFIG_SITE_ENV

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

@@ -1,19 +1,20 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2012 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.
 #*************************************************************************
-# RELEASE: Define location of external EPICS products
 
+#
+# RELEASE: Define the location of external EPICS products
+#
+
+# The version of this file in Base should normally be empty.
+#
 # Define INSTALL_LOCATION in CONFIG_SITE
 
-# VX_DIR definition now in os/CONFIG_SITE.Common.vxWorksCommon
-# RTEMS_BASE (and RTEMS_VERSION) now in os/CONFIG_SITE.Common.RTEMS
-
 # NB: Settings in RELEASE files can be overridden in files named
 #   RELEASE.$(EPICS_HOST_ARCH).Common
 #   RELEASE.Common.$(T_A)

configure/RULES.Db

@@ -8,10 +8,12 @@
 #*************************************************************************
 #RULES.Db
 
-# Set db substitutions file suffix
+# 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 +21,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 +36,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 +91,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 +125,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 +136,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 =
@@ -151,20 +154,15 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles
+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 +170,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 +213,8 @@ db_clean :
 
 realclean: clean
 
-##################################################### Dependency files
+#---------------------------------------------------------------
+# Dependency files
 
 %Record.h$(DEP): $(COMMON_DIR)/%Record.dbd
 	@$(RM) $@
@@ -256,19 +265,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 +291,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 +313,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 +361,8 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 
 .PRECIOUS: $(COMMON_DIR)/%.h
 
-##################################################### DBD files
+#---------------------------------------------------------------
+# DBD files
 
 $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
@@ -425,56 +425,64 @@ $(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
+$(COMMON_DIR)/%.html: %.dbd.pod
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
+	$(DBDTOHTML) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pod $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: %.pod
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: %.pm
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PODTOHTML) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
+$(COMMON_DIR)/%.html: ../%.pm
 	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	$(PODTOHTML) -s -o $(notdir $@) $<
+	@$(MKDIR) $(dir $@)
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.html: ../%.pl
+	@$(RM) $(notdir $@)
+	$(PODTOHTML) -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 +500,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 +507,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 +522,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 +539,3 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file))))
 
 .PRECIOUS: %_registerRecordDeviceDriver.cpp
 
-##################################################### END OF FILE

configure/RULES.ioc

@@ -14,7 +14,7 @@ build$(DIVIDER)$(ARCH) build: buildInstall
 install$(DIVIDER)$(ARCH) install: buildInstall
 $(ARCH): buildInstall
 
-ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(ARCH))
+ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(strip $(ARCH)))
     buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS)
 
     clean$(DIVIDER)$(ARCH) clean:
@@ -35,4 +35,3 @@ envPaths: $(wildcard $(TOP)/configure/RELEASE*) \
 
 realclean:
 	$(RM) cdCommands envPaths dllPath.bat relPaths.sh
-

configure/RULES_ARCHS

@@ -14,7 +14,7 @@ ACTIONS = inc
 ACTIONS += build
 ACTIONS += install
 ACTIONS += buildInstall
-ACTIONS += runtests tapfiles
+ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
 actionArchTargets = $(foreach action, $(ACTIONS), \
     $(addprefix $(action)$(DIVIDER), $(BUILD_ARCHS)))

configure/RULES_BUILD

@@ -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.
 #*************************************************************************
 #
 #	Rules for making things specified in Makefile
@@ -25,7 +25,6 @@ vpath %.html $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS)
 vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.pl $(USR_VPATH) $(ALL_SRC_DIRS)
 
 #---------------------------------------------------------------
 
@@ -115,10 +114,11 @@ endif
 ifneq (,$(findstring $(T_A),$(EPICS_HOST_ARCH) $(CROSS_COMPILER_RUNTEST_ARCHS)))
 RUNTESTS_ENABLED = YES
 TAPFILES += $(TESTSCRIPTS:.t=.tap)
+JUNITFILES += $(TAPFILES:.tap=.xml)
 endif
 
 #---------------------------------------------------------------
-#   Libraries 
+#   Libraries
 #
 
 LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
@@ -129,16 +129,16 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS) $(TESTLIBNAME) \
 
 #	Main targets
 
-install: buildInstall 
+install: buildInstall
 
-buildInstall : build 
+buildInstall: build
 
 # Allows rebuild to work with parallel builds option, -j.
 install: $(patsubst rebuild,clean,$(filter rebuild,$(MAKECMDGOALS)))
 
 rebuild: clean install
 
-build : inc 
+build: inc
 
 build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \
 	$(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS)
@@ -165,13 +165,13 @@ build_clean:
 	$(INC) $(TARGETS) $(TDS) $(CLEANS) \
 	*.out MakefileInclude *.manifest *.exp \
 	$(COMMON_INC) $(HDEPENDS_FILES) $(PRODTARGETS) \
-	$(TESTSCRIPTS) $(TAPFILES)
+	$(TESTSCRIPTS) $(TAPFILES) $(JUNITFILES)
 ifdef RES
 	@$(RM) *$(RES)
 endif
 
 $(DIRECTORY_TARGETS) :
-	$(MKDIR) -p $@
+	$(MKDIR) $@
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -188,7 +188,7 @@ warnRelease:
 	-$(CONVERTRELEASE) checkRelease
 noCheckRelease:
 ifeq ($(EPICS_HOST_ARCH),$(T_A))
-	@echo "Warning: RELEASE file consistency checks have been disabled"
+	$(info Warning: RELEASE file consistency checks have been disabled)
 endif
 
 #---------------------------------------------------------------
@@ -279,13 +279,17 @@ endif # RANLIB
 $(SHRLIBNAME) $(DLLSTUB_LIBNAME) $(TESTSHRLIBNAME) $(TESTDLLSTUB_LIBNAME): \
     $(LIBRARY_OBJS) $(LIBRARY_RESS) $(SHRLIB_DEPLIBS)
 
-$(DLLSTUB_LIBNAME): $(SHRLIBNAME);
+# Stub library timestamps may be earlier than the DLL itself.
+# This order-only prerequisite resolves any related problems.
+# The $(LINK.shrlib) command must build both library files if
+# the target requires a separate stub library file.
+$(DLLSTUB_LIBNAME): | $(SHRLIBNAME);
 $(SHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
 	$(MT_DLL_COMMAND)
 
-$(TESTDLLSTUB_LIBNAME): $(TESTSHRLIBNAME);
+$(TESTDLLSTUB_LIBNAME): | $(TESTSHRLIBNAME);
 $(TESTSHRLIBNAME): $(SHRLIB_PREFIX)%$(SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(LINK.shrlib)
@@ -324,6 +328,12 @@ $(MODNAME): %$(MODEXT): %$(EXE)
 	@$(RM) $@
 	$(LINK.mod)
 
+#---------------------------------------------------------------
+# Generate Perl include path module
+%ModuleDirs.pm: $(wildcard $(TOP)/configure/RELEASE*)
+	@$(MKDIR) $(dir $@)
+	$(CONVERTRELEASE) -T $(TOP) $@
+
 #---------------------------------------------------------------
 # Automated testing
 
@@ -340,7 +350,23 @@ testspec: $(TESTSCRIPTS)
 	$(if $(TESTFILES), @echo Files: $(TESTFILES) >> $@)
 	$(if $(TESTSPEC_$(OS_CLASS)), @echo "Harness: $(TESTSPEC_$(OS_CLASS))" >> $@)
 
+test-results: tapfiles
+ifneq ($(TAPFILES),)
+ifdef RUNTESTS_ENABLED
+	prove --failures --ext .tap --exec "$(CAT)" --color $(TAPFILES)
+endif
+endif
+
+clean-tests:
+ifneq ($(TAPFILES),)
+	$(RM) $(TAPFILES)
+endif
+ifneq ($(JUNITFILES),)
+	$(RM) $(JUNITFILES)
+endif
+
 tapfiles: $(TESTSCRIPTS) $(TAPFILES)
+junitfiles: $(JUNITFILES)
 
 # A .tap file is the output from running the associated test script
 %.tap: %.t
@@ -348,10 +374,13 @@ ifdef RUNTESTS_ENABLED
 	-$(PERL) $< -tap > $@
 endif
 
+%.xml: %.tap
+	$(TAPTOJUNIT) --puretap --output $@ --input $< $*
+
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
 	@$(RM) $@
-	$(CP) $< $@
+	$(EXPAND_TOOL) -t $(INSTALL_LOCATION) -a $(T_A) $< $@
 
 # Test programs (.t files) must be written in Perl.
 # Generate a perl program to exec the real test binary.
@@ -359,6 +388,14 @@ endif
 	@$(RM) $@
 	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 
+#---------------------------------------------------------------
+# Generate header with version number from VCS
+
+ifneq ($(GENVERSION),)
+$(COMMON_DIR)/$(GENVERSION): FORCE
+	$(GENVERSIONHEADER) -t $(TOP) -N $(GENVERSIONMACRO) -V "$(GENVERSIONDEFAULT)" $@
+endif
+
 #---------------------------------------------------------------
 # Install rules for BIN_INSTALLS and LIB_INSTALLS
 
@@ -434,6 +471,7 @@ ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION)))
 endif # LOADABLE_SHRLIB_VERSION
 endif # LOADABLE_SHRLIB_SUFFIX
 
+ifneq ($(INSTALL_CONFIGS),)
 $(INSTALL_CONFIG)/%: %
 	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
@@ -441,6 +479,7 @@ $(INSTALL_CONFIG)/%: %
 $(INSTALL_CONFIG)/%: ../%
 	$(ECHO) "Installing config file $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+endif
 
 $(INSTALL_INCLUDE)/% : $(COMMON_DIR)/%
 	$(ECHO) "Installing generated generic include file $@"
@@ -492,7 +531,8 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 .PRECIOUS: $(COMMON_INC)
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
-.PHONY: runtests tapfiles checkRelease warnRelease noCheckRelease
+.PHONY: runtests tapfiles clean-tests test-results junitfiles
+.PHONY: checkRelease warnRelease noCheckRelease FORCE
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

configure/RULES_DIRS

@@ -9,7 +9,7 @@
 
 ARCHS += $(BUILD_ARCHS)
 ACTIONS += inc build install buildInstall clean realclean archclean
-ACTIONS += runtests tapfiles
+ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
 dirActionArchTargets = $(foreach dir, $(DIRS), \
     $(foreach action, $(ACTIONS), \

configure/RULES_TARGET

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

configure/RULES_TOP

@@ -21,6 +21,9 @@ realuninstall: uninstallDirs
 
 UNINSTALL_DIRS += $(INSTALL_DBD) $(INSTALL_INCLUDE) $(INSTALL_DOC) \
     $(INSTALL_HTML) $(INSTALL_TEMPLATES) $(INSTALL_DB) $(DIRECTORY_TARGETS)
+ifneq ($(INSTALL_LOCATION),$(TOP))
+UNINSTALL_DIRS += $(INSTALL_CONFIG)
+endif
 uninstallDirs:
 	$(RMDIR) $(UNINSTALL_DIRS)
 
@@ -57,6 +60,7 @@ help:
 	@echo "                      Cannot be used within an O.<arch> dir"
 	@echo "     rebuild        - Same as clean install"
 	@echo "     archclean      - Removes O.<arch> dirs but not O.Common dir"
+	@echo "     runtests       - Run self-tests, summarize results"
 	@echo "\"Partial\" build targets supported by Makefiles:"
 	@echo "     host           - Builds and installs $(EPICS_HOST_ARCH) only."
 	@echo "     inc$(DIVIDER)<arch>     - Installs <arch> only header files."

configure/os/CONFIG.Common.linux-xscale_be

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

configure/os/CONFIG.Common.linuxCommon

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

configure/os/CONFIG.Common.vxWorksCommon

@@ -1,7 +1,7 @@
 # CONFIG.Common.vxWorksCommon
 #
 # Definitions for vxWorks target archs
-# 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,58 +78,38 @@ 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)
 
 #--------------------------------------------------
-# Wind River moved nm out of GNU_BIN in some versions
+# This finds nm on any supported VxWorks version
 
-WORKBENCH_BIN = $(WIND_BASE)/workbench-$(WORKBENCH_VERSION)/$(WIND_HOST_TYPE)/bin
-UTILITIES_BIN = $(WIND_BASE)/utilities-$(UTILITIES_VERSION)/$(WIND_HOST_TYPE)/bin
-
-NM_DIR_6.4 = $(WORKBENCH_BIN)
-NM_DIR_6.5 = $(WORKBENCH_BIN)
-NM_DIR_6.6 = $(WORKBENCH_BIN)
-NM_DIR_6.7 = $(GNU_BIN)
-NM_DIR_6.8 = $(UTILITIES_BIN)
-NM_DIR_6.9 = $(UTILITIES_BIN)
-NM_DIR = $(firstword $(NM_DIR_$(VXWORKS_VERSION)) $(GNU_BIN))
-
-NM = $(NM_DIR)/$(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NMPROG = $(CMPLR_PREFIX)nm$(CMPLR_SUFFIX)$(HOSTEXE)
+NM = $(firstword $(wildcard $(WIND_BASE)/*/$(WIND_HOST_TYPE)/bin/$(NMPROG)))
 
 #--------------------------------------------------
 # A linker script is essential for munching from vxWorks 6.6 onwards
-# (i.e. with versions that use gcc 4.1.2 or later).  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))
 
 #--------------------------------------------------
 # These are required by some of the Wind River tools
 export WIND_BASE
+export WIND_HOME = $(WIND_BASE)
 export WIND_HOST_TYPE
 export TOOL_FAMILY = GNU
 
@@ -140,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
 
 #--------------------------------------------------
@@ -157,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
@@ -179,6 +155,8 @@ OSITHREAD_USE_DEFAULT_STACK = NO
 
 #--------------------------------------------------
 # Link definitions
+CROSS_LDFLAGS =
+#
 LINK.cpp = $(LD) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
 LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
 

configure/os/CONFIG.UnixCommon.Common

@@ -8,7 +8,7 @@
 CP = cp
 MV = mv
 RM = rm -f
-MKDIR = mkdir
+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.linux-arm

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

configure/os/CONFIG.linux-x86_64.Common

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

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

@@ -95,11 +95,12 @@ CODE_CPPFLAGS += -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE
 # Compiler flags for C++ files
 
 #
-# -W<N> use warning level N
-# (maximum lint level warnings at level 4)
-# -w44355 set "'this' used in the base initializer list" to be level 4
+# -W<n> disable warnings from levels > n
+# -w<n><m> set warning m to level n
+# -w44355 "'this' used in the base initializer list"
 # -w44344 "behavior change: use of explicit template arguments results in ..."
-WARN_CXXFLAGS_YES = -W3 -w44355 -w44344
+# -w44251 "class needs to have dll-interface to be used by clients of ..."
+WARN_CXXFLAGS_YES = -W3 -w44355 -w44344 -w44251
 WARN_CXXFLAGS_NO  = -W1
 
 #
@@ -165,48 +166,38 @@ EXE=.exe
 OBJ=.obj
 RES=.res
 
-#       Problem: MS Visual C++ does not recognize  *.cc as C++ source,
-#       so we do C++ compiles using the global flag -TP 
+# MS Visual C++ doesn't recognize *.cc as a C++ source file,
+# so C++ compiles get the flag -TP
 COMPILER_CXXFLAGS = -TP
 
-#	Operating system flags 
+# Operating system flags
 OP_SYS_CFLAGS =
 OP_SYS_CXXFLAGS = $(COMPILER_CXXFLAGS)
 
-#
-#	Files and flags needed to link DLLs (used in RULES_BUILD)
-#
-WIN32_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) \
+# Files and flags needed to link DLLs (used in RULES_BUILD)
+WIN32_DLLFLAGS = -subsystem:windows -dll $(OPT_LDFLAGS) \
  $(USR_LDFLAGS) $(CMD_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
 
-#
-# specify dll .def file only if it exists
-#
+# Specify dll .def file only if it exists
 DLL_DEF_FLAG = $(addprefix -def:,$(wildcard ../$(addsuffix .def,$*)))
 
-#
-#	A WIN32 dll has three parts:
+# A WIN32 dll has three parts:
 #	x.dll: the real dll (SHRLIBNAME)
 #	x.lib: what you link to progs that use the dll (DLLSTUB_LIBNAME)
 #	x.exp: what you need to build the dll (in no variable)
-#
 LINK.shrlib = $(WINLINK) -nologo $(WIN32_DLLFLAGS) -out:$@ \
     -implib:$(@:%$(SHRLIB_SUFFIX)=%$(LIB_SUFFIX)) \
     $(DLL_DEF_FLAG) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
 
-
-#	adjust names of libraries to build
-#
+# Adjust names of libraries to build
 SHRLIB_SUFFIX_BASE = .dll
 SHRLIB_SUFFIX = $(SHRLIB_SUFFIX_BASE)
 SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
 TESTSHRLIBNAME_YES = $(TESTBUILD_LIBRARY:%=%$(SHRLIB_SUFFIX_BASE))
 
-#
-# When SHARED_LIBRARIES is YES we are building a DLL link library 
-# and when SHARED_LIBRARIES is NO we are building an object library
-#
+# When SHARED_LIBRARIES is YES we are building a DLL shared library.
+# When SHARED_LIBRARIES is NO we are building an object library
 DLLSTUB_SUFFIX = .lib
 DLLSTUB_LIBNAME_YES = $(BUILD_LIBRARY:%=%.lib)
 DLLSTUB_LIBNAME = $(DLLSTUB_LIBNAME_$(SHARED_LIBRARIES))
@@ -220,7 +211,7 @@ LIBNAME = $(LIBNAME_$(SHARED_LIBRARIES))
 TESTLIBNAME_NO = $(TESTBUILD_LIBRARY:%=%.lib)
 TESTLIBNAME = $(TESTLIBNAME_$(SHARED_LIBRARIES))
 
-#	dll install location
+# dll install location
 INSTALL_SHRLIB = $(INSTALL_BIN)
 
 
@@ -280,7 +271,7 @@ LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) \
 #--------------------------------------------------
 # UseManifestTool.pl checks MS Visual c++ compiler version number to
 # decide whether or not to use the Manifest Tool command to embed the
-# linker created .manifest file into a library or product target. 
+# linker created .manifest file into a library or product target.
 # useManifestTool.pl returns 0(don't use) or 1(use).
 #
 MT.exe = mt.exe -nologo -manifest $@.manifest
@@ -290,4 +281,3 @@ MT_EXE_COMMAND_NO = $(MT.exe) "-outputresource:$@;\#1"
 MT_EXE_COMMAND1 = $(MT_EXE_COMMAND_$(STATIC_BUILD))
 MT_DLL_COMMAND = $(MT_DLL_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))
 MT_EXE_COMMAND = $(MT_EXE_COMMAND$(shell $(PERL) $(TOOLS)/useManifestTool.pl))
-

configure/os/CONFIG.windows-x64.windows-x64

@@ -8,8 +8,7 @@
 include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
 -include $(CONFIG)/os/CONFIG_SITE.win32-x86.win32-x86
 
-OPT_LDFLAGS += /MACHINE:X64
-#	/MACHINE:X64
-#	/MACHINE:IA64  (Itanium)
-#	/MACHINE:X86
-
+OPT_LDFLAGS += -MACHINE:X64
+#	-MACHINE:X64
+#	-MACHINE:IA64  (Itanium)
+#	-MACHINE:X86

configure/os/CONFIG_SITE.Common.linux-xscale_be

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

configure/os/CONFIG_SITE.Common.vxWorksCommon

@@ -1,25 +1,17 @@
 # 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
-#VXWORKS_VERSION = 6.9
+VXWORKS_VERSION = 6.9
 
 
 # Sites may override the following path for a particular host
@@ -27,21 +19,7 @@ VXWORKS_VERSION = 5.5
 # CONFIG_SITE.$(EPICS_HOST_ARCH).vxWorksCommon file.
 
 # WIND_BASE is where you installed the Wind River software.
-# Under vxWorks 6.x this is *not* the same as the old VX_DIR setting
 
-WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
-#WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
+#WIND_BASE = /usr/local/vw/tornado22-$(ARCH_CLASS)
+WIND_BASE = /usr/local/vw/vxWorks-$(VXWORKS_VERSION)
 #WIND_BASE = /ade/vxWorks/$(VXWORKS_VERSION)
-
-
-# WorkBench Version number, if you're using vxWorks 6.x
-
-#WORKBENCH_VERSION = 2.6
-#WORKBENCH_VERSION = 3.0
-#WORKBENCH_VERSION = 3.2
-#WORKBENCH_VERSION = 3.3
-
-
-# Utilities Version number, required from vxWorks 6.8 and later
-
-#UTILITIES_VERSION = 1.0

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

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

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

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

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

@@ -14,10 +14,10 @@
 #GNU_DIR = /usr/local
 
 # Different distribution cross-build packages use different prefixes:
-# Ubuntu:
-#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-
 

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

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

documentation/KnownProblems.html

@@ -4,25 +4,33 @@
 <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.5</title>
+  <title>Known Problems in EPICS 7.0.1</title>
 </head>
 
 <body>
-<h1 style="text-align: center">EPICS Base R3.15.5: Known Problems</h1>
+<h1 style="text-align: center">EPICS 7.0.1: Known Problems</h1>
 
 <p>Any patch files linked below should be applied at the root of the
-base-3.15.5 tree. Download them, then use the GNU Patch program as
+base-7.0.1 tree. Download them, then use the GNU Patch program as
 follows:</p>
 
-<blockquote><pre>% <b>cd <i>/path/to/</i>base-3.15.5</b>
-% <b>patch -p0 &lt; <i>/path/to/</i>file.patch</b></pre></blockquote>
+<blockquote><pre>% <b>cd <i>/path/to/</i>base-7.0.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>
 
 </ul>
 

documentation/README.1st

@@ -1,24 +1,24 @@
                            Installation Instructions
 
-                           EPICS Base Release 3.15.5
+                           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?
+     * What is new in this release?
+     * Copyright
+     * Supported platforms
+     * Supported compilers
+     * Software requirements
+     * Host system storage requirements
+     * Documentation
+     * Directory Structure
+     * Build related components
+     * Building EPICS base (Unix and Win32)
+     * Example application and extension
+     * Multiple host platforms
 
    --------------------------------------------------------------------------
 
@@ -85,17 +85,17 @@
      as processes on the host platform.
 
      vxWorks
-     You must have vxWorks 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
+     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 5.x or vxWorks 6.x EPICS web pages about and the
-     vxWorks documentation for information about configuring your vxWorks
-     operating system for use with EPICS.
+     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

documentation/README.html

@@ -9,7 +9,7 @@
 <BODY>
 <CENTER>
 <H1>Installation Instructions</H1>
-<H2>EPICS Base Release 3.15.5</H2><BR>
+<H2>EPICS Base Release 7.0.1</H2><BR>
 </CENTER>
 <HR>
 <H3> Table of Contents</H3>
@@ -90,17 +90,16 @@
  as processes on the host platform.</P>
 
 <P><B>vxWorks</B><BR>
- 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
+ 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="http://www.aps.anl.gov/epics/base/tornado.php">vxWorks
- 5.x</a> or <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
- 6.x</a> EPICS web pages about and the vxWorks documentation for information
+<P>Consult the <a href="http://www.aps.anl.gov/epics/base/vxWorks6.php">vxWorks
+ 6.x</a> EPICS web pages and the vxWorks documentation for information
  about configuring your vxWorks operating system for use with EPICS.</P>
 
 <P><B>RTEMS</B><BR>
@@ -191,12 +190,12 @@
         CONFIG.CrossCommon    Cross build definitions
         CONFIG.gnuCommon      Gnu compiler build definitions for all archs
         CONFIG_ADDONS         Definitions for &lt;osclass&gt; and DEFAULT options
-        CONFIG_APP_INCLUDE    
+        CONFIG_APP_INCLUDE
         CONFIG_BASE           EPICS base tool and location definitions
         CONFIG_BASE_VERSION   Definitions for EPICS base version number
         CONFIG_COMMON         Definitions common to all builds
         CONFIG_ENV            Definitions of EPICS environment variables
-        CONFIG_FILE_TYPE      
+        CONFIG_FILE_TYPE
         CONFIG_SITE           Site specific make definitions
         CONFIG_SITE_ENV       Site defaults for EPICS environment variables
         MAKEFILE              Installs CONFIG* RULES* creates
@@ -207,9 +206,9 @@
         RULES_ARCHS           Definitions and rules for building architectures
         RULES_BUILD           Build and install rules and definitions
         RULES_DIRS            Definitions and rules for building subdirectories
-        RULES_EXPAND          
-        RULES_FILE_TYPE       
-        RULES_TARGET          
+        RULES_EXPAND
+        RULES_FILE_TYPE
+        RULES_TARGET
         RULES_TOP             Rules specific to a &lt;top&gt; dir (uninstall and tar)
         Sample.Makefile       Sample makefile with comments
 </PRE>
@@ -244,11 +243,11 @@ 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
+ Before you can build or use EPICS Base, the environment variable
+ EPICS_HOST_ARCH should 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.
+ followed by a dash and then your CPU architecture, e.g. linux-x86_64.
  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;
@@ -270,7 +269,7 @@ Files in the base/startup directory have been provided to
 
 <P><B>LD_LIBRARY_PATH</B><BR>
 
- R3.15 shared libraries and executables normally contain the full path
+ EPICS 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
@@ -341,18 +340,18 @@ Files in the base/startup directory have been provided to
 <H3><A NAME="0_0_13"> Example application and extension</A></H3>
 <BLOCKQUOTE>A perl tool, makeBaseApp.pl is included in the distribution
  file. This script will create a sample application that can be built
- and then executed to try out this release of base. 
+ and then executed to try out this release of base.
 
 <P>
- Instructions for building and executing the 3.15 example application
+ Instructions for building and executing the example IOC 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 
+ By running the example application as a host-based IOC, you will be
+ able to quickly implement a complete EPICS system and be able to run channel
  access clients on the host system.
 
 <P>

documentation/ReleaseChecklist.html

@@ -33,30 +33,29 @@
 <h1>EPICS Base Release Procedures &amp; Checklist</h1>
 
 <p>This document describes the procedures and provides a checklist of tasks
-that should be performed when creating 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 about weekly intervals during the testing and debugging period, and
-will be designated as either pre-release versions or Release Candidates by the
-Release Manager.  A Release Candidate that has received widespread testing for a
-week without any additional problems being discovered or significant changes
-being committed can be designated as the final release version.</p>
+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></dt>
+  <dt><strong>Platform Developers</strong> (optional)</dt>
     <dd>Responsible for individual operating system platforms</dd>
   <dt><strong>Application Developers</strong></dt>
     <dd>Responsible for support modules that depend on EPICS Base.</dd>
@@ -90,7 +89,7 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Set the Feature Freeze date, by which time all Bazaar commits for
+      <td>Set the Feature Freeze date, by which time all Git commits for
         enhancements and new functionality should have been completed. After
         this date, commits should only be made to fix problems that show up
         during testing.</td>
@@ -132,39 +131,40 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Tag the module in Bazaar, using these tag conventions:
+      <td>Tag the module in Git using these tag conventions:
         <ul>
           <li>
-            <tt>R3.15.5-pre<i>n</i></tt>
+            <tt>R3.16.1-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R3.15.5-rc<i>n</i></tt>
-            &mdash; release candidate tag, note the <tt>rc</tt> is now
-            lower-case</li>
+            <tt>R3.16.1-rc<i>n</i></tt>
+            &mdash; release candidate tag
+            </li>
         </ul>
         <blockquote><tt>
-          cd ~/base/mirror-3.15<br />
-          bzr tag R3.15.5-rc<i>n</i>
+          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. 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<br />
-          bzr export
-            --root=base-3.15.5-rc<i>n</i>
-            -r tag:R3.15.5-rc<i>n</i>
-            base-3.15.5-rc<i>n</i>.tar.gz
-            mirror-3.15
+          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.5-rc<i>n</i>.tar.gz
+          gpg --armor --sign --detach-sig base-3.16.1-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -258,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,29 +273,30 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Tag the module in Bazaar:
+      <td>Tag the module in Git:
         <blockquote><tt>
-          cd ~/base/mirror-3.15<br />
-          bzr tag R3.15.5</i>
+          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<br />
-          bzr export
-            --root=base-3.15.5
-            -r tag:R3.15.5
-            base-3.15.5.tar.gz
-            mirror-3.15
+          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.5.tar.gz
+          gpg --armor --sign --detach-sig base-3.16.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -305,14 +306,24 @@ relevent roles unless the Release Manager designates otherwise:</p>
       <td>Test the tar file by extracting its contents and building it on at
         least one supported platform</td>
       </tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>Release Manager</td>
+      <td>Upload the release tar file to the Launchpad download area.</td>
+      </tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>Release Manager</td>
+      <td>Find all Launchpad bug reports with the status Fix Committed which
+        have been fixed in this release and mark them Fix Released.</td>
+      </tr>
     <tr>
       <th colspan="3">Publish and Announce it</th>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Website Manager</td>
-      <td>If necessary recreate the tarfile following the instructions above.
-        Copy the tar file and its <tt>.asc</tt> signature file to the Base
+      <td>Copy the tar file and its <tt>.asc</tt> signature file to the Base
         download area of the website.</td>
       </tr>
     <tr>
@@ -343,24 +354,13 @@ relevent roles unless the Release Manager designates otherwise:</p>
     <tr>
       <td>&nbsp;</td>
       <td>Website Manager</td>
-      <td>Upload the release tar file to the Launchpad download area.</td>
-      </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Website Manager</td>
-      <td>Find all Launchpad bug reports with the status Fix Committed which
-        have been fixed in this release and mark them Fix Released.</td>
+      <td>Add an entry to the website News page, linking to the new version
+        webpage.</td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Email tech-talk</td>
-      </tr>
-    <tr>
-      <td>&nbsp;</td>
-      <td>Website Manager</td>
-      <td>Add an entry to the website News page, linking to the new version
-      webpage.</td>
+      <td>Announce the release on the tech-talk mailing list.</td>
       </tr>
     </tbody>
   </table>

modules/CONFIG_SITE.local

@@ -1,11 +1,10 @@
 #*************************************************************************
-# Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
-#     National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
 #*************************************************************************
 
-menu(menuPost) {
-    choice(menuPost_OnChange, "On Change")
-    choice(menuPost_Always, "Always")
-}
+# When building submodules, this should always be true:
+INSTALL_LOCATION = $(EPICS_BASE)
+
+# Stop submodules from installing their configuration files:
+CONFIG_INSTALLS =

modules/Makefile

@@ -0,0 +1,54 @@
+#*************************************************************************
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+TOP = ..
+include $(TOP)/configure/CONFIG
+
+# Submodules for bundle build
+SUBMODULES += libcom
+
+SUBMODULES += ca
+ca_DEPEND_DIRS = libcom
+
+SUBMODULES += database
+database_DEPEND_DIRS = ca
+
+SUBMODULES += pvData
+pvData_DEPEND_DIRS = libcom
+
+SUBMODULES += pvAccess
+pvAccess_DEPEND_DIRS = pvData database
+
+SUBMODULES += normativeTypes
+normativeTypes_DEPEND_DIRS = pvData
+
+SUBMODULES += pvaClient
+pvaClient_DEPEND_DIRS = pvAccess normativeTypes
+
+SUBMODULES += pvDatabase
+pvDatabase_DEPEND_DIRS = pvAccess
+
+SUBMODULES += pva2pva
+pva2pva_DEPEND_DIRS = pvAccess
+
+SUBMODULES += example
+example_DEPEND_DIRS = pva2pva pvaClient
+
+# Allow sites to add extra submodules
+-include Makefile.local
+
+# Add only checked-out submodules to DIRS
+DIRS += $(subst /Makefile,,$(wildcard $(addsuffix /Makefile, $(SUBMODULES))))
+
+include $(TOP)/configure/RULES_DIRS
+
+# Ensure that RELEASE.local exists before doing anything else
+all host $(DIRS) $(ARCHS) $(ACTIONS) $(dirActionTargets) $(dirArchTargets) \
+    $(dirActionArchTargets) $(actionArchTargets): | RELEASE.local
+
+RELEASE.local:
+	@echo EPICS_BASE = $(abspath $(INSTALL_LOCATION))> $@
+realclean:
+	$(RM) RELEASE.local

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 = ..
@@ -12,69 +12,10 @@ include $(TOP)/configure/CONFIG
 
 DIRS += tools
 
-DIRS += tools/test
-tools/test_DEPEND_DIRS = tools
-
 DIRS += template/base
 template/base_DEPEND_DIRS = tools
 
 DIRS += template/ext
 template/ext_DEPEND_DIRS = tools
 
-# Common
-
-DIRS += libCom
-libCom_DEPEND_DIRS = tools
-
-DIRS += libCom/RTEMS
-libCom/RTEMS_DEPEND_DIRS = libCom
-
-DIRS += libCom/test
-libCom/test_DEPEND_DIRS = libCom/RTEMS
-
-# Channel Access
-
-DIRS += ca/client
-ca/client_DEPEND_DIRS = libCom
-
-DIRS += ca/client/tools
-ca/client/tools_DEPEND_DIRS = ca/client
-
-DIRS += ca/legacy/gdd
-ca/legacy/gdd_DEPEND_DIRS = ca/client
-
-DIRS += ca/legacy/pcas
-ca/legacy/pcas_DEPEND_DIRS = ca/legacy/gdd
-
-DIRS += ca/legacy/pcas/ex
-# needs ioc for dbStaticHost
-ca/legacy/pcas/ex_DEPEND_DIRS = ca/legacy/pcas libCom ioc
-
-DIRS += ca/client/perl
-ca/client/perl_DEPEND_DIRS = ca/client
-
-# PDB Core
-
-DIRS += ioc
-ioc_DEPEND_DIRS = libCom ca/client
-
-DIRS += ioc/db/test
-ioc/db/test_DEPEND_DIRS = ioc libCom/RTEMS
-
-DIRS += ioc/dbtemplate/test
-ioc/dbtemplate/test_DEPEND_DIRS = ioc
-
-# PDB Standard Record Definitions
-
-DIRS += std
-std_DEPEND_DIRS = ioc libCom/RTEMS
-
-DIRS += std/filters/test
-std/filters/test_DEPEND_DIRS = std
-
-DIRS += std/rec/test
-std/rec/test_DEPEND_DIRS = std
-
-
 include $(TOP)/configure/RULES_DIRS
-

src/ca/client/CASG.cpp

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

src/ca/client/Makefile

@@ -1,118 +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 is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-
-TOP=../../..
-
-include $(TOP)/configure/CONFIG
-
-HTMLS += CAref.html
-
-#
-#	includes to install from this subproject
-#
-INC += cadef.h
-INC += caerr.h
-INC += caeventmask.h
-INC += caProto.h
-INC += db_access.h
-INC += addrList.h
-INC += cacIO.h
-INC += caDiagnostics.h
-
-LIBSRCS += cac.cpp
-LIBSRCS += cacChannel.cpp
-LIBSRCS += cacChannelNotify.cpp
-LIBSRCS += cacContextNotify.cpp
-LIBSRCS += cacReadNotify.cpp
-LIBSRCS += cacWriteNotify.cpp
-LIBSRCS += cacStateNotify.cpp
-LIBSRCS += access.cpp
-LIBSRCS += iocinf.cpp
-LIBSRCS += convert.cpp
-LIBSRCS += test_event.cpp
-LIBSRCS += repeater.cpp
-LIBSRCS += searchTimer.cpp
-LIBSRCS += disconnectGovernorTimer.cpp
-LIBSRCS += repeaterSubscribeTimer.cpp
-LIBSRCS += baseNMIU.cpp
-LIBSRCS += nciu.cpp
-LIBSRCS += netiiu.cpp
-LIBSRCS += udpiiu.cpp
-LIBSRCS += tcpiiu.cpp
-LIBSRCS += noopiiu.cpp
-LIBSRCS += netReadNotifyIO.cpp
-LIBSRCS += netWriteNotifyIO.cpp
-LIBSRCS += netSubscription.cpp
-LIBSRCS += tcpSendWatchdog.cpp
-LIBSRCS += tcpRecvWatchdog.cpp
-LIBSRCS += bhe.cpp
-LIBSRCS += ca_client_context.cpp
-LIBSRCS += oldChannelNotify.cpp
-LIBSRCS += oldSubscription.cpp
-LIBSRCS += getCallback.cpp
-LIBSRCS += getCopy.cpp
-LIBSRCS += putCallback.cpp
-LIBSRCS += syncgrp.cpp
-LIBSRCS += CASG.cpp
-LIBSRCS += syncGroupNotify.cpp
-LIBSRCS += syncGroupReadNotify.cpp
-LIBSRCS += syncGroupWriteNotify.cpp
-LIBSRCS += localHostName.cpp
-LIBSRCS += comQueRecv.cpp
-LIBSRCS += comQueSend.cpp
-LIBSRCS += comBuf.cpp
-LIBSRCS += hostNameCache.cpp
-LIBSRCS += msgForMultiplyDefinedPV.cpp
-LIBSRCS_vxWorks += templateInstances.cpp
-
-LIBRARY=ca
-
-ca_RCS = ca.rc
-
-ca_LIBS = Com
-
-ca_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-#   libs needed for PROD and TESTPRODUCT
-PROD_LIBS = ca Com 
-# needed when its an object library build
-PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-PROD_DEFAULT += caRepeater catime acctst caConnTest casw caEventRate
-PROD_vxWorks = -nil-
-PROD_RTEMS = -nil-
-PROD_iOS = -nil-
-
-OBJS_vxWorks = catime acctst caConnTest casw caEventRate acctstRegister
-
-caRepeater_SRCS = caRepeater.cpp
-catime_SRCS = catimeMain.c catime.c
-acctst_SRCS = acctstMain.c acctst.c
-caEventRate_SRCS = caEventRateMain.cpp caEventRate.cpp
-casw_SRCS = casw.cpp
-caConnTest_SRCS = caConnTestMain.cpp caConnTest.cpp
-
-casw_SYS_LIBS_solaris = socket
-
-SCRIPTS_HOST = S99caRepeater
-SCRIPTS_Linux = caRepeater.service
-
-EXPAND += S99caRepeater@
-EXPAND += caRepeater.service@
-EXPAND_VARS = INSTALL_BIN=$(abspath $(INSTALL_BIN))
-
-SRC_DIRS += $(TOP)/src/ca/client/test
-PROD_HOST += ca_test
-ca_test_SRCS = ca_test_main.c ca_test.c
-ca_test_LIBS  = ca Com
-ca_test_SYS_LIBS_WIN32 = ws2_32 advapi32 user32
-
-OBJS_vxWorks += ca_test
-
-include $(TOP)/configure/RULES

src/ca/client/S99caRepeater@

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

src/ca/client/SearchDest.h

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

src/ca/client/acctstMain.c

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

src/ca/client/acctstRegister.cpp

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

src/ca/client/addrList.h

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

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/autoPtrFreeList.h

@@ -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. 
-\*************************************************************************/
-
-/*  
- *
- *                              
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *                                  
- *  Copyright, The Regents of the University of California.
- *                                  
- *           
- *	Author Jeffrey O. Hill
- *	johill@lanl.gov
- *	505 665 1831
- */
-
-#ifndef autoPtrFreeListh
-#define autoPtrFreeListh
-
-#ifdef epicsExportSharedSymbols
-#   define autoPtrFreeListh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "tsFreeList.h"
-#include "compilerDependencies.h"
-
-#ifdef autoPtrFreeListh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#endif
-
-template < class T, unsigned N = 0x400, class MUTEX = epicsMutex >
-class autoPtrFreeList {
-public:
-    autoPtrFreeList ( tsFreeList < T, N, MUTEX > &, T * );
-    ~autoPtrFreeList ();
-    T & operator * () const;
-    T * operator -> () const;
-    T * get () const;
-    T * release ();
-private:
-    T * p;
-    tsFreeList < T, N, MUTEX > & freeList;
-    // not implemented
-    autoPtrFreeList & operator = ( const autoPtrFreeList & );
-    autoPtrFreeList ( const autoPtrFreeList < T, N, MUTEX > & );
-};
-
-template < class T, unsigned N, class MUTEX >
-inline autoPtrFreeList < T, N, MUTEX >::autoPtrFreeList ( 
-    tsFreeList < T, N, MUTEX > & freeListIn, T * pIn ) :
-    p ( pIn ), freeList ( freeListIn ) {}
-
-template < class T, unsigned N, class MUTEX >
-inline autoPtrFreeList < T, N, MUTEX >::~autoPtrFreeList ()
-{
-    if ( this->p ) {
-        this->p->~T();
-        // its probably a good idea to require that the class has placement delete
-        // by calling it during cleanup if the compiler supports it
-#       if defined ( CXX_PLACEMENT_DELETE )
-            T::operator delete ( this->p, this->freeList );
-#       else
-            this->freeList.release ( this->p );
-#       endif
-    }
-}
-
-template < class T, unsigned N, class MUTEX >
-inline T & autoPtrFreeList < T, N, MUTEX >::operator * () const
-{
-    return * this->p;
-}
-
-template < class T, unsigned N, class MUTEX >
-inline T * autoPtrFreeList < T, N, MUTEX >::operator -> () const
-{
-    return this->p;
-}
-
-template < class T, unsigned N, class MUTEX >
-inline T * autoPtrFreeList < T, N, MUTEX >::get () const
-{
-    return this->p;
-}
-
-template < class T, unsigned N, class MUTEX >
-inline T * autoPtrFreeList < T, N, MUTEX >::release ()
-{
-    T *pTmp = this->p;
-    this->p = 0;
-    return pTmp;
-}
-
-#endif // #ifdef autoPtrFreeListh

src/ca/client/autoPtrRecycle.h

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

src/ca/client/baseNMIU.cpp

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

src/ca/client/bhe.cpp

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

src/ca/client/bhe.h

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

src/ca/client/ca.rc

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

src/ca/client/caConnTest.cpp

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

src/ca/client/caConnTestMain.cpp

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

src/ca/client/caDiagnostics.h

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

src/ca/client/caEventRate.cpp

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

src/ca/client/caEventRateMain.cpp

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

src/ca/client/caProto.h

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

src/ca/client/caRepeater.cpp

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

src/ca/client/caRepeater.service@

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

src/ca/client/caServerID.h

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

src/ca/client/ca_client_context.cpp

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

src/ca/client/cac.h

@@ -1,467 +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 is distributed subject to a Software License Agreement found
-* in file LICENSE that is included with this distribution.
-\*************************************************************************/
-
-/*
- *                    L O S  A L A M O S
- *              Los Alamos National Laboratory
- *               Los Alamos, New Mexico 87545
- *
- *  Copyright, 1986, The Regents of the University of California.
- *
- *
- *  Author: Jeff Hill
- *
- */
-
-#ifndef cach
-#define cach
-
-#ifdef epicsExportSharedSymbols
-#   define cach_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "compilerDependencies.h"
-#include "ipAddrToAsciiAsynchronous.h"
-#include "msgForMultiplyDefinedPV.h"
-#include "epicsTimer.h"
-#include "epicsEvent.h"
-#include "freeList.h"
-#include "localHostName.h"
-
-#ifdef cach_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
-#include "nciu.h"
-#include "comBuf.h"
-#include "bhe.h"
-#include "cacIO.h"
-#include "netIO.h"
-#include "localHostName.h"
-#include "virtualCircuit.h"
-
-class netWriteNotifyIO;
-class netReadNotifyIO;
-class netSubscription;
-
-// used to control access to cac's recycle routines which
-// should only be indirectly invoked by CAC when its lock
-// is applied
-class cacRecycle {
-public:
-    virtual void recycleReadNotifyIO (
-        epicsGuard < epicsMutex > &, netReadNotifyIO &io ) = 0;
-    virtual void recycleWriteNotifyIO (
-        epicsGuard < epicsMutex > &, netWriteNotifyIO &io ) = 0;
-    virtual void recycleSubscription (
-        epicsGuard < epicsMutex > &, netSubscription &io ) = 0;
-protected:
-    virtual ~cacRecycle() {}
-};
-
-struct CASG;
-class inetAddrID;
-class caServerID;
-struct caHdrLargeArray;
-
-class cacComBufMemoryManager : public comBufMemoryManager
-{
-public:
-    cacComBufMemoryManager () {}
-    void * allocate ( size_t );
-    void release ( void * );
-private:
-    tsFreeList < comBuf, 0x20 > freeList;
-	cacComBufMemoryManager ( const cacComBufMemoryManager & );
-	cacComBufMemoryManager & operator = ( const cacComBufMemoryManager & );
-};
-
-class notifyGuard {
-public:
-    notifyGuard ( cacContextNotify & );
-    ~notifyGuard ();
-private:
-    cacContextNotify & notify;
-    notifyGuard ( const notifyGuard & );
-    notifyGuard & operator = ( const notifyGuard & );
-};
-
-class callbackManager : public notifyGuard {
-public:
-    callbackManager (
-        cacContextNotify &,
-        epicsMutex & callbackControl );
-    epicsGuard < epicsMutex > cbGuard;
-};
-
-class cac :
-    public cacContext,
-    private cacRecycle,
-    private callbackForMultiplyDefinedPV
-{
-public:
-    cac (
-        epicsMutex & mutualExclusion,
-        epicsMutex & callbackControl,
-        cacContextNotify & );
-    virtual ~cac ();
-
-    // beacon management
-    void beaconNotify ( const inetAddrID & addr, const epicsTime & currentTime,
-        ca_uint32_t beaconNumber, unsigned protocolRevision );
-    unsigned beaconAnomaliesSinceProgramStart (
-        epicsGuard < epicsMutex > & ) const;
-
-    // IO management
-    void flush ( epicsGuard < epicsMutex > & guard );
-    bool executeResponse ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, caHdrLargeArray &, char *pMsgBody );
-
-    // channel routines
-    void transferChanToVirtCircuit (
-        unsigned cid, unsigned sid,
-        ca_uint16_t typeCode, arrayElementCount count,
-        unsigned minorVersionNumber, const osiSockAddr &,
-        const epicsTime & currentTime );
-    cacChannel & createChannel (
-        epicsGuard < epicsMutex > & guard, const char * pChannelName,
-        cacChannelNotify &, cacChannel::priLev );
-    void destroyChannel (
-        epicsGuard < epicsMutex > &, nciu & );
-    void initiateConnect (
-        epicsGuard < epicsMutex > &, nciu &, netiiu * & );
-    nciu * lookupChannel (
-        epicsGuard < epicsMutex > &, const cacChannel::ioid & );
-
-    // IO requests
-    netWriteNotifyIO & writeNotifyRequest (
-        epicsGuard < epicsMutex > &, nciu &, privateInterfaceForIO &,
-        unsigned type, arrayElementCount nElem, const void * pValue,
-        cacWriteNotify & );
-    netReadNotifyIO & readNotifyRequest (
-        epicsGuard < epicsMutex > &, nciu &, privateInterfaceForIO &,
-        unsigned type, arrayElementCount nElem,
-        cacReadNotify & );
-    netSubscription & subscriptionRequest (
-        epicsGuard < epicsMutex > &, nciu &, privateInterfaceForIO &,
-        unsigned type, arrayElementCount nElem, unsigned mask,
-        cacStateNotify &, bool channelIsInstalled );
-    bool destroyIO (
-        CallbackGuard & callbackGuard,
-        epicsGuard < epicsMutex > & mutualExclusionGuard,
-        const cacChannel::ioid & idIn,
-        nciu & chan );
-    void disconnectAllIO (
-        epicsGuard < epicsMutex > & cbGuard,
-        epicsGuard < epicsMutex > & guard,
-        nciu &, tsDLList < baseNMIU > & ioList );
-
-    void ioShow (
-        epicsGuard < epicsMutex > & guard,
-        const cacChannel::ioid &id, unsigned level ) const;
-
-    // exception generation
-    void exception (
-        epicsGuard < epicsMutex > & cbGuard,
-        epicsGuard < epicsMutex > & guard,
-        int status, const char * pContext,
-        const char * pFileName, unsigned lineNo );
-
-    // search destination management
-    void registerSearchDest (
-        epicsGuard < epicsMutex > &, SearchDest & req );
-    bool findOrCreateVirtCircuit (
-        epicsGuard < epicsMutex > &, const osiSockAddr &,
-        unsigned, tcpiiu *&, unsigned, SearchDestTCP * pSearchDest = NULL );
-
-    // diagnostics
-    unsigned circuitCount ( epicsGuard < epicsMutex > & ) const;
-    void show ( epicsGuard < epicsMutex > &, unsigned level ) const;
-    int printFormated (
-        epicsGuard < epicsMutex > & callbackControl,
-        const char *pformat, ... ) const;
-    int varArgsPrintFormated (
-        epicsGuard < epicsMutex > & callbackControl,
-        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
-    const char * userNamePointer () const;
-    unsigned getInitializingThreadsPriority () const;
-    epicsMutex & mutexRef ();
-    void attachToClientCtx ();
-    void selfTest (
-        epicsGuard < epicsMutex > & ) const;
-    double beaconPeriod (
-        epicsGuard < epicsMutex > &,
-        const nciu & chan ) const;
-    static unsigned lowestPriorityLevelAbove ( unsigned priority );
-    static unsigned highestPriorityLevelBelow ( unsigned priority );
-    void destroyIIU ( tcpiiu & iiu );
-
-    const char * pLocalHostName ();
-
-private:
-    epicsSingleton < localHostName > :: reference _refLocalHostName;
-    chronIntIdResTable < nciu > chanTable;
-    //
-    // !!!! There is at this point no good reason
-    // !!!! to maintain one IO table for all types of
-    // !!!! IO. It would probably be better to maintain
-    // !!!! an independent table for each IO type. The
-    // !!!! new adaptive sized hash table will not
-    // !!!! waste memory. Making this change will
-    // !!!! avoid virtual function overhead when
-    // !!!! accessing the different types of IO. This
-    // !!!! approach would also probably be safer in
-    // !!!! terms of detecting damaged protocol.
-    //
-    chronIntIdResTable < baseNMIU > ioTable;
-    resTable < bhe, inetAddrID > beaconTable;
-    resTable < tcpiiu, caServerID > serverTable;
-    tsDLList < tcpiiu > circuitList;
-    tsDLList < SearchDest > searchDestList;
-    tsDLList < msgForMultiplyDefinedPV > msgMultiPVList;
-    tsFreeList
-        < class tcpiiu, 32, epicsMutexNOOP >
-            freeListVirtualCircuit;
-    tsFreeList
-        < class netReadNotifyIO, 1024, epicsMutexNOOP >
-            freeListReadNotifyIO;
-    tsFreeList
-        < class netWriteNotifyIO, 1024, epicsMutexNOOP >
-            freeListWriteNotifyIO;
-    tsFreeList
-        < class netSubscription, 1024, epicsMutexNOOP >
-            freeListSubscription;
-    tsFreeList
-        < class nciu, 1024, epicsMutexNOOP >
-            channelFreeList;
-    tsFreeList
-        < class msgForMultiplyDefinedPV, 16 >
-            mdpvFreeList;
-    cacComBufMemoryManager comBufMemMgr;
-    bheFreeStore bheFreeList;
-    epicsTime programBeginTime;
-    double connTMO;
-    // **** lock hierarchy ****
-    // 1) callback lock must always be acquired before
-    // the primary mutex if both locks are needed
-    epicsMutex & mutex;
-    epicsMutex & cbMutex;
-    epicsEvent iiuUninstall;
-    ipAddrToAsciiEngine & ipToAEngine;
-    epicsTimerQueueActive & timerQueue;
-    char * pUserName;
-    class udpiiu * pudpiiu;
-    void * tcpSmallRecvBufFreeList;
-    void * tcpLargeRecvBufFreeList;
-    cacContextNotify & notify;
-    epicsThreadId initializingThreadsId;
-    unsigned initializingThreadsPriority;
-    unsigned maxRecvBytesTCP;
-    unsigned maxContigFrames;
-    unsigned beaconAnomalyCount;
-    unsigned short _serverPort;
-    unsigned iiuExistenceCount;
-    bool cacShutdownInProgress;
-
-    void recycleReadNotifyIO (
-        epicsGuard < epicsMutex > &, netReadNotifyIO &io );
-    void recycleWriteNotifyIO (
-        epicsGuard < epicsMutex > &, netWriteNotifyIO &io );
-    void recycleSubscription (
-        epicsGuard < epicsMutex > &, netSubscription &io );
-
-    void disconnectChannel (
-        epicsGuard < epicsMutex > & cbGuard,
-        epicsGuard < epicsMutex > & guard, nciu & chan );
-
-    void ioExceptionNotify ( unsigned id, int status,
-        const char * pContext, unsigned type, arrayElementCount count );
-    void ioExceptionNotifyAndUninstall ( unsigned id, int status,
-        const char * pContext, unsigned type, arrayElementCount count );
-
-    void pvMultiplyDefinedNotify ( msgForMultiplyDefinedPV & mfmdpv,
-        const char * pChannelName, const char * pAcc, const char * pRej );
-
-    // recv protocol stubs
-    bool versionAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool echoRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool writeNotifyRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool searchRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool readNotifyRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool eventRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool readRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool clearChannelRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool exceptionRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool accessRightsRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool createChannelRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool verifyAndDisconnectChan ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    bool badTCPRespAction ( callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-
-    typedef bool ( cac::*pProtoStubTCP ) (
-        callbackManager &, tcpiiu &,
-        const epicsTime & currentTime, const caHdrLargeArray &, void *pMsgBdy );
-    static const pProtoStubTCP tcpJumpTableCAC [];
-
-    bool defaultExcep ( callbackManager &, tcpiiu &iiu, const caHdrLargeArray &hdr,
-                    const char *pCtx, unsigned status );
-    bool eventAddExcep ( callbackManager &, tcpiiu &iiu, const caHdrLargeArray &hdr,
-                    const char *pCtx, unsigned status );
-    bool readExcep ( callbackManager &, tcpiiu &iiu, const caHdrLargeArray &hdr,
-                    const char *pCtx, unsigned status );
-    bool writeExcep ( callbackManager &, tcpiiu &iiu, const caHdrLargeArray &hdr,
-                    const char *pCtx, unsigned status );
-    bool clearChanExcep ( callbackManager &, tcpiiu &iiu, const caHdrLargeArray &hdr,
-                    const char *pCtx, unsigned status );
-    bool readNotifyExcep ( callbackManager &, tcpiiu &iiu, const caHdrLargeArray &hdr,
-                    const char *pCtx, unsigned status );
-    bool writeNotifyExcep ( callbackManager &, tcpiiu &iiu, const caHdrLargeArray &hdr,
-                    const char *pCtx, unsigned status );
-    typedef bool ( cac::*pExcepProtoStubTCP ) (
-                    callbackManager &, tcpiiu &iiu, const caHdrLargeArray &hdr,
-                    const char *pCtx, unsigned status );
-    static const pExcepProtoStubTCP tcpExcepJumpTableCAC [];
-
-	cac ( const cac & );
-	cac & operator = ( const cac & );
-};
-
-inline const char * cac::userNamePointer () const
-{
-    return this->pUserName;
-}
-
-inline unsigned cac::getInitializingThreadsPriority () const
-{
-    return this->initializingThreadsPriority;
-}
-
-inline epicsMutex & cac::mutexRef ()
-{
-    return this->mutex;
-}
-
-inline int cac :: varArgsPrintFormated (
-    epicsGuard < epicsMutex > & callbackControl,
-    const char *pformat, va_list args ) const
-{
-    callbackControl.assertIdenticalMutex ( this->cbMutex );
-    return this->notify.varArgsPrintFormated ( pformat, args );
-}
-
-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
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    return this->beaconAnomalyCount;
-}
-
-inline notifyGuard::notifyGuard ( cacContextNotify & notifyIn ) :
-    notify ( notifyIn )
-{
-    this->notify.callbackProcessingInitiateNotify ();
-}
-
-inline notifyGuard::~notifyGuard ()
-{
-    this->notify.callbackProcessingCompleteNotify ();
-}
-
-inline callbackManager::callbackManager (
-    cacContextNotify & notify, epicsMutex & callbackControl ) :
-    notifyGuard ( notify ), cbGuard ( callbackControl )
-{
-}
-
-inline nciu * cac::lookupChannel (
-    epicsGuard < epicsMutex > & guard,
-    const cacChannel::ioid & idIn )
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    return this->chanTable.lookup ( idIn );
-}
-
-inline const char * cac :: pLocalHostName ()
-{
-    return _refLocalHostName->pointer ();
-}
-
-inline unsigned cac ::
-    maxContiguousFrames ( epicsGuard < epicsMutex > & ) const
-{
-    return maxContigFrames;
-}
-
-inline double cac ::
-    connectionTimeout ( epicsGuard < epicsMutex > & guard )
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    return this->connTMO;
-}
-
-#endif // ifdef cach

src/ca/client/cacChannel.cpp

@@ -1,145 +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: Jeff Hill
- */
-
-#include <stdexcept>
-#include <float.h>
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "errlog.h"
-
-#define epicsExportSharedSymbols
-#include "iocinf.h"
-#include "localHostName.h"
-#include "cacIO.h"
-
-class CACChannelPrivate {
-public:
-    CACChannelPrivate ();
-    unsigned getHostName ( char * pBuf, unsigned bufLength );
-    const char * pHostName ();
-private:
-    epicsSingleton < localHostName > :: reference
-        _refLocalHostName;
-};
-    
-static epicsThreadOnceId cacChannelIdOnce = EPICS_THREAD_ONCE_INIT;
-
-const cacChannel::priLev cacChannel::priorityMax = 99u;
-const cacChannel::priLev cacChannel::priorityMin = 0u;
-const cacChannel::priLev cacChannel::priorityDefault = priorityMin;
-const cacChannel::priLev cacChannel::priorityLinksDB = priorityMax;
-const cacChannel::priLev cacChannel::priorityArchive = ( priorityMax - priorityMin ) / 2;
-const cacChannel::priLev cacChannel::priorityOPI = priorityMin;
-
-cacChannel::~cacChannel ()
-{
-}
-
-caAccessRights cacChannel::accessRights ( 
-    epicsGuard < epicsMutex > & ) const 
-{
-    static caAccessRights ar ( true, true );
-    return ar;
-}
-
-unsigned cacChannel::searchAttempts ( 
-    epicsGuard < epicsMutex > & ) const 
-{
-    return 0u;
-}
-
-double cacChannel::beaconPeriod ( 
-    epicsGuard < epicsMutex > & ) const 
-{
-    return - DBL_MAX;
-}
-
-double cacChannel::receiveWatchdogDelay ( 
-    epicsGuard < epicsMutex > & ) const
-{
-    return - DBL_MAX;
-}
-
-bool cacChannel::ca_v42_ok (
-    epicsGuard < epicsMutex > & ) const 
-{
-    return true;
-}
-
-bool cacChannel::connected (
-    epicsGuard < epicsMutex > & ) const 
-{
-    return true;
-}
-
-CACChannelPrivate :: 
-    CACChannelPrivate() :
-    _refLocalHostName ( localHostNameCache.getReference () )
-{
-}
-
-inline unsigned CACChannelPrivate :: 
-    getHostName ( char * pBuf, unsigned bufLength )
-{
-    return _refLocalHostName->getName ( pBuf, bufLength );
-}
-    
-inline const char * CACChannelPrivate :: 
-    pHostName ()
-{
-    return _refLocalHostName->pointer ();
-}
-
-static CACChannelPrivate * pCACChannelPrivate = 0;
-    
-// runs once only for each process
-extern "C" void cacChannelSetup ( void * )
-{
-    pCACChannelPrivate = new CACChannelPrivate ();
-}
-
-// the default is to assume that it is a locally hosted channel
-unsigned cacChannel::getHostName ( 
-    epicsGuard < epicsMutex > &,
-    char * pBuf, unsigned bufLength ) const throw ()
-{
-    if ( bufLength ) {
-        epicsThreadOnce ( & cacChannelIdOnce, cacChannelSetup, 0);
-        return pCACChannelPrivate->getHostName ( pBuf, bufLength );
-    }
-    return 0u;
-}
-
-// the default is to assume that it is a locally hosted channel
-const char * cacChannel::pHostName (
-    epicsGuard < epicsMutex > & ) const throw ()
-{
-    epicsThreadOnce ( & cacChannelIdOnce, cacChannelSetup, 0);
-    return pCACChannelPrivate->pHostName ();
-}
-
-cacContext::~cacContext () {}
-
-cacService::~cacService () {}
-
-

src/ca/client/cacChannelNotify.cpp

@@ -1,34 +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
- */
-
-#include "iocinf.h"
-
-#define epicsExportSharedSymbols
-#include "cacIO.h"
-#undef epicsExportSharedSymbols
-
-cacChannelNotify::~cacChannelNotify () 
-{
-}
-

src/ca/client/cacContextNotify.cpp

@@ -1,43 +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: Jeff Hill
- */
-
-#include <stdlib.h>
-
-#include "iocinf.h"
-
-#define epicsExportSharedSymbols
-#include "cacIO.h"
-#undef epicsExportSharedSymbols
-
-cacContextNotify::~cacContextNotify ()
-{
-}
-
-void cacContextNotify::callbackProcessingInitiateNotify () 
-{
-}
-
-void cacContextNotify::callbackProcessingCompleteNotify () 
-{
-}
-
-
-

src/ca/client/cacIO.h

@@ -1,392 +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
- */
-
-#ifndef cacIOh
-#define cacIOh
-
-//
-// Open Issues
-// -----------
-//
-// 1) A status code from the old client side interface is passed
-// to the exception notify callback. Should we just pass a string?
-// If so, then how do they detect the type of error and recover.
-// Perhaps we should  call a different vf for each type of exception.
-//
-// 2) Some exception types are present here but there is no common
-// exception base class in use.
-//
-// 3) Should I be passing the channel reference in cacChannelNotify?
-//
-// 4) Should the code for caAccessRights not be inline so that this
-// interface is version independent.
-//
-//
-
-#include <new>
-#include <stdarg.h>
-
-#ifdef epicsExportSharedSymbols
-#   define cacIOh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "tsDLList.h"
-#include "epicsMutex.h"
-#include "epicsGuard.h"
-#include "epicsThread.h"
-
-#ifdef cacIOh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
-
-class cacChannel;
-
-typedef unsigned long arrayElementCount;
-
-// 1) this should not be passing caerr.h status to the exception callback
-// 2) needless-to-say the data should be passed here using the new data access API
-class epicsShareClass cacWriteNotify {
-public:
-    virtual ~cacWriteNotify () = 0;
-    virtual void completion ( epicsGuard < epicsMutex > & ) = 0;
-// we should probably have a different vf for each type of exception ????
-    virtual void exception (
-        epicsGuard < epicsMutex > &,
-        int status, const char * pContext,
-        unsigned type, arrayElementCount count ) = 0;
-};
-
-// 1) this should not be passing caerr.h status to the exception callback
-// 2) needless-to-say the data should be passed here using the new data access API
-class epicsShareClass cacReadNotify {
-public:
-    virtual ~cacReadNotify () = 0;
-    virtual void completion (
-        epicsGuard < epicsMutex > &, unsigned type,
-        arrayElementCount count, const void * pData ) = 0;
-// we should probably have a different vf for each type of exception ????
-    virtual void exception (
-        epicsGuard < epicsMutex > &, int status,
-        const char * pContext, unsigned type,
-        arrayElementCount count ) = 0;
-};
-
-// 1) this should not be passing caerr.h status to the exception callback
-// 2) needless-to-say the data should be passed here using the new data access API
-class epicsShareClass cacStateNotify {
-public:
-    virtual ~cacStateNotify () = 0;
-    virtual void current (
-        epicsGuard < epicsMutex > &, unsigned type,
-        arrayElementCount count, const void * pData ) = 0;
-// we should probably have a different vf for each type of exception ????
-    virtual void exception (
-        epicsGuard < epicsMutex > &, int status,
-        const char *pContext, unsigned type,
-        arrayElementCount count ) = 0;
-};
-
-class caAccessRights {
-public:
-    caAccessRights (
-        bool readPermit = false,
-        bool writePermit = false,
-        bool operatorConfirmationRequest = false);
-    void setReadPermit ();
-    void setWritePermit ();
-    void setOperatorConfirmationRequest ();
-    void clrReadPermit ();
-    void clrWritePermit ();
-    void clrOperatorConfirmationRequest ();
-    bool readPermit () const;
-    bool writePermit () const;
-    bool operatorConfirmationRequest () const;
-private:
-    bool f_readPermit:1;
-    bool f_writePermit:1;
-    bool f_operatorConfirmationRequest:1;
-};
-
-class epicsShareClass cacChannelNotify {
-public:
-    virtual ~cacChannelNotify () = 0;
-    virtual void connectNotify ( epicsGuard < epicsMutex > & ) = 0;
-    virtual void disconnectNotify ( epicsGuard < epicsMutex > & ) = 0;
-    virtual void serviceShutdownNotify (
-        epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0;
-    virtual void accessRightsNotify (
-        epicsGuard < epicsMutex > &, const caAccessRights & ) = 0;
-    virtual void exception (
-        epicsGuard < epicsMutex > &, int status, const char *pContext ) = 0;
-// we should probably have a different vf for each type of exception ????
-    virtual void readException (
-        epicsGuard < epicsMutex > &, int status, const char *pContext,
-        unsigned type, arrayElementCount count, void *pValue ) = 0;
-// we should probably have a different vf for each type of exception ????
-    virtual void writeException (
-        epicsGuard < epicsMutex > &, int status, const char * pContext,
-        unsigned type, arrayElementCount count ) = 0;
-};
-
-class CallbackGuard :
-    public epicsGuard < epicsMutex > {
-public:
-    CallbackGuard ( epicsMutex & mutex ) :
-        epicsGuard < epicsMutex > ( mutex ) {}
-private:
-    CallbackGuard ( const CallbackGuard & );
-    CallbackGuard & operator = ( const CallbackGuard & );
-};
-
-//
-// Notes
-// 1) This interface assumes that when a channel is deleted then all
-// attached IO is deleted. This is left over from the old interface,
-// but perhaps is a bad practice that should be eliminated? If so,
-// then the IO should not store or use a pointer to the channel.
-//
-class epicsShareClass cacChannel {
-public:
-    typedef unsigned priLev;
-    static const priLev priorityMax;
-    static const priLev priorityMin;
-    static const priLev priorityDefault;
-    static const priLev priorityLinksDB;
-    static const priLev priorityArchive;
-    static const priLev priorityOPI;
-
-    typedef unsigned ioid;
-    enum ioStatus { iosSynch, iosAsynch };
-
-    cacChannel ( cacChannelNotify & );
-    virtual void destroy (
-        CallbackGuard & callbackGuard,
-        epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0;
-    cacChannelNotify & notify () const; // required ?????
-    virtual unsigned getName (
-        epicsGuard < epicsMutex > &,
-        char * pBuf, unsigned bufLen ) const throw () = 0;
-    // !! deprecated, avoid use  !!
-    virtual const char * pName (
-        epicsGuard < epicsMutex > & guard ) const throw () = 0;
-    virtual void show (
-        epicsGuard < epicsMutex > &,
-        unsigned level ) const = 0;
-    virtual void initiateConnect (
-        epicsGuard < epicsMutex > & ) = 0;
-    virtual unsigned requestMessageBytesPending (
-        epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0;
-    virtual void flush (
-        epicsGuard < epicsMutex > & mutualExclusionGuard ) = 0;
-    virtual ioStatus read (
-        epicsGuard < epicsMutex > &,
-        unsigned type, arrayElementCount count,
-        cacReadNotify &, ioid * = 0 ) = 0;
-    virtual void write (
-        epicsGuard < epicsMutex > &,
-        unsigned type, arrayElementCount count,
-        const void *pValue ) = 0;
-    virtual ioStatus write (
-        epicsGuard < epicsMutex > &,
-        unsigned type, arrayElementCount count,
-        const void *pValue, cacWriteNotify &, ioid * = 0 ) = 0;
-    virtual void subscribe (
-        epicsGuard < epicsMutex > &, unsigned type,
-        arrayElementCount count, unsigned mask, cacStateNotify &,
-        ioid * = 0 ) = 0;
-    // The primary mutex must be released when calling the user's
-    // callback, and therefore a finite interval exists when we are
-    // moving forward with the intent to call the users callback
-    // but the users IO could be deleted during this interval.
-    // To prevent the user's callback from being called after
-    // destroying his IO we must past a guard for the callback
-    // mutex here.
-    virtual void ioCancel (
-        CallbackGuard & callbackGuard,
-        epicsGuard < epicsMutex > & mutualExclusionGuard,
-        const ioid & ) = 0;
-    virtual void ioShow (
-        epicsGuard < epicsMutex > &,
-        const ioid &, unsigned level ) const = 0;
-    virtual short nativeType (
-        epicsGuard < epicsMutex > & ) const = 0;
-    virtual arrayElementCount nativeElementCount (
-        epicsGuard < epicsMutex > & ) const = 0;
-    virtual caAccessRights accessRights (
-        epicsGuard < epicsMutex > & ) const;
-    virtual unsigned searchAttempts (
-        epicsGuard < epicsMutex > & ) const;
-    virtual double beaconPeriod (
-        epicsGuard < epicsMutex > & ) const; // negative DBL_MAX if UKN
-    virtual double receiveWatchdogDelay (
-        epicsGuard < epicsMutex > & ) const; // negative DBL_MAX if UKN
-    virtual bool ca_v42_ok (
-        epicsGuard < epicsMutex > & ) const;
-    virtual bool connected (
-        epicsGuard < epicsMutex > & ) const;
-    virtual unsigned getHostName (
-        epicsGuard < epicsMutex > &,
-        char * pBuf, unsigned bufLength ) const throw ();
-    // !! deprecated, avoid use  !!
-    virtual const char * pHostName (
-        epicsGuard < epicsMutex > & guard ) const throw ();
-
-    // exceptions
-    class badString {};
-    class badType {};
-    class badPriority {};
-    class outOfBounds {};
-    class badEventSelection {};
-    class noWriteAccess {};
-    class noReadAccess {};
-    class notConnected {};
-    class unsupportedByService {};
-    class msgBodyCacheTooSmall {}; // hopefully this one goes away in the future
-    class requestTimedOut {};
-
-protected:
-    virtual ~cacChannel () = 0;
-
-private:
-    cacChannelNotify & callback;
-	cacChannel ( const cacChannel & );
-	cacChannel & operator = ( const cacChannel & );
-};
-
-class epicsShareClass cacContext {
-public:
-    virtual ~cacContext ();
-    virtual cacChannel & createChannel (
-        epicsGuard < epicsMutex > &,
-        const char * pChannelName, cacChannelNotify &,
-        cacChannel::priLev = cacChannel::priorityDefault ) = 0;
-    virtual void flush (
-        epicsGuard < epicsMutex > & ) = 0;
-    virtual unsigned circuitCount (
-        epicsGuard < epicsMutex > & ) const = 0;
-    virtual void selfTest (
-        epicsGuard < epicsMutex > & ) const = 0;
-    virtual unsigned beaconAnomaliesSinceProgramStart (
-        epicsGuard < epicsMutex > & ) const = 0;
-    virtual void show (
-        epicsGuard < epicsMutex > &, unsigned level ) const = 0;
-};
-
-class epicsShareClass cacContextNotify {
-public:
-    virtual ~cacContextNotify () = 0;
-    virtual cacContext & createNetworkContext (
-        epicsMutex & mutualExclusion, epicsMutex & callbackControl ) = 0;
-// we should probably have a different vf for each type of exception ????
-    virtual void exception (
-        epicsGuard < epicsMutex > &, int status, const char * pContext,
-        const char * pFileName, unsigned lineNo ) = 0;
-// perhaps this should be phased out in deference to the exception mechanism
-    virtual int varArgsPrintFormated ( const char * pformat, va_list args ) const = 0;
-// backwards compatibility (from here down)
-    virtual void attachToClientCtx () = 0;
-    virtual void callbackProcessingInitiateNotify () = 0;
-    virtual void callbackProcessingCompleteNotify () = 0;
-};
-
-// **** Lock Hierarchy ****
-// callbackControl must be taken before mutualExclusion if both are held at
-// the same time
-class epicsShareClass cacService {
-public:
-    virtual ~cacService () = 0;
-    virtual cacContext & contextCreate (
-        epicsMutex & mutualExclusion,
-        epicsMutex & callbackControl,
-        cacContextNotify & ) = 0;
-};
-
-epicsShareFunc void epicsShareAPI caInstallDefaultService ( cacService & service );
-
-epicsShareExtern epicsThreadPrivateId caClientCallbackThreadId;
-
-inline cacChannel::cacChannel ( cacChannelNotify & notify ) :
-    callback ( notify )
-{
-}
-
-inline cacChannelNotify & cacChannel::notify () const
-{
-    return this->callback;
-}
-
-inline caAccessRights::caAccessRights (
-    bool readPermit, bool writePermit, bool operatorConfirmationRequest) :
-    f_readPermit ( readPermit ), f_writePermit ( writePermit ),
-        f_operatorConfirmationRequest ( operatorConfirmationRequest ) {}
-
-inline void caAccessRights::setReadPermit ()
-{
-    this->f_readPermit = true;
-}
-
-inline void caAccessRights::setWritePermit ()
-{
-    this->f_writePermit = true;
-}
-
-inline void caAccessRights::setOperatorConfirmationRequest ()
-{
-    this->f_operatorConfirmationRequest = true;
-}
-
-inline void caAccessRights::clrReadPermit ()
-{
-    this->f_readPermit = false;
-}
-
-inline void caAccessRights::clrWritePermit ()
-{
-    this->f_writePermit = false;
-}
-
-inline void caAccessRights::clrOperatorConfirmationRequest ()
-{
-    this->f_operatorConfirmationRequest = false;
-}
-
-inline bool caAccessRights::readPermit () const
-{
-    return this->f_readPermit;
-}
-
-inline bool caAccessRights::writePermit () const
-{
-    return this->f_writePermit;
-}
-
-inline bool caAccessRights::operatorConfirmationRequest () const
-{
-    return this->f_operatorConfirmationRequest;
-}
-
-#endif // ifndef cacIOh

src/ca/client/cacReadNotify.cpp

@@ -1,30 +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: Jeff Hill
- */
-
-#include "iocinf.h"
-
-#define epicsExportSharedSymbols
-#include "cacIO.h"
-#undef epicsExportSharedSymbols
-
-cacReadNotify::~cacReadNotify ()
-{
-}