Set version 7.0.1-pre1 in CONFIG_BASE_VERSION

On Windows, neither the shell nor echo will strip double-quote
characters from the command-line, so just leave them out.

.appveyor.yml

@@ -67,13 +67,13 @@ matrix:
 #---------------------------------#
 
 install:
-  - cmd: ci/appveyor-prepare.bat
+  - cmd: .ci/appveyor-prepare.bat
 
 build_script:
-  - cmd: ci/appveyor-make.bat
+  - cmd: .ci/appveyor-make.bat
 
 test_script:
-  - cmd: ci/appveyor-make.bat runtests
+  - cmd: .ci/appveyor-make.bat runtests
 
 #---------------------------------#
 #         notifications           #

.ci/make-tar.sh

@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# Make tar for git repo w/ one level of sub modules.
+#
+set -e
+
+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/"
+
+# temporary directory w/ automatic cleanup
+TDIR=`mktemp -d`
+trap 'rm -rf "$TDIR"' EXIT INT QUIT TERM
+
+mkdir "$TDIR"/tar
+
+echo "Export 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 "visit $HASH $MODDIR"
+    (cd $MODDIR && git 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 .) > "$TDIR"/list.1
+
+sed \
+-e '/.*ci$/d' \
+-e '/.*ci\//d' \
+-e '/.*jenkins$/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 "$TDIR"/list.1 "$TDIR"/list.2
+then
+  echo "Warning: prohibited files being ignored"
+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"

.ci/travis-build.sh

@@ -85,6 +85,6 @@ make -j2 $EXTRA
 
 if [ "$TEST" != "NO" ]
 then
-   make tapfiles
+   make -j2 tapfiles
    make -s test-results
 fi

.ci/travis-prepare.sh

@@ -38,3 +38,9 @@ then
 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

@@ -7,6 +7,7 @@
 /include/
 /templates/
 /configure/*.local
+/modules/RELEASE.local
 O.*/
 /QtC-*
 *.orig

.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

@@ -3,16 +3,6 @@ dist: trusty
 language: c
 compiler:
   - gcc
-env:
-  - CMPLR=gcc
-  - CMPLR=gcc EXTRA=CMD_CXXFLAGS=-std=c++11
-  - CMPLR=gcc STATIC=YES
-  - CMPLR=clang
-  - CMPLR=clang STATIC=YES
-  - WINE=32 TEST=NO STATIC=YES
-  - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=NO
-  - RTEMS=4.9 TEST=NO
 addons:
   apt:
     packages:
@@ -28,5 +18,16 @@ addons:
 cache:
   directories:
    - $HOME/.cache
-install: sh ci/travis-prepare.sh </dev/null
-script: sh ci/travis-build.sh </dev/null
+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_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,60 +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
-TAPTOJUNIT                 = $(PERL) $(TOOLS)/tap-to-junit-xml.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,27 +15,39 @@
 # 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
 EPICS_PATCH_LEVEL = 0
 
 # This will end in -DEV between official releases
-EPICS_DEV_SNAPSHOT=-DEV
-#EPICS_DEV_SNAPSHOT=-pre1
+#EPICS_DEV_SNAPSHOT=-DEV
+EPICS_DEV_SNAPSHOT=-pre1
 #EPICS_DEV_SNAPSHOT=-pre1-DEV
 #EPICS_DEV_SNAPSHOT=-pre2
 #EPICS_DEV_SNAPSHOT=-pre2-DEV

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_ENV

@@ -74,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/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 =
@@ -153,18 +156,13 @@ ACTIONS += install
 ACTIONS += buildInstall
 ACTIONS += runtests tapfiles clean-tests test-results junitfiles
 
-actionArchTargets = $(foreach x, $(ACTIONS),\ $(foreach arch,$(BUILD_ARCHS), $(x)$(DIVIDER)$(arch)))
+actionArchTargets = $(foreach action, $(ACTIONS), \
+    $(foreach arch, $(BUILD_ARCHS), $(action)$(DIVIDER)$(arch)))
+cleanArchTargets = $(foreach arch, $(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 
-cleanArchTargets = $(foreach arch,$(BUILD_ARCHS), clean$(DIVIDER)$(arch))
 -include $(TOP)/configure/CONFIG_APP_INCLUDE
 
 all: install
-ifeq ($(EPICS_HOST_ARCH),$T_A)
-host: install
-else
-# Do nothing
-host:
-endif
 
 install: buildInstall
 
@@ -172,20 +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_BUILD

@@ -171,7 +171,7 @@ ifdef RES
 endif
 
 $(DIRECTORY_TARGETS) :
-	$(MKDIR) -p $@
+	$(MKDIR) $@
 
 # Install LIB_INSTALLS libraries before linking executables
 $(TESTPRODNAME) $(PRODNAME): | $(INSTALL_LIB_INSTALLS)
@@ -328,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
 
@@ -374,7 +380,7 @@ endif
 # 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.
@@ -382,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
 
@@ -457,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)
@@ -464,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 $@"
@@ -516,7 +532,7 @@ $(INSTALL_TEMPLATES_SUBDIR)/%: %
 
 .PHONY: all host inc build install clean rebuild buildInstall build_clean
 .PHONY: runtests tapfiles clean-tests test-results junitfiles
-.PHONY: checkRelease warnRelease noCheckRelease
+.PHONY: checkRelease warnRelease noCheckRelease FORCE
 
 endif # BASE_RULES_BUILD
 #	EOF RULES_BUILD

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)
 

configure/os/CONFIG.Common.vxWorksCommon

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

configure/os/CONFIG.UnixCommon.Common

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

configure/os/CONFIG.linux-386.Common

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

configure/os/CONFIG.linux-486.Common

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

configure/os/CONFIG.linux-586.Common

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

configure/os/CONFIG.linux-686.Common

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

configure/os/CONFIG.linux-x86.Common

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

configure/os/CONFIG.linux-x86_64.Common

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

configure/os/CONFIG_SITE.Common.vxWorksCommon

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

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

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

documentation/KnownProblems.html

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

documentation/README.1st

@@ -1,24 +1,24 @@
                            Installation Instructions
 
-                           EPICS Base Release 3.15.6
+                           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.6</H2><BR>
+<H2>EPICS Base Release 3.16.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>
@@ -341,7 +340,7 @@ 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
@@ -351,8 +350,8 @@ Files in the base/startup directory have been provided 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,29 +33,27 @@
 <h1>EPICS Base Release Procedures &amp; Checklist</h1>
 
 <p>This document describes the procedures and provides a checklist of tasks
-that should be performed when creating new releases of EPICS Base.</p>
+that should be performed when creating production releases of EPICS Base.</p>
 
 <h3>The Release Process</h3>
 
 <p>The version released on the Feature Freeze date is designated the first
-pre-release, <tt>-pre1</tt>. The first Release Candidate <tt>-rc1</tt> is the
+pre-release, <tt>-pre1</tt>. The first release candidate <tt>-rc1</tt> is the
 first version that has undergone widespread testing and which has no known
 problems in it that are slated to be fixed in this release. New versions should
-be made at 2-weekly intervals during the testing and debugging period, and will
-be designated as either pre-release versions or Release Candidates by the
-Release Manager. After a Release Candidate has been available to the whole
+be made at about weekly intervals during the testing and debugging period, and
+will be designated as either pre-release or release candidate versions by the
+Release Manager. After a release candidate has been available to the whole
 community for testing for at least a week without any additional problems being
 reported or significant changes being committed, the branch can be designated as
 the final release version.</p>
 
 <h3>Roles</h3>
 
-<p>The following roles are required. The individuals named here have have been
-responsible for these tasks in the past and are expected to continue in the
-relevent roles unless the Release Manager designates otherwise:</p>
+<p>The following roles are used below:</p>
 
 <dl>
-  <dt><strong>Release Manager</strong> (Ralph Lange)</dt>
+  <dt><strong>Release Manager</strong> ()</dt>
     <dd>Responsible for managing and tagging the release</dd>
   <dt><strong>Platform Developers</strong> (optional)</dt>
     <dd>Responsible for individual operating system platforms</dd>
@@ -91,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>
@@ -133,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.6-pre1</tt>
+            <tt>R3.16.1-pre<i>n</i></tt>
             &mdash; pre-release tag
             </li>
           <li>
-            <tt>R3.15.6-rc1</tt>
+            <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.6-rc1
+          cd base-3.16<br />
+          git tag -m 'ANJ: Tagged for 3.16.1-rc1' R3.16.1-rc1
           </tt></blockquote>
         </td>
       </tr>
     <tr>
       <td>&nbsp;</td>
       <td>Release Manager</td>
-      <td>Export the tagged version into a tarfile. 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.6-rc1
-            -r tag:R3.15.6-rc1
-            base-3.15.6-rc1.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.6-rc1.tar.gz
+          gpg --armor --sign --detach-sig base-3.16.1-rc1.tar.gz
           </tt></blockquote>
         </td>
       </tr>
@@ -259,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>
@@ -274,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.6</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.6
-            -r tag:R3.15.6
-            base-3.15.6.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.6.tar.gz
+          gpg --armor --sign --detach-sig base-3.16.1.tar.gz
           </tt></blockquote>
         </td>
       </tr>

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,51 @@
+#*************************************************************************
+# 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
+
+# Add any checked-out submodules to DIRS
+DIRS += $(subst /,,$(dir $(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 ()
-{
-}

src/ca/client/cacStateNotify.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
-
-cacStateNotify::~cacStateNotify ()
-{
-}

src/ca/client/cacWriteNotify.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
-
-cacWriteNotify::~cacWriteNotify ()
-{
-}

src/ca/client/cadef.h

@@ -1,904 +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 INCLcadefh
-#define INCLcadefh
-
-/*
- * done in two ifdef steps so that we will remain compatible with
- * traditional C
- */
-#ifndef CA_DONT_INCLUDE_STDARGH
-#   include <stdarg.h>
-#endif
-
-#ifdef epicsExportSharedSymbols
-#   define INCLcadefh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "epicsThread.h"
-
-#ifdef INCLcadefh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
-
-#include "caerr.h"
-#include "db_access.h"
-#include "caeventmask.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct oldChannelNotify *chid;
-typedef chid                    chanId; /* for when the structures field name is "chid" */
-typedef long                    chtype;
-typedef struct oldSubscription  *evid;
-typedef double                  ca_real;
-
-/* arguments passed to user connection handlers */
-struct  connection_handler_args {
-    chanId  chid;  /* channel id */
-    long    op;    /* one of CA_OP_CONN_UP or CA_OP_CONN_DOWN */
-};
-
-typedef void caCh (struct connection_handler_args args);
-
-typedef struct ca_access_rights {
-    unsigned    read_access:1;
-    unsigned    write_access:1;
-} caar;
-
-/* arguments passed to user access rights handlers */
-struct  access_rights_handler_args {
-    chanId  chid;   /* channel id */
-    caar    ar;     /* new access rights state */
-};
-
-typedef void caArh (struct access_rights_handler_args args);
-
-/*  The conversion routine to call for each type    */
-#define VALID_TYPE(TYPE)  (((unsigned short)TYPE)<=LAST_BUFFER_TYPE)
-
-/* 
- * Arguments passed to event handlers and get/put call back handlers.   
- *
- * The status field below is the CA ECA_XXX status of the requested
- * operation which is saved from when the operation was attempted in the
- * server and copied back to the clients call back routine.
- * If the status is not ECA_NORMAL then the dbr pointer will be NULL
- * and the requested operation can not be assumed to be successful.
- */
-typedef struct event_handler_args {
-    void            *usr;   /* user argument supplied with request */
-    chanId          chid;   /* channel id */
-    long            type;   /* the type of the item returned */ 
-    long            count;  /* the element count of the item returned */
-    const void      *dbr;   /* a pointer to the item returned */
-    int             status; /* ECA_XXX status of the requested op from the server */
-} evargs;
-typedef void caEventCallBackFunc (struct event_handler_args);
-
-epicsShareFunc void epicsShareAPI ca_test_event
-(
-    struct event_handler_args
-);
-
-/* arguments passed to user exception handlers */
-struct exception_handler_args {
-    void            *usr;   /* user argument supplied when installed */
-    chanId          chid;   /* channel id (may be nill) */
-    long            type;   /* type requested */
-    long            count;  /* count requested */
-    void            *addr;  /* user's address to write results of CA_OP_GET */
-    long            stat;   /* channel access ECA_XXXX status code */
-    long            op;     /* CA_OP_GET, CA_OP_PUT, ..., CA_OP_OTHER */
-    const char      *ctx;   /* a character string containing context info */
-    const char      *pFile; /* source file name (may be NULL) */
-    unsigned        lineNo; /* source file line number (may be zero) */
-};
-
-typedef unsigned CA_SYNC_GID;
-
-/*
- *  External OP codes for CA operations
- */
-#define CA_OP_GET             0
-#define CA_OP_PUT             1
-#define CA_OP_CREATE_CHANNEL  2
-#define CA_OP_ADD_EVENT       3
-#define CA_OP_CLEAR_EVENT     4
-#define CA_OP_OTHER           5
-
-/* 
- * used with connection_handler_args 
- */
-#define CA_OP_CONN_UP       6
-#define CA_OP_CONN_DOWN     7
-
-/* depricated */
-#define CA_OP_SEARCH        2
-
-/*
- * provides efficient test and display of channel access errors
- */
-#define     SEVCHK(CA_ERROR_CODE, MESSAGE_STRING) \
-{ \
-    int ca_unique_status_name  = (CA_ERROR_CODE); \
-    if(!(ca_unique_status_name & CA_M_SUCCESS)) \
-        ca_signal_with_file_and_lineno( \
-            ca_unique_status_name, \
-            (MESSAGE_STRING), \
-            __FILE__, \
-            __LINE__); \
-}
-
-
-#define TYPENOTCONN (-1) /* the channel's native type when disconnected   */
-epicsShareFunc short epicsShareAPI ca_field_type (chid chan);
-epicsShareFunc unsigned long epicsShareAPI ca_element_count (chid chan);
-epicsShareFunc const char * epicsShareAPI ca_name (chid chan);
-epicsShareFunc void epicsShareAPI ca_set_puser (chid chan, void *puser);
-epicsShareFunc void * epicsShareAPI ca_puser (chid chan);
-epicsShareFunc unsigned epicsShareAPI ca_read_access (chid chan);
-epicsShareFunc unsigned epicsShareAPI ca_write_access (chid chan);
-
-/*
- *  cs_ - `channel state'   
- *  
- *  cs_never_conn       valid chid, IOC not found
- *  cs_prev_conn        valid chid, IOC was found, but unavailable
- *  cs_conn             valid chid, IOC was found, still available
- *  cs_closed           channel deleted by user
- */
-enum channel_state {cs_never_conn, cs_prev_conn, cs_conn, cs_closed};
-epicsShareFunc enum channel_state epicsShareAPI ca_state (chid chan);
-
-/************************************************************************/
-/*  Perform Library Initialization                                      */
-/*                                                                      */
-/*  Must be called once before calling any of the other routines        */
-/************************************************************************/
-epicsShareFunc int epicsShareAPI ca_task_initialize (void);
-enum ca_preemptive_callback_select 
-{ ca_disable_preemptive_callback, ca_enable_preemptive_callback };
-epicsShareFunc int epicsShareAPI 
-        ca_context_create (enum ca_preemptive_callback_select select);
-epicsShareFunc void epicsShareAPI ca_detach_context (); 
-
-/************************************************************************/
-/*  Remove CA facility from your task                                   */
-/*                                                                      */
-/*  Normally called automatically at task exit                          */
-/************************************************************************/
-epicsShareFunc int epicsShareAPI ca_task_exit (void);
-epicsShareFunc void epicsShareAPI ca_context_destroy (void);
-
-typedef unsigned capri; 
-#define CA_PRIORITY_MAX 99
-#define CA_PRIORITY_MIN 0
-#define CA_PRIORITY_DEFAULT CA_PRIORITY_MIN
-
-#define CA_PRIORITY_DB_LINKS 80
-#define CA_PRIORITY_ARCHIVE 20
-#define CA_PRIORITY_OPI 0
-
-/*
- * ca_create_channel ()
- *
- * pChanName            R   channel name string
- * pConnStateCallback   R   address of connection state change 
- *                          callback function
- * pUserPrivate         R   placed in the channel's user private field
- *                          o can be fetched later by ca_puser(CHID)
- *                          o passed as void * arg to *pConnectCallback above
- * priority             R   priority level in the server 0 - 100
- * pChanID              RW  channel id written here
- */
-epicsShareFunc int epicsShareAPI ca_create_channel
-(
-     const char     *pChanName, 
-     caCh           *pConnStateCallback, 
-     void           *pUserPrivate,
-     capri          priority,
-     chid           *pChanID
-);
-
-/*
- * ca_change_connection_event()
- *
- * chan     R   channel identifier  
- * pfunc    R   address of connection call-back function
- */
-epicsShareFunc int epicsShareAPI ca_change_connection_event
-(
-     chid       chan,
-     caCh *     pfunc
-);
-
-/*
- * ca_replace_access_rights_event ()
- *
- * chan     R   channel identifier  
- * pfunc    R   address of access rights call-back function
- */
-epicsShareFunc int epicsShareAPI ca_replace_access_rights_event (
-     chid   chan,
-     caArh  *pfunc
-);
-
-/*
- * ca_add_exception_event ()
- *
- * replace the default exception handler
- *
- * pfunc    R   address of exception call-back function
- * pArg     R   copy of this pointer passed to exception 
- *          call-back function
- */
-typedef void caExceptionHandler (struct exception_handler_args);
-epicsShareFunc int epicsShareAPI ca_add_exception_event
-(
-     caExceptionHandler *pfunc,
-     void               *pArg
-);
-
-/*
- * ca_clear_channel()
- * - deallocate resources reserved for a channel
- *
- * chanId   R   channel ID
- */
-epicsShareFunc int epicsShareAPI ca_clear_channel
-(
-     chid   chanId
-);
-
-/************************************************************************/
-/*  Write a value to a channel                  */
-/************************************************************************/
-/*
- * ca_bput()
- *
- * WARNING: this copies the new value from a string (dbr_string_t) 
- *      (and not as an integer)
- *
- * chan         R       channel identifier  
- * pValue       R       new channel value string copied from this location
- */
-#define ca_bput(chan, pValue) \
-ca_array_put(DBR_STRING, 1u, chan, (const dbr_string_t *) (pValue))
-
-/*
- * ca_rput()
- *
- * WARNING: this copies the new value from a dbr_float_t 
- *
- * chan         R       channel identifier  
- * pValue       R       new channel value copied from this location
- */
-#define ca_rput(chan,pValue) \
-ca_array_put(DBR_FLOAT, 1u, chan, (const dbr_float_t *) pValue)
-
-/*
- * ca_put()
- *
- * type         R   data type from db_access.h
- * chan         R   channel identifier  
- * pValue       R   new channel value copied from this location
- */
-#define ca_put(type, chan, pValue) ca_array_put (type, 1u, chan, pValue)
-
-/*
- * ca_array_put()
- *
- * type         R   data type from db_access.h
- * count        R   array element count
- * chan         R   channel identifier  
- * pValue       R       new channel value copied from this location
- */
-epicsShareFunc int epicsShareAPI ca_array_put
-(
-     chtype         type,   
-     unsigned long  count,   
-     chid           chanId,
-     const void *   pValue
-);
-
-/*
- * ca_array_put_callback()
- *
- * This routine functions identically to the original ca put request 
- * with the addition of a callback to the user supplied function 
- * after recod processing completes in the IOC. The arguments
- * to the user supplied callback function are declared in
- * the structure event_handler_args and include the pointer
- * sized user argument supplied when ca_array_put_callback() is called.
- *
- * type         R   data type from db_access.h
- * count        R   array element count
- * chan         R   channel identifier  
- * pValue       R       new channel value copied from this location
- * pFunc        R   pointer to call-back function
- * pArg         R   copy of this pointer passed to pFunc
- */
-epicsShareFunc int epicsShareAPI ca_array_put_callback
-(
-     chtype                 type,   
-     unsigned long          count,   
-     chid                   chanId,
-     const void *           pValue,
-     caEventCallBackFunc *  pFunc,
-     void *                 pArg
-);
-
-#define ca_put_callback(type, chan, pValue, pFunc, pArg) \
-    ca_array_put_callback(type, 1u, chan, pValue, pFunc, pArg)
-
-/************************************************************************/
-/*  Read a value from a channel                                         */
-/************************************************************************/
-
-/*
- * ca_bget()
- *
- * WARNING: this copies the new value into a string (dbr_string_t) 
- *      (and not into an integer)
- *
- * chan     R   channel identifier  
- * pValue   W   channel value copied to this location
- */
-#define ca_bget(chan, pValue) \
-ca_array_get(DBR_STRING, 1u, chan, (dbr_string_t *)(pValue))
-
-/*
- * ca_rget()
- *
- * WARNING: this copies the new value into a 32 bit float (dbr_float_t) 
- *
- * chan     R   channel identifier  
- * pValue   W   channel value copied to this location
- */
-#define ca_rget(chan, pValue) \
-ca_array_get(DBR_FLOAT, 1u, chan, (dbr_float_t *)(pValue))
-
-/*
- * ca_rget()
- *
- * type     R   data type from db_access.h
- * chan     R   channel identifier  
- * pValue   W   channel value copied to this location
- */
-#define ca_get(type, chan, pValue) ca_array_get(type, 1u, chan, pValue)
-
-/*
- * ca_array_get()
- *
- * type     R   data type from db_access.h
- * count    R   array element count
- * chan     R   channel identifier  
- * pValue   W   channel value copied to this location
- */
-epicsShareFunc int epicsShareAPI ca_array_get
-(
-     chtype         type,   
-     unsigned long  count,   
-     chid           chanId,
-     void *         pValue
-);
-
-/************************************************************************/
-/*  Read a value from a channel and run a callback when the value       */
-/*  returns                                                             */
-/*                                                                      */
-/*                                                                      */
-/************************************************************************/
-/*
- * ca_bget_callback()
- *
- * WARNING: this returns the new value as a string (dbr_string_t) 
- *      (and not as an integer)
- *
- * chan     R   channel identifier  
- * pFunc    R   pointer to call-back function
- * pArg     R   copy of this pointer passed to pFunc
- */
-#define ca_bget_callback(chan, pFunc, pArg)\
-ca_array_get_callback (DBR_STRING, 1u, chan, pFunc, pArg)
-
-/*
- * ca_rget_callback()
- *
- * WARNING: this returns the new value as a float (dbr_float_t) 
- *
- * chan     R   channel identifier  
- * pFunc    R   pointer to call-back function
- * pArg     R   copy of this pointer passed to pFunc
- */
-#define ca_rget_callback(chan, pFunc, pArg)\
-ca_array_get_callback (DBR_FLOAT, 1u, chan, pFunc, pArg)
-
-/*
- * ca_get_callback()
- *
- * type     R   data type from db_access.h
- * chan     R   channel identifier  
- * pFunc    R   pointer to call-back function
- * pArg     R   copy of this pointer passed to pFunc
- */
-#define ca_get_callback(type, chan, pFunc, pArg)\
-ca_array_get_callback (type, 1u, chan, pFunc, pArg)
-
-/*
- * ca_array_get_callback()
- *
- * type     R   data type from db_access.h
- * count    R   array element count
- * chan     R   channel identifier  
- * pFunc    R   pointer to call-back function
- * pArg     R   copy of this pointer passed to pFunc
- */
-epicsShareFunc int epicsShareAPI ca_array_get_callback
-(
-     chtype                 type,   
-     unsigned long          count,   
-     chid                   chanId,
-     caEventCallBackFunc *  pFunc,
-     void *                 pArg
-);
-
-/************************************************************************/
-/*  Specify a function to be executed whenever significant changes      */
-/*  occur to a channel.                                                 */
-/*  NOTES:                                                              */
-/*  1)  Evid may be omited by passing a NULL pointer                    */
-/*                                                                      */
-/*  2)  An array count of zero specifies the native db count            */ 
-/*                                                                      */
-/************************************************************************/
-
-/*
- * ca_create_subscription ()
- *
- * type     R   data type from db_access.h
- * count    R   array element count
- * chan     R   channel identifier  
- * mask     R   event mask - one of {DBE_VALUE, DBE_ALARM, DBE_LOG}
- * pFunc    R   pointer to call-back function
- * pArg     R   copy of this pointer passed to pFunc
- * pEventID W   event id written at specified address
- */
-epicsShareFunc int epicsShareAPI ca_create_subscription
-(
-     chtype                 type,   
-     unsigned long          count,   
-     chid                   chanId,
-     long                   mask,
-     caEventCallBackFunc *  pFunc,
-     void *                 pArg,
-     evid *                 pEventID
-);
-
-/************************************************************************/
-/*  Remove a function from a list of those specified to run             */
-/*  whenever significant changes occur to a channel                     */
-/*                                                                      */
-/************************************************************************/
-/*
- * ca_clear_subscription()
- *
- * eventID  R   event id
- */
-epicsShareFunc int epicsShareAPI ca_clear_subscription
-(
-     evid eventID
-);
-
-epicsShareFunc chid epicsShareAPI ca_evid_to_chid ( evid id );
-
-
-/************************************************************************/
-/*                                                                      */
-/*   Requested data is not necessarily stable prior to                  */
-/*   return from called subroutine.  Call ca_pend_io()                  */
-/*   to guarantee that requested data is stable.  Call the routine      */
-/*   ca_flush_io() to force all outstanding requests to be              */
-/*   sent out over the network.  Significant increases in               */
-/*   performance have been measured when batching several remote        */
-/*   requests together into one message.  Additional                    */
-/*   improvements can be obtained by performing local processing        */
-/*   in parallel with outstanding remote processing.                    */
-/*                                                                      */
-/*   FLOW OF TYPICAL APPLICATION                                        */
-/*                                                                      */
-/*   search()       ! Obtain Channel ids                                */
-/*   .              ! "				                                    */
-/*   .              ! "                                                 */
-/*   pend_io        ! wait for channels to connect                      */
-/*                                                                      */
-/*   get()          ! several requests for remote info                  */
-/*   get()          ! "					                                */
-/*   add_event()    ! "					                                */	
-/*   get()          ! "					                                */
-/*   .                                                                  */
-/*   .                                                                  */
-/*   .                                                                  */
-/*   flush_io()     ! send get requests                                 */
-/*                  ! optional parallel processing                      */
-/*   .              ! "					                                */
-/*   .              ! "					                                */
-/*   pend_io()      ! wait for replies from get requests                */
-/*   .              ! access to requested data                          */
-/*   .              ! "					                                */
-/*   pend_event()   ! wait for requested events                         */
-/*                                                                      */
-/************************************************************************/
-
-/************************************************************************/
-/*  These routines wait for channel subscription events and call the    */
-/*  functions specified with add_event when events occur. If the        */
-/*  timeout is specified as 0 an infinite timeout is assumed.           */
-/*  ca_flush_io() is called by this routine. If ca_pend_io ()           */
-/*  is called when no IO is outstanding then it will return immediately */ 
-/*  without processing.                                                 */
-/************************************************************************/
-
-/*
- * ca_pend_event()
- *
- * timeOut  R   wait for this delay in seconds
- */
-epicsShareFunc int epicsShareAPI ca_pend_event (ca_real timeOut);
-#define ca_poll() ca_pend_event(1e-12)
-
-/*
- * ca_pend_io()
- *
- * timeOut  R   wait for this delay in seconds but return early 
- *              if all get requests (or search requests with null 
- *              connection handler pointer have completed)
- */
-epicsShareFunc int epicsShareAPI ca_pend_io (ca_real timeOut);
-
-/* calls ca_pend_io() if early is true otherwise ca_pend_event() is called */
-epicsShareFunc int epicsShareAPI ca_pend (ca_real timeout, int early);
-
-/*
- * ca_test_io()
- *
- * returns TRUE when get requests (or search requests with null 
- * connection handler pointer) are outstanding
- */
-epicsShareFunc int epicsShareAPI ca_test_io (void);
-
-/************************************************************************/
-/*  Send out all outstanding messages in the send queue                 */
-/************************************************************************/
-/*
- * ca_flush_io()
- */
-epicsShareFunc int epicsShareAPI ca_flush_io (void);
-
-
-/*
- *  ca_signal()
- *
- * errorCode    R   status returned from channel access function
- * pCtxStr  R   context string included with error print out
- */
-epicsShareFunc void epicsShareAPI ca_signal
-(
-     long errorCode,    
-     const char *pCtxStr     
-);
-
-/*
- * ca_signal_with_file_and_lineno()
- * errorCode    R   status returned from channel access function
- * pCtxStr  R   context string included with error print out
- * pFileStr R   file name string included with error print out
- * lineNo   R   line number included with error print out
- *
- */
-epicsShareFunc void epicsShareAPI ca_signal_with_file_and_lineno
-(
-     long errorCode,    
-     const char *pCtxStr,    
-     const char *pFileStr,   
-     int lineNo     
-);
-
-/*
- * ca_signal_formated()
- * errorCode    R   status returned from channel access function
- * pFileStr     R   file name string included with error print out
- * lineNo       R   line number included with error print out
- * pFormat      R   printf dtyle format string (and optional arguments)
- *
- */
-epicsShareFunc void epicsShareAPI ca_signal_formated (long ca_status, const char *pfilenm, 
-                                       int lineno, const char *pFormat, ...);
-
-/*
- * ca_host_name_function()
- *
- * channel  R   channel identifier
- *
- * !!!! this function is _not_ thread safe !!!!
- */
-epicsShareFunc const char * epicsShareAPI ca_host_name (chid channel);
-/* thread safe version */
-epicsShareFunc unsigned epicsShareAPI ca_get_host_name ( chid pChan, 
-    char *pBuf, unsigned bufLength );
-
-/*
- *  CA_ADD_FD_REGISTRATION
- *
- *  call their function with their argument whenever 
- *  a new fd is added or removed
- *  (for use with a manager of the select system call under UNIX)
- *
- *  if (opened) then fd was created
- *  if (!opened) then fd was deleted
- *
- */
-typedef void CAFDHANDLER (void *parg, int fd, int opened); 
-
-/*
- * ca_add_fd_registration()
- *
- * pHandler R   pointer to function which is to be called
- *                  when an fd is created or deleted
- * pArg     R   argument passed to above function
- */
-epicsShareFunc int epicsShareAPI ca_add_fd_registration
-(
-     CAFDHANDLER    *pHandler,
-     void           *pArg
-);
-
-
-/*
- * CA synch groups
- *
- * This facility will allow the programmer to create
- * any number of synchronization groups. The programmer might then
- * interleave IO requests within any of the groups. Once The
- * IO operations are initiated then the programmer is free to
- * block for IO completion within any one of the groups as needed.
- */
-
-/*
- * ca_sg_create()
- *
- * create a sync group
- *
- * pgid     W   pointer to sync group id that will be written   
- */
-epicsShareFunc int epicsShareAPI ca_sg_create (CA_SYNC_GID *  pgid);
-
-/*
- * ca_sg_delete()
- *
- * delete a sync group
- *
- * gid      R   sync group id 
- */
-epicsShareFunc int epicsShareAPI ca_sg_delete (const CA_SYNC_GID gid);
-
-/*
- * ca_sg_block()
- *
- * block for IO performed within a sync group to complete 
- *
- * gid      R   sync group id 
- * timeout  R   wait for this duration prior to timing out
- *          and returning ECA_TIMEOUT
- */
-epicsShareFunc int epicsShareAPI ca_sg_block (const CA_SYNC_GID gid, ca_real timeout);
-
-/*
- * ca_sg_test()
- *
- * test for sync group IO operations in progress
- *
- * gid      R   sync group id
- * 
- * returns one of ECA_BADSYNCGRP, ECA_IOINPROGRESS, ECA_IODONE
- */
-epicsShareFunc int epicsShareAPI ca_sg_test (const CA_SYNC_GID gid);
-
-/*
- * ca_sg_reset
- *
- * gid      R   sync group id
- */
-epicsShareFunc int epicsShareAPI ca_sg_reset(const CA_SYNC_GID gid);
-
-/*
- * ca_sg_array_get()
- *
- * initiate a get within a sync group
- * (essentially a ca_array_get() with a sync group specified)
- *
- * gid      R   sync group id
- * type     R   data type from db_access.h
- * count    R   array element count
- * chan     R   channel identifier  
- * pValue   W   channel value copied to this location
- */
-epicsShareFunc int epicsShareAPI ca_sg_array_get
-(
-    const CA_SYNC_GID gid,
-    chtype type, 
-    unsigned long count,
-    chid chan,
-    void *pValue  
-);
-
-#define ca_sg_get(gid, type, chan, pValue) \
-ca_sg_array_get (gid, type, 1u, chan, pValue)
-
-/*
- * ca_sg_array_put()
- *
- * initiate a put within a sync group
- * (essentially a ca_array_put() with a sync group specified)
- *
- * gid      R   sync group id
- * type     R   data type from db_access.h
- * count    R   array element count
- * chan     R   channel identifier  
- * pValue   R   new channel value copied from this location
- */
-epicsShareFunc int epicsShareAPI ca_sg_array_put
-(
-    const CA_SYNC_GID gid,
-    chtype type, 
-    unsigned long count,
-    chid chan,
-    const void *pValue  
-);
-
-#define ca_sg_put(gid, type, chan, pValue) \
-ca_sg_array_put (gid, type, 1u, chan, pValue)
-
-/*
- * ca_sg_stat()
- *
- * print status of a sync group
- *
- * gid      R   sync group id
- */
-epicsShareFunc int epicsShareAPI ca_sg_stat (CA_SYNC_GID gid);
-
-epicsShareFunc void epicsShareAPI ca_dump_dbr (chtype type, unsigned count, const void * pbuffer);
-
-
-/*
- * ca_v42_ok()
- *
- * Put call back is available if the CA server is on version is 4.2 
- *  or higher.
- *
- * chan     R   channel identifier
- * 
- * (returns true or false)
- */
-epicsShareFunc int epicsShareAPI ca_v42_ok (chid chan);
-
-/*
- * ca_version()
- *
- * returns the CA version string
- */
-epicsShareFunc const char * epicsShareAPI ca_version (void);
-
-/*
- * ca_replace_printf_handler ()
- *
- * for apps that want to change where ca formatted
- * text output goes
- *
- * use two ifdef's for trad C compatibility
- *
- * ca_printf_func   R   pointer to new function called when
- *                          CA prints an error message
- */
-#ifndef CA_DONT_INCLUDE_STDARGH
-typedef int caPrintfFunc (const char *pformat, va_list args);
-epicsShareFunc int epicsShareAPI ca_replace_printf_handler (
-    caPrintfFunc    *ca_printf_func
-);
-#endif /*CA_DONT_INCLUDE_STDARGH*/
-
-/*
- * (for testing purposes only)
- */
-epicsShareFunc unsigned epicsShareAPI ca_get_ioc_connection_count (void);
-epicsShareFunc int epicsShareAPI ca_preemtive_callback_is_enabled (void);
-epicsShareFunc void epicsShareAPI ca_self_test (void);
-epicsShareFunc unsigned epicsShareAPI ca_beacon_anomaly_count (void);
-epicsShareFunc unsigned epicsShareAPI ca_search_attempts (chid chan);
-epicsShareFunc double epicsShareAPI ca_beacon_period (chid chan);
-epicsShareFunc double epicsShareAPI ca_receive_watchdog_delay (chid chan);
-
-/*
- * used when an auxillary thread needs to join a CA client context started
- * by another thread
- */
-epicsShareFunc struct ca_client_context * epicsShareAPI ca_current_context ();
-epicsShareFunc int epicsShareAPI ca_attach_context ( struct ca_client_context * context );
-
-
-epicsShareFunc int epicsShareAPI ca_client_status ( unsigned level );
-epicsShareFunc int epicsShareAPI ca_context_status ( struct ca_client_context *, unsigned level );
-
-/*
- * deprecated
- */
-#define ca_build_channel(NAME,XXXXX,CHIDPTR,YYYYY)\
-ca_build_and_connect(NAME, XXXXX, 1, CHIDPTR, YYYYY, 0, 0)
-#define ca_array_build(NAME,XXXXX, ZZZZZZ, CHIDPTR,YYYYY)\
-ca_build_and_connect(NAME, XXXXX, ZZZZZZ, CHIDPTR, YYYYY, 0, 0)
-epicsShareFunc int epicsShareAPI ca_build_and_connect
-    ( const char *pChanName, chtype, unsigned long, 
-    chid * pChanID, void *, caCh * pFunc, void * pArg );
-#define ca_search(pChanName, pChanID)\
-ca_search_and_connect (pChanName, pChanID, 0, 0)
-epicsShareFunc int epicsShareAPI ca_search_and_connect
-    ( const char * pChanName, chid * pChanID, 
-    caCh *pFunc, void * pArg );
-epicsShareFunc int epicsShareAPI ca_channel_status (epicsThreadId tid);
-epicsShareFunc int epicsShareAPI ca_clear_event ( evid eventID );
-#define ca_add_event(type,chan,pFunc,pArg,pEventID)\
-ca_add_array_event(type,1u,chan,pFunc,pArg,0.0,0.0,0.0,pEventID)
-#define ca_add_delta_event(TYPE,CHID,ENTRY,ARG,DELTA,EVID)\
-    ca_add_array_event(TYPE,1,CHID,ENTRY,ARG,DELTA,DELTA,0.0,EVID)
-#define ca_add_general_event(TYPE,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID)\
-ca_add_array_event(TYPE,1,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID)
-#define ca_add_array_event(TYPE,COUNT,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID)\
-ca_add_masked_array_event(TYPE,COUNT,CHID,ENTRY,ARG,P_DELTA,N_DELTA,TO,EVID, DBE_VALUE | DBE_ALARM)
-epicsShareFunc int epicsShareAPI ca_add_masked_array_event
-    ( chtype type, unsigned long count, chid chanId, caEventCallBackFunc * pFunc,
-        void * pArg, ca_real p_delta, ca_real n_delta, ca_real timeout,
-        evid * pEventID, long mask );
-
-/*
- * defunct
- */
-epicsShareFunc int epicsShareAPI ca_modify_user_name ( const char *pUserName );
-epicsShareFunc int epicsShareAPI ca_modify_host_name ( const char *pHostName );
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
- * no additions below this endif
- */
-#endif /* ifndef INCLcadefh */
-

src/ca/client/caerr.h

@@ -1,160 +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
- *
- */ 
-
-
-#ifndef INCLcaerrh
-#define INCLcaerrh
-
-#ifdef epicsExportSharedSymbols
-#   define INCLcaerrh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#   include "epicsTypes.h"
-
-#ifdef INCLcaerrh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
-/*  CA Status Code Definitions   */
-
-#define CA_K_INFO       3   /* successful */
-#define CA_K_ERROR      2   /* failed- continue */
-#define CA_K_SUCCESS    1   /* successful */
-#define CA_K_WARNING    0   /* unsuccessful */
-#define CA_K_SEVERE     4   /* failed- quit */
-#define CA_K_FATAL  CA_K_ERROR | CA_K_SEVERE
-
-#define CA_M_MSG_NO     0x0000FFF8
-#define CA_M_SEVERITY   0x00000007
-#define CA_M_LEVEL      0x00000003
-#define CA_M_SUCCESS    0x00000001
-#define CA_M_ERROR      0x00000002
-#define CA_M_SEVERE     0x00000004
-
-#define CA_S_MSG_NO     0x0D
-#define CA_S_SEVERITY   0x03
-
-#define CA_V_MSG_NO     0x03
-#define CA_V_SEVERITY   0x00
-#define CA_V_SUCCESS    0x00
-
-/* Define MACROS to extract/insert individual fields from a status value */
-
-#define CA_EXTRACT_MSG_NO(code)\
-( ( (code) & CA_M_MSG_NO )  >> CA_V_MSG_NO )
-#define CA_EXTRACT_SEVERITY(code)\
-( ( (code) & CA_M_SEVERITY )    >> CA_V_SEVERITY )
-#define CA_EXTRACT_SUCCESS(code)\
-( ( (code) & CA_M_SUCCESS )     >> CA_V_SUCCESS )
-
-#define CA_INSERT_MSG_NO(code)\
-(   ((code)<< CA_V_MSG_NO)  & CA_M_MSG_NO   )
-#define CA_INSERT_SEVERITY(code)\
-(   ((code)<< CA_V_SEVERITY)& CA_M_SEVERITY )
-#define CA_INSERT_SUCCESS(code)\
-(   ((code)<< CA_V_SUCCESS) & CA_M_SUCCESS  )
-
-#define DEFMSG(SEVERITY,NUMBER)\
-(CA_INSERT_MSG_NO(NUMBER) | CA_INSERT_SEVERITY(SEVERITY))
-
-/*
- * In the lines below "defunct" indicates that current release 
- * servers and client library will not return this error code, but
- * servers on earlier releases that communicate with current clients 
- * might still generate exceptions with these error constants
- */
-#define ECA_NORMAL          DEFMSG(CA_K_SUCCESS,    0) /* success */
-#define ECA_MAXIOC          DEFMSG(CA_K_ERROR,      1) /* defunct */
-#define ECA_UKNHOST         DEFMSG(CA_K_ERROR,      2) /* defunct */
-#define ECA_UKNSERV         DEFMSG(CA_K_ERROR,      3) /* defunct */
-#define ECA_SOCK            DEFMSG(CA_K_ERROR,      4) /* defunct */
-#define ECA_CONN            DEFMSG(CA_K_WARNING,    5) /* defunct */
-#define ECA_ALLOCMEM        DEFMSG(CA_K_WARNING,    6) 
-#define ECA_UKNCHAN         DEFMSG(CA_K_WARNING,    7) /* defunct */
-#define ECA_UKNFIELD        DEFMSG(CA_K_WARNING,    8) /* defunct */
-#define ECA_TOLARGE         DEFMSG(CA_K_WARNING,    9) 
-#define ECA_TIMEOUT         DEFMSG(CA_K_WARNING,   10)
-#define ECA_NOSUPPORT       DEFMSG(CA_K_WARNING,   11) /* defunct */
-#define ECA_STRTOBIG        DEFMSG(CA_K_WARNING,   12) /* defunct */
-#define ECA_DISCONNCHID     DEFMSG(CA_K_ERROR,     13) /* defunct */
-#define ECA_BADTYPE         DEFMSG(CA_K_ERROR,     14)
-#define ECA_CHIDNOTFND      DEFMSG(CA_K_INFO,      15) /* defunct */
-#define ECA_CHIDRETRY       DEFMSG(CA_K_INFO,      16) /* defunct */
-#define ECA_INTERNAL        DEFMSG(CA_K_FATAL,     17)
-#define ECA_DBLCLFAIL       DEFMSG(CA_K_WARNING,   18) /* defunct */
-#define ECA_GETFAIL         DEFMSG(CA_K_WARNING,   19)
-#define ECA_PUTFAIL         DEFMSG(CA_K_WARNING,   20)
-#define ECA_ADDFAIL         DEFMSG(CA_K_WARNING,   21) /* defunct */
-#define ECA_BADCOUNT        DEFMSG(CA_K_WARNING,   22)
-#define ECA_BADSTR          DEFMSG(CA_K_ERROR,     23)
-#define ECA_DISCONN         DEFMSG(CA_K_WARNING,   24)
-#define ECA_DBLCHNL         DEFMSG(CA_K_WARNING,   25)
-#define ECA_EVDISALLOW      DEFMSG(CA_K_ERROR,     26)
-#define ECA_BUILDGET        DEFMSG(CA_K_WARNING,   27) /* defunct */
-#define ECA_NEEDSFP         DEFMSG(CA_K_WARNING,   28) /* defunct */
-#define ECA_OVEVFAIL        DEFMSG(CA_K_WARNING,   29) /* defunct */
-#define ECA_BADMONID        DEFMSG(CA_K_ERROR,     30)
-#define ECA_NEWADDR         DEFMSG(CA_K_WARNING,   31) /* defunct */
-#define ECA_NEWCONN         DEFMSG(CA_K_INFO,      32) /* defunct */
-#define ECA_NOCACTX         DEFMSG(CA_K_WARNING,   33) /* defunct */
-#define ECA_DEFUNCT         DEFMSG(CA_K_FATAL,     34) /* defunct */
-#define ECA_EMPTYSTR        DEFMSG(CA_K_WARNING,   35) /* defunct */
-#define ECA_NOREPEATER      DEFMSG(CA_K_WARNING,   36) /* defunct */
-#define ECA_NOCHANMSG       DEFMSG(CA_K_WARNING,   37) /* defunct */
-#define ECA_DLCKREST        DEFMSG(CA_K_WARNING,   38) /* defunct */
-#define ECA_SERVBEHIND      DEFMSG(CA_K_WARNING,   39) /* defunct */
-#define ECA_NOCAST          DEFMSG(CA_K_WARNING,   40) /* defunct */
-#define ECA_BADMASK         DEFMSG(CA_K_ERROR,     41)
-#define ECA_IODONE          DEFMSG(CA_K_INFO,      42)
-#define ECA_IOINPROGRESS    DEFMSG(CA_K_INFO,      43)
-#define ECA_BADSYNCGRP      DEFMSG(CA_K_ERROR,     44)
-#define ECA_PUTCBINPROG     DEFMSG(CA_K_ERROR,     45)
-#define ECA_NORDACCESS      DEFMSG(CA_K_WARNING,   46)
-#define ECA_NOWTACCESS      DEFMSG(CA_K_WARNING,   47)
-#define ECA_ANACHRONISM     DEFMSG(CA_K_ERROR,     48)
-#define ECA_NOSEARCHADDR    DEFMSG(CA_K_WARNING,   49)
-#define ECA_NOCONVERT       DEFMSG(CA_K_WARNING,   50)
-#define ECA_BADCHID         DEFMSG(CA_K_ERROR,     51)
-#define ECA_BADFUNCPTR      DEFMSG(CA_K_ERROR,     52)
-#define ECA_ISATTACHED      DEFMSG(CA_K_WARNING,   53)
-#define ECA_UNAVAILINSERV   DEFMSG(CA_K_WARNING,   54)
-#define ECA_CHANDESTROY     DEFMSG(CA_K_WARNING,   55)
-#define ECA_BADPRIORITY     DEFMSG(CA_K_ERROR,     56)
-#define ECA_NOTTHREADED     DEFMSG(CA_K_ERROR,     57)
-#define ECA_16KARRAYCLIENT  DEFMSG(CA_K_WARNING,   58)
-#define ECA_CONNSEQTMO      DEFMSG(CA_K_WARNING,   59)
-#define ECA_UNRESPTMO       DEFMSG(CA_K_WARNING,   60)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-epicsShareFunc const char * epicsShareAPI ca_message(long ca_status);
-
-epicsShareExtern const char * ca_message_text [];
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/ca/client/caeventmask.h

@@ -1,44 +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 INCLcaeventmaskh
-#define INCLcaeventmaskh
-
-/*
-    event selections
-    (If any more than 8 of these are needed then update the 
-    select field in the event_block struct in db_event.c from 
-    unsigned char to unsigned short)
-
-
-    DBE_VALUE 
-    Trigger an event when a significant change in the channel's value
-    occurs. Relies on the monitor deadband field under DCT.
-
-    DBE_ARCHIVE (DBE_LOG)
-    Trigger an event when an archive significant change in the channel's
-    value occurs. Relies on the archiver monitor deadband field under DCT.
-
-    DBE_ALARM
-    Trigger an event when the alarm state changes
-
-    DBE_PROPERTY
-    Trigger an event when a property change (control limit, graphical
-    limit, status string, enum string ...) occurs.
-
-*/
-
-#define DBE_VALUE    (1<<0)
-#define DBE_ARCHIVE  (1<<1)
-#define DBE_LOG      DBE_ARCHIVE
-#define DBE_ALARM    (1<<2)
-#define DBE_PROPERTY (1<<3)
-
-#endif

src/ca/client/casw.cpp

@@ -1,306 +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 <stdio.h>
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "envDefs.h" 
-#include "errlog.h"
-#include "osiWireFormat.h"
-
-#include "bhe.h"
-#include "udpiiu.h"
-#include "inetAddrID.h"
-
-// using a wrapper class around the free list avoids
-// Tornado 2.0.1 GNU compiler bugs
-class bheFreeStoreMgr : public bheMemoryManager {
-public:
-    bheFreeStoreMgr () {}
-    void * allocate ( size_t );
-    void release ( void * );
-private:
-    tsFreeList < class bhe, 0x100 > freeList;
-	bheFreeStoreMgr ( const bheFreeStoreMgr & );
-	bheFreeStoreMgr & operator = ( const bheFreeStoreMgr & );
-};
-
-void * bheFreeStoreMgr::allocate ( size_t size )
-{
-    return freeList.allocate ( size );
-}
-
-void bheFreeStoreMgr::release ( void * pCadaver )
-{
-    freeList.release ( pCadaver );
-}
-
-int main ( int argc, char ** argv )
-{
-    epicsMutex mutex;
-    epicsGuard < epicsMutex > guard ( mutex );
-    bheFreeStoreMgr bheFreeList;
-    epicsTime programBeginTime = epicsTime::getCurrent ();
-    bool validCommandLine = false;
-    unsigned interest = 0u;
-    SOCKET sock;
-    osiSockAddr addr;
-    osiSocklen_t addrSize;
-    char buf [0x4000];
-    const char *pCurBuf;
-    const caHdr *pCurMsg;
-    ca_uint16_t serverPort;
-    ca_uint16_t repeaterPort;
-    int status;
-
-    if ( argc == 1 ) {
-        validCommandLine = true;
-    }
-    else if ( argc == 2 ) {
-        status = sscanf ( argv[1], " -i%u ", & interest );
-        if ( status == 1 ) {
-            validCommandLine = true;
-        }
-    }
-    else if ( argc == 3 ) {
-        if ( strcmp ( argv[1], "-i" ) == 0 ) {
-            status = sscanf ( argv[2], " %u ", & interest );
-            if ( status == 1 ) {
-                validCommandLine = true;
-            }
-        }
-    }
-
-    if ( ! validCommandLine ) {
-        printf ( "usage: casw <-i interestLevel>\n" );
-        return 0;
-    }
-
-    serverPort =
-        envGetInetPortConfigParam ( &EPICS_CA_SERVER_PORT,
-                                    static_cast <unsigned short> (CA_SERVER_PORT) );
-
-    repeaterPort =
-        envGetInetPortConfigParam ( &EPICS_CA_REPEATER_PORT,
-                                    static_cast <unsigned short> (CA_REPEATER_PORT) );
-
-    caStartRepeaterIfNotInstalled ( repeaterPort );
-
-    sock = epicsSocketCreate ( AF_INET, SOCK_DGRAM, IPPROTO_UDP );
-    if ( sock == INVALID_SOCKET ) {
-        char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
-        errlogPrintf ("casw: unable to create datagram socket because = \"%s\"\n",
-            sockErrBuf );
-        return -1;
-    }
-
-    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 ( 0 );  // any port
-    status = bind ( sock, &addr.sa, sizeof (addr) );
-    if ( status < 0 ) {
-        char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
-        epicsSocketDestroy ( sock );
-        errlogPrintf ( "casw: unable to bind to an unconstrained address because = \"%s\"\n",
-            sockErrBuf );
-        return -1;
-    }
-
-    osiSockIoctl_t yes = true;
-    status = socket_ioctl ( sock, FIONBIO, &yes );
-    if ( status < 0 ) {
-        char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
-        epicsSocketDestroy ( sock );
-        errlogPrintf ( "casw: unable to set socket to nonblocking state because \"%s\"\n",
-            sockErrBuf );
-        return -1;
-    }
-
-    unsigned attemptNumber = 0u;
-    while ( true ) {
-        caRepeaterRegistrationMessage ( sock, repeaterPort, attemptNumber );
-        epicsThreadSleep ( 0.1 );
-        addrSize = ( osiSocklen_t ) sizeof ( addr );
-        status = recvfrom ( sock, buf, sizeof ( buf ), 0,
-                            &addr.sa, &addrSize );
-        if ( status >= static_cast <int> ( sizeof ( *pCurMsg ) ) ) {
-            pCurMsg = reinterpret_cast < caHdr * > ( buf );
-            epicsUInt16 cmmd = AlignedWireRef < const epicsUInt16 > ( pCurMsg->m_cmmd );
-            if ( cmmd == REPEATER_CONFIRM ) {
-                break;
-            }
-        }
-
-        attemptNumber++;
-        if ( attemptNumber > 100 ) {
-            epicsSocketDestroy ( sock );
-            errlogPrintf ( "casw: unable to register with the CA repeater\n" );
-            return -1;
-        }
-    }
-
-    osiSockIoctl_t no = false;
-    status = socket_ioctl ( sock, FIONBIO, &no );
-    if ( status < 0 ) {
-        char sockErrBuf[64];
-        epicsSocketConvertErrnoToString ( 
-            sockErrBuf, sizeof ( sockErrBuf ) );
-        epicsSocketDestroy ( sock );
-        errlogPrintf ( "casw: unable to set socket to blocking state because \"%s\"\n",
-            sockErrBuf );
-        return -1;
-    }
-
-    resTable < bhe, inetAddrID > beaconTable;
-    while ( true ) {
-
-        addrSize = ( osiSocklen_t ) sizeof ( addr );
-        status = recvfrom ( sock, buf, sizeof ( buf ), 0,
-                            &addr.sa, &addrSize );
-        if ( status <= 0 ) {
-            char sockErrBuf[64];
-            epicsSocketConvertErrnoToString ( 
-                sockErrBuf, sizeof ( sockErrBuf ) );
-            epicsSocketDestroy ( sock );
-            errlogPrintf ("casw: error from recv was = \"%s\"\n",
-                sockErrBuf );
-            return -1;
-        }
-
-        if ( addr.sa.sa_family != AF_INET ) {
-            continue;
-        }
-        
-        unsigned byteCount = static_cast <unsigned> ( status );
-        pCurMsg = reinterpret_cast < const caHdr * > ( ( pCurBuf = buf ) );
-        while ( byteCount ) {
-            AlignedWireRef < const epicsUInt16 > pstSize ( pCurMsg->m_postsize );
-            size_t msgSize = pstSize + sizeof ( *pCurMsg ) ;
-            if ( msgSize > byteCount ) {
-                errlogPrintf ( "CASW: udp input protocol violation\n" );
-                break;
-            }
-
-            epicsUInt16 cmmd = AlignedWireRef < const epicsUInt16 > ( pCurMsg->m_cmmd );
-            if ( cmmd == CA_PROTO_RSRV_IS_UP ) {
-                bool anomaly = false;
-                epicsTime previousTime;
-                struct sockaddr_in ina;
-
-                /* 
-                 * this allows a fan-out server to potentially
-                 * insert the true address of the CA server 
-                 *
-                 * old servers:
-                 *   1) set this field to one of the ip addresses of the host _or_
-                 *   2) set this field to INADDR_ANY
-                 * new servers:
-                 *   always set this field to INADDR_ANY
-                 *
-                 * clients always assume that if this
-                 * field is set to something that isnt INADDR_ANY
-                 * then it is the overriding IP address of the server.
-                 */
-                ina.sin_family = AF_INET;
-                ina.sin_addr.s_addr = pCurMsg->m_available;
-
-                if ( pCurMsg->m_count != 0 ) {
-                    ina.sin_port = pCurMsg->m_count;
-                }
-                else {
-                    /*
-                     * old servers dont supply this and the
-                     * default port must be assumed
-                     */
-                    ina.sin_port = htons ( serverPort );
-                }
-
-                ca_uint32_t beaconNumber = ntohl ( pCurMsg->m_cid );
-                unsigned protocolRevision = ntohs ( pCurMsg->m_dataType );
-
-                epicsTime currentTime = epicsTime::getCurrent();
-
-                /*
-                 * look for it in the hash table
-                 */
-                bhe *pBHE = beaconTable.lookup ( ina );
-                if ( pBHE ) {
-                    previousTime = pBHE->updateTime ( guard );
-                    anomaly = pBHE->updatePeriod ( 
-                        guard, programBeginTime, 
-                        currentTime, beaconNumber, protocolRevision );
-                }
-                else {
-                    /*
-                     * This is the first beacon seen from this server.
-                     * Wait until 2nd beacon is seen before deciding
-                     * if it is a new server (or just the first
-                     * time that we have seen a server's beacon
-                     * shortly after the program started up)
-                     */
-                    pBHE = new ( bheFreeList ) 
-                        bhe ( mutex, currentTime, beaconNumber, ina );
-                    if ( pBHE ) {
-                        if ( beaconTable.add ( *pBHE ) < 0 ) {
-                            pBHE->~bhe ();
-                            bheFreeList.release ( pBHE );
-                        }
-                    }
-                }
-                if ( anomaly || interest > 1 ) {
-                    char date[64];
-                    currentTime.strftime ( date, sizeof ( date ), 
-                        "%Y-%m-%d %H:%M:%S.%09f");
-                    char host[64];
-                    ipAddrToA ( &ina, host, sizeof ( host ) );
-                    const char * pPrefix = "";
-                    if ( interest > 1 ) {
-                        if ( anomaly ) {
-                            pPrefix = "* ";
-                        }
-                        else {
-                            pPrefix = "  ";
-                        }
-                    }
-                    printf ( "%s%-40s %s\n", 
-                        pPrefix, host, date );
-                    if ( anomaly && interest > 0 ) {
-                        printf ( "\testimate=%f current=%f\n", 
-                            pBHE->period ( guard ), 
-                            currentTime - previousTime );
-                    }
-                    fflush(stdout);
-                }
-            }
-            pCurBuf += msgSize;
-            pCurMsg = reinterpret_cast < const caHdr * > ( pCurBuf );
-            byteCount -= msgSize;
-        }
-    }
-}

src/ca/client/catime.c

@@ -1,685 +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 performance test 
- *
- *  History 
- *  joh 09-12-89 Initial release
- *  joh 12-20-94 portability
- *
- * 
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <float.h>
-#include <limits.h>
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "epicsAssert.h"
-#include "epicsTime.h"
-#include "cadef.h"
-#include "caProto.h"
-
-#include "caDiagnostics.h"
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#define WAIT_FOR_ACK
-
-typedef struct testItem {
-    chid                chix;
-    char                name[128];
-    int                 type;
-    int                 count;
-    void *              pValue;	
-} ti;
-
-typedef void tf ( ti *pItems, unsigned iterations, unsigned *pInlineIter );
-
-/*
- * test_pend()
- */
-static void test_pend(
-ti          *pItems,
-unsigned    iterations,
-unsigned    *pInlineIter
-)
-{
-    unsigned    i;
-    int         status;
-
-    for (i=0; i<iterations; i++) {
-        status = ca_pend_event(1e-9);
-        if (status != ECA_TIMEOUT && status != ECA_NORMAL) {
-            SEVCHK(status, NULL);
-        }
-        status = ca_pend_event(1e-9);
-        if (status != ECA_TIMEOUT && status != ECA_NORMAL) {
-            SEVCHK(status, NULL);
-        }
-        status = ca_pend_event(1e-9);
-        if (status != ECA_TIMEOUT && status != ECA_NORMAL) {
-            SEVCHK(status, NULL);
-        }
-        status = ca_pend_event(1e-9);
-        if (status != ECA_TIMEOUT && status != ECA_NORMAL) {
-            SEVCHK(status, NULL);
-        }
-        status = ca_pend_event(1e-9);
-        if (status != ECA_TIMEOUT && status != ECA_NORMAL) {
-            SEVCHK(status, NULL);
-        }
-    }
-    *pInlineIter = 5;
-}
-
-/*
- * test_search ()
- */
-static void test_search (
-ti      *pItems,
-unsigned    iterations,
-unsigned    *pInlineIter
-)
-{
-    unsigned i;
-    int status;
-
-    for ( i = 0u; i < iterations; i++ ) {
-        status = ca_search ( pItems[i].name, &pItems[i].chix );
-        SEVCHK (status, NULL);
-    }
-    status = ca_pend_io ( 0.0 );
-        SEVCHK ( status, NULL );
-
-    *pInlineIter = 1;
-}
-
-/*
- * test_sync_search()
- */
-#if 0
-static void test_sync_search(
-ti      *pItems,
-unsigned    iterations,
-unsigned    *pInlineIter
-)
-{
-    unsigned i;
-    int status;
-
-    for (i=0u; i<iterations; i++) {
-        status = ca_search (pItems[i].name, &pItems[i].chix);
-        SEVCHK (status, NULL);
-        status = ca_pend_io(0.0);
-        SEVCHK (status, NULL);
-    }
-
-    *pInlineIter = 1;
-}
-#endif
-
-/*
- * test_free ()
- */
-static void test_free(
-ti      *pItems,
-unsigned    iterations,
-unsigned    *pInlineIter
-)
-{
-    int status;
-    unsigned i;
-        
-    for (i=0u; i<iterations; i++) {
-        status = ca_clear_channel (pItems[i].chix);
-        SEVCHK (status, NULL);
-    }
-    status = ca_flush_io();
-    SEVCHK (status, NULL);
-    *pInlineIter = 1;
-}
-
-/*
- * test_put ()
- */
-static void test_put(
-ti      *pItems,
-unsigned    iterations,
-unsigned    *pInlineIter
-)
-{
-    ti      *pi;
-    int     status;
-    dbr_int_t   val;
-  
-    for (pi=pItems; pi < &pItems[iterations]; pi++) {
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_put(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-    }
-#ifdef WAIT_FOR_ACK
-    status = ca_array_get (DBR_INT, 1, pItems[0].chix, &val);
-    SEVCHK (status, NULL);
-    ca_pend_io(100.0);
-#endif
-    status = ca_array_put(
-            pItems[0].type,
-            pItems[0].count,
-            pItems[0].chix,
-            pItems[0].pValue);
-        SEVCHK (status, NULL);
-    status = ca_flush_io();
-        SEVCHK (status, NULL);
-
-    *pInlineIter = 10;
-}
-
-/*
- * test_get ()
- */
-static void test_get(
-ti          *pItems,
-unsigned    iterations,
-unsigned    *pInlineIter
-)
-{
-    ti  *pi;
-    int status;
-  
-    for (pi=pItems; pi<&pItems[iterations]; pi++) {
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-        SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-    }
-    status = ca_pend_io(1e20);
-        SEVCHK (status, NULL);
-
-    *pInlineIter = 10;
-}
-
-/*
- * test_wait ()
- */
-static void test_wait (
-ti      *pItems,
-unsigned    iterations,
-unsigned    *pInlineIter
-)
-{
-    ti  *pi;
-    int status;
-  
-    for (pi=pItems; pi<&pItems[iterations]; pi++) {
-        status = ca_array_get(
-                pi->type,
-                pi->count,
-                pi->chix,
-                pi->pValue);
-            SEVCHK (status, NULL);
-        status = ca_pend_io(100.0);
-        SEVCHK (status, NULL);
-    }
-
-    *pInlineIter = 1;
-}
-
-/*
- * measure_get_latency
- */
-static void measure_get_latency (ti *pItems, unsigned iterations)
-{
-    epicsTimeStamp end_time;
-    epicsTimeStamp start_time;
-    double delay;
-    double X = 0u;
-    double XX = 0u; 
-    double max = DBL_MIN; 
-    double min = DBL_MAX; 
-    double mean;
-    double stdDev;
-    ti *pi;
-    int status;
-
-    for ( pi = pItems; pi < &pItems[iterations]; pi++ ) {
-        epicsTimeGetCurrent ( &start_time );
-        status = ca_array_get ( pi->type, pi->count, 
-                        pi->chix, pi->pValue );
-        SEVCHK ( status, NULL );
-        status = ca_pend_io ( 100.0 );
-        SEVCHK ( status, NULL );
-
-        epicsTimeGetCurrent ( &end_time );
-
-        delay = epicsTimeDiffInSeconds ( &end_time,&start_time );
-
-        X += delay;
-        XX += delay*delay;
-
-        if ( delay > max ) {
-            max = delay;
-        }
-
-        if ( delay < min ) {
-            min = delay;
-        }
-    }
-
-    mean = X/iterations;
-    stdDev = sqrt ( XX/iterations - mean*mean );
-    printf ( 
-        "Get Latency - "
-        "mean = %3.1f uS, "
-        "std dev = %3.1f uS, "
-        "min = %3.1f uS "
-        "max = %3.1f uS\n",
-        mean * 1e6, stdDev * 1e6, 
-        min * 1e6, max * 1e6 );
-}
-
-/*
- * printSearchStat()
- */
-static void printSearchStat ( const ti * pi, unsigned iterations )
-{
-    unsigned i;
-    double  X = 0u;
-    double  XX = 0u; 
-    double  max = DBL_MIN; 
-    double  min = DBL_MAX; 
-    double  mean;
-    double  stdDev;
-
-    for ( i = 0; i < iterations; i++ ) {
-        double retry = ca_search_attempts ( pi[i].chix );
-        X += retry;
-        XX += retry * retry;
-        if ( retry > max ) {
-            max = retry;
-        }
-        if ( retry < min ) {
-            min = retry;
-        }
-    }
-
-    mean = X / iterations;
-    stdDev = sqrt( XX / iterations - mean * mean );
-    printf ( 
-        "Search tries per chan - "
-        "mean = %3.1f "
-        "std dev = %3.1f "
-        "min = %3.1f "
-        "max = %3.1f\n",
-        mean, stdDev, min, max);
-}
-
-/*
- * timeIt ()
- */
-void timeIt ( tf *pfunc, ti *pItems, unsigned iterations,
-    unsigned nBytesSent, unsigned nBytesRecv )
-{
-    epicsTimeStamp      end_time;
-    epicsTimeStamp      start_time;
-    double              delay;
-    unsigned            inlineIter;
-
-    epicsTimeGetCurrent ( &start_time );
-    (*pfunc) ( pItems, iterations, &inlineIter );
-    epicsTimeGetCurrent ( &end_time );
-    delay = epicsTimeDiffInSeconds ( &end_time, &start_time );
-    if ( delay > 0.0 ) {
-        double freq = ( iterations * inlineIter ) / delay;
-        printf ( "Per Op, %8.4f uS ( %8.4f MHz )", 
-            1e6 / freq, freq / 1e6 );
-        if ( pItems != NULL ) {
-            printf(", %8.4f snd Mbps, %8.4f rcv Mbps\n", 
-                (inlineIter*nBytesSent*CHAR_BIT)/(delay*1e6),
-                (inlineIter*nBytesRecv*CHAR_BIT)/(delay*1e6) );
-        }
-        else {
-            printf ("\n");
-        }
-    }
-}
-
-/*
- * test ()
- */
-static void test ( ti *pItems, unsigned iterations )
-{
-    unsigned payloadSize, dblPayloadSize;
-    unsigned nBytesSent, nBytesRecv;
-
-    payloadSize =     
-        dbr_size_n ( pItems[0].type, pItems[0].count );
-    payloadSize = CA_MESSAGE_ALIGN ( payloadSize );
-
-    dblPayloadSize = dbr_size [ DBR_DOUBLE ];
-    dblPayloadSize = CA_MESSAGE_ALIGN ( dblPayloadSize );
-    
-    if ( payloadSize > dblPayloadSize ) {
-        unsigned factor = payloadSize / dblPayloadSize;
-        while ( factor ) {
-            if ( iterations > 10 * factor ) {
-                iterations /= factor;
-                break;
-            }
-            factor /= 2;
-        }
-    }
-
-    printf ( "\t### async put test ###\n");
-    nBytesSent = sizeof ( caHdr ) + CA_MESSAGE_ALIGN( payloadSize );
-    nBytesRecv = 0u;
-    timeIt ( test_put, pItems, iterations, 
-        nBytesSent * iterations, 
-        nBytesRecv * iterations );
-
-    printf ( "\t### async get test ###\n");
-    nBytesSent = sizeof ( caHdr );
-    nBytesRecv = sizeof ( caHdr ) + CA_MESSAGE_ALIGN ( payloadSize );
-    timeIt ( test_get, pItems, iterations, 
-        nBytesSent * ( iterations ), 
-        nBytesRecv * ( iterations ) );
-
-    printf ("\t### synch get test ###\n");
-    nBytesSent = sizeof ( caHdr );
-    nBytesRecv = sizeof ( caHdr ) + CA_MESSAGE_ALIGN ( payloadSize );
-    if ( iterations > 100 ) {
-        iterations /= 100;
-    }
-    else if ( iterations > 10 ) {
-        iterations /= 10;
-    }
-    timeIt ( test_wait, pItems, iterations, 
-        nBytesSent * iterations,
-        nBytesRecv * iterations );
-}
-
-/*
- * catime ()
- */
-int catime ( const char * channelName, 
-    unsigned channelCount, enum appendNumberFlag appNF )
-{
-    unsigned i;
-    int j;
-    unsigned strsize;
-    unsigned nBytesSent, nBytesRecv;
-    ti *pItemList;
-    
-    if ( channelCount == 0 ) {
-        printf ( "channel count was zero\n" );
-        return 0;
-    }
-
-    pItemList = calloc ( channelCount, sizeof (ti) );
-    if ( ! pItemList ) {
-        return -1;
-    }
-
-    SEVCHK ( ca_context_create ( ca_disable_preemptive_callback ), 
-        "Unable to initialize" );
-
-    if ( appNF == appendNumber ) {
-        printf ( "Testing with %u channels named %snnn\n", 
-            channelCount, channelName );
-    }
-    else {
-        printf ( "Testing with %u channels named %s\n", 
-             channelCount, channelName );
-    }
-
-    strsize = sizeof ( pItemList[0].name ) - 1;
-    nBytesSent = 0;
-    nBytesRecv = 0;
-    for ( i=0; i < channelCount; i++ ) {
-        if ( appNF == appendNumber ) {
-            sprintf ( pItemList[i].name,"%.*s%.6u",
-                (int) (strsize - 15u), channelName, i );
-        }
-        else {
-            strncpy ( pItemList[i].name, channelName, strsize);
-        }
-        pItemList[i].name[strsize]= '\0';
-        pItemList[i].count = 0;
-        pItemList[i].pValue = 0;
-        nBytesSent += 2 * ( CA_MESSAGE_ALIGN ( strlen ( pItemList[i].name ) ) 
-                            + sizeof (caHdr) );
-        nBytesRecv += 2 * sizeof (caHdr);
-    }
-
-    printf ( "Channel Connect Test\n" );
-    printf ( "--------------------\n" );
-    timeIt ( test_search, pItemList, channelCount, nBytesSent, nBytesRecv );
-    printSearchStat ( pItemList, channelCount );
-    
-    for ( i = 0; i < channelCount; i++ ) {
-        size_t count = ca_element_count ( pItemList[i].chix );
-        size_t size = sizeof ( dbr_string_t ) * count;
-        pItemList[i].count = count;
-        pItemList[i].pValue = malloc ( size );
-        assert ( pItemList[i].pValue );
-    }
-
-    printf (
-        "channel name=%s, native type=%d, native count=%u\n",
-        ca_name (pItemList[0].chix),
-        ca_field_type (pItemList[0].chix),
-        pItemList[0].count );
-
-    printf ("Pend Event Test\n");
-    printf ( "----------------\n" );
-    timeIt ( test_pend, NULL, 100, 0, 0 );
-
-    for ( i = 0; i < channelCount; i++ ) {
-        dbr_float_t * pFltVal = ( dbr_float_t * ) pItemList[i].pValue;
-        double val = i;
-        val /= channelCount;
-        for ( j = 0; j < pItemList[i].count; j++ ) {
-            pFltVal[j] = (dbr_float_t) val;
-        }
-        pItemList[i].type = DBR_FLOAT; 
-    }
-    printf ( "DBR_FLOAT Test\n" );
-    printf ( "--------------\n" );
-    test ( pItemList, channelCount );
-
-    for ( i = 0; i < channelCount; i++ ) {
-        dbr_double_t * pDblVal = ( dbr_double_t * ) pItemList[i].pValue;
-        double val = i;
-        val /= channelCount;
-        for ( j = 0; j < pItemList[i].count; j++ ) {
-            pDblVal[j] = (dbr_double_t) val;
-        }
-        pItemList[i].type = DBR_DOUBLE; 
-    }
-    printf ( "DBR_DOUBLE Test\n" );
-    printf ( "---------------\n" );
-    test ( pItemList, channelCount );
-
-    
-    for ( i = 0; i < channelCount; i++ ) {
-        dbr_string_t * pStrVal = ( dbr_string_t * ) pItemList[i].pValue;
-        double val = i;
-        val /= channelCount;
-        for ( j = 0; j < pItemList[i].count; j++ ) {
-            sprintf ( pStrVal[j], "%f", val );
-        }
-        pItemList[i].type = DBR_STRING; 
-    }
-    printf ( "DBR_STRING Test\n" );
-    printf ( "---------------\n" );
-    test ( pItemList, channelCount );
-
-    for ( i = 0; i < channelCount; i++ ) {
-        dbr_int_t * pIntVal = ( dbr_int_t * ) pItemList[i].pValue;
-        double val = i;
-        val /= channelCount;
-        for ( j = 0; j < pItemList[i].count; j++ ) {
-            pIntVal[j] = (dbr_int_t) val;
-        }
-        pItemList[i].type = DBR_INT; 
-    }
-    printf ( "DBR_INT Test\n" );
-    printf ( "------------\n" );
-    test ( pItemList, channelCount );
-
-    printf ( "Get Latency Test\n" );
-    printf ( "----------------\n" );
-    for ( i = 0; i < channelCount; i++ ) {
-        dbr_double_t * pDblVal = ( dbr_double_t * ) pItemList[i].pValue;
-        for ( j = 0; j < pItemList[i].count; j++ ) {
-            pDblVal[j] = 0;
-        }
-        pItemList[i].type = DBR_DOUBLE; 
-    }   
-    measure_get_latency ( pItemList, channelCount );
-
-    printf ( "Free Channel Test\n" );
-    printf ( "-----------------\n" );
-    timeIt ( test_free, pItemList, channelCount, 0, 0 );
-
-    SEVCHK ( ca_task_exit (), "Unable to free resources at exit" );
-    
-    for ( i = 0; i < channelCount; i++ ) {
-        free ( pItemList[i].pValue );
-    }   
-
-    free ( pItemList );
-
-    return CATIME_OK;
-}
-
-
-
-

src/ca/client/catimeMain.c

@@ -1,53 +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 "caDiagnostics.h"
-
-static const unsigned defaultIterations = 10000u;
-
-int main ( int argc, char **argv )
-{
-    const char *pUsage = "<PV name> [<channel count> [<append number to pv name if true>]]";
-
-    if ( argc > 1 ) {
-        char *pname = argv[1];
-        if ( argc > 2 ) {
-            int  iterations = atoi (argv[2]);
-            if ( iterations > 0) {
-                if ( argc > 3 ) {
-                    if ( argc == 4 ) {
-                        int status;
-                        unsigned appendNumberBool;
-                        status = sscanf ( argv[3], " %u ", &appendNumberBool );
-                        if ( status == 1 ) {
-                            if ( appendNumberBool ) {
-                                return catime ( pname, (unsigned) iterations, appendNumber );
-                            }
-                            else {
-                                return catime ( pname, (unsigned) iterations, dontAppendNumber );
-                            }
-                        }
-                    }
-                }
-                else {
-                    return catime ( pname, (unsigned) iterations, dontAppendNumber );
-                }
-            }
-        }
-        else {
-            return catime ( pname, defaultIterations, dontAppendNumber );
-        }
-    }
-    printf ( "usage: %s %s\n", argv[0], pUsage);
-    return -1;
-}

src/ca/client/comBuf.cpp

@@ -1,66 +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
- */
-
-#include <stdexcept>
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "comBuf.h"
-#include "errlog.h"
-
-bool comBuf::flushToWire ( wireSendAdapter & wire, const epicsTime & currentTime )
-{
-    unsigned index = this->nextReadIndex;
-    unsigned finalIndex = this->commitIndex;
-    while ( index < finalIndex ) {
-        unsigned nBytes = wire.sendBytes ( 
-            &this->buf[index], finalIndex - index, currentTime );
-        if ( nBytes == 0u ) {
-            this->nextReadIndex = index;
-            return false;
-        }
-        index += nBytes;
-    }
-    this->nextReadIndex = index;
-    return true;
-}
-
-// throwing the exception from a function that isnt inline 
-// shrinks the GNU compiled object code
-void comBuf::throwInsufficentBytesException () 
-{
-    throw comBuf::insufficentBytesAvailable ();
-}
-
-void comBuf::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__ );
-}
-
-comBufMemoryManager::~comBufMemoryManager () {}

src/ca/client/comBuf.h

@@ -1,335 +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
- */
-
-#ifndef comBufh
-#define comBufh
-
-#include <new>
-#include <cstring>
-
-#include "epicsAssert.h"
-#include "epicsTypes.h"
-#include "tsFreeList.h"
-#include "tsDLList.h"
-#include "osiWireFormat.h"
-#include "compilerDependencies.h"
-
-static const unsigned comBufSize = 0x4000;
-
-// this wrapper avoids Tornado 2.0.1 compiler bugs
-class comBufMemoryManager {
-public:
-    virtual ~comBufMemoryManager ();
-    virtual void * allocate ( size_t ) = 0; 
-    virtual void release ( void * ) = 0; 
-};
-
-class wireSendAdapter {
-public:
-    virtual unsigned sendBytes ( const void * pBuf, 
-        unsigned nBytesInBuf, 
-        const class epicsTime & currentTime ) = 0;
-protected:
-    virtual ~wireSendAdapter() {}
-};
-
-enum swioCircuitState { 
-        swioConnected, 
-        swioPeerHangup, 
-        swioPeerAbort, 
-        swioLinkFailure,
-        swioLocalAbort
-};
-struct statusWireIO {
-    unsigned bytesCopied;
-    swioCircuitState circuitState;
-};
-
-class wireRecvAdapter {
-public:
-    virtual void recvBytes ( void * pBuf, 
-        unsigned nBytesInBuf, statusWireIO & ) = 0;
-protected:
-    virtual ~wireRecvAdapter() {}
-};
-
-class comBuf : public tsDLNode < comBuf > {
-public:
-    class insufficentBytesAvailable {};
-    comBuf ();
-    unsigned unoccupiedBytes () const;
-    unsigned occupiedBytes () const;
-    unsigned uncommittedBytes () const;
-    static unsigned capacityBytes ();
-    void clear ();
-    unsigned copyInBytes ( const void *pBuf, unsigned nBytes );
-    unsigned push ( comBuf & );
-    template < class T >
-    bool push ( const T & value );
-    template < class T >
-    unsigned push ( const T * pValue, unsigned nElem );
-    unsigned push ( const epicsInt8 * pValue, unsigned nElem );
-    unsigned push ( const epicsUInt8 * pValue, unsigned nElem );
-    unsigned push ( const epicsOldString * pValue, unsigned nElem );
-    void commitIncomming ();
-    void clearUncommittedIncomming ();
-    bool copyInAllBytes ( const void *pBuf, unsigned nBytes );
-    unsigned copyOutBytes ( void *pBuf, unsigned nBytes );
-    bool copyOutAllBytes ( void *pBuf, unsigned nBytes );
-    unsigned removeBytes ( unsigned nBytes );
-    bool flushToWire ( wireSendAdapter &, const epicsTime & currentTime );
-    void fillFromWire ( wireRecvAdapter &, statusWireIO & );
-    struct popStatus {
-        bool success;
-        bool nowEmpty;
-    };
-    template < class T >
-    popStatus pop ( T & );
-    static void throwInsufficentBytesException ();
-    void * operator new ( size_t size, 
-        comBufMemoryManager  & );
-    epicsPlacementDeleteOperator (( void *, comBufMemoryManager & ))
-private:
-    unsigned commitIndex;
-    unsigned nextWriteIndex;
-    unsigned nextReadIndex;
-    epicsUInt8 buf [ comBufSize ];
-    void operator delete ( void * );
-    template < class T >
-    bool push ( const T * ); // disabled
-};
-
-inline void * comBuf::operator new ( size_t size, 
-    comBufMemoryManager & mgr )
-{
-    return mgr.allocate ( size );
-}
-    
-#ifdef CXX_PLACEMENT_DELETE
-inline void comBuf::operator delete ( void * pCadaver, 
-    comBufMemoryManager & mgr )
-{
-    mgr.release ( pCadaver );
-}
-#endif
-
-inline comBuf::comBuf () : commitIndex ( 0u ),
-    nextWriteIndex ( 0u ), nextReadIndex ( 0u )
-{
-}
-
-inline void comBuf :: clear ()
-{
-    this->commitIndex = 0u;
-    this->nextWriteIndex = 0u;
-    this->nextReadIndex = 0u;
-}
-
-inline unsigned comBuf :: unoccupiedBytes () const
-{
-    return sizeof ( this->buf ) - this->nextWriteIndex;
-}
-
-inline unsigned comBuf :: occupiedBytes () const
-{
-    return this->commitIndex - this->nextReadIndex;
-}
-
-inline unsigned comBuf :: uncommittedBytes () const
-{
-    return this->nextWriteIndex - this->commitIndex;
-}
-
-inline unsigned comBuf :: push ( comBuf & bufIn )
-{
-    unsigned nBytes = this->copyInBytes ( 
-        & bufIn.buf[ bufIn.nextReadIndex ], 
-        bufIn.commitIndex - bufIn.nextReadIndex );
-    bufIn.nextReadIndex += nBytes;
-    return nBytes;
-}
-
-inline unsigned comBuf :: capacityBytes ()
-{
-    return comBufSize;
-}
-
-inline void comBuf :: fillFromWire ( 
-    wireRecvAdapter & wire, statusWireIO & stat )
-{
-    wire.recvBytes ( 
-        & this->buf[this->nextWriteIndex], 
-        sizeof ( this->buf ) - this->nextWriteIndex, stat );
-    if ( stat.circuitState == swioConnected ) {
-        this->nextWriteIndex += stat.bytesCopied;
-    }
-}
-
-template < class T >
-inline bool comBuf :: push ( const T & value )
-{
-    unsigned index = this->nextWriteIndex;
-    unsigned available = sizeof ( this->buf ) - index;
-    if ( sizeof ( value ) > available ) {
-        return false;
-    }
-    WireSet ( value, & this->buf[index] );
-    this->nextWriteIndex = index + sizeof ( value );
-    return true;
-}
-
-inline unsigned comBuf :: push ( const epicsInt8 *pValue, unsigned nElem )
-{
-    return copyInBytes ( pValue, nElem );
-}
-
-inline unsigned comBuf :: push ( const epicsUInt8 *pValue, unsigned nElem )
-{
-    return copyInBytes ( pValue, nElem );
-}
-
-inline unsigned comBuf :: push ( const epicsOldString * pValue, unsigned nElem )
-{
-    unsigned index = this->nextWriteIndex;
-    unsigned available = sizeof ( this->buf ) - index;
-    unsigned nBytes = sizeof ( *pValue ) * nElem;
-    if ( nBytes > available ) {
-        nElem = available / sizeof ( *pValue );
-        nBytes = nElem * sizeof ( *pValue );
-    }
-    memcpy ( &this->buf[ index ], pValue, nBytes );
-    this->nextWriteIndex = index + nBytes;
-    return nElem;
-}
-
-template < class T >
-unsigned comBuf :: push ( const T * pValue, unsigned nElem )
-{
-    unsigned index = this->nextWriteIndex;
-    unsigned available = sizeof ( this->buf ) - index;
-    unsigned nBytes = sizeof ( *pValue ) * nElem;
-    if ( nBytes > available ) {
-        nElem = available / sizeof ( *pValue );
-    }
-    for ( unsigned i = 0u; i < nElem; i++ ) {
-        // allow native floating point formats to be converted to IEEE
-        WireSet( pValue[i], &this->buf[index] );
-        index += sizeof ( *pValue );
-    }
-    this->nextWriteIndex = index;
-    return nElem;
-}
-
-inline void comBuf :: commitIncomming ()
-{
-    this->commitIndex = this->nextWriteIndex;
-}
-
-inline void comBuf :: clearUncommittedIncomming ()
-{
-    this->nextWriteIndex = this->commitIndex;
-}
-
-inline bool comBuf :: copyInAllBytes ( const void *pBuf, unsigned nBytes )
-{
-    unsigned index = this->nextWriteIndex;
-    unsigned available = sizeof ( this->buf ) - index;
-    if ( nBytes <= available ) {
-        memcpy ( & this->buf[index], pBuf, nBytes );
-        this->nextWriteIndex = index + nBytes;
-        return true;
-    }
-    return false;
-}
-
-inline unsigned comBuf :: copyInBytes ( const void * pBuf, unsigned nBytes )
-{
-    unsigned index = this->nextWriteIndex;
-    unsigned available = sizeof ( this->buf ) - index;
-    if ( nBytes > available ) {
-        nBytes = available;
-    }
-    memcpy ( & this->buf[index], pBuf, nBytes );
-    this->nextWriteIndex = index + nBytes;
-    return nBytes;
-}
-
-inline bool comBuf :: copyOutAllBytes ( void * pBuf, unsigned nBytes )
-{
-    unsigned index = this->nextReadIndex;
-    unsigned occupied = this->commitIndex - index;
-    if ( nBytes <= occupied ) {
-        memcpy ( pBuf, &this->buf[index], nBytes);
-        this->nextReadIndex = index + nBytes;
-        return true;
-    }
-    return false;
-}
-
-inline unsigned comBuf :: copyOutBytes ( void *pBuf, unsigned nBytes )
-{
-    unsigned index = this->nextReadIndex;
-    unsigned occupied = this->commitIndex - index;
-    if ( nBytes > occupied ) {
-        nBytes = occupied;
-    }
-    memcpy ( pBuf, &this->buf[index], nBytes);
-    this->nextReadIndex = index + nBytes;
-    return nBytes;
-}
-
-inline unsigned comBuf :: removeBytes ( unsigned nBytes )
-{
-    unsigned index = this->nextReadIndex;
-    unsigned occupied = this->commitIndex - index;
-    if ( nBytes > occupied ) {
-        nBytes = occupied;
-    }
-    this->nextReadIndex = index + nBytes;
-    return nBytes;
-}
-
-template < class T >
-comBuf :: popStatus comBuf :: pop ( T & returnVal )
-{
-    unsigned nrIndex = this->nextReadIndex;
-    unsigned popIndex = nrIndex + sizeof ( returnVal );
-    unsigned cIndex = this->commitIndex;
-    popStatus status;
-    status.success = true;
-    status.nowEmpty = false;
-    if ( popIndex >= cIndex ) {
-        if ( popIndex == cIndex ) {
-            status.nowEmpty = true;
-        }
-        else {
-            status.success = false;
-            return status;
-        }
-    }
-    WireGet ( & this->buf[ nrIndex ], returnVal );
-    this->nextReadIndex = popIndex;
-    return status;
-}
-
-#endif // ifndef comBufh

src/ca/client/comQueRecv.cpp

@@ -1,269 +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
- */
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#include "iocinf.h"
-#include "virtualCircuit.h"
-
-comQueRecv::comQueRecv ( comBufMemoryManager & comBufMemoryManagerIn ): 
-    comBufMemMgr ( comBufMemoryManagerIn ), nBytesPending ( 0u ) 
-{
-}
-
-comQueRecv::~comQueRecv ()
-{
-    this->clear ();
-}
-
-void comQueRecv::clear ()
-{
-    comBuf *pBuf;
-    while ( ( pBuf = this->bufs.get () ) ) {
-        pBuf->~comBuf ();
-        this->comBufMemMgr.release ( pBuf );
-    }
-    this->nBytesPending = 0u;
-}
-
-unsigned comQueRecv::copyOutBytes ( epicsInt8 *pBuf, unsigned nBytes )
-{
-    unsigned totalBytes = 0u;
-    do {
-        comBuf * pComBuf = this->bufs.first ();
-        if ( ! pComBuf ) {
-            this->nBytesPending -= totalBytes;
-            return totalBytes;
-        }
-        totalBytes += pComBuf->copyOutBytes ( &pBuf[totalBytes], nBytes - totalBytes );
-        if ( pComBuf->occupiedBytes () == 0u ) {
-            this->bufs.remove ( *pComBuf );
-            pComBuf->~comBuf ();
-            this->comBufMemMgr.release ( pComBuf );
-        }
-    }
-    while ( totalBytes < nBytes );
-    this->nBytesPending -= totalBytes;
-    return totalBytes;
-}
-
-unsigned comQueRecv::removeBytes ( unsigned nBytes )
-{
-    unsigned totalBytes = 0u;
-    unsigned bytesLeft = nBytes;
-    while ( bytesLeft ) {
-        comBuf * pComBuf = this->bufs.first ();
-        if ( ! pComBuf ) {
-            this->nBytesPending -= totalBytes;
-            return totalBytes;
-        }
-        unsigned nBytesThisTime = pComBuf->removeBytes ( bytesLeft );
-        if ( pComBuf->occupiedBytes () == 0u ) {
-            this->bufs.remove ( *pComBuf );
-            pComBuf->~comBuf ();
-            this->comBufMemMgr.release ( pComBuf );
-        }
-        if ( nBytesThisTime == 0u) {
-            break;
-        }
-        totalBytes += nBytesThisTime;
-        bytesLeft = nBytes - totalBytes;
-    }
-    this->nBytesPending -= totalBytes;
-    return totalBytes;
-}
-
-void comQueRecv::popString ( epicsOldString *pStr )
-{
-    for ( unsigned i = 0u; i < sizeof ( *pStr ); i++ ) {
-        pStr[0][i] = this->popInt8 ();
-    }
-}
-
-void comQueRecv::pushLastComBufReceived ( comBuf & bufIn )
-   
-{
-    bufIn.commitIncomming ();
-    comBuf * pComBuf = this->bufs.last ();
-    if ( pComBuf ) {
-        if ( pComBuf->unoccupiedBytes() ) {
-            this->nBytesPending += pComBuf->push ( bufIn );
-            pComBuf->commitIncomming ();
-        }
-    }
-    unsigned bufBytes = bufIn.occupiedBytes();
-    if ( bufBytes ) {
-        this->nBytesPending += bufBytes;
-        this->bufs.add ( bufIn );
-    }
-    else {
-        bufIn.~comBuf ();
-        this->comBufMemMgr.release ( & bufIn );
-    }
-}
-
-// 1) split between buffers expected to run slower
-// 2) using canonical unsigned tmp avoids ANSI C conversions to int
-// 3) cast required because sizeof(unsigned) >= sizeof(epicsUInt32)
-epicsUInt16 comQueRecv::multiBufferPopUInt16 ()
-{
-    epicsUInt16 tmp;
-    if ( this->occupiedBytes() >= sizeof (tmp) ) {
-        unsigned byte1 = this->popUInt8 ();
-        unsigned byte2 = this->popUInt8 ();
-        tmp = static_cast <epicsUInt16> ( ( byte1 << 8u ) | byte2 );
-    }
-    else {
-        comBuf::throwInsufficentBytesException ();
-        tmp = 0u;
-    }
-    return tmp;
-}
-
-// 1) split between buffers expected to run slower
-// 2) using canonical unsigned temporary avoids ANSI C conversions to int
-// 3) cast required because sizeof(unsigned) >= sizeof(epicsUInt32)
-epicsUInt32 comQueRecv::multiBufferPopUInt32 ()
-{
-    epicsUInt32 tmp;
-    if ( this->occupiedBytes() >= sizeof (tmp) ) {
-        // 1) split between buffers expected to run slower
-        // 2) using canonical unsigned temporary avoids ANSI C conversions to int
-        // 3) cast required because sizeof(unsigned) >= sizeof(epicsUInt32)
-        unsigned byte1 = this->popUInt8();
-        unsigned byte2 = this->popUInt8();
-        unsigned byte3 = this->popUInt8();
-        unsigned byte4 = this->popUInt8();
-        tmp = static_cast <epicsUInt32>
-            ( ( byte1 << 24u ) | ( byte2 << 16u ) |
-              ( byte3 << 8u ) | byte4 );
-    }
-    else {
-        comBuf::throwInsufficentBytesException ();
-        tmp = 0u; // avoid compiler warnings
-    }
-    return tmp;
-}
-
-void comQueRecv::removeAndDestroyBuf ( comBuf & buf )
-{
-    this->bufs.remove ( buf );
-    buf.~comBuf ();
-    this->comBufMemMgr.release ( & buf );
-}
-
-epicsUInt8 comQueRecv::popUInt8 () 
-{
-    comBuf * pComBuf = this->bufs.first ();
-    if ( ! pComBuf ) {
-        comBuf::throwInsufficentBytesException ();
-    }
-    epicsUInt8 tmp = '\0';
-    comBuf::popStatus status = pComBuf->pop ( tmp );
-    if ( ! status.success ) {
-        comBuf::throwInsufficentBytesException ();
-    }
-    if ( status.nowEmpty ) {
-        this->removeAndDestroyBuf ( *pComBuf );
-    }
-    this->nBytesPending--;
-    return tmp;
-}
-
-epicsUInt16 comQueRecv::popUInt16 ()
-{
-    comBuf * pComBuf = this->bufs.first ();
-    if ( ! pComBuf ) {
-        comBuf::throwInsufficentBytesException ();
-    }
-    // try first for all in one buffer efficent version
-    epicsUInt16 tmp = 0;
-    comBuf::popStatus status = pComBuf->pop ( tmp );
-    if ( status.success ) {
-        this->nBytesPending -= sizeof ( epicsUInt16 );
-        if ( status.nowEmpty ) {
-            this->removeAndDestroyBuf ( *pComBuf );
-        }
-        return tmp;
-    }
-    return this->multiBufferPopUInt16 ();
-}
-
-epicsUInt32 comQueRecv::popUInt32 ()
-{
-    comBuf *pComBuf = this->bufs.first ();
-    if ( ! pComBuf ) {
-        comBuf::throwInsufficentBytesException ();
-    }
-    // try first for all in one buffer efficent version
-    epicsUInt32 tmp = 0;
-    comBuf::popStatus status = pComBuf->pop ( tmp );
-    if ( status.success ) {
-        this->nBytesPending -= sizeof ( epicsUInt32 );
-        if ( status.nowEmpty ) {
-            this->removeAndDestroyBuf ( *pComBuf );
-        }
-        return tmp;
-    }
-    return this->multiBufferPopUInt32 ();
-}
-
-bool comQueRecv::popOldMsgHeader ( caHdrLargeArray & msg )
-{
-    // try first for all in one buffer efficent version
-    comBuf * pComBuf = this->bufs.first ();
-    if ( ! pComBuf ) {
-        return false;
-    }
-    unsigned avail = pComBuf->occupiedBytes ();
-    if ( avail >= sizeof ( caHdr ) ) {
-        pComBuf->pop ( msg.m_cmmd );
-        ca_uint16_t smallPostsize = 0;
-        pComBuf->pop ( smallPostsize );
-        msg.m_postsize = smallPostsize;
-        pComBuf->pop ( msg.m_dataType );
-        ca_uint16_t smallCount = 0;
-        pComBuf->pop ( smallCount );
-        msg.m_count = smallCount;
-        pComBuf->pop ( msg.m_cid );
-        pComBuf->pop ( msg.m_available );
-        this->nBytesPending -= sizeof ( caHdr );
-        if ( avail == sizeof ( caHdr ) ) {
-            this->removeAndDestroyBuf ( *pComBuf );
-        }
-        return true;
-    }
-    else if ( this->occupiedBytes () >= sizeof ( caHdr ) ) {
-        msg.m_cmmd = this->popUInt16 ();
-        msg.m_postsize = this->popUInt16 ();
-        msg.m_dataType = this->popUInt16 ();
-        msg.m_count = this->popUInt16 ();
-        msg.m_cid = this->popUInt32 ();
-        msg.m_available = this->popUInt32 ();
-        return true;
-    }
-    else {
-        return false;
-    }
-}
-

src/ca/client/comQueRecv.h

@@ -1,111 +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 comQueRecvh  
-#define comQueRecvh
-
-#include "comBuf.h"
-
-class comQueRecv {
-public:
-    comQueRecv ( comBufMemoryManager & );
-    ~comQueRecv ();
-    unsigned occupiedBytes () const;
-    unsigned copyOutBytes ( epicsInt8 *pBuf, unsigned nBytes );
-    unsigned removeBytes ( unsigned nBytes );
-    void pushLastComBufReceived ( comBuf & );
-    void clear ();
-    bool popOldMsgHeader ( struct caHdrLargeArray & );
-    epicsInt8 popInt8 ();
-    epicsUInt8 popUInt8 ();
-    epicsInt16 popInt16 ();
-    epicsUInt16 popUInt16 ();
-    epicsInt32 popInt32 ();
-    epicsUInt32 popUInt32 ();
-    epicsFloat32 popFloat32 ();
-    epicsFloat64 popFloat64 ();
-    void popString ( epicsOldString * );
-private:
-    tsDLList < comBuf > bufs;
-    comBufMemoryManager & comBufMemMgr;
-    unsigned nBytesPending;
-    epicsUInt16 multiBufferPopUInt16 ();
-    epicsUInt32 multiBufferPopUInt32 ();
-    void removeAndDestroyBuf ( comBuf & );
-	comQueRecv ( const comQueRecv & );
-	comQueRecv & operator = ( const comQueRecv & );
-};
-
-inline unsigned comQueRecv::occupiedBytes () const
-{
-    return this->nBytesPending;
-}
-
-inline epicsInt8 comQueRecv::popInt8 ()
-{
-    return static_cast < epicsInt8 > ( this->popUInt8() );
-}
-
-inline epicsInt16 comQueRecv::popInt16 ()
-{
-    return static_cast < epicsInt16 > ( this->popUInt16() );
-}
-
-inline epicsInt32 comQueRecv::popInt32 ()
-{
-    return static_cast < epicsInt32 > ( this->popUInt32() );
-}
-
-// this has been optimized to aligned convert, maybe more could be done,
-// but since it is currently not used ...
-inline epicsFloat32 comQueRecv::popFloat32 ()
-{
-    union {
-        epicsUInt8 _wire[ sizeof ( epicsFloat32 ) ];
-        epicsFloat32 _fp;
-    } tmp;
-    // optimizer will unroll this loop
-    for ( unsigned i = 0u; i < sizeof ( tmp._wire ); i++ ) {
-        tmp._wire[i] = this->popUInt8 ();
-    }
-    return AlignedWireRef < epicsFloat32 > ( tmp._fp );
-}
-
-// this has been optimized to aligned convert, maybe more could be done,
-// but since it is currently not used ...
-inline epicsFloat64 comQueRecv::popFloat64 ()
-{
-    union {
-        epicsUInt8 _wire[ sizeof ( epicsFloat64 ) ];
-        epicsFloat64 _fp;
-    } tmp;
-    // optimizer will unroll this loop
-    for ( unsigned i = 0u; i < sizeof ( tmp._wire ); i++ ) {
-        tmp._wire[i] = this->popUInt8 ();
-    }
-    return AlignedWireRef < epicsFloat64 > ( tmp._fp );
-}
-
-#endif // ifndef comQueRecvh

src/ca/client/comQueSend.cpp

@@ -1,411 +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
- */
-
-//
-// Requirements:
-// 1) Allow sufficent headroom so that users will be able to perform
-// a reasonable amount of IO within CA callbacks without experiencing
-// a push/pull deadlock. If a potential push/pull deadlock situation
-// occurs then detect and avoid it and provide diagnotic to the user
-// via special status.
-// 2) Return status to the user when there is insufficent memory to
-// queue a complete message.
-// 3) return status to the user when a message cant be flushed because
-// a connection dropped.
-// 4) Do not allocate too much memory in exception situatons (such as
-// after a circuit disconnect).
-// 5) Avoid allocating more memory than is absolutely necessary to meet 
-// the above requirements.
-// 6) Message fragments must never be sent to the IOC when there isnt
-// enough memory to queue part of a message (we also must not force
-// a disconnect because the client is starved for memory).
-// 7) avoid the need to check status for each byte pushed into the
-// protocol stream.
-//
-// Implementation:
-// 1) When queuing a complete message, first test to see if a flush is 
-// required. If it is a receive thread scheduals the flush with the
-// send thread, and otherwise directly execute the system call. The
-// send thread must run at a higher priority than the receive thread
-// if we are to minimize memory consumption.
-// 2) Preallocate space for the entire message prior to copying in the
-// message so that message fragments are not flushed out just prior
-// to detecting that memory is unavailable.
-// 3) Return a special error constant when the following situations 
-// are detected when the user is attempting to queue a request
-// from within a user callback executed by a receive thread:
-//      a) A user is queuing more requests that demand a response from a 
-//      callback than are removed by the response that initiated the
-//      callback, and this situation persists for many callbacks until
-//      all buffering in the system is exausted.
-//      b) A user is queuing many requests that demand a response from one 
-//      callback until all buffering in the system is exausted.
-//      c) Some combination of both (a) nad (b).
-//
-//
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#define epicsExportSharedSymbols
-#include "iocinf.h"
-#include "virtualCircuit.h"
-#include "db_access.h" // for dbr_short_t etc
-
-// nill message alignment pad bytes
-const char cacNillBytes [] = 
-{ 
-    0, 0, 0, 0,
-    0, 0, 0, 0
-};
-
-comQueSend::comQueSend ( wireSendAdapter & wireIn, 
-    comBufMemoryManager & comBufMemMgrIn ):
-        comBufMemMgr ( comBufMemMgrIn ), wire ( wireIn ), 
-            nBytesPending ( 0u )
-{
-}
-
-comQueSend::~comQueSend ()
-{
-    this->clear ();
-}
-
-void comQueSend::clear () 
-{
-    comBuf *pBuf;
-
-    while ( ( pBuf = this->bufs.get () ) ) {
-        this->nBytesPending -= pBuf->occupiedBytes ();
-        pBuf->~comBuf ();
-        this->comBufMemMgr.release ( pBuf );
-    }
-    this->pFirstUncommited = tsDLIter < comBuf > ();
-    assert ( this->nBytesPending == 0 );
-}
-
-void comQueSend::copy_dbr_string ( const void * pValue )
-{
-    this->push ( static_cast < const char * > ( pValue ), MAX_STRING_SIZE );
-}
-
-void comQueSend::copy_dbr_short ( const void * pValue )
-{
-    this->push ( * static_cast <const dbr_short_t *> ( pValue ) );
-}
-
-void comQueSend::copy_dbr_float ( const void * pValue )
-{
-    this->push ( * static_cast <const dbr_float_t *> ( pValue ) );
-}
-
-void comQueSend::copy_dbr_char ( const void * pValue )
-{
-    this->push ( * static_cast <const dbr_char_t *> ( pValue ) );
-}
-
-void comQueSend::copy_dbr_long ( const void * pValue )
-{
-    this->push ( * static_cast <const dbr_long_t *> ( pValue ) );
-}
-
-void comQueSend::copy_dbr_double ( const void * pValue )
-{
-    this->push ( * static_cast <const dbr_double_t *> ( pValue ) );
-}
-
-void comQueSend::copy_dbr_invalid ( const void * )
-{
-    throw cacChannel::badType ();
-}
-
-const comQueSend::copyScalarFunc_t comQueSend::dbrCopyScalar [39] = {
-    &comQueSend::copy_dbr_string,
-    &comQueSend::copy_dbr_short,
-    &comQueSend::copy_dbr_float,
-    &comQueSend::copy_dbr_short,   // DBR_ENUM
-    &comQueSend::copy_dbr_char,
-    &comQueSend::copy_dbr_long,
-    &comQueSend::copy_dbr_double,
-    &comQueSend::copy_dbr_invalid, // DBR_STS_SHORT
-    &comQueSend::copy_dbr_invalid, // DBR_STS_FLOAT
-    &comQueSend::copy_dbr_invalid, // DBR_STS_ENUM
-    &comQueSend::copy_dbr_invalid, // DBR_STS_CHAR
-    &comQueSend::copy_dbr_invalid, // DBR_STS_LONG
-    &comQueSend::copy_dbr_invalid, // DBR_STS_DOUBLE
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_STRING
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_INT
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_SHORT
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_FLOAT
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_ENUM
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_CHAR
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_LONG
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_DOUBLE
-    &comQueSend::copy_dbr_invalid, // DBR_GR_STRING
-    &comQueSend::copy_dbr_invalid, // DBR_GR_SHORT
-    &comQueSend::copy_dbr_invalid, // DBR_GR_FLOAT
-    &comQueSend::copy_dbr_invalid, // DBR_GR_ENUM
-    &comQueSend::copy_dbr_invalid, // DBR_GR_CHAR
-    &comQueSend::copy_dbr_invalid, // DBR_GR_LONG
-    &comQueSend::copy_dbr_invalid, // DBR_GR_DOUBLE
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_STRING
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_SHORT
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_FLOAT
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_ENUM
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_CHAR
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_LONG
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_DOUBLE
-    &comQueSend::copy_dbr_short,   // DBR_PUT_ACKT
-    &comQueSend::copy_dbr_short,   // DBR_PUT_ACKS
-    &comQueSend::copy_dbr_invalid, // DBR_STSACK_STRING
-    &comQueSend::copy_dbr_invalid  // DBR_CLASS_NAME
-};
-
-void comQueSend::copy_dbr_string ( const void *pValue, unsigned nElem ) 
-{
-    this->push ( static_cast < const char * > ( pValue ), nElem * MAX_STRING_SIZE );
-}
-
-void comQueSend::copy_dbr_short ( const void *pValue, unsigned nElem ) 
-{
-    this->push ( static_cast <const dbr_short_t *> ( pValue ), nElem );
-}
-
-void comQueSend::copy_dbr_float ( const void *pValue, unsigned nElem ) 
-{
-    this->push ( static_cast <const dbr_float_t *> ( pValue ), nElem );
-}
-
-void comQueSend::copy_dbr_char ( const void *pValue, unsigned nElem ) 
-{
-    this->push ( static_cast <const dbr_char_t *> ( pValue ), nElem );
-}
-
-void comQueSend::copy_dbr_long ( const void *pValue, unsigned nElem ) 
-{
-    this->push ( static_cast <const dbr_long_t *> ( pValue ), nElem );
-}
-
-void comQueSend::copy_dbr_double ( const void *pValue, unsigned nElem ) 
-{
-    this->push ( static_cast <const dbr_double_t *> ( pValue ), nElem );
-}
-
-void comQueSend::copy_dbr_invalid ( const void *, unsigned )
-{
-    throw cacChannel::badType ();
-}
-
-const comQueSend::copyVectorFunc_t comQueSend::dbrCopyVector [39] = {
-    &comQueSend::copy_dbr_string,
-    &comQueSend::copy_dbr_short,
-    &comQueSend::copy_dbr_float,
-    &comQueSend::copy_dbr_short,   // DBR_ENUM
-    &comQueSend::copy_dbr_char,
-    &comQueSend::copy_dbr_long,
-    &comQueSend::copy_dbr_double,
-    &comQueSend::copy_dbr_invalid, // DBR_STS_SHORT
-    &comQueSend::copy_dbr_invalid, // DBR_STS_FLOAT
-    &comQueSend::copy_dbr_invalid, // DBR_STS_ENUM
-    &comQueSend::copy_dbr_invalid, // DBR_STS_CHAR
-    &comQueSend::copy_dbr_invalid, // DBR_STS_LONG
-    &comQueSend::copy_dbr_invalid, // DBR_STS_DOUBLE
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_STRING
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_INT
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_SHORT
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_FLOAT
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_ENUM
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_CHAR
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_LONG
-    &comQueSend::copy_dbr_invalid, // DBR_TIME_DOUBLE
-    &comQueSend::copy_dbr_invalid, // DBR_GR_STRING
-    &comQueSend::copy_dbr_invalid, // DBR_GR_SHORT
-    &comQueSend::copy_dbr_invalid, // DBR_GR_FLOAT
-    &comQueSend::copy_dbr_invalid, // DBR_GR_ENUM
-    &comQueSend::copy_dbr_invalid, // DBR_GR_CHAR
-    &comQueSend::copy_dbr_invalid, // DBR_GR_LONG
-    &comQueSend::copy_dbr_invalid, // DBR_GR_DOUBLE
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_STRING
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_SHORT
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_FLOAT
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_ENUM
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_CHAR
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_LONG
-    &comQueSend::copy_dbr_invalid, // DBR_CTRL_DOUBLE
-    &comQueSend::copy_dbr_short,   // DBR_PUT_ACKT
-    &comQueSend::copy_dbr_short,   // DBR_PUT_ACKS
-    &comQueSend::copy_dbr_invalid, // DBR_STSACK_STRING
-    &comQueSend::copy_dbr_invalid  // DBR_CLASS_NAME
-};
-
-comBuf * comQueSend::popNextComBufToSend () 
-{
-    comBuf *pBuf = this->bufs.get ();
-    if ( pBuf ) {
-        unsigned nBytesThisBuf = pBuf->occupiedBytes ();
-        if ( nBytesThisBuf ) {
-            assert ( this->nBytesPending >= nBytesThisBuf );
-            this->nBytesPending -= nBytesThisBuf;
-        }
-        else {
-            this->bufs.push ( *pBuf );
-            pBuf = 0;
-        }
-    }
-    else {
-        assert ( this->nBytesPending == 0u );
-    }
-    return pBuf;
-}
-
-void comQueSend::insertRequestHeader (
-    ca_uint16_t request, ca_uint32_t payloadSize, 
-    ca_uint16_t dataType, ca_uint32_t nElem, ca_uint32_t cid, 
-    ca_uint32_t requestDependent, bool v49Ok ) 
-{
-    if ( payloadSize < 0xffff && nElem < 0xffff ) {
-        comBuf * pComBuf = this->bufs.last ();
-        if ( ! pComBuf || pComBuf->unoccupiedBytes() < 16u ) {
-            pComBuf = newComBuf ();
-            this->pushComBuf ( *pComBuf );
-        }
-        pComBuf->push ( request ); 
-        pComBuf->push ( static_cast < ca_uint16_t > ( payloadSize ) ); 
-        pComBuf->push ( dataType ); 
-        pComBuf->push ( static_cast < ca_uint16_t > ( nElem ) ); 
-        pComBuf->push ( cid ); 
-        pComBuf->push ( requestDependent );  
-    }
-    else if ( v49Ok ) {
-        comBuf * pComBuf = this->bufs.last ();
-        if ( ! pComBuf || pComBuf->unoccupiedBytes() < 24u ) {
-            pComBuf = newComBuf ();
-            this->pushComBuf ( *pComBuf );
-        }
-        pComBuf->push ( request ); 
-        pComBuf->push ( static_cast < ca_uint16_t > ( 0xffff ) ); 
-        pComBuf->push ( dataType ); 
-        pComBuf->push ( static_cast < ca_uint16_t > ( 0u ) ); 
-        pComBuf->push ( cid ); 
-        pComBuf->push ( requestDependent );  
-        pComBuf->push ( payloadSize ); 
-        pComBuf->push ( nElem ); 
-    }
-    else {
-        throw cacChannel::outOfBounds ();
-    }
-}
-
-void comQueSend::insertRequestWithPayLoad (
-    ca_uint16_t request, unsigned dataType, arrayElementCount nElem, 
-    ca_uint32_t cid, ca_uint32_t requestDependent, 
-    const void * pPayload, bool v49Ok ) 
-{
-    if ( INVALID_DB_REQ ( dataType ) ) {
-        throw cacChannel::badType ();
-    }
-    if ( dataType >= comQueSendCopyDispatchSize ) {
-        throw cacChannel::badType();
-    }
-    ca_uint32_t size = 0u;
-    ca_uint32_t payloadSize = 0u;
-    if ( nElem == 1 ) {
-        if ( dataType == DBR_STRING  ) {
-            const char * pStr = static_cast < const char * >  ( pPayload );
-            size = strlen ( pStr ) + 1u;
-            if ( size > MAX_STRING_SIZE ) {
-                throw cacChannel::outOfBounds();
-            }
-            payloadSize = CA_MESSAGE_ALIGN ( size );
-            this->insertRequestHeader ( request, payloadSize, 
-                static_cast <ca_uint16_t> ( dataType ), 
-                nElem, cid, requestDependent, v49Ok );
-            this->pushString ( pStr, size );  
-        }
-        else {
-            size = dbr_size[dataType];
-            payloadSize = CA_MESSAGE_ALIGN ( size );
-            this->insertRequestHeader ( request, payloadSize, 
-                static_cast <ca_uint16_t> ( dataType ), 
-                nElem, cid, requestDependent, v49Ok );
-            ( this->*dbrCopyScalar [dataType] ) ( pPayload );
-        }
-    }
-    else {
-        arrayElementCount maxBytes;
-        if ( v49Ok ) {
-            maxBytes = 0xffffffff;
-        }
-        else {
-            maxBytes = MAX_TCP - sizeof ( caHdr ); 
-        }
-        arrayElementCount maxElem = 
-            ( maxBytes - sizeof (dbr_double_t) - dbr_size[dataType] ) / 
-                dbr_value_size[dataType];
-        if ( nElem >= maxElem ) {
-            throw cacChannel::outOfBounds();
-        }
-        // the above checks verify that the total size
-        // is lest that 0xffffffff
-        size = static_cast < ca_uint32_t > 
-            ( dbr_size_n ( dataType, nElem ) );
-        payloadSize = CA_MESSAGE_ALIGN ( size );
-        this->insertRequestHeader ( request, payloadSize, 
-            static_cast <ca_uint16_t> ( dataType ), 
-            static_cast < ca_uint32_t > ( nElem ), 
-            cid, requestDependent, v49Ok );
-        ( this->*dbrCopyVector [dataType] ) ( pPayload, nElem );
-    }
-    // set pad bytes to nill
-    unsigned padSize = payloadSize - size;
-    if ( padSize ) {
-        this->pushString ( cacNillBytes, payloadSize - size );
-    }
-}
-
-void comQueSend::commitMsg () 
-{
-    while ( this->pFirstUncommited.valid() ) {
-        this->nBytesPending += this->pFirstUncommited->uncommittedBytes ();
-        this->pFirstUncommited->commitIncomming ();
-        this->pFirstUncommited++;
-    }
-    // printf ( "NBP: %u\n", this->nBytesPending );
-}
-
-
-void comQueSend::clearUncommitedMsg ()
-{
-    while ( this->pFirstUncommited.valid() ) {
-        tsDLIter < comBuf > next = this->pFirstUncommited;
-        next++;
-        this->pFirstUncommited->clearUncommittedIncomming ();
-        if ( this->pFirstUncommited->occupiedBytes() == 0u ) {
-            this->bufs.remove ( *this->pFirstUncommited );
-            this->pFirstUncommited->~comBuf ();
-            this->comBufMemMgr.release ( this->pFirstUncommited.pointer() );
-        }
-        this->pFirstUncommited = next;
-    }
-}
-

src/ca/client/comQueSend.h

@@ -1,238 +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 comQueSendh  
-#define comQueSendh
-
-#include <new> 
-
-#include "tsDLList.h"
-#include "comBuf.h"
-
-#define comQueSendCopyDispatchSize 39
-
-class epicsMutex;
-template < class T > class epicsGuard;
-
-class comQueSendMsgMinder {
-public:
-    comQueSendMsgMinder ( 
-        class comQueSend &, epicsGuard < epicsMutex > & );
-    ~comQueSendMsgMinder ();
-    void commit ();
-private:
-    class comQueSend * pSendQue;
-};
-
-//
-// Notes.
-// o calling popNextComBufToSend() will clear any uncommitted bytes
-//
-class comQueSend {
-public:
-    comQueSend ( wireSendAdapter &, comBufMemoryManager & );
-    ~comQueSend ();
-    void clear ();
-    unsigned occupiedBytes () const; 
-    bool flushEarlyThreshold ( unsigned nBytesThisMsg ) const;
-    bool flushBlockThreshold () const; 
-    void pushUInt16 ( const ca_uint16_t value );
-    void pushUInt32 ( const ca_uint32_t value );
-    void pushFloat32 ( const ca_float32_t value );
-    void pushString ( const char *pVal, unsigned nChar );
-    void insertRequestHeader ( 
-        ca_uint16_t request, ca_uint32_t payloadSize, 
-        ca_uint16_t dataType, ca_uint32_t nElem, ca_uint32_t cid, 
-        ca_uint32_t requestDependent, bool v49Ok );
-    void insertRequestWithPayLoad (
-        ca_uint16_t request, unsigned dataType, arrayElementCount nElem, 
-        ca_uint32_t cid, ca_uint32_t requestDependent, 
-        const void * pPayload, bool v49Ok );
-    comBuf * popNextComBufToSend ();
-private:
-    comBufMemoryManager & comBufMemMgr;
-    tsDLList < comBuf > bufs;
-    tsDLIter < comBuf > pFirstUncommited;
-    wireSendAdapter & wire;
-    unsigned nBytesPending;
-
-    typedef void ( comQueSend::*copyScalarFunc_t ) ( 
-        const void * pValue );
-    static const copyScalarFunc_t dbrCopyScalar [comQueSendCopyDispatchSize];
-    void copy_dbr_string ( const void * pValue );
-    void copy_dbr_short ( const void * pValue ); 
-    void copy_dbr_float ( const void * pValue ); 
-    void copy_dbr_char ( const void * pValue ); 
-    void copy_dbr_long ( const void * pValue ); 
-    void copy_dbr_double ( const void * pValue ); 
-    void copy_dbr_invalid ( const void * pValue );
-
-    typedef void ( comQueSend::*copyVectorFunc_t ) (  
-        const void * pValue, unsigned nElem );
-    static const copyVectorFunc_t dbrCopyVector [comQueSendCopyDispatchSize];
-    void copy_dbr_string ( const void *pValue, unsigned nElem );
-    void copy_dbr_short ( const void *pValue, unsigned nElem ); 
-    void copy_dbr_float ( const void *pValue, unsigned nElem ); 
-    void copy_dbr_char ( const void *pValue, unsigned nElem ); 
-    void copy_dbr_long ( const void *pValue, unsigned nElem ); 
-    void copy_dbr_double ( const void *pValue, unsigned nElem ); 
-    void copy_dbr_invalid ( const void * pValue, unsigned nElem );
-
-    void pushComBuf ( comBuf & ); 
-    comBuf * newComBuf (); 
-
-    void beginMsg (); 
-    void commitMsg (); 
-    void clearUncommitedMsg ();
-
-    friend class comQueSendMsgMinder;
-
-    //
-    // visual C++ versions 6 & 7 do not allow out of 
-    // class member template function definition
-    //
-    template < class T >
-    inline void push ( const T *pVal, const unsigned nElem ) 
-    {
-        comBuf * pLastBuf = this->bufs.last ();
-        unsigned nCopied;
-        if ( pLastBuf ) {
-            nCopied = pLastBuf->push ( pVal, nElem );
-        }
-        else {
-            nCopied = 0u;
-        }
-        while ( nElem > nCopied ) {
-            comBuf * pComBuf = newComBuf ();
-            nCopied += pComBuf->push 
-                        ( &pVal[nCopied], nElem - nCopied );
-            this->pushComBuf ( *pComBuf );
-        }
-    }
-
-    //
-    // visual C++ versions 6 and 7 do not allow out of 
-    // class member template function definition
-    //
-    template < class T >
-    inline void push ( const T & val ) 
-    {
-        comBuf * pComBuf = this->bufs.last ();
-        if ( pComBuf && pComBuf->push ( val ) ) {
-            return;
-        }
-        pComBuf = newComBuf ();
-        bool success = pComBuf->push ( val );
-        assert ( success );
-        this->pushComBuf ( *pComBuf );
-    }
-
-    template < class T >
-    inline void push ( const T * ); // disabled
-
-    comQueSend ( const comQueSend & );
-    comQueSend & operator = ( const comQueSend & );
-};
-
-extern const char cacNillBytes[];
-
-inline comQueSendMsgMinder::comQueSendMsgMinder ( 
-    class comQueSend & sendQueIn, epicsGuard < epicsMutex > & ) : 
-        pSendQue ( & sendQueIn )
-{
-    sendQueIn.beginMsg ();
-}
-
-inline comQueSendMsgMinder::~comQueSendMsgMinder ()
-{
-    if ( this->pSendQue ) {
-        this->pSendQue->clearUncommitedMsg ();
-    }
-}
-
-inline void comQueSendMsgMinder::commit ()
-{
-    if ( this->pSendQue ) {
-        this->pSendQue->commitMsg ();
-        this->pSendQue = 0;
-    }
-}
-
-inline void comQueSend::beginMsg () 
-{
-    this->pFirstUncommited = this->bufs.lastIter ();
-}
-
-inline void comQueSend::pushUInt16 ( const ca_uint16_t value ) 
-{
-    this->push ( value );
-}
-
-inline void comQueSend::pushUInt32 ( const ca_uint32_t value ) 
-{
-    this->push ( value );
-}
-
-inline void comQueSend::pushFloat32 ( const ca_float32_t value ) 
-{
-    this->push ( value );
-}
-
-inline void comQueSend::pushString ( const char *pVal, unsigned nChar ) 
-{
-    this->push ( pVal, nChar );
-}
-
-inline void comQueSend::pushComBuf ( comBuf & cb ) 
-{
-    this->bufs.add ( cb );
-    if ( ! this->pFirstUncommited.valid() ) {
-        this->pFirstUncommited = this->bufs.lastIter ();
-    }
-}
-
-inline unsigned comQueSend::occupiedBytes () const 
-{
-    return this->nBytesPending;
-}
-
-inline bool comQueSend::flushBlockThreshold () const
-{
-    return ( this->nBytesPending > 16 * comBuf::capacityBytes () );
-}
-
-inline bool comQueSend::flushEarlyThreshold ( unsigned nBytesThisMsg ) const
-{
-    return ( this->nBytesPending + nBytesThisMsg > 4 * comBuf::capacityBytes () );
-}
-
-// wrapping this with a function avoids WRS T2.2 Cygnus GNU compiler bugs
-inline comBuf * comQueSend::newComBuf ()
-{
-    return new ( this->comBufMemMgr ) comBuf;
-}
-
-#endif // ifndef comQueSendh

src/ca/client/db_access.h

@@ -1,740 +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. 
-\*************************************************************************/
-/* base/include/db_access.h */
-/*      Author:          Bob Dalesio
- *      Date:            4-4-88
-*/
-
-#ifndef INCLdb_accessh
-#define INCLdb_accessh
-
-#include <stddef.h>
-
-#ifdef epicsExportSharedSymbols
-#   define INCLdb_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "epicsTypes.h"
-#include "epicsTime.h"
-
-#ifdef INCLdb_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAX_UNITS_SIZE		8	
-#define MAX_ENUM_STRING_SIZE	26
-#define MAX_ENUM_STATES		16	
-
-/*
- * architecture independent types
- *
- * (so far this is sufficient for all archs we have ported to)
- */
-typedef epicsOldString dbr_string_t;
-typedef epicsUInt8 dbr_char_t;
-typedef epicsInt16 dbr_short_t;
-typedef epicsUInt16	dbr_ushort_t;
-typedef epicsInt16 dbr_int_t;
-typedef epicsUInt16 dbr_enum_t;
-typedef epicsInt32 dbr_long_t;
-typedef epicsUInt32 dbr_ulong_t;
-typedef epicsFloat32 dbr_float_t;
-typedef epicsFloat64 dbr_double_t;
-typedef epicsUInt16	dbr_put_ackt_t;
-typedef epicsUInt16	dbr_put_acks_t;
-typedef epicsOldString dbr_stsack_string_t;
-typedef epicsOldString dbr_class_name_t;
-
-#ifndef db_accessHFORdb_accessC
-/* database field types */
-#define DBF_STRING	0
-#define	DBF_INT		1
-#define	DBF_SHORT	1
-#define	DBF_FLOAT	2
-#define	DBF_ENUM	3
-#define	DBF_CHAR	4
-#define	DBF_LONG	5
-#define	DBF_DOUBLE	6
-#define DBF_NO_ACCESS	7
-#define	LAST_TYPE	DBF_DOUBLE
-#define	VALID_DB_FIELD(x)	((x >= 0) && (x <= LAST_TYPE))
-#define	INVALID_DB_FIELD(x)	((x < 0) || (x > LAST_TYPE))
-
-/* data request buffer types */
-#define DBR_STRING	DBF_STRING	
-#define	DBR_INT		DBF_INT		
-#define	DBR_SHORT	DBF_INT		
-#define	DBR_FLOAT	DBF_FLOAT	
-#define	DBR_ENUM	DBF_ENUM
-#define	DBR_CHAR	DBF_CHAR
-#define	DBR_LONG	DBF_LONG
-#define	DBR_DOUBLE	DBF_DOUBLE
-#define DBR_STS_STRING	7
-#define	DBR_STS_SHORT	8
-#define	DBR_STS_INT	DBR_STS_SHORT	
-#define	DBR_STS_FLOAT	9
-#define	DBR_STS_ENUM	10
-#define	DBR_STS_CHAR	11
-#define	DBR_STS_LONG	12
-#define	DBR_STS_DOUBLE	13
-#define	DBR_TIME_STRING	14
-#define	DBR_TIME_INT	15
-#define	DBR_TIME_SHORT	15
-#define	DBR_TIME_FLOAT	16
-#define	DBR_TIME_ENUM	17
-#define	DBR_TIME_CHAR	18
-#define	DBR_TIME_LONG	19
-#define	DBR_TIME_DOUBLE	20
-#define	DBR_GR_STRING	21
-#define	DBR_GR_SHORT	22
-#define	DBR_GR_INT	DBR_GR_SHORT	
-#define	DBR_GR_FLOAT	23
-#define	DBR_GR_ENUM	24
-#define	DBR_GR_CHAR	25
-#define	DBR_GR_LONG	26
-#define	DBR_GR_DOUBLE	27
-#define	DBR_CTRL_STRING	28
-#define DBR_CTRL_SHORT	29
-#define DBR_CTRL_INT	DBR_CTRL_SHORT	
-#define	DBR_CTRL_FLOAT	30
-#define DBR_CTRL_ENUM	31
-#define	DBR_CTRL_CHAR	32
-#define	DBR_CTRL_LONG	33
-#define	DBR_CTRL_DOUBLE	34
-#define DBR_PUT_ACKT	DBR_CTRL_DOUBLE + 1
-#define DBR_PUT_ACKS    DBR_PUT_ACKT + 1
-#define DBR_STSACK_STRING DBR_PUT_ACKS + 1
-#define DBR_CLASS_NAME DBR_STSACK_STRING + 1
-#define	LAST_BUFFER_TYPE	DBR_CLASS_NAME
-#define	VALID_DB_REQ(x)	((x >= 0) && (x <= LAST_BUFFER_TYPE))
-#define	INVALID_DB_REQ(x)	((x < 0) || (x > LAST_BUFFER_TYPE))
-
-/*
- * The enumeration "epicsType" is an index to this array
- * of type DBR types. In some cases we select the a
- * larger type to avoid loss of information
- */
-epicsShareExtern const int epicsTypeToDBR_XXXX [lastEpicsType+1];
-
-/*
- * The DBR_XXXX types are indicies into this array
- */
-epicsShareExtern const epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1];
-
-/* values returned for each field type
- * 	DBR_STRING	returns a NULL terminated string
- *	DBR_SHORT	returns an unsigned short
- *	DBR_INT		returns an unsigned short
- *	DBR_FLOAT	returns an IEEE floating point value
- *	DBR_ENUM	returns an unsigned short which is the enum item
- *	DBR_CHAR	returns an unsigned char
- *	DBR_LONG	returns an unsigned long
- *	DBR_DOUBLE	returns a double precision floating point number
- *	DBR_STS_STRING	returns a string status structure (dbr_sts_string)
- *	DBR_STS_SHORT	returns a short status structure (dbr_sts_short)
- *	DBR_STS_INT	returns a short status structure (dbr_sts_int)
- *	DBR_STS_FLOAT	returns a float status structure (dbr_sts_float)
- *	DBR_STS_ENUM	returns an enum status structure (dbr_sts_enum)
- *	DBR_STS_CHAR	returns a char status structure (dbr_sts_char)
- *	DBR_STS_LONG	returns a long status structure (dbr_sts_long)
- *	DBR_STS_DOUBLE	returns a double status structure (dbr_sts_double)
- *	DBR_TIME_STRING	returns a string time structure (dbr_time_string)
- *	DBR_TIME_SHORT	returns a short time structure (dbr_time_short)
- *	DBR_TIME_INT	returns a short time structure (dbr_time_short)
- *	DBR_TIME_FLOAT	returns a float time structure (dbr_time_float)
- *	DBR_TIME_ENUM	returns an enum time structure (dbr_time_enum)
- *	DBR_TIME_CHAR	returns a char time structure (dbr_time_char)
- *	DBR_TIME_LONG	returns a long time structure (dbr_time_long)
- *	DBR_TIME_DOUBLE	returns a double time structure (dbr_time_double)
- *	DBR_GR_STRING	returns a graphic string structure (dbr_gr_string)
- *	DBR_GR_SHORT	returns a graphic short structure (dbr_gr_short)
- *	DBR_GR_INT	returns a graphic short structure (dbr_gr_int)
- *	DBR_GR_FLOAT	returns a graphic float structure (dbr_gr_float)
- *	DBR_GR_ENUM	returns a graphic enum structure (dbr_gr_enum)
- *	DBR_GR_CHAR	returns a graphic char structure (dbr_gr_char)
- *	DBR_GR_LONG	returns a graphic long structure (dbr_gr_long)
- *	DBR_GR_DOUBLE	returns a graphic double structure (dbr_gr_double)
- *	DBR_CTRL_STRING	returns a control string structure (dbr_ctrl_int)
- *	DBR_CTRL_SHORT	returns a control short structure (dbr_ctrl_short)
- *	DBR_CTRL_INT	returns a control short structure (dbr_ctrl_int)
- *	DBR_CTRL_FLOAT	returns a control float structure (dbr_ctrl_float)
- *	DBR_CTRL_ENUM	returns a control enum structure (dbr_ctrl_enum)
- *	DBR_CTRL_CHAR	returns a control char structure (dbr_ctrl_char)
- *	DBR_CTRL_LONG	returns a control long structure (dbr_ctrl_long)
- *	DBR_CTRL_DOUBLE	returns a control double structure (dbr_ctrl_double)
- */
-#endif /*db_accessHFORdb_accessC*/
-
-/* VALUES WITH STATUS STRUCTURES */
-
-/* structure for a  string status field */
-struct dbr_sts_string {
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_string_t	value;			/* current value */
-};
-
-/* structure for a  string status and ack field */
-struct dbr_stsack_string{
-	dbr_ushort_t	status;	 		/* status of value */
-	dbr_ushort_t	severity;		/* severity of alarm */
-	dbr_ushort_t	ackt;	 		/* ack transient? */
-	dbr_ushort_t	acks;			/* ack severity	*/
-	dbr_string_t	value;			/* current value */
-};
-/* structure for an short status field */
-struct dbr_sts_int{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_short_t	value;			/* current value */
-};
-struct dbr_sts_short{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_short_t	value;			/* current value */
-};
-
-/* structure for a  float status field */
-struct dbr_sts_float{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_float_t	value;			/* current value */
-};
-
-/* structure for a  enum status field */
-struct dbr_sts_enum{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_enum_t	value;			/* current value */
-};
-
-/* structure for a char status field */
-struct dbr_sts_char{
-	dbr_short_t	status;	 	/* status of value */
-	dbr_short_t	severity;	/* severity of alarm */
-	dbr_char_t	RISC_pad;	/* RISC alignment */
-	dbr_char_t	value;		/* current value */
-};
-
-/* structure for a long status field */
-struct dbr_sts_long{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_long_t	value;			/* current value */
-};
-
-/* structure for a double status field */
-struct dbr_sts_double{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_long_t	RISC_pad;		/* RISC alignment */
-	dbr_double_t	value;			/* current value */
-};
-
-/* VALUES WITH STATUS AND TIME STRUCTURES */
-
-/* structure for a  string time field */
-struct dbr_time_string{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	epicsTimeStamp	stamp;			/* time stamp */
-	dbr_string_t	value;			/* current value */
-};
-
-/* structure for an short time field */
-struct dbr_time_short{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	epicsTimeStamp	stamp;			/* time stamp */
-	dbr_short_t	RISC_pad;		/* RISC alignment */
-	dbr_short_t	value;			/* current value */
-};
-
-/* structure for a  float time field */
-struct dbr_time_float{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	epicsTimeStamp	stamp;			/* time stamp */
-	dbr_float_t	value;			/* current value */
-};
-
-/* structure for a  enum time field */
-struct dbr_time_enum{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	epicsTimeStamp	stamp;			/* time stamp */
-	dbr_short_t	RISC_pad;		/* RISC alignment */
-	dbr_enum_t	value;			/* current value */
-};
-
-/* structure for a char time field */
-struct dbr_time_char{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	epicsTimeStamp	stamp;			/* time stamp */
-	dbr_short_t	RISC_pad0;		/* RISC alignment */
-	dbr_char_t	RISC_pad1;		/* RISC alignment */
-	dbr_char_t	value;			/* current value */
-};
-
-/* structure for a long time field */
-struct dbr_time_long{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	epicsTimeStamp	stamp;			/* time stamp */
-	dbr_long_t	value;			/* current value */
-};
-
-/* structure for a double time field */
-struct dbr_time_double{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	epicsTimeStamp	stamp;			/* time stamp */
-	dbr_long_t	RISC_pad;		/* RISC alignment */
-	dbr_double_t	value;			/* current value */
-};
-
-/* VALUES WITH STATUS AND GRAPHIC STRUCTURES */
-
-/* structure for a graphic string */
-	/* not implemented; use struct_dbr_sts_string */
-
-/* structure for a graphic short field */
-struct dbr_gr_int{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_short_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_short_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_short_t	upper_alarm_limit;	
-	dbr_short_t	upper_warning_limit;
-	dbr_short_t	lower_warning_limit;
-	dbr_short_t	lower_alarm_limit;
-	dbr_short_t	value;			/* current value */
-};
-struct dbr_gr_short{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_short_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_short_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_short_t	upper_alarm_limit;	
-	dbr_short_t	upper_warning_limit;
-	dbr_short_t	lower_warning_limit;
-	dbr_short_t	lower_alarm_limit;
-	dbr_short_t	value;			/* current value */
-};
-
-/* structure for a graphic floating point field */
-struct dbr_gr_float{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_short_t	precision;		/* number of decimal places */
-	dbr_short_t	RISC_pad0;		/* RISC alignment */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_float_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_float_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_float_t	upper_alarm_limit;	
-	dbr_float_t	upper_warning_limit;
-	dbr_float_t	lower_warning_limit;
-	dbr_float_t	lower_alarm_limit;
-	dbr_float_t	value;			/* current value */
-};
-
-/* structure for a graphic enumeration field */
-struct dbr_gr_enum{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_short_t	no_str;			/* number of strings */
-	char		strs[MAX_ENUM_STATES][MAX_ENUM_STRING_SIZE];
-						/* state strings */
-	dbr_enum_t	value;			/* current value */
-};
-
-/* structure for a graphic char field */
-struct dbr_gr_char{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_char_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_char_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_char_t	upper_alarm_limit;	
-	dbr_char_t	upper_warning_limit;
-	dbr_char_t	lower_warning_limit;
-	dbr_char_t	lower_alarm_limit;
-	dbr_char_t	RISC_pad;		/* RISC alignment */
-	dbr_char_t	value;			/* current value */
-};
-
-/* structure for a graphic long field */
-struct dbr_gr_long{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_long_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_long_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_long_t	upper_alarm_limit;	
-	dbr_long_t	upper_warning_limit;
-	dbr_long_t	lower_warning_limit;
-	dbr_long_t	lower_alarm_limit;
-	dbr_long_t	value;			/* current value */
-};
-
-/* structure for a graphic double field */
-struct dbr_gr_double{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_short_t	precision;		/* number of decimal places */
-	dbr_short_t	RISC_pad0;		/* RISC alignment */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_double_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_double_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_double_t	upper_alarm_limit;	
-	dbr_double_t	upper_warning_limit;
-	dbr_double_t	lower_warning_limit;
-	dbr_double_t	lower_alarm_limit;
-	dbr_double_t	value;			/* current value */
-};
-
-/* VALUES WITH STATUS, GRAPHIC and CONTROL STRUCTURES */
-
-/* structure for a control string */
-	/* not implemented; use struct_dbr_sts_string */
-
-/* structure for a control integer */
-struct dbr_ctrl_int{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_short_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_short_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_short_t	upper_alarm_limit;	
-	dbr_short_t	upper_warning_limit;
-	dbr_short_t	lower_warning_limit;
-	dbr_short_t	lower_alarm_limit;
-	dbr_short_t	upper_ctrl_limit;	/* upper control limit */
-	dbr_short_t	lower_ctrl_limit;	/* lower control limit */
-	dbr_short_t	value;			/* current value */
-};
-struct dbr_ctrl_short{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_short_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_short_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_short_t	upper_alarm_limit;	
-	dbr_short_t	upper_warning_limit;
-	dbr_short_t	lower_warning_limit;
-	dbr_short_t	lower_alarm_limit;
-	dbr_short_t	upper_ctrl_limit;	/* upper control limit */
-	dbr_short_t	lower_ctrl_limit;	/* lower control limit */
-	dbr_short_t	value;			/* current value */
-};
-
-/* structure for a control floating point field */
-struct dbr_ctrl_float{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_short_t	precision;		/* number of decimal places */
-	dbr_short_t	RISC_pad;		/* RISC alignment */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_float_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_float_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_float_t	upper_alarm_limit;	
-	dbr_float_t	upper_warning_limit;
-	dbr_float_t	lower_warning_limit;
-	dbr_float_t	lower_alarm_limit;
- 	dbr_float_t	upper_ctrl_limit;	/* upper control limit */
-	dbr_float_t	lower_ctrl_limit;	/* lower control limit */
-	dbr_float_t	value;			/* current value */
-};
-
-/* structure for a control enumeration field */
-struct dbr_ctrl_enum{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_short_t	no_str;			/* number of strings */
-	char	strs[MAX_ENUM_STATES][MAX_ENUM_STRING_SIZE];
-					/* state strings */
-	dbr_enum_t	value;		/* current value */
-};
-
-/* structure for a control char field */
-struct dbr_ctrl_char{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_char_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_char_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_char_t	upper_alarm_limit;	
-	dbr_char_t	upper_warning_limit;
-	dbr_char_t	lower_warning_limit;
-	dbr_char_t	lower_alarm_limit;
-	dbr_char_t	upper_ctrl_limit;	/* upper control limit */
-	dbr_char_t	lower_ctrl_limit;	/* lower control limit */
-	dbr_char_t	RISC_pad;		/* RISC alignment */
-	dbr_char_t	value;			/* current value */
-};
-
-/* structure for a control long field */
-struct dbr_ctrl_long{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_long_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_long_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_long_t	upper_alarm_limit;	
-	dbr_long_t	upper_warning_limit;
-	dbr_long_t	lower_warning_limit;
-	dbr_long_t	lower_alarm_limit;
-	dbr_long_t	upper_ctrl_limit;	/* upper control limit */
-	dbr_long_t	lower_ctrl_limit;	/* lower control limit */
-	dbr_long_t	value;			/* current value */
-};
-
-/* structure for a control double field */
-struct dbr_ctrl_double{
-	dbr_short_t	status;	 		/* status of value */
-	dbr_short_t	severity;		/* severity of alarm */
-	dbr_short_t	precision;		/* number of decimal places */
-	dbr_short_t	RISC_pad0;		/* RISC alignment */
-	char		units[MAX_UNITS_SIZE];	/* units of value */
-	dbr_double_t	upper_disp_limit;	/* upper limit of graph */
-	dbr_double_t	lower_disp_limit;	/* lower limit of graph */
-	dbr_double_t	upper_alarm_limit;	
-	dbr_double_t	upper_warning_limit;
-	dbr_double_t	lower_warning_limit;
-	dbr_double_t	lower_alarm_limit;
-	dbr_double_t	upper_ctrl_limit;	/* upper control limit */
-	dbr_double_t	lower_ctrl_limit;	/* lower control limit */
-	dbr_double_t	value;			/* current value */
-};
-
-#define dbr_size_n(TYPE,COUNT)\
-((unsigned)((COUNT)<=0?dbr_size[TYPE]:dbr_size[TYPE]+((COUNT)-1)*dbr_value_size[TYPE]))
-
-/* size for each type - array indexed by the DBR_ type code */
-epicsShareExtern const unsigned short dbr_size[];
-
-/* size for each type's value - array indexed by the DBR_ type code */
-epicsShareExtern const unsigned short dbr_value_size[];
-
-#ifndef db_accessHFORdb_accessC
-/* class for each type's value */
-enum dbr_value_class { 
-		dbr_class_int, 
-		dbr_class_float, 
-		dbr_class_string, 
-		dbr_class_max};
-
-epicsShareExtern const enum dbr_value_class dbr_value_class[LAST_BUFFER_TYPE+1];
-
-/* 
- * ptr to value given a pointer to the structure and the DBR type
- */
-#define dbr_value_ptr(PDBR, DBR_TYPE) \
-((void *)(((char *)PDBR)+dbr_value_offset[DBR_TYPE]))
-
-/* 
- * ptr to value given a pointer to the structure and the structure declaration
- */
-#define dbr_value_ptr_from_structure(PDBR, STRUCTURE)\
-((void *)(((char *)PDBR)+BYTE_OS(STRUCTURE, value)))
-
-epicsShareExtern const unsigned short dbr_value_offset[LAST_BUFFER_TYPE+1];
-
-
-/* union for each fetch buffers */
-union db_access_val{
-	dbr_string_t		strval;		/* string max size	      */
-	dbr_short_t		shrtval;	/* short		      */
-	dbr_short_t		intval;		/* short		      */
-	dbr_float_t		fltval;		/* IEEE Float		      */
-	dbr_enum_t		enmval;		/* item number		      */
-	dbr_char_t		charval;	/* character		      */
-	dbr_long_t		longval;	/* long			      */
-	dbr_double_t		doubleval;	/* double		      */
-	struct dbr_sts_string	sstrval;	/* string field	with status   */
-	struct dbr_sts_short	sshrtval;	/* short field with status    */
-	struct dbr_sts_float	sfltval;	/* float field with status    */
-	struct dbr_sts_enum	senmval;	/* item number with status    */
-	struct dbr_sts_char	schrval;	/* char field with status     */
-	struct dbr_sts_long	slngval;	/* long field with status     */
-	struct dbr_sts_double	sdblval;	/* double field with time     */
-	struct dbr_time_string	tstrval;	/* string field	with time     */
-	struct dbr_time_short	tshrtval;	/* short field with time      */
-	struct dbr_time_float	tfltval;	/* float field with time      */
-	struct dbr_time_enum	tenmval;	/* item number with time      */
-	struct dbr_time_char	tchrval;	/* char field with time	      */
-	struct dbr_time_long	tlngval;	/* long field with time	      */
-	struct dbr_time_double	tdblval;	/* double field with time     */
-	struct dbr_sts_string	gstrval;	/* graphic string info	      */
-	struct dbr_gr_short	gshrtval;	/* graphic short info	      */
-	struct dbr_gr_float	gfltval;	/* graphic float info	      */
-	struct dbr_gr_enum	genmval;	/* graphic item info	      */
-	struct dbr_gr_char	gchrval;	/* graphic char info	      */
-	struct dbr_gr_long	glngval;	/* graphic long info	      */
-	struct dbr_gr_double	gdblval;	/* graphic double info	      */
-	struct dbr_sts_string	cstrval;	/* control string info	      */
-	struct dbr_ctrl_short	cshrtval;	/* control short info	      */
-	struct dbr_ctrl_float	cfltval;	/* control float info	      */
-	struct dbr_ctrl_enum	cenmval;	/* control item info	      */
-	struct dbr_ctrl_char	cchrval;	/* control char info	      */
-	struct dbr_ctrl_long	clngval;	/* control long info	      */
-	struct dbr_ctrl_double	cdblval;	/* control double info	      */
-	dbr_put_ackt_t		putackt;	/* item number		      */
-	dbr_put_acks_t		putacks;	/* item number		      */
-	struct dbr_sts_string	sastrval;	/* string field	with status   */
-	dbr_string_t		classname;	/* string max size	      */
-};
-
-/*----------------------------------------------------------------------------
-* repository for some useful PV database constants and utilities
-*
-* item dimensions
-*    db_strval_dim		dimension for string values
-*    db_units_dim		dimension for record units text
-*    db_desc_dim		dimension for record description text
-*    db_name_dim		dimension for channel names (record.field\0)
-*    db_state_dim		number of states possible in a state table
-*    db_state_text_dim		dimension for a state text string
-*		usage: char state_table[db_state_dim][db_state_text_dim]
-*
-* type checking macros -- return non-zero if condition is true, zero otherwise
-*
-*      int dbf_type_is_valid(type)	type is a valid DBF_xxx
-*      int dbr_type_is_valid(type)	type is a valid DBR_xxx
-*      int dbr_type_is_plain(type)	type is a valid plain DBR_xxx
-*      int dbr_type_is_STS(type)	type is a valid DBR_STS_xxx
-*      int dbr_type_is_TIME(type)	type is a valid DBR_TIME_xxx
-*      int dbr_type_is_GR(type)		type is a valid DBR_GR_xxx
-*      int dbr_type_is_CTRL(type)	type is a valid DBR_CTRL_xxx
-*      int dbr_type_is_STRING(type)	type is a valid DBR_STRING_xxx
-*      int dbr_type_is_SHORT(type)	type is a valid DBR_SHORT_xxx
-*      int dbr_type_is_FLOAT(type)	type is a valid DBR_FLOAT_xxx
-*      int dbr_type_is_ENUM(type)	type is a valid DBR_ENUM_xxx
-*      int dbr_type_is_CHAR(type)	type is a valid DBR_CHAR_xxx
-*      int dbr_type_is_LONG(type)	type is a valid DBR_LONG_xxx
-*      int dbr_type_is_DOUBLE(type)	type is a valid DBR_DOUBLE_xxx
-*
-* type conversion macros
-*
-*    char *dbf_type_to_text(type)	returns text matching DBF_xxx
-*     void dbf_text_to_type(text, type) finds DBF_xxx matching text
-*      int dbf_type_to_DBR(type)	returns DBR_xxx matching DBF_xxx
-*      int dbf_type_to_DBR_TIME(type)	returns DBR_TIME_xxx matching DBF_xxx
-*      int dbf_type_to_DBR_GR(type)	returns DBR_GR_xxx matching DBF_xxx
-*      int dbf_type_to_DBR_CTRL(type)	returns DBR_CTRL_xxx matching DBF_xxx
-*    char *dbr_type_to_text(type)	returns text matching DBR_xxx
-*     void dbr_text_to_type(text, type) finds DBR_xxx matching text
-*---------------------------------------------------------------------------*/
-#define db_strval_dim 		MAX_STRING_SIZE
-#define db_units_dim		MAX_UNITS_SIZE	
-#define db_desc_dim		24
-#define db_name_dim		36
-#define db_state_dim		MAX_ENUM_STATES	
-#define db_state_text_dim	MAX_ENUM_STRING_SIZE 
-
-#define dbf_type_is_valid(type)   ((type) >= 0 && (type) <= LAST_TYPE)
-#define dbr_type_is_valid(type)   ((type) >= 0 && (type) <= LAST_BUFFER_TYPE)
-#define dbr_type_is_plain(type)   \
-		((type) >= DBR_STRING && (type) <= DBR_DOUBLE)
-#define dbr_type_is_STS(type)   \
-		((type) >= DBR_STS_STRING && (type) <= DBR_STS_DOUBLE)
-#define dbr_type_is_TIME(type)   \
-		((type) >= DBR_TIME_STRING && (type) <= DBR_TIME_DOUBLE)
-#define dbr_type_is_GR(type)   \
-		((type) >= DBR_GR_STRING && (type) <= DBR_GR_DOUBLE)
-#define dbr_type_is_CTRL(type)   \
-		((type) >= DBR_CTRL_STRING && (type) <= DBR_CTRL_DOUBLE)
-#define dbr_type_is_STRING(type)   \
-		((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
-		 (type)%(LAST_TYPE+1) == DBR_STRING)
-#define dbr_type_is_SHORT(type)   \
-		((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
-		 (type)%(LAST_TYPE+1) == DBR_SHORT)
-#define dbr_type_is_FLOAT(type)   \
-		((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
-		 (type)%(LAST_TYPE+1) == DBR_FLOAT)
-#define dbr_type_is_ENUM(type)   \
-		((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
-		 (type)%(LAST_TYPE+1) == DBR_ENUM)
-#define dbr_type_is_CHAR(type)   \
-		((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
-		 (type)%(LAST_TYPE+1) == DBR_CHAR)
-#define dbr_type_is_LONG(type)   \
-		((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
-		 (type)%(LAST_TYPE+1) == DBR_LONG)
-#define dbr_type_is_DOUBLE(type)   \
-		((type) >= 0 && (type) <= LAST_BUFFER_TYPE && \
-		 (type)%(LAST_TYPE+1) == DBR_DOUBLE)
-
-#define dbf_type_to_text(type)   \
-    (  ((type) >= -1 && (type) < dbf_text_dim-2) ? \
-        dbf_text[type+1] : dbf_text_invalid  )
-
-#define dbf_text_to_type(text, type)   \
-    for (type=dbf_text_dim-3; type>=0; type--) { \
-        if (strcmp(text, dbf_text[type+1]) == 0) \
-        break; \
-    }
-
-#define dbr_type_to_text(type)   \
-    (  ((type) >= 0 && (type) < dbr_text_dim) ? \
-        dbr_text[(type)] : dbr_text_invalid  )
-
-#define dbr_text_to_type(text, type)   \
-    for (type=dbr_text_dim-2; type>=0; type--) { \
-        if (strcmp(text, dbr_text[type]) == 0) \
-        break; \
-    }
-
-#define dbf_type_to_DBR(type)   \
-    (((type) >= 0 && (type) <= dbf_text_dim-3) ? \
-        (type)   :  -1  )
-
-#define dbf_type_to_DBR_STS(type)  \
-    (((type) >= 0 && (type) <= dbf_text_dim-3) ? \
-        (type) + (dbf_text_dim-2)   :  -1  )
-
-#define dbf_type_to_DBR_TIME(type)  \
-    (((type) >= 0 && (type) <= dbf_text_dim-3) ? \
-        (type) + 2*(dbf_text_dim-2)   :  -1  )
-
-#define dbf_type_to_DBR_GR(type)  \
-    (((type) >= 0 && (type) <= dbf_text_dim-3) ? \
-        (type) + 3*(dbf_text_dim-2)   :  -1  )
-
-#define dbf_type_to_DBR_CTRL(type)  \
-    (((type) >= 0 && (type) <= dbf_text_dim-3) ? \
-        (type) + 4*(dbf_text_dim-2)   :  -1  )
-
-
-epicsShareExtern const char	    *dbf_text[LAST_TYPE+3];
-epicsShareExtern const short	    dbf_text_dim;
-epicsShareExtern const char      *dbf_text_invalid;
-
-epicsShareExtern const char	    *dbr_text[LAST_BUFFER_TYPE+1];
-epicsShareExtern const short	    dbr_text_dim;
-epicsShareExtern const char      *dbr_text_invalid;
-#endif /*db_accessHFORdb_accessC*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* INCLdb_accessh */

src/ca/client/disconnectGovernorTimer.cpp

@@ -1,110 +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
-//
-
-#define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
-
-#define epicsExportSharedSymbols
-#include "disconnectGovernorTimer.h"
-#include "udpiiu.h"
-#include "nciu.h"
-
-static const double disconnectGovernorPeriod = 10.0; // sec
-
-disconnectGovernorTimer::disconnectGovernorTimer ( 
-    disconnectGovernorNotify & iiuIn, 
-    epicsTimerQueue & queueIn, 
-    epicsMutex & mutexIn ) :
-        mutex ( mutexIn ), timer ( queueIn.createTimer () ),
-    iiu ( iiuIn )
-{
-}
-
-disconnectGovernorTimer::~disconnectGovernorTimer ()
-{
-    this->timer.destroy ();
-}
-
-void disconnectGovernorTimer:: start ()
-{
-    this->timer.start ( *this, disconnectGovernorPeriod );
-}
-
-void disconnectGovernorTimer::shutdown (
-    epicsGuard < epicsMutex > & cbGuard,
-    epicsGuard < epicsMutex > & guard )
-{
-    {
-        epicsGuardRelease < epicsMutex > unguard ( guard );
-        {
-            epicsGuardRelease < epicsMutex > cbUnguard ( cbGuard );
-            this->timer.cancel ();
-        }
-    }
-    while ( nciu * pChan = this->chanList.get () ) {
-        pChan->channelNode::listMember = 
-            channelNode::cs_none;
-        pChan->serviceShutdownNotify ( cbGuard, guard );
-    }
-}
-
-epicsTimerNotify::expireStatus disconnectGovernorTimer::expire ( 
-    const epicsTime & /* currentTime */ )
-{
-    epicsGuard < epicsMutex > guard ( this->mutex );
-    while ( nciu * pChan = chanList.get () ) {
-        pChan->channelNode::listMember = 
-            channelNode::cs_none;
-        this->iiu.govExpireNotify ( guard, *pChan );
-    }
-    return expireStatus ( restart, disconnectGovernorPeriod );
-}
-
-void disconnectGovernorTimer::show ( unsigned level ) const
-{
-    epicsGuard < epicsMutex > guard ( this->mutex );
-    ::printf ( "disconnect governor timer: with %u channels pending\n",
-        this->chanList.count () );
-    if ( level > 0u ) {
-        tsDLIterConst < nciu > pChan = this->chanList.firstIter ();
-	    while ( pChan.valid () ) {
-            pChan->show ( level - 1u );
-            pChan++;
-        }
-    }
-}
-
-void disconnectGovernorTimer::installChan ( 
-    epicsGuard < epicsMutex > & guard, nciu & chan )
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    this->chanList.add ( chan );
-    chan.channelNode::listMember = channelNode::cs_disconnGov;
-}
-
-void disconnectGovernorTimer::uninstallChan (
-    epicsGuard < epicsMutex > & guard, nciu & chan )
-{
-    guard.assertIdenticalMutex ( this->mutex );
-    this->chanList.remove ( chan );
-    chan.channelNode::listMember = channelNode::cs_none;
-}
-
-disconnectGovernorNotify::~disconnectGovernorNotify () {}
-

src/ca/client/disconnectGovernorTimer.h

@@ -1,77 +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 disconnectGovernorTimerh  
-#define disconnectGovernorTimerh
-
-#ifdef epicsExportSharedSymbols
-#   define searchTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "epicsMutex.h"
-#include "epicsGuard.h"
-#include "epicsTimer.h"
-
-#ifdef searchTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
-
-#include "caProto.h"
-#include "netiiu.h"
-
-class disconnectGovernorNotify {
-public:
-    virtual ~disconnectGovernorNotify () = 0;
-    virtual void govExpireNotify ( 
-        epicsGuard < epicsMutex > &, nciu & ) = 0;
-};
-
-class disconnectGovernorTimer : private epicsTimerNotify {
-public:
-    disconnectGovernorTimer ( 
-        class disconnectGovernorNotify &, epicsTimerQueue &, epicsMutex & );
-    virtual ~disconnectGovernorTimer ();
-    void start ();
-    void shutdown (
-        epicsGuard < epicsMutex > & cbGuard,
-        epicsGuard < epicsMutex > & guard );
-    void installChan ( 
-        epicsGuard < epicsMutex > &, nciu & );
-    void uninstallChan ( 
-        epicsGuard < epicsMutex > &, nciu & );
-    void show ( unsigned level ) const;
-private:
-    tsDLList < nciu > chanList;
-    epicsMutex & mutex;
-    epicsTimer & timer;
-    class disconnectGovernorNotify & iiu;
-    epicsTimerNotify::expireStatus expire ( const epicsTime & currentTime );
-	disconnectGovernorTimer ( const disconnectGovernorTimer & );
-	disconnectGovernorTimer & operator = ( const disconnectGovernorTimer & );
-};
-
-#endif // ifdef disconnectGovernorTimerh

src/ca/client/evtime.c

@@ -1,95 +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 "dbDefs.h"
-#include "epicsTime.h"
-#include "cadef.h"
-
-void event_handler (struct event_handler_args args);
-int evtime (char *pname);
-
-static unsigned 	iteration_count;
-static epicsUInt32	last_time;
-
-#ifndef iocCore
-int main(int argc, char **argv)
-{
-        char    *pname;
-
-        if(argc == 2){
-                pname = argv[1];
-                evtime(pname);
-        }
-        else{
-                printf("usage: %s <channel name>", argv[0]);
-        }
-	return(0);
-}
-#endif
-
-/*
- * evtime()
- */
-int evtime(char *pname)
-{
-	chid	chan;
-	int	status;
-
-	status = ca_search(pname,  &chan);
-	SEVCHK(status, NULL);
-
-	status = ca_pend_io(10.0);
-	if(status != ECA_NORMAL){
-		printf("%s not found\n", pname);
-		return 0;
-	}
-
-	status = ca_add_event(
-			DBR_FLOAT,
-			chan,
-			event_handler,
-			NULL,
-			NULL);
-	SEVCHK(status, __FILE__);
-
-	status = ca_pend_event(0.0);
-	SEVCHK(status, NULL);
-}
-
-
-/*
- * event_handler()
- *
- */
-void event_handler(struct event_handler_args args)
-{
-	epicsUInt32		current_time;
-#	define 			COUNT	0x8000
-	double			interval;
-	double			delay;
-        epicsTimeStamp		ts;
-
-	if(iteration_count%COUNT == 0){
-		epicsTimeGetCurrent(&ts);
-		current_time = ts.secPastEpoch;
-		if(last_time != 0){
-			interval = current_time - last_time;
-			delay = interval/COUNT;
-			printf("Delay = %f sec per event\n",
-				delay);
-		}
-		last_time = current_time;
-	}
-
-	iteration_count++;
-}
-