Update module version and release date for V4.6.0-rc1

jenkins: fix CloudBees doc job (SourceForge upload)
Set cloudbees branches
2016-08-26 16:36:16 -05:00 · 2016-08-20 21:47:22 +02:00 · 2016-08-01 13:30:58 -05:00
48 changed files with 1362 additions and 3181 deletions
--- a/.ci/travis-build.sh
+++ b/.ci/travis-build.sh
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e -x
-
-make -j2 $EXTRA
-
-if [ "$TEST" != "NO" ]
-then
-  make -j2 tapfiles
-  make -j2 -s test-results
-fi
--- a/.ci/travis-prepare.sh
+++ b/.ci/travis-prepare.sh
@@ -1,109 +0,0 @@
-#!/bin/sh
-set -e -x
-
-CURDIR="$PWD"
-
-cat << EOF > $CURDIR/configure/RELEASE.local
-EPICS_BASE=$HOME/.source/epics-base
-EOF
-
-install -d "$HOME/.source"
-cd "$HOME/.source"
-
-add_gh_flat() {
-  MODULE=$1
-  REPOOWNER=$2
-  REPONAME=$3
-  BRANCH=$4
-  MODULE_UC=$(echo $MODULE | tr 'a-z' 'A-Z')
-  ( git clone --quiet --depth 5 --branch $BRANCH https://github.com/$REPOOWNER/$REPONAME.git $MODULE && \
-  cd $MODULE && git log -n1 )
-  cat < $CURDIR/configure/RELEASE.local > $MODULE/configure/RELEASE.local
-  cat << EOF >> $CURDIR/configure/RELEASE.local
-${MODULE_UC}=$HOME/.source/$MODULE
-EOF
-}
-
-# not recursive
-git clone --quiet --depth 5 --branch "$BRBASE" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
-(cd epics-base && git log -n1 )
-add_gh_flat pvData ${REPOPVD:-epics-base} pvDataCPP ${BRPVD:-master}
-add_gh_flat pvAccess ${REPOPVA:-epics-base} pvAccessCPP ${BRPVA:-master}
-
-if [ -e $CURDIR/configure/RELEASE.local ]
-then
-  cat $CURDIR/configure/RELEASE.local
-fi
-
-EPICS_HOST_ARCH=`sh epics-base/startup/EpicsHostArch`
-
-# requires wine and g++-mingw-w64-i686
-if [ "$WINE" = "32" ]
-then
-  echo "Cross mingw32"
-  sed -i -e '/CMPLR_PREFIX/d' epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
-CMPLR_PREFIX=i686-w64-mingw32-
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS+=win32-x86-mingw
-EOF
-fi
-
-if [ "$STATIC" = "YES" ]
-then
-  echo "Build static libraries/executables"
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-SHARED_LIBRARIES=NO
-STATIC_BUILD=YES
-EOF
-fi
-
-case "$CMPLR" in
-clang)
-  echo "Host compiler is clang"
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.$EPICS_HOST_ARCH
-GNU         = NO
-CMPLR_CLASS = clang
-CC          = clang
-CCC         = clang++
-EOF
-
-  # hack
-  sed -i -e 's/CMPLR_CLASS = gcc/CMPLR_CLASS = clang/' epics-base/configure/CONFIG.gnuCommon
-
-  clang --version
-  ;;
-*)
-  echo "Host compiler is default"
-  gcc --version
-  ;;
-esac
-
-cat <<EOF >> epics-base/configure/CONFIG_SITE
-USR_CPPFLAGS += $USR_CPPFLAGS
-USR_CFLAGS += $USR_CFLAGS
-USR_CXXFLAGS += $USR_CXXFLAGS
-EOF
-
-# set RTEMS to eg. "4.9" or "4.10"
-# requires qemu, bison, flex, texinfo, install-info
-if [ -n "$RTEMS" ]
-then
-  echo "Cross RTEMS${RTEMS} for pc386"
-  curl -L "https://github.com/mdavidsaver/rsb/releases/download/20171203-${RTEMS}/i386-rtems${RTEMS}-trusty-20171203-${RTEMS}.tar.bz2" \
-  | tar -C / -xmj
-
-  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
-RTEMS_VERSION=$RTEMS
-RTEMS_BASE=$HOME/.rtems
-EOF
-  cat << EOF >> epics-base/configure/CONFIG_SITE
-CROSS_COMPILER_TARGET_ARCHS += RTEMS-pc386-qemu
-EOF
-fi
-
-make -j2 -C epics-base $EXTRA
-make -j2 -C pvData $EXTRA
-make -j2 -C pvAccess $EXTRA
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,13 @@
-/cfg/
-/bin/
-/lib/
-/db/
-/dbd/
-/html/
-/include/
-/templates/
-/configure/*.local
-/documentation/html
-/documentation/*.tag
-O.*/
-/QtC-*
+bin/
+lib/
+doc/
+include/
+db/
+dbd/
+documentation/html
+documentation/*.tag
 envPaths
-*.orig
-*.log
-.*.swp
+configure/*.local
+!configure/ExampleRELEASE.local
+**/O.*
+QtC-*
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +0,0 @@
-sudo: false
-dist: trusty
-language: c++
-compiler:
-  - gcc
-addons:
-  apt:
-    packages:
-    - libreadline6-dev
-    - libncurses5-dev
-    - perl
-    - clang
-    - g++-mingw-w64-i686
-    - qemu-system-x86
-install:
- - ./.ci/travis-prepare.sh
-script:
- - ./.ci/travis-build.sh
-env:
- - BRBASE=7.0
- - BRBASE=7.0 CMPLR=clang
- - BRBASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++98"
- - BRBASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
- - BRBASE=7.0 CMPLR=clang EXTRA="CMD_CXXFLAGS=-std=c++11"
- - BRBASE=7.0 WINE=32 TEST=NO STATIC=YES
- - BRBASE=7.0 WINE=32 TEST=NO STATIC=NO
- - BRBASE=7.0 RTEMS=4.10 TEST=NO
- - BRBASE=7.0 RTEMS=4.9 TEST=NO
- - BRBASE=3.16
- - BRBASE=3.15
- - BRBASE=3.14
--- a/README.md
+++ b/README.md
@@ -1,21 +1,38 @@
-# pvDatabaseCPP
+pvaDatabaseCPP
+============

-The EPICS **pvDatabase** module provides a set of network accessible, smart, memory resident records with a C++ API. Each record has data composed of a top level PVStructure. Each record has a name which is the channelName for pvAccess. A local Channel Provider implements the complete ChannelProvider and Channel interfaces as defined by pvAccess. The local provider gives access to the records in the pvDatabase. This local provider is accessed by the remote pvAccess server. A record is smart because code can be attached to a record, which is accessed via a method named process.

-The pvDatabase module implements a synchronous C++ server interface to pvAccessCPP that was designed to be easier to use than the basic pvAccess server API.
+A brief description of a pvDatabase is that it is a set of network accessible, smart, memory resident records. Each record has data composed of a top level PVStructure. Each record has a name which is the channelName for pvAccess. A local Channel Provider implements the complete ChannelProvider and Channel interfaces as defined by pvAccess. The local provider provides access to the records in the pvDatabase. This local provider is accessed by the remote pvAccess server. A record is smart because code can be attached to a record, which is accessed via a method named process.
+pvaDatabase is a synchronous Database interface to pvAccess,
+which is callback based.
+pvaDatabase is thus easier to use than pvAccess itself.

-## Links
+See documentation/pvaDatabaseCPP.html for details.

- General information about EPICS can be found at the
-  [EPICS Controls website](https://epics-controls.org).
- API documentation for this module can be found in its
-  documentation directory, in particular the file
-  pvDatabaseCPP.html
+Building
+--------

-## Building
+If a proper RELEASE.local file exists one directory level above pvaDatabaseCPP
+then just type:

-This module is included as a submodule of a full EPICS 7 release and will be compiled during builds of that software.
+    make
+
+It can also be built by:
+
+    cp configure/ExampleRELEASE.local configure/RELEASE.local
+    edit configure/RELEASE.local
+    make
+
+
+
+Examples
+------------
+
+Examples are available in exampleCPP.
+
+Status
+------
+
+* The API is for EPICS Version 4 release 4.6.0

-## Examples

-Some examples are available in the separate exampleCPP module.
--- a/configure/ExampleRELEASE.local
+++ b/configure/ExampleRELEASE.local
@@ -0,0 +1,8 @@
+EPICS4_DIR=/home/epicsv4/master
+
+PVACCESS=${EPICS4_DIR}/pvAccessCPP
+PVDATA=${EPICS4_DIR}/pvDataCPP
+PVCOMMON=${EPICS4_DIR}/pvCommonCPP
+
+TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
+EPICS_BASE=/home/install/epics/base
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -1,43 +1,27 @@
-# RELEASE - Location of external support modules
+# pvDatabaseCPP RELEASE - Location of external support modules
 #
-# IF YOU CHANGE ANY PATHS in this file or make API changes to
-# any modules it refers to, you should do a "make rebuild" in
-# this application's top level directory.
+# IF YOU CHANGE this file or any file it includes you must
+# subsequently do a "gnumake rebuild" in the application's
+# top level directory.
 #
-# The EPICS build process does not check dependencies against
-# any files from outside the application, so it is safest to
-# rebuild it completely if any modules it depends on change.
+# The build process does not check dependencies against files
+# that are outside this application, thus you should also do a
+# "gnumake rebuild" in the top level directory after EPICS_BASE
+# or any other external module pointed to below is rebuilt.
 #
 # Host- or target-specific settings can be given in files named
 #  RELEASE.$(EPICS_HOST_ARCH).Common
 #  RELEASE.Common.$(T_A)
 #  RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+
+# EPICS V4 Developers: Do not edit the locations in this file!
 #
-# This file is parsed by both GNUmake and an EPICS Perl script,
-# so it may ONLY contain definititions of paths to other support
-# modules, variable definitions that are used in module paths,
-# and include statements that pull in other RELEASE files.
-# Variables may be used before their values have been set.
-# Build variables that are NOT used in paths should be set in
-# the CONFIG_SITE file.
+# Create a file RELEASE.local pointing to your PVASRV, PVACCESS,
+# PVDATA, PVCOMMON and EPICS_BASE build directories, e.g.
+#   PVACCESS = /path/to/epics/pvAccessCPP
+#   PVDATA   = /path/to/epics/pvDataCPP
+#   PVCOMMON = /path/to/epics/pvCommonCPP
+#   EPICS_BASE = /path/to/epics/base

-# Variables and paths to dependent modules:
-#MODULES = /path/to/modules
-#MYMODULE = $(MODULES)/my-module
-
-# If building the EPICS modules individually, set these:
-#EPICS_PVACCESS = $(MODULES)/pvAccess
-#EPICS_PVDATA = $(MODULES)/pvData
-#EPICS_DATABASE = $(MODULES)/database
-#EPICS_CA = $(MODULES)/ca
-#EPICS_LIBCOM = $(MODULES)/libcom
-#EPICS_BASE = $(MODULES)/core
-
-# Set RULES here if you want to use build rules from elsewhere:
-#RULES = $(MODULES)/build-rules
-
-# These allow developers to override the RELEASE variable settings
-# without having to modify the configure/RELEASE file itself.
 -include $(TOP)/../RELEASE.local
-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
 -include $(TOP)/configure/RELEASE.local
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -1,50 +1,23 @@
-# pvDatabaseCPP Module

-This document summarizes the changes to the module between releases.
-
-## Release 4.4.2 (EPICS 7.0.2.2, Apr 2019)
-
-Formerly if a client makes a request for a subfield of a non structure field
-it resulted in a crash.
-
-Now if a request is made for a subfield of a non structure field
-
-1) if the field is not a union an exception is thrown which is passed to the client.
-2) if the field is a union
-    a) if more than one subfield is requested an exception is thrown 
-    b) if the subfield is the type for the current union the request succeeds
-    c) if type is not the same an exception is thrown
-
-## Release 4.4.1 (EPICS 7.0.2.1, Mar 2019)
-
-* Cleaned up some build warnings.
-* RTEMS test harness simplified.
-
-
-## Release 4.4 (EPICS 7.0.2, Dec 2018)
-
-* pvCopy is now implemented in pvDatabaseCPP. The version in pvDatacPP can be deprecated.
-* plugin support is implemented.
-
-
-## Release 4.3 (EPICS 7.0.1, Dec 2017)
-
-* Updates for pvAccess API and build system changes.
-
-
-## Release 4.2 (EPICS V4.6, Aug 2016)
+EPICS V4 release 4.6
+====================

 * The examples are moved to exampleCPP
 * Support for channelRPC is now available.
 * removeRecord and traceRecord are now available.

-The test is now a regression test which can be run using:
+The test is now a regression test the can be ran via

     make runtests


-## Release 4.1 (EPICS V4.5, Oct 2015)
+EPICS V4 release 4.5
+====================
+
+This release is one component of EPICS V4 release 4.5.

 This is the first release of pvDatabaseCPP.

 It provides functionality equivalent to pvDatabaseJava.
+
+
--- a/documentation/pvDatabaseCPP.html
+++ b/documentation/pvDatabaseCPP.html
@@ -36,7 +36,7 @@

 <div class="head">
 <h1>pvDatabaseCPP</h1>
-<h2 class="nocount">Release 4.4 - December 2018</h2>
+<h2 class="nocount">Release 4.2.1 - 2016-08-26</h2>


 <h2 class="nocount">Abstract</h2>
@@ -60,13 +60,15 @@ The minimum that an extension must provide is a top level PVStructure and a proc
  <h2 class="nocount">Table of Contents</h2>
 </div>

-<div id="contents" class="contents">
+<div id="contents" class="contents">	  
 <hr />

 <h2>Overview</h2>
 <p>
-pvDatabaseCPP is one of the components of
-EPICS Version 7
+pvDatabaseCPP is one of the components of 
+<a href="http://epics-pvdata.sourceforge.net">
+EPICS Version 4
+</a>
 </p>
 <p>This document is only a guide to help locate code and documentation related to pvDatabaseCPP
 </p>
@@ -76,7 +78,7 @@ It is intended for developers that want to use pvDatabaseCPP.
 <h2>Developer Guide</h2>
 <p>A guide for developers is available at
 <a
-href="https://mrkraimer.github.io/website/developerGuide/developerGuide.html">
+href="http://epics-pvdata.sourceforge.net/informative/developerGuide/developerGuide.html">
 developerGuide
 </a>
 </p>
@@ -85,18 +87,6 @@ Some understanding of the components and how they are related is necessary in or
 develop code that uses pvDatabaseCPP.
 In particular read everything related to pvDatabase.
 </p>
-<p>pvDatabase has plugin support, which is implemented in <b>pvCopy</b>.
-<b>pvCopy</b> was originally implemented in <b>pvDataCPP</b>,
-but pvDatabaseCPP now implemnents its own version and adds plugin support.
-</p>
-<p>
-See
-<a
-href="https://mrkraimer.github.io/website/pvRequest/pvRequest.html">
-pvRequest
-</a>
-for details.
-</p>
 <p>The developerGuide discusses code in a way that applies to both CPP and C++.
 For the descriptions of the CPP specific code consult the next section.
 </p>
@@ -133,7 +123,7 @@ exampleCPP
 <h3>database</h3>
 <p>This has many examples of how to create both soft records and records that implement
 other functionality.</p>
-<dl>
+<dl> 
   <dt>exampleDatabase.cpp</dt>
     <dd>
      This shows how to create soft records of each pvData type.<br />
@@ -158,7 +148,7 @@ other functionality.</p>
 </dl>
 <h3>exampleLink</h3>
 <p>This shows how to implement a record that has a link to another record</p>
-<dl>
+<dl> 
  <dt>exampleMonitorLinkRecord</dt>
     <dd>
      This creates a monitor link to another record.
@@ -179,7 +169,7 @@ provided by iocCore.
 The following provide EPICS V4 shell commands:</p>
 <pre>
 pvAccessCPP
-qsrv
+pvaSrv
 pvDatabaseCPP
 </pre>

--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -21,21 +21,30 @@ installE4 () {
    local module=$1
    local branch=$2

-    wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
+    # If microbench version does not exist, try without
+    if [ "${MB}" = "WITH_MICROBENCH" ]; then
+        if ! wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=WITH_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz; then
+            wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
+        fi
+    else
+        wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
+    fi
    tar -xzf ${module}.CB-dist.tar.gz
 }

 ###########################################
-# Defaults for EPICS Base
+# Defaults for EPICS Base and MB

 DEFAULT_BASE=3.15.4
 BASE=${BASE:-${DEFAULT_BASE}}
+MB=${MB:-"NO_MICROBENCH"}

 ###########################################
 # Dependent module branches

-PVDATA_BRANCH="master"
-PVACCESS_BRANCH="master"
+PVCOMMON_BRANCH="release-4.2"
+PVDATA_BRANCH="release-6.0"
+PVACCESS_BRANCH="release-5.0"

 ###########################################
 # Fetch and unpack dependencies
@@ -49,6 +58,7 @@ cd ${STUFF}
 installTool Boost 1.61.0
 installTool Base ${BASE}

+installE4 pvCommon ${PVCOMMON_BRANCH}
 installE4 pvData ${PVDATA_BRANCH}
 installE4 pvAccess ${PVACCESS_BRANCH}

@@ -74,6 +84,6 @@ make distclean all
 make runtests

 ###########################################
-# Create cache
+# Create distribution

 tar -czf pvDatabase.CB-dist.tar.gz lib include dbd LICENSE
--- a/jenkins/cloudbees_doc
+++ b/jenkins/cloudbees_doc
@@ -21,7 +21,14 @@ installE4 () {
    local module=$1
    local branch=$2

-    wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE}/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
+    # If microbench version does not exist, try without
+    if [ "${MB}" = "WITH_MICROBENCH" ]; then
+        if ! wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=WITH_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz; then
+            wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
+        fi
+    else
+        wget -nv https://openepics.ci.cloudbees.com/job/e4-cpp-${module}-${branch}-build/BASE=${BASE},MB=NO_MICROBENCH/lastSuccessfulBuild/artifact/${module}.CB-dist.tar.gz
+    fi
    tar -xzf ${module}.CB-dist.tar.gz
 }

@@ -31,6 +38,7 @@ installE4 () {
 BASE=3.15.4
 PUBLISH=${PUBLISH:-NO}
 BRANCH=${BRANCH:-master}
+MB=NO_MICROBENCH

 ###########################################
 # Fetch and unpack dependencies
@@ -57,10 +65,9 @@ doxygen
 ###########################################
 # Publish

-if [ "${PUBLISH}" != "DONT" ]; then
+if [ "${PUBLISH}" != "NO" ]; then
    # Upload explicit dummy to ensure target directory exists
    echo "Created by CloudBees Jenkins upload job. Should be deleted as part of the job." > DUMMY
    rsync -q -e ssh DUMMY epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvDatabaseCPP/${PUBLISH}/
-
    rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvDatabaseCPP/${PUBLISH}/
 fi
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,22 +5,26 @@ include $(TOP)/configure/CONFIG

 PVDATABASE_SRC = $(TOP)/src

+
 LIBRARY += pvDatabase

 # shared library ABI version.
-SHRLIB_VERSION ?= 4.4.2
+SHRLIB_VERSION ?= 4.2

 INC += pv/channelProviderLocal.h
 INC += pv/pvDatabase.h
 INC += pv/traceRecord.h
 INC += pv/removeRecord.h

-include $(PVDATABASE_SRC)/copy/Makefile
 include $(PVDATABASE_SRC)/database/Makefile
 include $(PVDATABASE_SRC)/pvAccess/Makefile
 include $(PVDATABASE_SRC)/special/Makefile

-pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
+
+pvDatabase_LIBS += pvAccess pvData Com
 pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)

+
+
 include $(TOP)/configure/RULES
+
--- a/src/copy/Makefile
+++ b/src/copy/Makefile
@@ -1,15 +0,0 @@
-# This is a Makefile fragment, see ../Makefile
-
-SRC_DIRS += $(PVDATABASE_SRC)/copy
-
-INC += pv/pvStructureCopy.h
-INC += pv/pvPlugin.h
-INC += pv/pvArrayPlugin.h
-INC += pv/pvDeadbandPlugin.h
-INC += pv/pvTimestampPlugin.h
-
-LIBSRCS += pvCopy.cpp
-LIBSRCS += pvPlugin.cpp
-LIBSRCS += pvArrayPlugin.cpp
-LIBSRCS += pvDeadbandPlugin.cpp
-LIBSRCS += pvTimestampPlugin.cpp
--- a/src/copy/pv/pvArrayPlugin.h
+++ b/src/copy/pv/pvArrayPlugin.h
@@ -1,102 +0,0 @@
-/* pvArrayPlugin.h */
-/*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
- */
-
-#ifndef PVARRAYPLUGIN_H
-#define PVARRAYPLUGIN_H
-
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
-#include <string>
-#include <map>
-#include <pv/lock.h>
-#include <pv/pvData.h>
-#include <pv/pvPlugin.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvCopy{
-
-class PVArrayPlugin;
-class PVArrayFilter;
-
-typedef std::tr1::shared_ptr<PVArrayPlugin> PVArrayPluginPtr;
-typedef std::tr1::shared_ptr<PVArrayFilter> PVArrayFilterPtr;
-
-
-/**
- * @brief A plugin for a filter that gets a sub array from a PVScalarArray.
- *
- * @author mrk
- * @since date 2017.02.23
- */
-class epicsShareClass PVArrayPlugin : public PVPlugin
-{
-private:
-    PVArrayPlugin();
-public:
-    POINTER_DEFINITIONS(PVArrayPlugin);
-    virtual ~PVArrayPlugin();
-    /**
-     * Factory
-     */
-    static void create();
-    /**
-     * Create a PVFilter.
-     * @param requestValue The value part of a name=value request option.
-     * @param pvCopy The PVCopy to which the PVFilter will be attached.
-     * @param master The field in the master PVStructure to which the PVFilter will be attached
-     * @return The PVFilter.
-     * Null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    virtual PVFilterPtr create(
-         const std::string & requestValue,
-         const PVCopyPtr & pvCopy,
-         const epics::pvData::PVFieldPtr & master);
-};
-
-/**
- * @brief  A filter that gets a sub array from a PVScalarArray.
- */
-class epicsShareClass PVArrayFilter : public PVFilter
-{
-private:
-    long start;
-    long increment;
-    long end;
-    epics::pvData::PVScalarArrayPtr masterArray;
-
-    PVArrayFilter(long start,long increment,long end,const epics::pvData::PVScalarArrayPtr & masterArray);
-public:
-    POINTER_DEFINITIONS(PVArrayFilter);
-    virtual ~PVArrayFilter();
-    /**
-     * Create a PVArrayFilter.
-     * @param requestValue The value part of a name=value request option.
-     * @param master The field in the master PVStructure to which the PVFilter will be attached.
-     * @return The PVFilter.
-     * A null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    static PVArrayFilterPtr create(const std::string & requestValue,const epics::pvData::PVFieldPtr & master);
-    /**
-     * Perform a filter operation
-     * @param pvCopy The field in the copy PVStructure.
-     * @param bitSet A bitSet for copyPVStructure.
-     * @param toCopy (true,false) means copy (from master to copy,from copy to master)
-     * @return if filter (modified, did not modify) destination.
-     * Null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    bool filter(const epics::pvData::PVFieldPtr & pvCopy,const epics::pvData::BitSetPtr & bitSet,bool toCopy);
-    /**
-     * Get the filter name.
-     * @return The name.
-     */
-    std::string getName();
-};
-
-}}
-#endif  /* PVARRAYPLUGIN_H */
-
--- a/src/copy/pv/pvDeadbandPlugin.h
+++ b/src/copy/pv/pvDeadbandPlugin.h
@@ -1,106 +0,0 @@
-/* pvDeadbandPlugin.h */
-/*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
- */
-
-#ifndef PVDEADBANDPLUGIN_H
-#define PVDEADBANDPLUGIN_H
-
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
-#include <string>
-#include <map>
-#include <pv/lock.h>
-#include <pv/pvData.h>
-#include <pv/pvPlugin.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvCopy{
-
-class PVDeadbandPlugin;
-class PVDeadbandFilter;
-
-typedef std::tr1::shared_ptr<PVDeadbandPlugin> PVDeadbandPluginPtr;
-typedef std::tr1::shared_ptr<PVDeadbandFilter> PVDeadbandFilterPtr;
-
-
-/**
- * @brief  A plugin for a filter that gets a sub array from a PVScalarDeadband.
- *
- * @author mrk
- * @since date 2017.02.23
- */
-class epicsShareClass PVDeadbandPlugin : public PVPlugin
-{
-private:
-    PVDeadbandPlugin();
-public:
-    POINTER_DEFINITIONS(PVDeadbandPlugin);
-    virtual ~PVDeadbandPlugin();
-    /**
-     * Factory
-     */
-    static void create();
-    /**
-     * Create a PVFilter.
-     * @param requestValue The value part of a name=value request option.
-     * @param pvCopy The PVCopy to which the PVFilter will be attached.
-     * @param master The field in the master PVStructure to which the PVFilter will be attached
-     * @return The PVFilter.
-     * Null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    virtual PVFilterPtr create(
-         const std::string & requestValue,
-         const PVCopyPtr & pvCopy,
-         const epics::pvData::PVFieldPtr & master);
-};
-
-/**
- * @brief  A Plugin for a filter that gets a sub array from a PVScalarDeadband.
- */
-class epicsShareClass PVDeadbandFilter : public PVFilter
-{
-private:
-    bool absolute;
-    double deadband;
-    epics::pvData::PVScalarPtr master;
-    bool firstTime;
-    double lastReportedValue;
-    
-
-    PVDeadbandFilter(bool absolute,double deadband,epics::pvData::PVScalarPtr const & master);
-public:
-    POINTER_DEFINITIONS(PVDeadbandFilter);
-    virtual ~PVDeadbandFilter();
-    /**
-     * Create a PVDeadbandFilter.
-     * @param requestValue The value part of a name=value request option.
-     * @param master The field in the master PVStructure to which the PVFilter will be attached.
-     * @return The PVFilter.
-     * A null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    static PVDeadbandFilterPtr create(
-        const std::string & requestValue,
-        const epics::pvData::PVFieldPtr & master);
-    /**
-     * Perform a filter operation
-     * @param pvCopy The field in the copy PVStructure.
-     * @param bitSet A bitSet for copyPVStructure.
-     * @param toCopy (true,false) means copy (from master to copy,from copy to master)
-     * @return if filter (modified, did not modify) destination.
-     * Null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    bool filter(const epics::pvData::PVFieldPtr & pvCopy,const epics::pvData::BitSetPtr & bitSet,bool toCopy);
-    /**
-     * Get the filter name.
-     * @return The name.
-     */
-    std::string getName();
-};
-
-}}
-#endif  /* PVDEADBANDPLUGIN_H */
-
--- a/src/copy/pv/pvPlugin.h
+++ b/src/copy/pv/pvPlugin.h
@@ -1,110 +0,0 @@
-/* pvPlugin.h */
-/*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
- */
-/**
- * @author Marty Kraimer
- * @date 2017.03
- */
-#ifndef PVPLUGIN_H
-#define PVPLUGIN_H
-
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
-#include <string>
-#include <map>
-#include <pv/lock.h>
-#include <pv/pvStructureCopy.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvCopy{ 
-
-class PVPlugin;
-class PVFilter;
-class PVPluginRegistry;
-
-typedef std::tr1::shared_ptr<PVPlugin> PVPluginPtr;
-typedef std::tr1::shared_ptr<PVFilter> PVFilterPtr;
-typedef std::map<std::string,PVPluginPtr> PVPluginMap;
-
-
-/**
- * @brief A filter plugin that attaches to a field of a PVStrcture.
- *
- * PVCopy looks for plugins defined in pvRequest and calls the filter when a pvCopy is updated.
- * @author mrk
- * @since 2017.03.17
- * 
- * Interface for a filter plugin for PVCopy.
- *
- */
-
-class epicsShareClass PVPlugin {
-public:
-    POINTER_DEFINITIONS(PVPlugin);
-    virtual ~PVPlugin() {}
-    /**
-     * Create a PVFilter.
-     * @param requestValue The value part of a name=value request option.
-     * @param pvCopy The PVCopy to which the PVFilter will be attached.
-     * @param master The field in the master PVStructure to which the PVFilter will be attached.
-     * @return The PVFilter.
-     * A null is returned if master or requestValue is not appropriate for the plugin.
-     */
-     virtual PVFilterPtr create(
-         const std::string & requestValue,
-         const PVCopyPtr & pvCopy,
-         const epics::pvData::PVFieldPtr & master) = 0;
-};
-
-/**
- * @brief  A Filter that is called when a copy PVStructure is being updated.
- *
- * This interface defines a filter to update a copy of a field from a master PVStructure.
- * of the data in the master.
- */
-class epicsShareClass PVFilter {
-public:
-    POINTER_DEFINITIONS(PVFilter);
-    virtual ~PVFilter() {}
-    /**
-     * Update copy or master.
-     * @param copy The data for copy.
-     * @param bitSet The BitSet for copy.
-     * @param toCopy (true,false) means copy (from master to copy,from copy to master)
-     * @return (true,false) if filter modified destination.
-     */
-    virtual bool filter(const epics::pvData::PVFieldPtr & copy,const epics::pvData::BitSetPtr & bitSet,bool toCopy) = 0;
-    /**
-     * Get the filter name.
-     * This is the name part of a request name=value pair.
-     * @return The name.
-     */
-    virtual std::string getName() = 0;
-};
-/**
- * @brief  A registry for filter plugins for PVCopy.
- *
- */
-class epicsShareClass PVPluginRegistry {
-public:
-    /**
-     * Register a plugin.
-     * @param name The name that appears in [name=value] of a field request option.
-     * @param pvPlugin The implementation for the plugin.
-     */
-    static void registerPlugin(const std::string & name,const PVPluginPtr & pvPlugin);
-    /**
-     * Find a plugin.
-     * @param name The name that appears in [name=value] of a field request option.
-     * @return The plugin implementation or null if no pluging by that name has been registered.
-     */
-    static PVPluginPtr find(const std::string & name);
-};
-
-}}
-
-#endif  /* PVPLUGIN_H */
--- a/src/copy/pv/pvStructureCopy.h
+++ b/src/copy/pv/pvStructureCopy.h
@@ -1,247 +0,0 @@
-/* pvStructureCopy.h */
-/*
- * Copyright information and license terms for this software can be
- * found in the file LICENSE that is included with the distribution
- */
-/**
- * @author Marty Kraimer
- * @date 2013.04
- */
-#ifndef PVSTRUCTURECOPY_H
-#define PVSTRUCTURECOPY_H
-
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
-#include <string>
-#include <stdexcept>
-#include <memory>
-#include <pv/pvData.h>
-#include <pv/bitSet.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvCopy{ 
-
-class PVCopyTraverseMasterCallback;
-typedef std::tr1::shared_ptr<PVCopyTraverseMasterCallback> PVCopyTraverseMasterCallbackPtr;
-
-/**
- * @brief Callback for traversing master structure
- *
- * Must be implemented by code that creates pvCopy.
- *
- * This was originally name pvCopy.h and implemented in pvDataCPP
- * When it was moved to pvDatabaseCPP it was renamed to prevent conflicts with
- * the version in pvDataCPP.
- * Also the namespace was changed from epics::pvData to epics::pvCopy
- */
-class epicsShareClass PVCopyTraverseMasterCallback
-{
-public:
-    POINTER_DEFINITIONS(PVCopyTraverseMasterCallback);
-    virtual ~PVCopyTraverseMasterCallback() {}
-    /**
-     * Called once for each field in master.
-     * @param pvField The field in master.
-     */
-    virtual void nextMasterPVField(epics::pvData::PVFieldPtr const &pvField) = 0;
-};
-
-
-class PVCopy;
-typedef std::tr1::shared_ptr<PVCopy> PVCopyPtr;
-
-struct CopyNode;
-typedef std::tr1::shared_ptr<CopyNode> CopyNodePtr;
-
-struct CopyStructureNode;
-typedef std::tr1::shared_ptr<CopyStructureNode> CopyStructureNodePtr;
-
-
-/**
- * @brief Support for subset of fields in a pvStructure.
- *
- * Class that manages one or more PVStructures that holds an arbitrary subset of the fields
- * in another PVStructure called master.
- */
-class epicsShareClass PVCopy : 
-    public std::tr1::enable_shared_from_this<PVCopy>
-{
-public:
-    POINTER_DEFINITIONS(PVCopy);
-    /**
-     * Create a new pvCopy
-     * @param pvMaster The top-level structure for which a copy of
-     * an arbitrary subset of the fields in master will be created and managed.
-     * @param pvRequest Selects the set of subfields desired and options for each field.
-     * @param structureName The name for the top level of any PVStructure created.
-     */
-    static PVCopyPtr create(
-        epics::pvData::PVStructurePtr const &pvMaster,
-        epics::pvData::PVStructurePtr const &pvRequest,
-        std::string const & structureName);
-    virtual ~PVCopy(){}
-    virtual void destroy();
-    /**
-     * Get the top-level structure of master
-     * @returns The master top-level structure.
-     * This should not be modified.
-     */
-    epics::pvData::PVStructurePtr getPVMaster();
-    /**
-     * Traverse all the fields in master.
-     * @param callback This is called for each field on master.
-     */
-    void traverseMaster(PVCopyTraverseMasterCallbackPtr const & callback);
-    /**
-     * Get the introspection interface for a PVStructure for e copy.
-     */
-    epics::pvData::StructureConstPtr getStructure();
-    /**
-     * Create a copy instance. Monitors keep a queue of monitor elements.
-     * Since each element needs a PVStructure, multiple top-level structures will be created.
-     */
-    epics::pvData::PVStructurePtr createPVStructure();
-    /**
-     * Given a field in pvMaster. return the offset in copy for the same field.
-     * A value of std::string::npos means that the copy does not have this field.
-     * @param masterPVField The field in master.
-     */
-    std::size_t getCopyOffset(epics::pvData::PVFieldPtr const  &masterPVField);
-    /**
-     * Given a field in pvMaster. return the offset in copy for the same field.
-     * A value of std::string::npos means that the copy does not have this field.
-     * @param masterPVStructure A structure in master that has masterPVField.
-     * @param masterPVField The field in master.
-     */
-    std::size_t getCopyOffset(
-        epics::pvData::PVStructurePtr const  &masterPVStructure,
-        epics::pvData::PVFieldPtr const  &masterPVField);
-    /**
-     * Given an offset in the copy get the corresponding field in pvMaster.
-     * @param structureOffset The offset in the copy.
-     */
-    epics::pvData::PVFieldPtr getMasterPVField(std::size_t structureOffset);
-    /**
-     * Initialize the fields in copyPVStructure by giving each field
-     * the value from the corresponding field in pvMaster.
-     * bitSet will be set to show that all fields are changed.
-     * @param copyPVStructure A copy top-level structure.
-     * @param bitSet A bitSet for copyPVStructure.
-     */
-    void initCopy(
-        epics::pvData::PVStructurePtr const  &copyPVStructure,
-        epics::pvData::BitSetPtr const  &bitSet);
-    /**
-     * Set all fields in copyPVStructure to the value of the corresponding field in pvMaster.
-     * Each field that is changed has it's corresponding bit set in bitSet.
-     * @param copyPVStructure A copy top-level structure.
-     * @param bitSet A bitSet for copyPVStructure.
-     * @returns (false,true) if client (should not,should) receive changes.
-     */
-    bool updateCopySetBitSet(
-        epics::pvData::PVStructurePtr const  &copyPVStructure,
-        epics::pvData::BitSetPtr const  &bitSet);
-    /**
-     * For each set bit in bitSet
-     * set the field in copyPVStructure to the value of the corresponding field in pvMaster.
-     * @param copyPVStructure A copy top-level structure.
-     * @param bitSet A bitSet for copyPVStructure.
-     * @returns (false,true) if client (should not,should) receive changes.
-     */
-    bool updateCopyFromBitSet(
-        epics::pvData::PVStructurePtr const  &copyPVStructure,
-        epics::pvData::BitSetPtr const  &bitSet);
-    /**
-     * For each set bit in bitSet
-     * set the field in pvMaster to the value of the corresponding field in copyPVStructure
-     * @param copyPVStructure A copy top-level structure.
-     * @param bitSet A bitSet for copyPVStructure.
-     */
-    void updateMaster(
-        epics::pvData::PVStructurePtr const  &copyPVStructure,
-        epics::pvData::BitSetPtr const  &bitSet);
-    /**
-     * Get the options for the field at the specified offset.
-     * @param fieldOffset the offset in copy.
-     * @returns A NULL is returned if no options were specified for the field.
-     * If options were specified,PVStructurePtr is a structures
-     *  with a set of PVString subfields that specify name,value pairs.s
-     *  name is the subField name and value is the subField value.
-     */
-    epics::pvData::PVStructurePtr getOptions(std::size_t fieldOffset);
-    /**
-     * For debugging.
-     */
-    std::string dump();
-private:
-    
-    PVCopyPtr getPtrSelf()
-    {
-        return shared_from_this();
-    }
-    
-    epics::pvData::PVStructurePtr pvMaster;
-    epics::pvData::StructureConstPtr structure;
-    CopyNodePtr headNode;
-    epics::pvData::PVStructurePtr cacheInitStructure;
-    epics::pvData::BitSetPtr ignorechangeBitSet;
-
-    void traverseMaster(
-        CopyNodePtr const &node,
-        PVCopyTraverseMasterCallbackPtr const & callback);
-    void updateCopySetBitSet(
-        epics::pvData::PVFieldPtr const &pvCopy,
-        epics::pvData::PVFieldPtr const &pvMaster,
-        epics::pvData::BitSetPtr const &bitSet);
-    void updateCopySetBitSet(
-        epics::pvData::PVFieldPtr const &pvCopy,
-        CopyNodePtr const &node,
-        epics::pvData::BitSetPtr const &bitSet);
-    void updateCopyFromBitSet(
-        epics::pvData::PVFieldPtr const &pvCopy,
-        CopyNodePtr const &node,
-        epics::pvData::BitSetPtr const &bitSet);
-    void updateMaster(
-        epics::pvData::PVFieldPtr const &pvCopy,
-        CopyNodePtr const &node,
-        epics::pvData::BitSetPtr const &bitSet);
-
-    PVCopy(epics::pvData::PVStructurePtr const &pvMaster);
-    bool init(epics::pvData::PVStructurePtr const &pvRequest);
-    epics::pvData::StructureConstPtr createStructure(
-        epics::pvData::PVStructurePtr const &pvMaster,
-        epics::pvData::PVStructurePtr const &pvFromRequest);
-    CopyNodePtr createStructureNodes(
-        epics::pvData::PVStructurePtr const &pvMasterStructure,
-        epics::pvData::PVStructurePtr const &pvFromRequest,
-        epics::pvData::PVStructurePtr const &pvFromField);
-    void initPlugin(
-        CopyNodePtr const & node,
-        epics::pvData::PVStructurePtr const & pvOptions,
-        epics::pvData::PVFieldPtr const & pvMasterField);
-    void traverseMasterInitPlugin();
-    void traverseMasterInitPlugin(CopyNodePtr const & node);
-
-    CopyNodePtr getCopyOffset(
-        CopyStructureNodePtr const &structureNode,
-        epics::pvData::PVFieldPtr const &masterPVField);
-    bool checkIgnore(
-        epics::pvData::PVStructurePtr const & copyPVStructure,
-        epics::pvData::BitSetPtr const & bitSet);
-    void setIgnore(CopyNodePtr const & node);
-    CopyNodePtr getMasterNode(
-        CopyStructureNodePtr const &structureNode,
-        std::size_t structureOffset);
-    void dump(
-        std::string *builder,
-        CopyNodePtr const &node,
-        int indentLevel);
-    friend class PVCopyMonitor;
-};
-
-}}
-
-#endif  /* PVSTRUCTURECOPY_H */
--- a/src/copy/pv/pvTimestampPlugin.h
+++ b/src/copy/pv/pvTimestampPlugin.h
@@ -1,105 +0,0 @@
-/* pvTimeStampPlugin.h */
-/*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
- */
-
-#ifndef PVTIMESTAMPPLUGIN_H
-#define PVTIMESTAMPPLUGIN_H
-
-#if defined(_WIN32) && !defined(NOMINMAX)
-#define NOMINMAX
-#endif
-
-#include <string>
-#include <map>
-#include <pv/lock.h>
-#include <pv/pvData.h>
-#include <pv/pvPlugin.h>
-#include <pv/pvTimeStamp.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvCopy{
-
-class PVTimestampPlugin;
-class PVTimestampFilter;
-
-typedef std::tr1::shared_ptr<PVTimestampPlugin> PVTimestampPluginPtr;
-typedef std::tr1::shared_ptr<PVTimestampFilter> PVTimestampFilterPtr;
-
-
-/**
- * @brief  A plugin for a filter that sets a timeStamp to the current time.
- *
- * @author mrk
- * @since date 2017.03.24
- */
-class epicsShareClass PVTimestampPlugin : public PVPlugin
-{
-private:
-    PVTimestampPlugin();
-public:
-    POINTER_DEFINITIONS(PVTimestampPlugin);
-    virtual ~PVTimestampPlugin();
-    /**
-     * Factory
-     */
-    static void create();
-    /**
-     * Create a PVFilter.
-     * @param requestValue The value part of a name=value request option.
-     * @param pvCopy The PVCopy to which the PVFilter will be attached.
-     * @param master The field in the master PVStructure to which the PVFilter will be attached
-     * @return The PVFilter.
-     * Null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    virtual PVFilterPtr create(
-         const std::string & requestValue,
-         const PVCopyPtr & pvCopy,
-         const epics::pvData::PVFieldPtr & master);
-};
-
-/**
- * @brief  A filter that sets a timeStamp to the current time.
- */
-class epicsShareClass PVTimestampFilter : public PVFilter
-{
-private:
-    epics::pvData::PVTimeStamp pvTimeStamp;
-    epics::pvData::TimeStamp timeStamp;
-    bool current;
-    bool copy;
-    epics::pvData::PVFieldPtr master;
-    
-
-    PVTimestampFilter(bool current,bool copy,epics::pvData::PVFieldPtr const & pvField);
-public:
-    POINTER_DEFINITIONS(PVTimestampFilter);
-    virtual ~PVTimestampFilter();
-    /**
-     * Create a PVTimestampFilter.
-     * @param requestValue The value part of a name=value request option.
-     * @param master The field in the master PVStructure to which the PVFilter will be attached.
-     * @return The PVFilter.
-     * A null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    static PVTimestampFilterPtr create(const std::string & requestValue,const epics::pvData::PVFieldPtr & master);
-    /**
-     * Perform a filter operation
-     * @param pvCopy The field in the copy PVStructure.
-     * @param bitSet A bitSet for copyPVStructure.
-     * @param toCopy (true,false) means copy (from master to copy,from copy to master)
-     * @return if filter (modified, did not modify) destination.
-     * Null is returned if master or requestValue is not appropriate for the plugin.
-     */
-    bool filter(const epics::pvData::PVFieldPtr & pvCopy,const epics::pvData::BitSetPtr & bitSet,bool toCopy);
-    /**
-     * Get the filter name.
-     * @return The name.
-     */
-    std::string getName();
-};
-
-}}
-#endif  /* PVTIMESTAMPPLUGIN_H */
-
--- a/src/copy/pvArrayPlugin.cpp
+++ b/src/copy/pvArrayPlugin.cpp
@@ -1,193 +0,0 @@
-/* pvArrayPlugin.cpp */
-/*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
- */
-
-#include <stdlib.h>
-#include <pv/pvData.h>
-#include <pv/bitSet.h>
-#include <pv/convert.h>
-#include <pv/pvSubArrayCopy.h>
-#define epicsExportSharedSymbols
-#include <pv/pvArrayPlugin.h>
-
-using std::string;
-using std::size_t;
-using std::cout;
-using std::endl;
-using std::tr1::static_pointer_cast;
-using std::vector;
-using namespace epics::pvData;
-
-namespace epics { namespace pvCopy{
-
-static ConvertPtr convert = getConvert();
-static std::string name("array");
-
-PVArrayPlugin::PVArrayPlugin()
-{
-}
-
-PVArrayPlugin::~PVArrayPlugin()
-{
-}
-
-void PVArrayPlugin::create()
-{
-     static bool firstTime = true;
-     if(firstTime) {
-         firstTime = false;
-         PVArrayPluginPtr pvPlugin = PVArrayPluginPtr(new PVArrayPlugin());
-         PVPluginRegistry::registerPlugin(name,pvPlugin);
-    }
-}
-
-PVFilterPtr PVArrayPlugin::create(
-     const std::string & requestValue,
-     const PVCopyPtr & pvCopy,
-     const PVFieldPtr & master)
-{
-    return PVArrayFilter::create(requestValue,master);
-}
-
-PVArrayFilter::~PVArrayFilter()
-{
-}
-
-static vector<string> split(string const & colonSeparatedList) {
-    string::size_type numValues = 1;
-    string::size_type index=0;
-    while(true) {
-        string::size_type pos = colonSeparatedList.find(':',index);
-        if(pos==string::npos) break;
-        numValues++;
-        index = pos +1;
-    }
-    vector<string> valueList(numValues,"");
-    index=0;
-    for(size_t i=0; i<numValues; i++) {
-        size_t pos = colonSeparatedList.find(':',index);
-        string value = colonSeparatedList.substr(index,pos-index);
-        valueList[i] = value;
-        index = pos +1;
-    }
-    return valueList;
-}
-
-PVArrayFilterPtr PVArrayFilter::create(
-     const std::string & requestValue,
-     const PVFieldPtr & master)
-{
-    Type type = master->getField()->getType();
-    if(type!=scalarArray) {
-        PVArrayFilterPtr filter = PVArrayFilterPtr();
-        return filter;
-    }
-    long start =0;
-    long increment =1;
-    long end = -1;
-    vector<string> values(split(requestValue));
-    long num = values.size();
-    bool ok = true;
-    string value;
-    if(num==1) {
-        value = values[0];
-        start = strtol(value.c_str(),0,10);
-    } else if(num==2) {
-        value = values[0];
-        start = strtol(value.c_str(),0,10);
-        value = values[1];
-        end = strtol(value.c_str(),0,10);
-    } else if(num==3) {
-        value = values[0];
-        start = strtol(value.c_str(),0,10);
-        value = values[1];
-        increment = strtol(value.c_str(),0,10);
-        value = values[2];
-        end = strtol(value.c_str(),0,10);
-    } else {
-        ok = false;
-    }
-    if(!ok) {
-        PVArrayFilterPtr filter = PVArrayFilterPtr();
-        return filter;
-    }
-    PVArrayFilterPtr filter =
-         PVArrayFilterPtr(
-             new PVArrayFilter(
-                 start,increment,end,static_pointer_cast<PVScalarArray>(master))); 
-    return filter;
-}
-
-PVArrayFilter::PVArrayFilter(long start,long increment,long end,const PVScalarArrayPtr & masterArray)
-: start(start),
-  increment(increment),
-  end(end),
-  masterArray(masterArray)
-{
-}
-
-
-bool PVArrayFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet,bool toCopy)
-{
-    PVScalarArrayPtr copyArray = static_pointer_cast<PVScalarArray>(pvCopy);
-    long len = 0;
-    long start = this->start;
-    long end = this->end;
-    long no_elements = masterArray->getLength();
-    if(start<0) {
-    	start = no_elements+start;
-    	if(start<0) start = 0;
-    }
-    if (end < 0) {
-    	end = no_elements + end;
-    	if (end < 0) end = 0;
-
-    }
-    if(toCopy) {	
-    	if (end >= no_elements) end = no_elements - 1;
-    	if (end - start >= 0) len = 1 + (end - start) / increment;
-    	if(len<=0 || start>=no_elements) {
-    		copyArray->setLength(0);
-    		return true;
-    	}
-    	long indfrom = start;
-    	long indto = 0;
-    	copyArray->setCapacity(len);
-    	if(increment==1) {
-            copy(*masterArray,indfrom,1,*copyArray,indto,1,len);
-    	} else {
-    	    for(long i=0; i<len; ++i) {
-    	        copy(*masterArray,indfrom,1,*copyArray,indto,1,1);
-    	        indfrom += increment;
-    	         indto += 1;
-    	    }
-    	}
-    	copyArray->setLength(len);
-    	bitSet->set(pvCopy->getFieldOffset());
-    	return true;
-    }
-    if (end - start >= 0) len = 1 + (end - start) / increment;
-    if(len<=0) return true;
-    if(no_elements<=end) masterArray->setLength(end+1);
-    long indfrom = 0;
-    long indto = start;
-    if(increment==1) {
-    	copy(*copyArray,indfrom,1,*masterArray,indto,1,len);
-    } else {
-    	for(long i=0; i<len; ++i) {
-    	    copy(*copyArray,indfrom,1,*masterArray,indto,1,1);
-    	    indfrom += increment;
-    	     indto += 1;
-    	}
-    }
-    return true;
-}
-
-string PVArrayFilter::getName()
-{
-	return name;
-}
-
-}}
-
--- a/src/copy/pvCopy.cpp
+++ b/src/copy/pvCopy.cpp
@@ -1,747 +0,0 @@
-/* pvCopy.cpp */
-/*
- * License terms for this software can be found in the file LICENSE that is included with the distribution
- */
-/**
- * @author Marty Kraimer
- * @date 2013.04
- */
-#include <string>
-#include <stdexcept>
-#include <memory>
-#include <sstream>
-
-#include <epicsThread.h>
-#include <pv/pvData.h>
-#include <pv/bitSet.h>
-#include <pv/thread.h>
-
-#define epicsExportSharedSymbols
-#include <pv/pvPlugin.h>
-#include <pv/pvStructureCopy.h>
-
-using std::tr1::static_pointer_cast;
-using std::tr1::dynamic_pointer_cast;
-using std::string;
-using std::size_t;
-using std::cout;
-using std::endl;
-using std::vector;
-using namespace epics::pvData;
-
-namespace epics { namespace pvCopy { 
-
-/**
- * Convenience method for implementing dump.
- * It generates a newline and inserts blanks at the beginning of the newline.
- * @param builder The std::string * being constructed.
- * @param indentLevel Indent level, Each level is four spaces.
- */
-static void newLine(string *buffer, int indentLevel)
-{
-    *buffer += "\n";
-    *buffer += string(indentLevel*4, ' ');
-}
-
-static PVCopyPtr NULLPVCopy;
-static StructureConstPtr NULLStructure;
-static PVStructurePtr NULLPVStructure;
-
-struct CopyNode {
-    CopyNode()
-    : isStructure(false),
-      structureOffset(0),
-      nfields(0)
-    {}
-    PVFieldPtr masterPVField;
-    bool isStructure;
-    size_t structureOffset; // In the copy
-    size_t nfields;
-    PVStructurePtr options;
-    vector<PVFilterPtr> pvFilters;
-};
-    
-static CopyNodePtr NULLCopyNode;
-
-typedef std::vector<CopyNodePtr> CopyNodePtrArray;
-typedef std::tr1::shared_ptr<CopyNodePtrArray> CopyNodePtrArrayPtr;
-    
-struct CopyStructureNode : public  CopyNode {
-    CopyNodePtrArrayPtr nodes;
-};
-
-PVCopyPtr PVCopy::create(
-    PVStructurePtr const &pvMaster, 
-    PVStructurePtr const &pvRequest, 
-    string const & structureName)
-{
-    PVStructurePtr pvStructure(pvRequest);
-    if(structureName.size()>0) {
-        if(pvStructure->getStructure()->getNumberFields()>0) {
-            pvStructure = pvRequest->getSubField<PVStructure>(structureName);
-            if(!pvStructure) return NULLPVCopy;
-        }
-    } else if(pvRequest->getSubField<PVStructure>("field")) {
-        pvStructure = pvRequest->getSubField<PVStructure>("field");
-    }
-    PVCopyPtr pvCopy = PVCopyPtr(new PVCopy(pvMaster));
-    bool result = pvCopy->init(pvStructure);
-    if(!result) return PVCopyPtr();
-    pvCopy->traverseMasterInitPlugin();
-//cout << pvCopy->dump() << endl;
-    return pvCopy;
-}
-
-PVStructurePtr PVCopy::getPVMaster()
-{
-    return pvMaster;
-}
-
-void PVCopy::traverseMaster(PVCopyTraverseMasterCallbackPtr const & callback)
-{
-    traverseMaster(headNode,callback);
-}
-
-StructureConstPtr PVCopy::getStructure()
-{
-    return structure;
-}
-
-PVStructurePtr PVCopy::createPVStructure()
-{
-    if(cacheInitStructure) {
-        PVStructurePtr save = cacheInitStructure;
-        cacheInitStructure.reset();
-        return save;
-    }
-    PVStructurePtr pvStructure = 
-        getPVDataCreate()->createPVStructure(structure);
-    return pvStructure;
-}
-
-
-size_t PVCopy::getCopyOffset(PVFieldPtr const &masterPVField)
-{
-    if(!headNode->isStructure) {
-        CopyNodePtr node = static_pointer_cast<CopyNode>(headNode);
-        if((node->masterPVField.get())==masterPVField.get()) {
-             return headNode->structureOffset;
-        }
-        PVStructure * parent = masterPVField->getParent();
-        size_t offsetParent = parent->getFieldOffset();
-        size_t off = masterPVField->getFieldOffset();
-        size_t offdiff = off -offsetParent;
-        if(offdiff<node->nfields) return headNode->structureOffset + offdiff;
-        return string::npos;
-    }
-    CopyStructureNodePtr structNode = static_pointer_cast<CopyStructureNode>(headNode);
-    CopyNodePtr node = getCopyOffset(structNode,masterPVField);
-    if(node) return node->structureOffset;
-    return string::npos;
-}
-
-size_t PVCopy::getCopyOffset(
-    PVStructurePtr const  &masterPVStructure,
-    PVFieldPtr const  &masterPVField)
-{
-    CopyNodePtr node;
-    if(!headNode->isStructure) {
-        node = static_pointer_cast<CopyNode>(headNode);
-        if(node->masterPVField.get()!=masterPVStructure.get()) return string::npos;
-    } else {
-        CopyStructureNodePtr snode = static_pointer_cast<CopyStructureNode>(headNode);
-        node = getCopyOffset(snode,masterPVField);
-    }
-    if(!node) return string::npos;
-    size_t diff = masterPVField->getFieldOffset()
-        - masterPVStructure->getFieldOffset();
-    return node->structureOffset + diff;
-}
-
-PVFieldPtr PVCopy::getMasterPVField(size_t structureOffset)
-{
-    CopyNodePtr node;
-    if(!headNode->isStructure) {
-        node = headNode;
-    } else {
-        CopyStructureNodePtr snode = static_pointer_cast<CopyStructureNode>(headNode);
-        node = getMasterNode(snode,structureOffset);
-    }
-    if(!node) {
-        throw std::logic_error(
-            "PVCopy::getMasterPVField: structureOffset not valid");
-    }
-    size_t diff = structureOffset - node->structureOffset;
-    PVFieldPtr pvMasterField = node->masterPVField;
-    if(diff==0) return pvMasterField;
-    PVStructurePtr pvStructure
-        = static_pointer_cast<PVStructure>(pvMasterField);
-    return pvStructure->getSubField(
-        pvMasterField->getFieldOffset() + diff);
-}
-
-void PVCopy::initCopy(
-    PVStructurePtr const  &copyPVStructure,
-    BitSetPtr const  &bitSet)
-{
-    for(size_t i=0; i< copyPVStructure->getNumberFields(); ++i) {
-        bitSet->set(i,true);
-    }
-    updateCopyFromBitSet(copyPVStructure,headNode,bitSet);
-}
-
-
-bool PVCopy::updateCopySetBitSet(
-    PVStructurePtr const  &copyPVStructure,
-    BitSetPtr const  &bitSet)
-{
-    updateCopySetBitSet(copyPVStructure,headNode,bitSet);
-    return checkIgnore(copyPVStructure,bitSet);
-}
-
-bool PVCopy::updateCopyFromBitSet(
-    PVStructurePtr const  &copyPVStructure,
-    BitSetPtr const  &bitSet)
-{
-    if(bitSet->get(0)) {
-        for(size_t i=0; i< copyPVStructure->getNumberFields(); ++i) {
-            bitSet->set(i,true);
-        }
-    }
-    updateCopyFromBitSet(copyPVStructure,headNode,bitSet);
-    return checkIgnore(copyPVStructure,bitSet);
-}
-
-void PVCopy::updateMaster(
-    PVStructurePtr const  &copyPVStructure,
-    BitSetPtr const  &bitSet)
-{
-    if(bitSet->get(0)) {
-        for(size_t i=0; i< copyPVStructure->getNumberFields(); ++i) {
-            bitSet->set(i,true);
-        }
-    }
-    updateMaster(copyPVStructure,headNode,bitSet);
-}
-
-
-PVStructurePtr PVCopy::getOptions(std::size_t fieldOffset)
-{
-    if(fieldOffset==0) return headNode->options;
-    CopyNodePtr node = headNode;
-    while(true) {
-        if(node->structureOffset==fieldOffset) return node->options;
-        if(!node->isStructure) return NULLPVStructure;
-        CopyStructureNodePtr structNode = static_pointer_cast<CopyStructureNode>(node);
-        CopyNodePtrArrayPtr nodes = structNode->nodes;
-        bool okToContinue = false;
-        for(size_t i=0; i< nodes->size(); i++) {
-            node = (*nodes)[i];
-            size_t soff = node->structureOffset;
-            if(fieldOffset>=soff && fieldOffset<soff+node->nfields) {
-                if(fieldOffset==soff) return node->options;
-                if(!node->isStructure) {
-                    return NULLPVStructure;
-                }
-                okToContinue = true;
-                break;
-            }
-        }
-        if(okToContinue) continue;
-        throw std::logic_error("PVCopy logic error: fieldOffset not valid");
-    }
-}
-
-string PVCopy::dump()
-{
-    string builder;
-    dump(&builder,headNode,0);
-    return builder;
-}
-
-void PVCopy::traverseMaster(
-    CopyNodePtr const &innode,
-    PVCopyTraverseMasterCallbackPtr const & callback)
-{
-    CopyNodePtr node = innode;
-    if(!node->isStructure) {
-        callback->nextMasterPVField(node->masterPVField);
-        return;
-    }
-    CopyStructureNodePtr structNode = static_pointer_cast<CopyStructureNode>(node);
-    CopyNodePtrArrayPtr nodes = structNode->nodes;
-    for(size_t i=0; i< nodes->size(); i++) {
-        node = (*nodes)[i];
-        traverseMaster(node,callback);
-    }
-}
-
-void PVCopy::updateCopySetBitSet(
-    PVFieldPtr const & pvCopy,
-    PVFieldPtr const & pvMaster,
-    BitSetPtr const & bitSet)
-{
-    if(pvCopy->getField()->getType()!=epics::pvData::structure) {
-        if(*pvCopy==*pvMaster) return;
-        pvCopy->copy(*pvMaster);
-        bitSet->set(pvCopy->getFieldOffset());
-        return;
-    }
-    PVStructurePtr pvCopyStructure = static_pointer_cast<PVStructure>(pvCopy);
-    PVFieldPtrArray const & pvCopyFields = pvCopyStructure->getPVFields();
-    for(size_t i=0; i<pvCopyFields.size(); ++i) {
-        PVFieldPtr master = getMasterPVField(pvCopyFields[i]->getFieldOffset());
-        updateCopySetBitSet(pvCopyFields[i],master,bitSet);
-    }
-}
-
-void PVCopy::updateCopySetBitSet(
-    PVFieldPtr const & pvCopy,
-    CopyNodePtr const & node,
-    BitSetPtr const & bitSet)
-{
-    bool result = false;
-    for(size_t i=0; i< node->pvFilters.size(); ++i) {
-        PVFilterPtr pvFilter = node->pvFilters[i];
-        if(pvFilter->filter(pvCopy,bitSet,true)) result = true;
-    }
-    if(!node->isStructure) {
-        if(result) return;
-        updateCopySetBitSet(pvCopy,node->masterPVField,bitSet);
-        return;
-    }
-    CopyStructureNodePtr structureNode = static_pointer_cast<CopyStructureNode>(node);
-    PVStructurePtr pvCopyStructure = static_pointer_cast<PVStructure>(pvCopy);
-    PVFieldPtrArray const & pvCopyFields = pvCopyStructure->getPVFields();
-    for(size_t i=0; i<pvCopyFields.size(); ++i) {
-        updateCopySetBitSet(pvCopyFields[i],(*structureNode->nodes)[i],bitSet);
-    }
-}
-
-
-void PVCopy::updateCopyFromBitSet(
-    PVFieldPtr const & pvCopy,
-    CopyNodePtr const & node,
-    BitSetPtr const & bitSet)
-{
-    bool result = false;
-    bool update = bitSet->get(pvCopy->getFieldOffset());
-    if(update) {
-        for(size_t i=0; i< node->pvFilters.size(); ++i) {
-            PVFilterPtr pvFilter = node->pvFilters[i];
-            if(pvFilter->filter(pvCopy,bitSet,true)) result = true;
-        }
-    }
-    if(!node->isStructure) {
-        if(result) return;
-        PVFieldPtr pvMaster = node->masterPVField;
-        pvCopy->copy(*pvMaster);
-        return;
-    }
-    CopyStructureNodePtr structureNode = static_pointer_cast<CopyStructureNode>(node);
-    size_t offset = structureNode->structureOffset;
-    size_t nextSet = bitSet->nextSetBit(offset);
-    if(nextSet==string::npos) return;
-    if(offset>=pvCopy->getNextFieldOffset()) return;  
-    PVStructurePtr pvCopyStructure = static_pointer_cast<PVStructure>(pvCopy);
-    PVFieldPtrArray const & pvCopyFields = pvCopyStructure->getPVFields();
-    for(size_t i=0; i<pvCopyFields.size(); ++i) {
-        updateCopyFromBitSet(pvCopyFields[i],(*structureNode->nodes)[i],bitSet);
-    }
-}
-void PVCopy::updateMaster(
-    PVFieldPtr const & pvCopy,
-    CopyNodePtr const & node,
-    BitSetPtr const & bitSet)
-{
-    bool result = false;
-    bool update = bitSet->get(pvCopy->getFieldOffset());
-    if(update) {
-        for(size_t i=0; i< node->pvFilters.size(); ++i) {
-            PVFilterPtr pvFilter = node->pvFilters[i];
-            if(pvFilter->filter(pvCopy,bitSet,false)) result = true;
-        }
-    }
-    if(!node->isStructure) {
-        if(result) return;
-        PVFieldPtr pvMaster = node->masterPVField;
-        pvMaster->copy(*pvCopy);
-        return;
-    }
-    CopyStructureNodePtr structureNode = static_pointer_cast<CopyStructureNode>(node);
-    size_t offset = structureNode->structureOffset;
-    size_t nextSet = bitSet->nextSetBit(offset);
-    if(nextSet==string::npos) return;
-    if(offset>=pvCopy->getNextFieldOffset()) return;  
-    PVStructurePtr pvCopyStructure = static_pointer_cast<PVStructure>(pvCopy);
-    PVFieldPtrArray const & pvCopyFields = pvCopyStructure->getPVFields();
-    for(size_t i=0; i<pvCopyFields.size(); ++i) {
-        updateMaster(pvCopyFields[i],(*structureNode->nodes)[i],bitSet);
-    }
-}
-
-PVCopy::PVCopy(
-    PVStructurePtr const &pvMaster)
-: pvMaster(pvMaster)
-{
-}
-
-void PVCopy::destroy()
-{
-    headNode.reset();
-}
-
-bool PVCopy::init(epics::pvData::PVStructurePtr const &pvRequest)
-{
-    PVStructurePtr pvMasterStructure = pvMaster;
-    size_t len = pvRequest->getPVFields().size();
-    bool entireMaster = false;
-    if(len==0) entireMaster = true;
-    PVStructurePtr pvOptions;
-    if(len==1) {
-        pvOptions = pvRequest->getSubField<PVStructure>("_options");
-    }
-    if(entireMaster) {
-        structure = pvMasterStructure->getStructure();
-        CopyNodePtr node(new CopyNode());
-        headNode = node;
-        node->options = pvOptions;
-        node->isStructure = false;
-        node->structureOffset = 0;
-        node->masterPVField = pvMasterStructure;
-        node->nfields = pvMasterStructure->getNumberFields();
-        return true;
-    }
-    structure = createStructure(pvMasterStructure,pvRequest);
-    if(!structure) return false;
-    cacheInitStructure = createPVStructure();
-    ignorechangeBitSet = BitSetPtr(new BitSet(cacheInitStructure->getNumberFields()));
-    headNode = createStructureNodes(
-        pvMaster,
-        pvRequest,
-        cacheInitStructure);
-    return true;
-}
-
-
-StructureConstPtr PVCopy::createStructure(
-    PVStructurePtr const &pvMaster,
-    PVStructurePtr const  &pvFromRequest)
-{
-    if(pvFromRequest->getStructure()->getNumberFields()==0) {
-        return pvMaster->getStructure();
-    }
-    PVFieldPtrArray const &pvFromRequestFields = pvFromRequest->getPVFields();
-    StringArray const &fromRequestFieldNames = pvFromRequest->getStructure()->getFieldNames();
-    size_t length = pvFromRequestFields.size();
-    if(length==0) return NULLStructure;
-    FieldConstPtrArray fields; fields.reserve(length);
-    StringArray fieldNames; fieldNames.reserve(length);
-    for(size_t i=0; i<length; ++i) {
-        string const &fieldName = fromRequestFieldNames[i];
-        PVFieldPtr pvMasterField = pvMaster->getSubField(fieldName);
-        if(!pvMasterField) continue;
-        FieldConstPtr field = pvMasterField->getField();
-        if(field->getType()==epics::pvData::structure) {
-            PVStructurePtr pvRequestStructure = static_pointer_cast<PVStructure>(
-                pvFromRequestFields[i]);
-            if(pvRequestStructure->getNumberFields()>0) {
-                 StringArray const &names = pvRequestStructure->getStructure()->
-                     getFieldNames();
-                 size_t num = names.size();
-                 if(num>0 && names[0].compare("_options")==0) --num;
-                 if(num>0) {
-                     if(pvMasterField->getField()->getType()!=epics::pvData::structure) continue;
-                     fieldNames.push_back(fieldName);
-                     fields.push_back(createStructure(
-                         static_pointer_cast<PVStructure>(pvMasterField),
-                         pvRequestStructure));
-                     continue;
-                 }
-            }
-        }
-        fieldNames.push_back(fieldName);
-        fields.push_back(field);
-    }
-    size_t numsubfields = fields.size();
-    if(numsubfields==0) {
-         std::stringstream ss;
-         ss << pvFromRequest << "\n";
-         string val("no fields from the following request were found\n");
-         val += ss.str();
-         throw std::invalid_argument(val);
-    }
-    return getFieldCreate()->createStructure(fieldNames, fields);
-}
-
-CopyNodePtr PVCopy::createStructureNodes(
-    PVStructurePtr const &pvMasterStructure,
-    PVStructurePtr const &pvFromRequest,
-    PVStructurePtr const &pvFromCopy)
-{
-    PVFieldPtrArray const & copyPVFields = pvFromCopy->getPVFields();
-    PVStructurePtr pvOptions = pvFromRequest->getSubField<PVStructure>("_options");
-    size_t number = copyPVFields.size();
-    CopyNodePtrArrayPtr nodes(new CopyNodePtrArray());
-    nodes->reserve(number);
-    for(size_t i=0; i<number; i++) {
-        PVFieldPtr copyPVField = copyPVFields[i];
-        string fieldName = copyPVField->getFieldName();
-        PVStructurePtr requestPVStructure = 
-             pvFromRequest->getSubField<PVStructure>(fieldName);
-        PVStructurePtr pvSubFieldOptions = 
-            requestPVStructure->getSubField<PVStructure>("_options");
-        PVFieldPtr pvMasterField = pvMasterStructure->getSubField(fieldName);
-        if(!pvMasterField) {
-              throw std::logic_error("PVCopy logic error: did not find field in master");
-        }
-        size_t numberRequest = requestPVStructure->getPVFields().size();
-        bool haveOptions = false;
-        if(pvSubFieldOptions) {
-             numberRequest--;
-             haveOptions = true;
-        }
-        if(numberRequest>0) {
-            Type copyType = copyPVField->getField()->getType();
-            if(copyType==epics::pvData::structure) {
-                nodes->push_back(createStructureNodes(
-                    static_pointer_cast<PVStructure>(pvMasterField),
-                    requestPVStructure,
-                    static_pointer_cast<PVStructure>(copyPVField)));
-                continue;
-            }
-            if(copyType==epics::pvData::union_) {
-                 if(numberRequest!=1) {
-                     std::stringstream ss;
-                     ss << pvFromRequest << "\n";
-                     string val("In the following request a union field has more than one subfield in\n");
-                     val += ss.str();
-                     throw std::invalid_argument(val);
-                 }
-                 PVUnionPtr pvUnion = static_pointer_cast<PVUnion>(pvMasterField);
-                 std::string selectedName = pvUnion->getSelectedFieldName();
-                 PVFieldPtrArray const & pvFields = requestPVStructure->getPVFields();
-                 size_t len = pvFields.size();
-                 if(len>2 || (haveOptions && len!=2)) {
-                      std::stringstream ss;
-                      ss << pvFromRequest << "\n";
-                      string val("PVCopy logic error: pvRequest is\n");
-                      val += ss.str();
-                      throw std::logic_error(val);
-                 }
-                 size_t indRequestValue = 0;
-                 if((pvFields[0]->getFieldName().compare("_options"))==0) indRequestValue = 1;
-                 PVFieldPtr pvRequestValue = pvFields[indRequestValue];
-                 if(pvRequestValue) {
-                     string requestName = pvRequestValue->getFieldName();
-                     if(requestName.compare(selectedName)!=0) {
-                         std::stringstream ss;
-                         ss << pvFromCopy << "\n";
-                         string requestName = pvRequestValue->getFieldName();
-                         string val("field ");
-                         val += requestName + " does not match union type in\n";
-                         val += ss.str();
-                         throw std::invalid_argument(val);
-                     }
-                 }
-            } else {
-                 std::stringstream ss;
-                 ss << pvFromCopy << "\n";
-                 string val("requested a subfield of field ");
-                 val += fieldName + " which does not have type structure in\n";
-                 val += ss.str();
-                 throw std::invalid_argument(val);
-            }
-        }
-        CopyNodePtr node(new CopyNode());
-        node->options = pvSubFieldOptions;
-        node->isStructure = false;
-        node->masterPVField = pvMasterField;
-        node->nfields = copyPVField->getNumberFields();
-        node->structureOffset = copyPVField->getFieldOffset();
-        nodes->push_back(node);
-    }
-    CopyStructureNodePtr structureNode(new CopyStructureNode());
-    structureNode->masterPVField = pvMasterStructure;
-    structureNode->isStructure = true;
-    structureNode->nodes = nodes;
-    structureNode->structureOffset = pvFromCopy->getFieldOffset();
-    structureNode->nfields = pvFromCopy->getNumberFields();
-    structureNode->options = pvOptions;
-    return structureNode;
-}
-
-void PVCopy::initPlugin(
-    CopyNodePtr const & node,
-    PVStructurePtr const & pvOptions,
-    PVFieldPtr const & pvMasterField)
-{
-    PVFieldPtrArray const & pvFields = pvOptions->getPVFields();
-    size_t num = pvFields.size();
-    vector<PVFilterPtr> pvFilters(num);
-    size_t numfilter = 0;
-    for(size_t i=0; i<num; ++i) {
-         PVStringPtr pvOption = static_pointer_cast<PVString>(pvFields[i]);
-         string name = pvOption->getFieldName();
-         string value = pvOption->get();
-         PVPluginPtr pvPlugin = PVPluginRegistry::find(name);
-         if(!pvPlugin) {
-            if(name.compare("ignore")==0) setIgnore(node);
-            continue;
-        }
-        pvFilters[numfilter] = pvPlugin->create(value,shared_from_this(),pvMasterField);
-        if(pvFilters[numfilter]) ++numfilter;
-    }
-    if(numfilter==0) return;
-    node->pvFilters.resize(numfilter);
-    for(size_t i=0; i<numfilter; ++i) node->pvFilters[i] = pvFilters[i];
-}
-
-void PVCopy::traverseMasterInitPlugin()
-{
-    traverseMasterInitPlugin(headNode); 
-}
-
-void PVCopy::traverseMasterInitPlugin(CopyNodePtr const & node)
-{
-    PVFieldPtr pvField = node->masterPVField;
-    PVStructurePtr pvOptions = node->options;
-    if(pvOptions) initPlugin(node,pvOptions,pvField);	
-    if(!node->isStructure) return;
-    CopyStructureNodePtr structureNode = static_pointer_cast<CopyStructureNode>(node);
-    CopyNodePtrArrayPtr nodes = structureNode->nodes;
-    for(size_t i=0; i< nodes->size(); i++) {
-       traverseMasterInitPlugin((*nodes)[i]);
-    }
-}
-
-CopyNodePtr PVCopy::getCopyOffset(
-        CopyStructureNodePtr const &structureNode,
-        PVFieldPtr const &masterPVField)
-{
-    size_t offset = masterPVField->getFieldOffset();
-    CopyNodePtrArrayPtr nodes = structureNode->nodes;
-    for(size_t i=0; i< nodes->size(); i++) {
-        CopyNodePtr node = (*nodes)[i];
-        if(!node->isStructure) {
-            size_t off = node->masterPVField->getFieldOffset();
-            size_t nextOffset = node->masterPVField->getNextFieldOffset(); 
-            if(offset>= off && offset<nextOffset) return node;
-        } else {
-            CopyStructureNodePtr subNode =
-                static_pointer_cast<CopyStructureNode>(node);
-            CopyNodePtr node =
-                getCopyOffset(subNode,masterPVField);
-            if(node) return node;
-        }
-    }
-    return NULLCopyNode;
-}
-
-
-
-bool PVCopy::checkIgnore(
-     PVStructurePtr const & copyPVStructure,
-     BitSetPtr const & bitSet)
-{
-    if(!ignorechangeBitSet) {
-        return (bitSet->nextSetBit(0)<0) ? false : true;
-    }
-    int32 numFields = copyPVStructure->getNumberFields();
-    BitSet temp(numFields);
-    temp = *bitSet;
-    int32 ind = 0;
-    while(true) {
-        ind = ignorechangeBitSet->nextSetBit(ind);
-        if(ind<0) break;
-        temp.clear(ind);
-        ind++;
-        if(ind>=numFields) break;
-    }
-    return (temp.nextSetBit(0)<0) ? false : true;
-}
-
-void PVCopy::setIgnore(CopyNodePtr const &node) {
-    ignorechangeBitSet->set(node->structureOffset);
-    if(node->isStructure) {
-        CopyStructureNodePtr structureNode = static_pointer_cast<CopyStructureNode>(node);
-         CopyNodePtrArrayPtr nodes = structureNode->nodes;
-         for(size_t i=0; i<nodes->size(); ++i) {
-            CopyNodePtr node = (*nodes)[i];
-            setIgnore(node);		}
-    } else {
-        size_t num = node->masterPVField->getNumberFields();
-        if(num>1) {
-            for(size_t i=1; i<num; ++i) {
-                ignorechangeBitSet->set(node->structureOffset+i);
-            }
-        }
-    }
-}
-
-
-CopyNodePtr PVCopy::getMasterNode(
-        CopyStructureNodePtr const &structureNode,
-        std::size_t structureOffset)
-{
-    CopyNodePtrArrayPtr nodes = structureNode->nodes;
-    for(size_t i=0; i<nodes->size(); ++i) {
-        CopyNodePtr node = (*nodes)[i];
-        if(structureOffset>=(node->structureOffset + node->nfields)) continue;
-        if(!node->isStructure) return node;
-        CopyStructureNodePtr subNode =
-            static_pointer_cast<CopyStructureNode>(node);
-        return  getMasterNode(subNode,structureOffset);
-    }
-    return NULLCopyNode;
-}
-
-void PVCopy::dump(string *builder,CopyNodePtr const &node,int indentLevel)
-{
-    newLine(builder,indentLevel);
-    std::stringstream ss;
-    ss << (node->isStructure ? "structureNode" : "node");
-    ss << " structureOffset " << node->structureOffset;
-    ss << " nfields " << node->nfields;
-    *builder +=  ss.str();
-    PVStructurePtr options = node->options;
-    if(options) {
-        newLine(builder,indentLevel +1);
-        *builder += options->getFieldName();
-        PVFieldPtrArray pvFields = options->getPVFields();
-        for(size_t i=0; i< pvFields.size() ; ++i) {
-           PVStringPtr pvString = static_pointer_cast<PVString>(pvFields[i]);
-           newLine(builder,indentLevel +2);
-           *builder += pvString->getFieldName() + " " + pvString->get();
-        }
-    }
-    string name = node->masterPVField->getFullName();
-    newLine(builder,indentLevel +1);
-    *builder += "masterField " + name;
-    if(node->pvFilters.size()>0) {
-        newLine(builder,indentLevel +2);
-        *builder += "filters:";
-        for(size_t i=0; i< node->pvFilters.size(); ++i) {
-            PVFilterPtr pvFilter = node->pvFilters[i];
-            *builder += " " + pvFilter->getName();
-        }
-    }
-    if(!node->isStructure) return;
-    CopyStructureNodePtr structureNode =
-        static_pointer_cast<CopyStructureNode>(node);
-    CopyNodePtrArrayPtr nodes = structureNode->nodes;
-    for(size_t i=0; i<nodes->size(); ++i) {
-        CopyNodePtr node = (*nodes)[i];
-        if(!node) {
-            newLine(builder,indentLevel +1);
-            ss.str("");
-            ss << "node[" << i << "] is null";
-            *builder += ss.str();
-            continue;
-        }
-        dump(builder,node,indentLevel+1);
-    }
-}
-
-
-}}
--- a/src/copy/pvDeadbandPlugin.cpp
+++ b/src/copy/pvDeadbandPlugin.cpp
@@ -1,132 +0,0 @@
-/* pvDeadbandPlugin.cpp */
-/*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
- */
-#include <stdlib.h>
-
-#include <pv/pvData.h>
-#include <pv/bitSet.h>
-#include <pv/convert.h>
-#include <pv/pvSubArrayCopy.h>
-#define epicsExportSharedSymbols
-#include <pv/pvDeadbandPlugin.h>
-
-using std::string;
-using std::size_t;
-using std::cout;
-using std::endl;
-using std::tr1::static_pointer_cast;
-using std::vector;
-using namespace epics::pvData;
-
-namespace epics { namespace pvCopy{
-
-static ConvertPtr convert = getConvert();
-static std::string name("deadband");
-
-PVDeadbandPlugin::PVDeadbandPlugin()
-{
-}
-
-PVDeadbandPlugin::~PVDeadbandPlugin()
-{
-}
-
-void PVDeadbandPlugin::create()
-{
-     static bool firstTime = true;
-     if(firstTime) {
-         firstTime = false;
-         PVDeadbandPluginPtr pvPlugin = PVDeadbandPluginPtr(new PVDeadbandPlugin());
-         PVPluginRegistry::registerPlugin(name,pvPlugin);
-     }
-}
-
-PVFilterPtr PVDeadbandPlugin::create(
-     const std::string & requestValue,
-     const PVCopyPtr & pvCopy,
-     const PVFieldPtr & master)
-{
-    return PVDeadbandFilter::create(requestValue,master);
-}
-
-PVDeadbandFilter::~PVDeadbandFilter()
-{
-}
-
-PVDeadbandFilterPtr PVDeadbandFilter::create(
-     const std::string & requestValue,
-     const PVFieldPtr & master)
-{
-    FieldConstPtr field =master->getField();
-    Type type = field->getType();
-    if(type!=scalar) return PVDeadbandFilterPtr();
-    ScalarConstPtr scalar = static_pointer_cast<const Scalar>(field);
-    if(!ScalarTypeFunc::isNumeric(scalar->getScalarType())) return PVDeadbandFilterPtr();
-    bool absolute = false;
-    if(requestValue.find("abs")>=0) {
-        absolute = true;
-    } else if(requestValue.find("rel")>=0) {
-        absolute = false;
-    } else {
-        return PVDeadbandFilterPtr();
-    }
-    size_t ind = requestValue.find(':');
-    if(ind==string::npos) return PVDeadbandFilterPtr();
-    string svalue = requestValue.substr(ind+1);
-    double deadband = atof(svalue.c_str());
-    if(deadband==0.0) return PVDeadbandFilterPtr();
-    PVDeadbandFilterPtr filter =
-         PVDeadbandFilterPtr(
-             new PVDeadbandFilter(
-                 absolute,deadband,static_pointer_cast<PVScalar>(master))); 
-    return filter;
-}
-
-PVDeadbandFilter::PVDeadbandFilter(bool absolute,double deadband,PVScalarPtr const & master)
-: absolute(absolute),
-  deadband(deadband),
-  master(master),
-  firstTime(true),
-  lastReportedValue(0.0) 
-{
-}
-
-
-bool PVDeadbandFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet,bool toCopy)
-{
-    if(!toCopy) return false;
-    double value = convert->toDouble(master);
-    double diff = value - lastReportedValue;
-    if(diff<0.0) diff = - diff;
-    bool report = true;
-    if(firstTime) {
-        firstTime = false;
-    } else if(absolute) {
-        if(diff<deadband) report = false;
-    } else {
-        double last = lastReportedValue;
-        if(last<0.0) last = -last;
-        if(last>1e-20) {
-            double percent = (diff/last)*100.0;
-            if(percent<deadband) report = false;
-         }
-     }
-     PVScalarPtr copy = static_pointer_cast<PVScalar>(pvCopy);
-     convert->fromDouble(copy,value);
-     if(report) {
-         lastReportedValue = value;
-         bitSet->set(pvCopy->getFieldOffset());
-     } else {
-         bitSet->clear(pvCopy->getFieldOffset());
-     }
-     return true;
-}
-
-string PVDeadbandFilter::getName()
-{
-	return name;
-}
-
-}}
-
--- a/src/copy/pvPlugin.cpp
+++ b/src/copy/pvPlugin.cpp
@@ -1,37 +0,0 @@
-/* pvPlugin.cpp */
-/*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
- */
-
-#include <pv/pvData.h>
-#define epicsExportSharedSymbols
-#include <pv/pvStructureCopy.h>
-#include <pv/pvPlugin.h>
-
-using namespace epics::pvData;
-
-namespace epics { namespace pvCopy{ 
-
-typedef std::map<std::string,PVPluginPtr> PVPluginMap;
-
-static PVPluginMap pluginMap;
-static Mutex mutex;
-
-void PVPluginRegistry::registerPlugin(const std::string & name,const PVPluginPtr & pvPlugin)
-{
-    Lock xx(mutex);
-    PVPluginMap::iterator iter = pluginMap.find(name);
-    if(iter!=pluginMap.end()) throw std::logic_error("plugin already registered");
-    pluginMap.insert(PVPluginMap::value_type(name,pvPlugin));
-}
-
-PVPluginPtr PVPluginRegistry::find(const std::string & name)
-{
-    Lock xx(mutex);
-    PVPluginMap::iterator iter = pluginMap.find(name);
-    if(iter!=pluginMap.end()) return (*iter).second;
-    return PVPluginPtr();
-}
-
-}}
-
--- a/src/copy/pvTimestampPlugin.cpp
+++ b/src/copy/pvTimestampPlugin.cpp
@@ -1,124 +0,0 @@
-/* pvTimestampPlugin.cpp */
-/*
- * The License for this software can be found in the file LICENSE that is included with the distribution.
- */
-
-#include <pv/pvData.h>
-#include <pv/bitSet.h>
-#include <pv/convert.h>
-#include <pv/pvTimeStamp.h>
-
-#define epicsExportSharedSymbols
-#include <pv/pvTimestampPlugin.h>
-#include <pv/pvStructureCopy.h>
-
-using std::string;
-using std::size_t;
-using std::cout;
-using std::endl;
-using std::tr1::static_pointer_cast;
-using std::vector;
-using namespace epics::pvData;
-
-namespace epics { namespace pvCopy{
-
-static ConvertPtr convert = getConvert();
-static std::string name("timestamp");
-
-PVTimestampPlugin::PVTimestampPlugin()
-{
-}
-
-PVTimestampPlugin::~PVTimestampPlugin()
-{
-}
-
-void PVTimestampPlugin::create()
-{
-     static bool firstTime = true;
-     if(firstTime) {
-         firstTime = false;
-         PVTimestampPluginPtr pvPlugin = PVTimestampPluginPtr(new PVTimestampPlugin());
-         PVPluginRegistry::registerPlugin(name,pvPlugin);
-     }
-}
-
-PVFilterPtr PVTimestampPlugin::create(
-     const std::string & requestValue,
-     const PVCopyPtr & pvCopy,
-     const PVFieldPtr & master)
-{
-    return PVTimestampFilter::create(requestValue,master);
-}
-
-PVTimestampFilter::~PVTimestampFilter()
-{
-}
-
-
-PVTimestampFilterPtr PVTimestampFilter::create(
-     const std::string & requestValue,
-     const PVFieldPtr & master)
-{
-    PVTimeStamp pvTimeStamp;
-    if(!pvTimeStamp.attach(master)) return PVTimestampFilterPtr();
-    bool current = false;
-    bool copy = false;
-    if(requestValue.compare("current")==0) {
-        current = true;
-    } else if(requestValue.compare("copy")==0){
-        copy = true;
-    } else {
-        return  PVTimestampFilterPtr();
-    }
-    PVTimestampFilterPtr filter = PVTimestampFilterPtr(
-             new PVTimestampFilter(current,copy,master));
-    return filter;
-}
-
-PVTimestampFilter::PVTimestampFilter(bool current,bool copy,PVFieldPtr const & master)
-: current(current),
-  copy(copy),
-  master(master)
-{
-}
-
-
-bool PVTimestampFilter::filter(const PVFieldPtr & pvCopy,const BitSetPtr & bitSet,bool toCopy)
-{
-    if(current) {	
-        timeStamp.getCurrent();
-        if(toCopy) {
-            if(!pvTimeStamp.attach(pvCopy)) return false;
-        } else {
-            if(!pvTimeStamp.attach(master)) return false;
-        }
-        pvTimeStamp.set(timeStamp);
-        bitSet->set(pvCopy->getFieldOffset());
-        return true;
-     }
-     if(copy) {	
-        if(toCopy) {
-            if(!pvTimeStamp.attach(master)) return false;
-            pvTimeStamp.get(timeStamp);
-            if(!pvTimeStamp.attach(pvCopy)) return false;
-            pvTimeStamp.set(timeStamp);
-            bitSet->set(pvCopy->getFieldOffset());
-        } else {
-            if(!pvTimeStamp.attach(pvCopy)) return false;
-            pvTimeStamp.get(timeStamp);
-            if(!pvTimeStamp.attach(master)) return false;
-            pvTimeStamp.set(timeStamp);
-        }
-        return true;
-     }
-     return false;
-}
-
-string PVTimestampFilter::getName()
-{
-	return name;
-}
-
-}}
-
--- a/src/database/pvDatabase.cpp
+++ b/src/database/pvDatabase.cpp
@@ -10,54 +10,54 @@
 */

 #include <epicsGuard.h>
+
 #define epicsExportSharedSymbols
+
 #include <pv/pvDatabase.h>
-#include <pv/pvStructureCopy.h>
-#include <pv/pvPlugin.h>
-#include <pv/pvArrayPlugin.h>
-#include <pv/pvTimestampPlugin.h>
-#include <pv/pvDeadbandPlugin.h>

 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
-using namespace epics::pvCopy;
 using namespace std;

 namespace epics { namespace pvDatabase {

-#define DEBUG_LEVEL 0
-
-static PVDatabasePtr pvDatabaseMaster;
-
 PVDatabasePtr PVDatabase::getMaster()
 {
-    static bool firstTime = true;
-    if(firstTime) {
-        firstTime = false;
-        pvDatabaseMaster = PVDatabasePtr(new PVDatabase());
-        PVArrayPlugin::create();
-        PVTimestampPlugin::create();
-        PVDeadbandPlugin::create();
-    }    
-    return pvDatabaseMaster;
+    static PVDatabasePtr master;
+    static Mutex mutex;
+    Lock xx(mutex);
+    if(master.get()==NULL) {
+        master = PVDatabasePtr(new PVDatabase());
+    }
+    return master;
 }

 PVDatabase::PVDatabase()
+: isDestroyed(false)
 {
-    if(DEBUG_LEVEL>0) cout << "PVDatabase::PVDatabase()\n";
 }

 PVDatabase::~PVDatabase()
 {
-    if(DEBUG_LEVEL>0) cout << "PVDatabase::~PVDatabase()\n";
-    size_t len = recordMap.size();
-    shared_vector<string> names(len);
-    PVRecordMap::iterator iter;
-    size_t i = 0;
-    for(iter = recordMap.begin(); iter!=recordMap.end(); ++iter) {
-        names[i++] = (*iter).first;
+    destroy();
+}
+
+void PVDatabase::destroy()
+{
+    {
+        epicsGuard<epics::pvData::Mutex> guard(mutex);
+        if(isDestroyed) {
+            return;
+        }
+        isDestroyed = true;
    }
-    for(size_t i=0; i<len; ++i) removeRecord(findRecord(names[i]));
+    for(PVRecordMap::iterator iter = recordMap.begin(); iter != recordMap.end(); iter++) {
+        PVRecordPtr pvRecord = (*iter).second;
+        if(pvRecord) {
+             pvRecord->destroy();
+        }
+    }
+    recordMap.clear();
 }

 void PVDatabase::lock() {
@@ -71,19 +71,23 @@ void PVDatabase::unlock() {
 PVRecordPtr PVDatabase::findRecord(string const& recordName)
 {
    epicsGuard<epics::pvData::Mutex> guard(mutex);
+    PVRecordPtr xxx;
+    if(isDestroyed) {
+        return xxx;
+    }
    PVRecordMap::iterator iter = recordMap.find(recordName);
    if(iter!=recordMap.end()) {
         return (*iter).second;
    }
-    return PVRecordPtr();
+    return xxx;
 }

 bool PVDatabase::addRecord(PVRecordPtr const & record)
 {
-    if(record->getTraceLevel()>0) {
-        cout << "PVDatabase::addRecord " << record->getRecordName() << endl;
-    }
    epicsGuard<epics::pvData::Mutex> guard(mutex);
+    if(isDestroyed) {
+        return false;
+    }
    string recordName = record->getRecordName();
    PVRecordMap::iterator iter = recordMap.find(recordName);
    if(iter!=recordMap.end()) {
@@ -96,15 +100,16 @@ bool PVDatabase::addRecord(PVRecordPtr const & record)

 bool PVDatabase::removeRecord(PVRecordPtr const & record)
 {
-    if(record->getTraceLevel()>0) {
-        cout << "PVDatabase::removeRecord " << record->getRecordName() << endl;
-    }
    epicsGuard<epics::pvData::Mutex> guard(mutex);
+    if(isDestroyed) {
+        return false;
+    }
    string recordName = record->getRecordName();
    PVRecordMap::iterator iter = recordMap.find(recordName);
    if(iter!=recordMap.end())  {
        PVRecordPtr pvRecord = (*iter).second;
        recordMap.erase(iter);
+        if(pvRecord) pvRecord->destroy();
        return true;
    }
    return false;
@@ -114,6 +119,9 @@ PVStringArrayPtr PVDatabase::getRecordNames()
 {
    epicsGuard<epics::pvData::Mutex> guard(mutex);
    PVStringArrayPtr xxx;
+    if(isDestroyed) {
+        return xxx;
+    }
    PVStringArrayPtr pvStringArray = static_pointer_cast<PVStringArray>
        (getPVDataCreate()->createPVScalarArray(pvString));
    size_t len = recordMap.size();
--- a/src/database/pvRecord.cpp
+++ b/src/database/pvRecord.cpp
@@ -12,13 +12,12 @@
 #include <epicsThread.h>

 #define epicsExportSharedSymbols
+
 #include <pv/pvDatabase.h>
-#include <pv/pvStructureCopy.h>


 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
-using namespace epics::pvDatabase;
 using namespace std;

 namespace epics { namespace pvDatabase {
@@ -42,61 +41,17 @@ PVRecord::PVRecord(
  pvStructure(pvStructure),
  depthGroupPut(0),
  traceLevel(0),
+  isDestroyed(false),
  isAddListener(false)
 {
 }

-void PVRecord::notifyClients()
-{
-    {
-        epicsGuard<epics::pvData::Mutex> guard(mutex);
-        if(traceLevel>0) {
-            cout << "PVRecord::notifyClients() " << recordName 
-                 << endl;
-        }
-    }
-    pvTimeStamp.detach();
-    for(std::list<PVListenerWPtr>::iterator iter = pvListenerList.begin();
-         iter!=pvListenerList.end();
-         iter++ )
-    {
-        PVListenerPtr listener = iter->lock();
-        if(!listener) continue;
-        if(traceLevel>0) {
-            cout << "PVRecord::notifyClients() calling listener->unlisten " 
-                 << recordName << endl;
-        }
-        listener->unlisten(shared_from_this());
-    }
-    pvListenerList.clear();
-    for (std::list<PVRecordClientWPtr>::iterator iter = clientList.begin();
-         iter!=clientList.end();
-         iter++ )
-    {
-        PVRecordClientPtr client = iter->lock();
-        if(!client) continue;
-        if(traceLevel>0) {
-            cout << "PVRecord::notifyClients() calling client->detach "
-                 << recordName << endl;
-        }
-        client->detach(shared_from_this());
-    }
-    if(traceLevel>0) {
-        cout << "PVRecord::notifyClients() calling clientList.clear() " 
-             << recordName << endl;
-    }
-    clientList.clear();
-    if(traceLevel>0) {
-        cout << "PVRecord::notifyClients() returning " << recordName << endl;
-    }
-}
-
 PVRecord::~PVRecord()
 {
    if(traceLevel>0) {
        cout << "~PVRecord() " << recordName << endl;
    }
-    notifyClients();
+    destroy();
 }

 void PVRecord::initPVRecord()
@@ -109,13 +64,55 @@ void PVRecord::initPVRecord()
    if(pvField) pvTimeStamp.attach(pvField);
 }

+void PVRecord::destroy()
+{
+    {
+        epicsGuard<epics::pvData::Mutex> guard(mutex);
+        if(traceLevel>0) {
+            cout << "PVRecord::destroy() " << recordName 
+                 << " isDestroyed " << (isDestroyed ? "true" : "false")
+                 << endl;
+        }
+        if(isDestroyed) {
+            return;
+        }
+        isDestroyed = true;
+    }
+    PVDatabasePtr pvDatabase(PVDatabase::getMaster());
+    if(pvDatabase) pvDatabase->removeRecord(shared_from_this());
+    pvTimeStamp.detach();     
+    for(std::list<PVListenerWPtr>::iterator iter = pvListenerList.begin();
+         iter!=pvListenerList.end();
+         iter++ )
+    {
+        PVListenerPtr listener = iter->lock();
+        if(!listener) continue;
+        if(traceLevel>0) {
+            cout << "PVRecord::destroy() calling listener->unlisten " << recordName << endl;
+        }
+        listener->unlisten(shared_from_this());
+    }
+    pvListenerList.clear();
+    for (std::list<PVRecordClientPtr>::iterator iter = clientList.begin();
+         iter!=clientList.end();
+         iter++ )
+    {
+        PVRecordClientPtr client = *iter;
+        if(!client) continue;
+        if(traceLevel>0) {
+            cout << "PVRecord::destroy() calling client->detach " << recordName << endl;
+        }
+        client->detach(shared_from_this());
+    }
+    clientList.clear();
+}
+
 void PVRecord::process()
 {
    if(traceLevel>2) {
        cout << "PVRecord::process() " << recordName << endl;
    }
    if(pvTimeStamp.isAttached()) {
-        pvTimeStamp.get(timeStamp);
        timeStamp.getCurrent();
        pvTimeStamp.set(timeStamp);
    }
@@ -194,39 +191,70 @@ bool PVRecord::addPVRecordClient(PVRecordClientPtr const & pvRecordClient)
        cout << "PVRecord::addPVRecordClient() " << recordName << endl;
    }
    epicsGuard<epics::pvData::Mutex> guard(mutex);
-    // clean clientList
-    bool clientListClean = false;
-    while(!clientListClean) {
-        if(clientList.empty()) break;
-        clientListClean = true;
-        std::list<PVRecordClientWPtr>::iterator iter;
-        for (iter = clientList.begin();
-             iter!=clientList.end();
-             iter++ )
-        {
-            PVRecordClientPtr client = iter->lock();
-            if(client) continue;
-            if(traceLevel>1) {
-                 cout << "PVRecord::addPVRecordClient() erasing client"
-                      << recordName << endl;
-            }
-            clientList.erase(iter);
-            clientListClean = false;
-            break;
+    if(isDestroyed) {
+        return false;
+    }
+    std::list<PVRecordClientPtr>::iterator iter;
+    for (iter = clientList.begin();
+         iter!=clientList.end();
+         iter++ )
+    {
+        PVRecordClientPtr client = *iter;
+        if(client==pvRecordClient) {
+            return false;
        }
    }
+    if(traceLevel>1) {
+        cout << "PVRecord::addPVRecordClient() calling clientList.push_back(pvRecordClient)" << recordName << endl;
+    }
    clientList.push_back(pvRecordClient);
    return true;
 }

+bool PVRecord::removePVRecordClient(PVRecordClientPtr const & pvRecordClient)
+{
+    if(traceLevel>1) {
+        cout << "PVRecord::removePVRecordClient() " << recordName << endl;
+    }
+    epicsGuard<epics::pvData::Mutex> guard(mutex);
+    if(isDestroyed) {
+        return false;
+    }
+    std::list<PVRecordClientPtr>::iterator iter;
+    for (iter = clientList.begin();
+         iter!=clientList.end();
+         iter++ )
+    {
+        PVRecordClientPtr client = *iter;
+        if(!client) continue;
+        if(client==pvRecordClient) {
+            clientList.erase(iter);
+            return true;
+        }
+    }
+    return false;
+}
+
 bool PVRecord::addListener(
    PVListenerPtr const & pvListener,
-    epics::pvCopy::PVCopyPtr const & pvCopy)
+    PVCopyPtr const & pvCopy)
 {
    if(traceLevel>1) {
        cout << "PVRecord::addListener() " << recordName << endl;
    }
    epicsGuard<epics::pvData::Mutex> guard(mutex);
+    if(isDestroyed) {
+        return false;
+    }
+    std::list<PVListenerWPtr>::iterator iter;
+    for (iter = pvListenerList.begin(); iter!=pvListenerList.end(); iter++ )
+    {
+        PVListenerPtr listener = iter->lock();
+        if(!listener.get()) continue;
+        if(listener.get()==pvListener.get()) {
+            return false;
+        }
+    }
    pvListenerList.push_back(pvListener);
    this->pvListener = pvListener;
    isAddListener = true;
@@ -249,12 +277,15 @@ void PVRecord::nextMasterPVField(PVFieldPtr const & pvField)

 bool PVRecord::removeListener(
    PVListenerPtr const & pvListener,
-    epics::pvCopy::PVCopyPtr const & pvCopy)
+    PVCopyPtr const & pvCopy)
 {
    if(traceLevel>1) {
        cout << "PVRecord::removeListener() " << recordName << endl;
    }
    epicsGuard<epics::pvData::Mutex> guard(mutex);
+    if(isDestroyed) {
+        return false;
+    }
    std::list<PVListenerWPtr>::iterator iter;
    for (iter = pvListenerList.begin(); iter!=pvListenerList.end(); iter++ )
    {
@@ -363,6 +394,14 @@ bool PVRecordField::addListener(PVListenerPtr const & pvListener)
    if(pvRecord && pvRecord->getTraceLevel()>1) {
         cout << "PVRecordField::addListener() " << getFullName() << endl;
    }
+    std::list<PVListenerWPtr>::iterator iter;
+    for (iter = pvListenerList.begin(); iter!=pvListenerList.end(); iter++ ) {
+        PVListenerPtr listener = iter->lock();
+        if(!listener.get()) continue;
+        if(listener.get()==pvListener.get()) {
+            return false;
+        }
+    }
    pvListenerList.push_back(pvListener);
    return true;
 }
@@ -411,8 +450,7 @@ void PVRecordField::postSubField()
 {
    callListener();
    if(isStructure) {
-        PVRecordStructurePtr pvrs = 
-            static_pointer_cast<PVRecordStructure>(shared_from_this());
+        PVRecordStructurePtr pvrs = static_pointer_cast<PVRecordStructure>(shared_from_this());
        PVRecordFieldPtrArrayPtr pvRecordFields = pvrs->getPVRecordFields();
        PVRecordFieldPtrArray::iterator iter;
        for(iter = pvRecordFields->begin() ; iter !=pvRecordFields->end(); iter++) {
--- a/src/pv/channelProviderLocal.h
+++ b/src/pv/channelProviderLocal.h
@@ -25,34 +25,79 @@
 #include <pv/lock.h>
 #include <pv/pvType.h>
 #include <pv/pvData.h>
+#include <pv/pvCopy.h>
 #include <pv/pvAccess.h>
 #include <pv/status.h>
 #include <pv/serverContext.h>

-
 #ifdef channelProviderLocalEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #	undef channelProviderLocalEpicsExportSharedSymbols
 #endif

 #include <shareLib.h>
+
 #include <pv/pvDatabase.h>
-#include <pv/pvStructureCopy.h>
+

 namespace epics { namespace pvDatabase { 

+
+class MonitorFactory;
+typedef std::tr1::shared_ptr<MonitorFactory> MonitorFactoryPtr;
+
+class MonitorLocal;
+typedef std::tr1::shared_ptr<MonitorLocal> MonitorLocalPtr;
+
+
 class ChannelProviderLocal;
 typedef std::tr1::shared_ptr<ChannelProviderLocal> ChannelProviderLocalPtr;
-typedef std::tr1::weak_ptr<ChannelProviderLocal> ChannelProviderLocalWPtr;
 class ChannelLocal;
 typedef std::tr1::shared_ptr<ChannelLocal> ChannelLocalPtr;
-typedef std::tr1::weak_ptr<ChannelLocal> ChannelLocalWPtr;

+epicsShareFunc MonitorFactoryPtr getMonitorFactory();
+
+/**
+ * @brief MonitorFactory
+ *
+ * This class provides a static method to create a monitor for a PVRecord
+ */
+class epicsShareClass MonitorFactory 
+{
+public:
+    POINTER_DEFINITIONS(MonitorFactory);
+    /**
+     * @brief Destructor
+     */
+    virtual ~MonitorFactory();
+    /**
+     * @brief Destroy the monitor factory.
+     */
+    virtual void destroy();
+    /** 
+     * @brief Create a monitor on a record.
+     *
+     * This is called by the local channel provider.
+     * @param pvRecord The record to monitor.
+     * @param monitorRequester The client callback.
+     * @param pvRequest Options specified by the client.
+     * This includes the subset of the fields in the record to monitor.
+     * @return A shared pointer to the newly created monitor.
+     * If the monitor can not be created a null monitor is returned.
+     * This means the pvRequest specified options that could not be satisfied.
+     */
+    epics::pvData::MonitorPtr createMonitor(
+        PVRecordPtr const & pvRecord,
+        epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
+        epics::pvData::PVStructurePtr const & pvRequest);
+private:
+    MonitorFactory();
+    friend class MonitorLocal;
+    friend epicsShareFunc MonitorFactoryPtr getMonitorFactory();
+    bool isDestroyed;
+    epics::pvData::Mutex mutex;
+};

-epicsShareFunc epics::pvData::MonitorPtr createMonitorLocal(
-    PVRecordPtr const & pvRecord,
-    epics::pvData::MonitorRequester::shared_pointer const & monitorRequester,
-    epics::pvData::PVStructurePtr const & pvRequest);

 epicsShareFunc ChannelProviderLocalPtr getChannelProviderLocal();

@@ -64,33 +109,27 @@ epicsShareFunc ChannelProviderLocalPtr getChannelProviderLocal();
 */
 class epicsShareClass ChannelProviderLocal :
    public epics::pvAccess::ChannelProvider,
-    public epics::pvAccess::ChannelFind,
    public std::tr1::enable_shared_from_this<ChannelProviderLocal>
 {
 public:
    POINTER_DEFINITIONS(ChannelProviderLocal);
-    /**
-     * @brief Constructor
-     */
-    ChannelProviderLocal();
    /**
     * @brief Destructor
     */
    virtual ~ChannelProviderLocal();
    /**
-     * @brief DEPRECATED
+     * @brief Destroy the channel provider.
     *
+     * Probably never called.
     */
-    virtual void destroy(){};
+    virtual void destroy();
    /**
     * @brief Returns the channel provider name.
-     *
     * @return <b>local</b>
     */
    virtual  std::string getProviderName();
    /**
     * @brief Returns either a null channelFind or a channelFind for records in the PVDatabase.
-     *
     * @param channelName The name of the channel desired.
     * @param channelFindRequester The client callback.
     * @return shared pointer to ChannelFind.
@@ -146,31 +185,17 @@ public:
        epics::pvAccess::ChannelRequester::shared_pointer const &channelRequester,
        short priority,
        std::string const &address);
-    /**
-     * @brief get trace level (0,1,2) means (nothing,lifetime,process)
-     * @return the level
-     */
-    int getTraceLevel() {return traceLevel;}
-    /**
-     * @brief set trace level (0,1,2) means (nothing,lifetime,process)
-     * @param level The level
-     */
-    void setTraceLevel(int level) {traceLevel = level;}
-    /**
-     * @brief ChannelFind method.
-     *
-     * @return pointer to self.
-     */
-    virtual std::tr1::shared_ptr<ChannelProvider> getChannelProvider();
-    /**
-     * @brief ChannelFind method.
-     *
-     */
-    virtual void cancel() {}
 private:
+    shared_pointer getPtrSelf()
+    {
+        return shared_from_this();
+    }
+    ChannelProviderLocal();
    friend epicsShareFunc ChannelProviderLocalPtr getChannelProviderLocal();
-    PVDatabaseWPtr pvDatabase;
-    int traceLevel;
+    PVDatabasePtr pvDatabase;
+    epics::pvData::Mutex mutex;
+    bool beingDestroyed;
+    epics::pvAccess::ChannelFind::shared_pointer channelFinder;
    friend class ChannelProviderLocalRun;
 };

@@ -202,15 +227,20 @@ public:
     */
    virtual ~ChannelLocal();
    /** 
-     * @brief DEPRECATED
+     * @brief Destroy the channel.
     *
+     * It cleans up all resources used to access the record.
+     * Note that this assumes that client has destroyed any objects that
+     * have been created for the  channel like channelGet, etc.
+     * The remote pvAccess server does this cleanup.
     */
-    virtual void destroy() {};
+    virtual void destroy();
    /** 
     * @brief Detach from the record.
     *
     * This is called when a record is being removed from the database.
-     * @param pvRecord The record being removed.
+     * Calls destroy.
+     * @param pvRecord The record being destroyed.
     */
    virtual void detach(PVRecordPtr const &pvRecord);
    /** 
@@ -230,7 +260,10 @@ public:
     * @brief Get the channel provider
     * @return The provider.
     */
-    virtual epics::pvAccess::ChannelProvider::shared_pointer getProvider();
+    virtual epics::pvAccess::ChannelProvider::shared_pointer getProvider()
+    {
+        return provider;
+    }
    /** 
     * @brief Get the remote address
     * @return <b>local</b>
@@ -369,8 +402,9 @@ protected:
    }
 private:
    epics::pvAccess::ChannelRequester::shared_pointer requester;
-    ChannelProviderLocalWPtr provider;
-    PVRecordWPtr pvRecord;
+    ChannelProviderLocalPtr provider;
+    PVRecordPtr pvRecord;
+    bool isDestroyed;
    epics::pvData::Mutex mutex;
 };

--- a/src/pv/pvDatabase.h
+++ b/src/pv/pvDatabase.h
@@ -13,19 +13,20 @@

 #include <list>
 #include <map>
+#include <deque>

 #include <pv/pvData.h>
+#include <pv/pvCopy.h>
 #include <pv/pvTimeStamp.h>
 #include <pv/rpcService.h>

-
 #ifdef pvdatabaseEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #	undef pvdatabaseEpicsExportSharedSymbols
 #endif

 #include <shareLib.h>
-#include <pv/pvStructureCopy.h>
+

 namespace epics { namespace pvDatabase { 

@@ -45,7 +46,6 @@ typedef std::tr1::weak_ptr<PVRecordStructure> PVRecordStructureWPtr;

 class PVRecordClient;
 typedef std::tr1::shared_ptr<PVRecordClient> PVRecordClientPtr;
-typedef std::tr1::weak_ptr<PVRecordClient> PVRecordClientWPtr;

 class PVListener;
 typedef std::tr1::shared_ptr<PVListener> PVListenerPtr;
@@ -53,7 +53,6 @@ typedef std::tr1::weak_ptr<PVListener> PVListenerWPtr;

 class PVDatabase;
 typedef std::tr1::shared_ptr<PVDatabase> PVDatabasePtr;
-typedef std::tr1::weak_ptr<PVDatabase> PVDatabaseWPtr;

 /**
 * @brief Base interface for a PVRecord.
@@ -65,7 +64,7 @@ typedef std::tr1::weak_ptr<PVDatabase> PVDatabaseWPtr;
 * @date 2012.11.20
 */
 class epicsShareClass PVRecord :
-     public epics::pvCopy::PVCopyTraverseMasterCallback,
+     public epics::pvData::PVCopyTraverseMasterCallback,
     public std::tr1::enable_shared_from_this<PVRecord>
 {
 public:
@@ -98,9 +97,14 @@ public:
     */
    virtual void process();
    /**
-     *  @brief DEPRECATED
+     *  @brief Optional method for derived class.
+     *
+     * Destroy the PVRecord. Release any resources used and 
+     *  get rid of listeners and requesters.
+     *  If derived class overrides this then it must call PVRecord::destroy()
+     *  after it has destroyed any resorces it uses.
     */
-    virtual void destroy() {}
+    virtual void destroy();
    /**
     *  @brief Optional method for derived class.
     *
@@ -108,10 +112,10 @@ public:
     * @param pvRequest The request PVStructure 
     * @return The corresponding service
     */
-    virtual epics::pvAccess::RPCServiceAsync::shared_pointer getService(
+    virtual epics::pvAccess::Service::shared_pointer getService(
        epics::pvData::PVStructurePtr const & pvRequest)
    {
-        return epics::pvAccess::RPCServiceAsync::shared_pointer();
+        return epics::pvAccess::Service::shared_pointer();
    }
    /**
     * @brief Creates a <b>soft</b> record. 
@@ -191,6 +195,13 @@ public:
     * @return <b>true</b> if the client is added.
     */
    bool addPVRecordClient(PVRecordClientPtr const & pvRecordClient);
+    /**
+     * @brief Remove a client.
+     *
+     * @param pvRecordClient The client.
+     * @return <b>true</b> if the client is removed.
+     */
+    bool removePVRecordClient(PVRecordClientPtr const & pvRecordClient);
    /**
     * @brief Add a PVListener.
     *
@@ -201,7 +212,7 @@ public:
     */
    bool addListener(
        PVListenerPtr const & pvListener,
-        epics::pvCopy::PVCopyPtr const & pvCopy);
+        epics::pvData::PVCopyPtr const & pvCopy);
    /**
     *  @brief  PVCopyTraverseMasterCallback method
     *
@@ -217,7 +228,7 @@ public:
     */
    bool removeListener(
        PVListenerPtr const & pvListener,
-        epics::pvCopy::PVCopyPtr const & pvCopy);
+        epics::pvData::PVCopyPtr const & pvCopy);


    /**
@@ -253,26 +264,35 @@ protected:
     * Must be called by derived classes.
     */
    void initPVRecord();
+    /** 
+     * @brief Get shared pointer to self.
+     * @return The shared pointer.
+     */
+    PVRecordPtr getPtrSelf()
+    {
+        return shared_from_this();
+    }
 private:
    PVRecordFieldPtr findPVRecordField(
        PVRecordStructurePtr const & pvrs,
        epics::pvData::PVFieldPtr const & pvField);
-    void notifyClients();

    std::string recordName;
    epics::pvData::PVStructurePtr pvStructure;
    PVRecordStructurePtr pvRecordStructure;
    std::list<PVListenerWPtr> pvListenerList;
-    std::list<PVRecordClientWPtr> clientList;
+    std::list<PVRecordClientPtr> clientList;
    epics::pvData::Mutex mutex;
    std::size_t depthGroupPut;
    int traceLevel;
-    // following only valid while addListener or removeListener is active.
-    bool isAddListener;
-    PVListenerWPtr pvListener;
+    bool isDestroyed;

    epics::pvData::PVTimeStamp pvTimeStamp;
    epics::pvData::TimeStamp timeStamp;
+
+    // following only valid while addListener or removeListener is active.
+    bool isAddListener;
+    PVListenerWPtr pvListener;
 };

 epicsShareFunc std::ostream& operator<<(std::ostream& o, const PVRecord& record);
@@ -484,6 +504,12 @@ public:
     * @brief Destructor
     */
    virtual ~PVDatabase();
+    /**
+     *  @brief Destroy the PVDatabase.
+     *
+     *  For each record in the database the record is removed and it's destroy method is called.
+     */
+    virtual void destroy();
    /**
     * Find a record.
     * An empty pointer is returned if the record is not in the database.
@@ -515,7 +541,7 @@ private:
    void unlock();
    PVRecordMap  recordMap;
    epics::pvData::Mutex mutex;
-    static bool getMasterFirstCall;
+    bool isDestroyed;
 };

 }}
--- a/src/pv/removeRecord.h
+++ b/src/pv/removeRecord.h
@@ -54,6 +54,7 @@ private:
    RemoveRecord(
        std::string const & recordName,
        epics::pvData::PVStructurePtr const & pvStructure);
+    PVDatabasePtr pvDatabase;
    epics::pvData::PVStringPtr pvRecordName;
    epics::pvData::PVStringPtr pvResult;
 };
--- a/src/pv/traceRecord.h
+++ b/src/pv/traceRecord.h
@@ -55,6 +55,7 @@ private:
    TraceRecord(
        std::string const & recordName,
        epics::pvData::PVStructurePtr const & pvStructure);
+    PVDatabasePtr pvDatabase;
    epics::pvData::PVStringPtr pvRecordName;
    epics::pvData::PVIntPtr pvLevel;
    epics::pvData::PVStringPtr pvResult;
--- a/src/pvAccess/channelLocal.cpp
+++ b/src/pvAccess/channelLocal.cpp
--- a/src/pvAccess/channelProviderLocal.cpp
+++ b/src/pvAccess/channelProviderLocal.cpp
@@ -9,18 +9,16 @@
 * @date 2013.04
 */

-#include <epicsThread.h>
-
 #include <pv/serverContext.h>
 #include <pv/syncChannelFind.h>

 #define epicsExportSharedSymbols

 #include <pv/channelProviderLocal.h>
+#include <pv/traceRecord.h>

 using namespace epics::pvData;
 using namespace epics::pvAccess;
-using namespace epics::pvCopy;
 using std::tr1::static_pointer_cast;
 using std::tr1::dynamic_pointer_cast;
 using std::cout;
@@ -30,59 +28,77 @@ using std::string;
 namespace epics { namespace pvDatabase { 

 static string providerName("local");
-static ChannelProviderLocalPtr channelProvider;
+
+
+class LocalChannelProviderFactory;
+typedef std::tr1::shared_ptr<LocalChannelProviderFactory> LocalChannelProviderFactoryPtr;

 class LocalChannelProviderFactory : public ChannelProviderFactory
-{  
+{
+    
 public:
    POINTER_DEFINITIONS(LocalChannelProviderFactory);
    virtual string getFactoryName() { return providerName;}
+    static LocalChannelProviderFactoryPtr create(
+        ChannelProviderLocalPtr const &channelProvider)
+    {
+        LocalChannelProviderFactoryPtr xxx(
+            new LocalChannelProviderFactory(channelProvider));
+        registerChannelProviderFactory(xxx);
+        return xxx;
+    }
    virtual  ChannelProvider::shared_pointer sharedInstance()
    {
-        if(!channelProvider) channelProvider = ChannelProviderLocalPtr(new ChannelProviderLocal());
        return channelProvider;
    }
    virtual  ChannelProvider::shared_pointer newInstance()
    {
-        throw std::logic_error(
-            "LocalChannelProviderFactory::newInstance() not Implemented");
+        throw std::logic_error("newInstance not Implemented");
    }
+private:
+    LocalChannelProviderFactory(
+        ChannelProviderLocalPtr const &channelProvider)
+    : channelProvider(channelProvider)
+    {}
+    ChannelProviderLocalPtr channelProvider;
 };

-
 ChannelProviderLocalPtr getChannelProviderLocal()
 {
-    static int firstTime = 1;
-    if (firstTime) {
-        firstTime = 0;
-        ChannelProviderFactory::shared_pointer factory(
-             new  LocalChannelProviderFactory());
-         ChannelProviderRegistry::servers()->add(factory);
+    static ChannelProviderLocalPtr channelProviderLocal;
+    static Mutex mutex;
+    Lock xx(mutex);
+    if(!channelProviderLocal) {
+        channelProviderLocal = ChannelProviderLocalPtr(
+            new ChannelProviderLocal());
+        ChannelProvider::shared_pointer xxx =
+            dynamic_pointer_cast<ChannelProvider>(channelProviderLocal);
+        channelProviderLocal->channelFinder =
+            SyncChannelFind::shared_pointer(new SyncChannelFind(xxx));
+        LocalChannelProviderFactoryPtr factory(LocalChannelProviderFactory::create(channelProviderLocal));
+        
    }
-    ChannelProvider::shared_pointer channelProvider =
-        ChannelProviderRegistry::servers()->getProvider(providerName);
-    return std::tr1::dynamic_pointer_cast<ChannelProviderLocal>(channelProvider);
+    return channelProviderLocal;
 }

 ChannelProviderLocal::ChannelProviderLocal()
 : pvDatabase(PVDatabase::getMaster()),
-  traceLevel(0)
+  beingDestroyed(false)
 {
-    if(traceLevel>0) {
-        cout << "ChannelProviderLocal::ChannelProviderLocal()\n";
-    }
 }

 ChannelProviderLocal::~ChannelProviderLocal()
 {
-    if(traceLevel>0) {
-        cout << "ChannelProviderLocal::~ChannelProviderLocal()\n";
-    }
+    destroy();
 }

-std::tr1::shared_ptr<ChannelProvider> ChannelProviderLocal::getChannelProvider()
+void ChannelProviderLocal::destroy()
 {
-    return shared_from_this();
+    Lock xx(mutex);
+    if(beingDestroyed) return;
+    beingDestroyed = true;
+    pvDatabase->destroy();
+    pvDatabase.reset();
 }

 string ChannelProviderLocal::getProviderName()
@@ -94,46 +110,35 @@ ChannelFind::shared_pointer ChannelProviderLocal::channelFind(
    string const & channelName,
    ChannelFindRequester::shared_pointer  const &channelFindRequester)
 {
-    if(traceLevel>1) {
-        cout << "ChannelProviderLocal::channelFind " << "channelName" << endl;
-    }
-    PVDatabasePtr pvdb(pvDatabase.lock());
-    if(!pvdb) {
-        Status notFoundStatus(Status::STATUSTYPE_ERROR,"pvDatabase was deleted");
-        channelFindRequester->channelFindResult(
-            notFoundStatus,
-            shared_from_this(),
-            false);
-    }
-    PVRecordPtr pvRecord = pvdb->findRecord(channelName);
+    Lock xx(mutex);
+    PVRecordPtr pvRecord = pvDatabase->findRecord(channelName);
    if(pvRecord) {
        channelFindRequester->channelFindResult(
            Status::Ok,
-            shared_from_this(),
+            channelFinder,
            true);
        
    } else {
        Status notFoundStatus(Status::STATUSTYPE_ERROR,"pv not found");
        channelFindRequester->channelFindResult(
            notFoundStatus,
-            shared_from_this(),
+            channelFinder,
            false);
    }
-    return shared_from_this();
+    return channelFinder;
 }

 ChannelFind::shared_pointer ChannelProviderLocal::channelList(
    ChannelListRequester::shared_pointer const & channelListRequester)
 {
-    if(traceLevel>1) {
-        cout << "ChannelProviderLocal::channelList\n";
+    PVStringArrayPtr records;
+    {
+        Lock guard(mutex);
+        records = pvDatabase->getRecordNames();
    }
-    PVDatabasePtr pvdb(pvDatabase.lock());
-    if(!pvdb)throw std::logic_error("pvDatabase was deleted");
-    PVStringArrayPtr records(pvdb->getRecordNames());
-    channelListRequester->channelListResult(
-        Status::Ok, shared_from_this(), records->view(), false);
-    return shared_from_this();
+
+    channelListRequester->channelListResult(Status::Ok, channelFinder, records->view(), false);
+    return channelFinder;
 }

 Channel::shared_pointer ChannelProviderLocal::createChannel(
@@ -141,26 +146,23 @@ Channel::shared_pointer ChannelProviderLocal::createChannel(
    ChannelRequester::shared_pointer  const &channelRequester,
    short priority)
 {
-    if(traceLevel>1) {
-        cout << "ChannelProviderLocal::createChannel " << "channelName" << endl;
-    }
-    ChannelLocalPtr channel;
-    Status status = Status::Ok;
-    PVDatabasePtr pvdb(pvDatabase.lock());
-    if(!pvdb) {
-        status = Status::error("pvDatabase was deleted");
-    } else {
-        PVRecordPtr pvRecord = pvdb->findRecord(channelName);
-        if(pvRecord) {
-            channel = ChannelLocalPtr(new ChannelLocal(
-                shared_from_this(),channelRequester,pvRecord));
-            pvRecord->addPVRecordClient(channel);
-       } else {
-            status = Status::error("pv not found");
-       }
-    }
-    channelRequester->channelCreated(status,channel);
-    return channel;
+    Lock xx(mutex);
+    PVRecordPtr pvRecord = pvDatabase->findRecord(channelName);
+    if(pvRecord) {
+        ChannelLocalPtr channel(new ChannelLocal(
+            getPtrSelf(),channelRequester,pvRecord));
+        channelRequester->channelCreated(
+            Status::Ok,
+            channel);
+        pvRecord->addPVRecordClient(channel);
+        return channel;
+    }   
+    Status notFoundStatus(Status::STATUSTYPE_ERROR,"pv not found");
+    channelRequester->channelCreated(
+        notFoundStatus,
+        Channel::shared_pointer());
+    return Channel::shared_pointer();
+    
 }

 Channel::shared_pointer ChannelProviderLocal::createChannel(
--- a/src/pvAccess/monitorFactory.cpp
+++ b/src/pvAccess/monitorFactory.cpp
@@ -14,6 +14,7 @@
 #include <epicsGuard.h>
 #include <pv/thread.h>
 #include <pv/bitSetUtil.h>
+#include <pv/queue.h>
 #include <pv/timeStamp.h>

 #define epicsExportSharedSymbols
@@ -22,7 +23,6 @@

 using namespace epics::pvData;
 using namespace epics::pvAccess;
-using namespace epics::pvCopy;
 using std::tr1::static_pointer_cast;
 using std::cout;
 using std::endl;
@@ -30,116 +30,36 @@ using std::string;

 namespace epics { namespace pvDatabase { 

-class MonitorLocal;
-typedef std::tr1::shared_ptr<MonitorLocal> MonitorLocalPtr;

 static MonitorPtr nullMonitor;
 static MonitorElementPtr NULLMonitorElement;
-static Status failedToCreateMonitorStatus(
-    Status::STATUSTYPE_ERROR,"failed to create monitor");
+static Status failedToCreateMonitorStatus(Status::STATUSTYPE_ERROR,"failed to create monitor");
+static Status wasDestroyedStatus(Status::STATUSTYPE_ERROR,"was destroyed");
 static Status alreadyStartedStatus(Status::STATUSTYPE_ERROR,"already started");
 static Status notStartedStatus(Status::STATUSTYPE_ERROR,"not started");
-static Status deletedStatus(Status::STATUSTYPE_ERROR,"record is deleted");

-class MonitorElementQueue;
+
+
+typedef Queue<MonitorElement> MonitorElementQueue;
 typedef std::tr1::shared_ptr<MonitorElementQueue> MonitorElementQueuePtr;
-
-class  MonitorElementQueue
-{
-private:
-    MonitorElementPtrArray elements;
-    // TODO use size_t instead
-    int size;
-    int numberFree;
-    int numberUsed;
-    int nextGetFree;
-    int nextSetUsed;
-    int nextGetUsed;
-    int nextReleaseUsed;
-public:
-    POINTER_DEFINITIONS(MonitorElementQueue);
-
-    MonitorElementQueue(std::vector<MonitorElementPtr> monitorElementArray)
-    :  elements(monitorElementArray),
-       size(monitorElementArray.size()),
-       numberFree(size),
-       numberUsed(0),
-       nextGetFree(0),
-       nextSetUsed(0),
-       nextGetUsed(0),
-       nextReleaseUsed(0)
-    {
-    }
-
-    virtual ~MonitorElementQueue() {}
-
-    void clear()
-    {
-        numberFree = size;
-        numberUsed = 0;
-        nextGetFree = 0;
-        nextSetUsed = 0;
-        nextGetUsed = 0;
-        nextReleaseUsed = 0;
-    }
-    
-    MonitorElementPtr getFree()
-    {
-        if(numberFree==0) return MonitorElementPtr();
-        numberFree--;
-        int ind = nextGetFree;
-        MonitorElementPtr queueElement = elements[nextGetFree++];
-        if(nextGetFree>=size) nextGetFree = 0;
-        return elements[ind];
-    }
-    
-    void setUsed(MonitorElementPtr const &element)
-    {
-       if(element!=elements[nextSetUsed++]) {
-           throw std::logic_error("not correct queueElement");
-        }
-        numberUsed++;
-        if(nextSetUsed>=size) nextSetUsed = 0;
-    }
-    
-    MonitorElementPtr getUsed()
-    {
-        if(numberUsed==0) return MonitorElementPtr();
-        int ind = nextGetUsed;
-        MonitorElementPtr queueElement = elements[nextGetUsed++];
-        if(nextGetUsed>=size) nextGetUsed = 0;
-        return elements[ind];
-    }
-    void releaseUsed(MonitorElementPtr const &element)
-    {
-        if(element!=elements[nextReleaseUsed++]) {
-            throw std::logic_error(
-               "not queueElement returned by last call to getUsed");
-        }
-        if(nextReleaseUsed>=size) nextReleaseUsed = 0;
-        numberUsed--;
-        numberFree++;
-    }
-};
-
-
 typedef std::tr1::shared_ptr<MonitorRequester> MonitorRequesterPtr;

+
    
 class MonitorLocal :
    public Monitor,
    public PVListener,
    public std::tr1::enable_shared_from_this<MonitorLocal>
 {
-    enum MonitorState {idle,active,deleted};
+    enum MonitorState {idle,active, destroyed};
 public:
    POINTER_DEFINITIONS(MonitorLocal);
    virtual ~MonitorLocal();
-    virtual void destroy() {} // DEPRECATED
    virtual Status start();
    virtual Status stop();
    virtual MonitorElementPtr poll();
-    virtual void detach(PVRecordPtr const & pvRecord){}
+    virtual void destroy();
+    virtual void detach(PVRecordPtr const & pvRecord){destroy();}
    virtual void release(MonitorElementPtr const & monitorElement);
    virtual void dataPut(PVRecordFieldPtr const & pvRecordField);
    virtual void dataPut(
@@ -189,8 +109,25 @@ MonitorLocal::~MonitorLocal()
    {
        cout << "MonitorLocal::~MonitorLocal()" << endl;
    }
+    destroy();
 }

+void MonitorLocal::destroy()
+{
+    if(pvRecord->getTraceLevel()>0)
+    {
+        cout << "MonitorLocal::destroy state " << state << endl;
+    }
+    {
+        Lock xx(mutex);
+        if(state==destroyed) return;
+    }
+    if(state==active) stop();
+    {
+        Lock xx(mutex);
+        state = destroyed;
+    }
+}

 Status MonitorLocal::start()
 {
@@ -200,8 +137,8 @@ Status MonitorLocal::start()
    }
    {
        Lock xx(mutex);
+        if(state==destroyed) return wasDestroyedStatus;
        if(state==active) return alreadyStartedStatus;
-        if(state==deleted) return deletedStatus;
    }
    pvRecord->addListener(getPtrSelf(),pvCopy);
    epicsGuard <PVRecord> guard(*pvRecord);
@@ -224,10 +161,10 @@ Status MonitorLocal::stop()
    }
    {
        Lock xx(mutex);
+        if(state==destroyed) return wasDestroyedStatus;
        if(state==idle) return notStartedStatus;
-        if(state==deleted) return deletedStatus;
        state = idle;
-    }
+   }
    pvRecord->removeListener(getPtrSelf(),pvCopy);
    return Status::Ok;
 }
@@ -267,10 +204,9 @@ void MonitorLocal::releaseActiveElement()
    {
        Lock xx(queueMutex);
        if(state!=active) return;
-        bool result = pvCopy->updateCopyFromBitSet(activeElement->pvStructurePtr,activeElement->changedBitSet);
-        if(!result) return;
        MonitorElementPtr newActive = queue->getFree();
        if(!newActive) return;
+        pvCopy->updateCopyFromBitSet(activeElement->pvStructurePtr,activeElement->changedBitSet);
        BitSetUtil::compress(activeElement->changedBitSet,activeElement->pvStructurePtr);
        BitSetUtil::compress(activeElement->overrunBitSet,activeElement->pvStructurePtr);
        queue->setUsed(activeElement);
@@ -373,10 +309,6 @@ void MonitorLocal::unlisten(PVRecordPtr const & pvRecord)
    {
        cout << "PVCopyMonitor::unlisten\n";
    }
-    {
-        Lock xx(mutex);
-        state = deleted;
-    }
    MonitorRequesterPtr requester = monitorRequester.lock();
    if(requester) {
        if(pvRecord->getTraceLevel()>1)
@@ -385,6 +317,7 @@ void MonitorLocal::unlisten(PVRecordPtr const & pvRecord)
        }
        requester->unlisten(getPtrSelf());
    }
+    pvRecord->removeListener(getPtrSelf(),pvCopy);
 }


@@ -449,27 +382,62 @@ bool MonitorLocal::init(PVStructurePtr const & pvRequest)
    return true;
 }

-MonitorPtr createMonitorLocal(
+
+MonitorFactory::MonitorFactory()
+: isDestroyed(false)
+{
+}
+
+MonitorFactory::~MonitorFactory()
+{
+}
+
+void MonitorFactory::destroy()
+{
+    Lock lock(mutex);
+    isDestroyed = true;
+}
+
+MonitorPtr MonitorFactory::createMonitor(
    PVRecordPtr const & pvRecord,
    MonitorRequester::shared_pointer const & monitorRequester,
    PVStructurePtr const & pvRequest)
 {
+    Lock xx(mutex);
+    if(isDestroyed) {
+        monitorRequester->message("MonitorFactory is destroyed",errorMessage);
+        return nullMonitor;
+    }
    MonitorLocalPtr monitor(new MonitorLocal(
        monitorRequester,pvRecord));
    bool result = monitor->init(pvRequest);
    if(!result) {
        MonitorPtr monitor;
        StructureConstPtr structure;
-        monitorRequester->monitorConnect(
-            failedToCreateMonitorStatus,monitor,structure);
+        monitorRequester->monitorConnect(failedToCreateMonitorStatus,monitor,structure);
        return nullMonitor;
    }
    if(pvRecord->getTraceLevel()>0)
    {
-        cout << "MonitorFactory::createMonitor"
-        << " recordName " << pvRecord->getRecordName() << endl;
+        cout << "MonitorFactory::createMonitor";
+        cout << " recordName " << pvRecord->getRecordName() << endl;
    }
    return monitor;
 }

+
+
+MonitorFactoryPtr getMonitorFactory()
+{
+    static MonitorFactoryPtr monitorFactoryPtr;
+    static Mutex mutex;
+    Lock xx(mutex);
+
+    if(!monitorFactoryPtr) {
+        monitorFactoryPtr = MonitorFactoryPtr(
+            new MonitorFactory());
+    }
+    return monitorFactoryPtr;
+}
+
 }}
--- a/src/pvAccess/registerChannelProviderLocal.cpp
+++ b/src/pvAccess/registerChannelProviderLocal.cpp
@@ -53,15 +53,18 @@ extern "C" void pvdbl(const iocshArgBuf *args)
    for(size_t i=0; i<xxx.size(); ++i) cout<< xxx[i] << endl;
 }

+static void channelProviderLocalExitHandler(void* /*pPrivate*/) {
+    getChannelProviderLocal()->destroy();
+}

 static void registerChannelProviderLocal(void)
 {
    static int firstTime = 1;
-cout << "registerChannelProviderLocal firstTime " << (firstTime ? "true" : "false") << endl;
    if (firstTime) {
        firstTime = 0;
        iocshRegister(&pvdblFuncDef, pvdbl);
        getChannelProviderLocal();
+        epicsAtExit(channelProviderLocalExitHandler, NULL);
    }
 }

--- a/src/special/removeRecord.cpp
+++ b/src/special/removeRecord.cpp
@@ -42,7 +42,8 @@ RemoveRecordPtr RemoveRecord::create(
 RemoveRecord::RemoveRecord(
    std::string const & recordName,
    epics::pvData::PVStructurePtr const & pvStructure)
-: PVRecord(recordName,pvStructure)
+: PVRecord(recordName,pvStructure),
+  pvDatabase(PVDatabase::getMaster())
 {
 }

@@ -60,7 +61,7 @@ bool RemoveRecord::init()
 void RemoveRecord::process()
 {
    string name = pvRecordName->get();
-    PVRecordPtr pvRecord = PVDatabase::getMaster()->findRecord(name);
+    PVRecordPtr pvRecord = pvDatabase->findRecord(name);
    if(!pvRecord) {
        pvResult->put(name + " not found");
        return;
--- a/src/special/traceRecord.cpp
+++ b/src/special/traceRecord.cpp
@@ -43,7 +43,8 @@ TraceRecordPtr TraceRecord::create(
 TraceRecord::TraceRecord(
    std::string const & recordName,
    epics::pvData::PVStructurePtr const & pvStructure)
-: PVRecord(recordName,pvStructure)
+: PVRecord(recordName,pvStructure),
+  pvDatabase(PVDatabase::getMaster())
 {
 }

@@ -64,7 +65,7 @@ bool TraceRecord::init()
 void TraceRecord::process()
 {
    string name = pvRecordName->get();
-    PVRecordPtr pvRecord = PVDatabase::getMaster()->findRecord(name);
+    PVRecordPtr pvRecord = pvDatabase->findRecord(name);
    if(!pvRecord) {
        pvResult->put(name + " not found");
        return;
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,28 +5,24 @@ include $(TOP)/configure/CONFIG

 PVDATABASE_TEST = $(TOP)/test

-PROD_LIBS += pvDatabase
-PROD_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
-PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
+PROD_LIBS += pvDatabase pvAccess pvData Com

 include $(PVDATABASE_TEST)/src/Makefile

-# pvDatabaseAllTests runs all the test programs in a known working order.
+# The testHarness runs all the test programs in a known working order.
 testHarness_SRCS += pvDatabaseAllTests.c

-# Name the application pvDbTestHarness
-pvDbTestHarness_SRCS = $(testHarness_SRCS)
+PROD_vxWorks = vxTestHarness
+vxTestHarness_SRCS += $(testHarness_SRCS)
+TESTSPEC_vxWorks = vxTestHarness.$(MUNCH_SUFFIX); pvDatabaseAllTests

-# Build for vxWorks
-PROD_vxWorks = pvDbTestHarness
-TESTSPEC_vxWorks = pvDbTestHarness.$(MUNCH_SUFFIX); pvDatabaseAllTests
+PROD_RTEMS += rtemsTestHarness
+rtemsTestHarness_SRCS += rtemsTestHarness.c rtemsConfig.c
+rtemsTestHarness_SRCS += $(testHarness_SRCS)
+TESTSPEC_RTEMS = rtemsTestHarness.$(MUNCH_SUFFIX); pvDatabaseAllTests

-# Build for RTEMS, with harness code & configuration
-PROD_RTEMS += pvDbTestHarness
-pvDbTestHarness_SRCS_RTEMS += rtemsTestHarness.c
-TESTSPEC_RTEMS = pvDbTestHarness.$(MUNCH_SUFFIX); pvDatabaseAllTests
-
-# Build test scripts for hosts
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)

 include $(TOP)/configure/RULES
+
+
--- a/test/pvDatabaseAllTests.c
+++ b/test/pvDatabaseAllTests.c
@@ -8,12 +8,10 @@
 #include <stdio.h>
 #include <epicsThread.h>
 #include <epicsUnitTest.h>
-#include <epicsExit.h>

 /* src */
 int testExampleRecord(void);
 int testPVCopy(void);
-int testPlugin(void);
 int testPVRecord(void);
 int testLocalProvider(void);
 int testPVAServer(void);
@@ -25,10 +23,8 @@ void pvDatabaseAllTests(void)
    /* src */
    runTest(testExampleRecord);
    runTest(testPVCopy);
-    runTest(testPlugin);
    runTest(testPVRecord);
    runTest(testLocalProvider);
    runTest(testPVAServer);
-
-    epicsExit(0);   /* Trigger test harness */
 }
+
--- a/test/rtemsConfig.c
+++ b/test/rtemsConfig.c
@@ -0,0 +1,72 @@
+/*************************************************************************\
+* Copyright (c) 2002 The University of Saskatchewan
+* 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. 
+\*************************************************************************/
+/*
+ * RTEMS configuration for EPICS
+ *  Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd
+ *      Author: W. Eric Norum
+ *              norume@aps.anl.gov
+ *              (630) 252-4793
+ */
+
+#include <rtems.h>
+
+/*
+ ***********************************************************************
+ *                         RTEMS CONFIGURATION                         *
+ ***********************************************************************
+ */
+#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
+
+#if __RTEMS_MAJOR__>4 || (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__>9) || (__RTEMS_MAJOR__==4 && __RTEMS_MINOR__==9 && __RTEMS_REVISION__==99)
+#  define CONFIGURE_UNIFIED_WORK_AREAS
+#else
+#  define CONFIGURE_EXECUTIVE_RAM_SIZE (2000*1024)
+#endif
+
+#define CONFIGURE_MAXIMUM_TASKS             rtems_resource_unlimited(30)
+#define CONFIGURE_MAXIMUM_SEMAPHORES        rtems_resource_unlimited(500)
+#define CONFIGURE_MAXIMUM_TIMERS            rtems_resource_unlimited(20)
+#define CONFIGURE_MAXIMUM_MESSAGE_QUEUES    rtems_resource_unlimited(5)
+#define CONFIGURE_MAXIMUM_USER_EXTENSIONS   1
+
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 150
+#define CONFIGURE_USE_IMFS_AS_BASE_FILESYSTEM
+#define CONFIGURE_MAXIMUM_DRIVERS       8
+
+#define CONFIGURE_MICROSECONDS_PER_TICK 20000
+
+#define CONFIGURE_INIT_TASK_PRIORITY    80
+
+#define CONFIGURE_MALLOC_STATISTICS     1
+
+#define CONFIGURE_INIT
+#define CONFIGURE_INIT_TASK_INITIAL_MODES (RTEMS_PREEMPT | \
+                    RTEMS_NO_TIMESLICE | \
+                    RTEMS_NO_ASR | \
+                    RTEMS_INTERRUPT_LEVEL(0))
+#define CONFIGURE_INIT_TASK_ATTRIBUTES (RTEMS_FLOATING_POINT | RTEMS_LOCAL)
+#define CONFIGURE_INIT_TASK_STACK_SIZE  (16*1024)
+rtems_task Init (rtems_task_argument argument);
+
+#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER
+#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
+
+#define CONFIGURE_FILESYSTEM_NFS
+#define CONFIGURE_FILESYSTEM_IMFS
+
+/*
+ * This should be made BSP dependent, not CPU dependent but I know of no
+ * appropriate conditionals to use.
+ * The new general time support makes including the RTC driver less important.
+ */
+#if !defined(mpc604) && !defined(__mc68040__) && !defined(__mcf5200__) && !defined(mpc7455) && !defined(__arm__)  /* don't have RTC code */
+#define CONFIGURE_APPLICATION_NEEDS_RTC_DRIVER
+#endif
+
+
+#include <bsp.h>
+#include <rtems/confdefs.h>
--- a/test/rtemsNetworking.h
+++ b/test/rtemsNetworking.h
@@ -0,0 +1,294 @@
+/*
+ * Network configuration -- QEMU NOT using DHCP
+ * 
+ ************************************************************
+ * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION     *
+ * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! * 
+ ************************************************************
+ *
+ *  The dynamic probing is based upon the EPICS network
+ *  configuration file written by:
+ *      W. Eric Norum
+ *      eric.norum@usask.ca
+ *      (306) 966-5394
+ */
+
+#ifndef _RTEMS_NETWORKCONFIG_H_
+#define _RTEMS_NETWORKCONFIG_H_
+
+/* #define USE_LIBBSDPORT */
+
+#if defined(USE_LIBBSDPORT)
+  #include <bsp/libbsdport_api.h>
+  #define CONFIGURE_MAXIMUM_TIMERS 10
+#endif
+/*
+ * For TFTP test application
+ */
+#if (defined (RTEMS_USE_BOOTP))
+#define RTEMS_TFTP_TEST_HOST_NAME "BOOTP_HOST"
+#define RTEMS_TFTP_TEST_FILE_NAME "BOOTP_FILE"
+#else
+#define RTEMS_TFTP_TEST_HOST_NAME "XXX.YYY.ZZZ.XYZ"
+#define RTEMS_TFTP_TEST_FILE_NAME "tftptest"
+#endif
+
+/*
+ * For NFS test application
+ * 
+ * NFS mount and a directory to ls once mounted
+ */
+#define RTEMS_NFS_SERVER      "192.168.1.210"
+#define RTEMS_NFS_SERVER_PATH "/home"
+#define RTEMS_NFS_LS_PATH     "/mnt/nfstest"
+
+
+
+/*
+ * This file can be copied to an application source directory
+ * and modified to override the values shown below.
+ *
+ * The following CPP symbols may be passed from the Makefile:
+ *
+ *   symbol                   default       description
+ *
+ *   NETWORK_TASK_PRIORITY    150           can be read by app from public
+ *                                          var 'gesysNetworkTaskPriority'
+ *   FIXED_IP_ADDR            <undefined>   hardcoded IP address (e.g.,
+ *                                          "192.168.0.10"); disables BOOTP;
+ *                                          must also define FIXED_NETMASK
+ *   FIXED_NETMASK            <undefined>   IP netmask string
+ *                                          (e.g. "255.255.255.0")
+ *   MULTI_NETDRIVER          <undefined>   ugly hack; if defined try to probe
+ *                                          a variety of PCI and ISA drivers
+ *                                          (i386 ONLY) use is discouraged!
+ *   NIC_NAME                 <undefined>   Ethernet driver name (e.g. "pcn1");
+ *                                          must also define NIC_ATTACH
+ *   NIC_ATTACH               <undefined>   Ethernet driver attach function
+ *                                          (e.g., rtems_fxp_attach).
+ *                                          If these are undefined then
+ *                                            a) MULTI_NETDRIVER is used
+ *                                               (if defined)
+ *                                            b) RTEMS_BSP_NETWORK_DRIVER_NAME/
+ *                                               RTEMS_BSP_NETWORK_DRIVER_ATTACH
+ *                                               are tried
+ *   MEMORY_CUSTOM            <undefined>   Allocate the defined amount of
+ *                                          memory for mbufs and mbuf clusters,
+ *                                          respectively. Define to a comma ','
+ *                                          separated pair of two numerical
+ *                                          values, e.g: 100*1024,200*1024
+ *   MEMORY_SCARCE            <undefined>   Allocate few memory for mbufs
+ *                                          (hint for how much memory the
+ *                                          board has)
+ *   MEMORY_HUGE              <undefined>   Allocate a lot of memory for mbufs
+ *                                          (hint for how much memory the
+ *                                          board has)
+ *                                          If none of MEMORY_CUSTOM/
+ *                                          MEMORY_SCARCE/MEMORY_HUGE are
+ *                                          defined then a medium amount of
+ *                                          memory is allocated for mbufs.
+ */
+
+#include <rtems/bspIo.h>
+#include <bsp.h>
+#include <rtems/rtems_bsdnet.h>
+
+#if 0
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#else
+#include "verscheck.h"
+#endif
+#endif
+
+//#define MULTI_NETDRIVER
+//#define RTEMS_BSP_NETWORK_DRIVER_NAME 1
+
+#define FIXED_IP_ADDR "192.168.1.249"
+#define FIXED_NETMASK "255.255.255.0"
+
+#ifndef NETWORK_TASK_PRIORITY
+#define NETWORK_TASK_PRIORITY   150  /* within EPICS' range */
+#endif
+
+/* make publicly available for startup scripts... */
+const int gesysNetworkTaskPriority = NETWORK_TASK_PRIORITY;
+
+#ifdef  FIXED_IP_ADDR
+#define RTEMS_DO_BOOTP 0
+#else
+#define RTEMS_DO_BOOTP rtems_bsdnet_do_bootp
+#define FIXED_IP_ADDR  0
+#undef  FIXED_NETMASK
+#define FIXED_NETMASK  0
+#endif
+
+#if !defined(NIC_NAME)
+
+#ifdef MULTI_NETDRIVER
+
+#if 0
+  #if RTEMS_VERSION_ATLEAST(4,6,99)
+  #define pcib_init pci_initialize
+  #endif
+#endif
+
+extern int rtems_3c509_driver_attach (struct rtems_bsdnet_ifconfig *, int);
+extern int rtems_fxp_attach (struct rtems_bsdnet_ifconfig *, int);
+extern int rtems_elnk_driver_attach (struct rtems_bsdnet_ifconfig *, int);
+extern int rtems_dec21140_driver_attach (struct rtems_bsdnet_ifconfig *, int);
+
+/* these don't probe and will be used even if there's no device :-( */
+extern int rtems_ne_driver_attach (struct rtems_bsdnet_ifconfig *, int);
+extern int rtems_wd_driver_attach (struct rtems_bsdnet_ifconfig *, int);
+
+static struct rtems_bsdnet_ifconfig isa_netdriver_config[] = {
+  {
+  	"ep0", rtems_3c509_driver_attach, isa_netdriver_config + 1,
+  },
+  {
+  	"ne1", rtems_ne_driver_attach, 0, irno: 9 /* qemu cannot configure irq-no :-(; has it hardwired to 9 */
+  },
+};
+
+static struct rtems_bsdnet_ifconfig pci_netdriver_config[]={
+  {
+  "dc1", rtems_dec21140_driver_attach, pci_netdriver_config+1,
+  },
+  #if !defined(USE_LIBBSDPORT)
+    {
+    "fxp1", rtems_fxp_attach, pci_netdriver_config+2,
+    },
+  #else
+    {
+      "", libbsdport_netdriver_attach, pci_netdriver_config+2,
+    },
+  #endif
+  {
+  "elnk1", rtems_elnk_driver_attach, isa_netdriver_config,
+  },
+};
+
+static int pci_check(struct rtems_bsdnet_ifconfig *ocfg, int attaching)
+{
+struct rtems_bsdnet_ifconfig *cfg;
+int if_index_pre;
+extern int if_index;
+  if ( attaching ) {
+  	cfg = pci_initialize() ?
+                      isa_netdriver_config : pci_netdriver_config;
+  }
+  while ( cfg ) {
+  	printk("Probing '%s'", cfg->name);
+  	/* unfortunately, the return value is unreliable - some drivers report
+  	 * success even if they fail.
+  	 * Check if they chained an interface (ifnet) structure instead
+  	 */
+  	if_index_pre = if_index;
+  	cfg->attach(cfg, attaching);
+  	if ( if_index > if_index_pre ) {
+  		/* assume success */
+  		printk(" .. seemed to work\n");
+  		ocfg->name   = cfg->name;
+  		ocfg->attach = cfg->attach;
+  		return 0;
+  	}
+  	printk(" .. failed\n");
+  	cfg = cfg->next;
+  }
+  return -1;
+}
+
+
+#define NIC_NAME   "dummy"
+#define NIC_ATTACH pci_check
+
+#else
+
+#if defined(RTEMS_BSP_NETWORK_DRIVER_NAME)  /* Use NIC provided by BSP */
+
+/* force ne2k_isa on i386 for qemu */
+#if defined(__i386__)
+# define NIC_NAME  BSP_NE2000_NETWORK_DRIVER_NAME
+# define NIC_ATTACH BSP_NE2000_NETWORK_DRIVER_ATTACH
+
+#else
+
+# define NIC_NAME  RTEMS_BSP_NETWORK_DRIVER_NAME
+# define NIC_ATTACH RTEMS_BSP_NETWORK_DRIVER_ATTACH
+#endif
+
+#endif
+
+#endif /* ifdef MULTI_NETDRIVER */
+#endif
+
+
+#ifdef NIC_NAME
+
+extern int NIC_ATTACH();
+
+#if RTEMS_BSP_NETWORK_DRIVER_ATTACH == BSP_NE2000_NETWORK_DRIVER_ATTACH
+static char ethernet_address[6] = { 0x00, 0xab, 0xcd, 0xef, 0x12, 0x34 };
+#endif
+
+static struct rtems_bsdnet_ifconfig netdriver_config[1] = {{
+  NIC_NAME,  /* name */
+  (int (*)(struct rtems_bsdnet_ifconfig*,int))NIC_ATTACH,  /* attach function */
+  0,  		/* link to next interface */
+  FIXED_IP_ADDR,
+  FIXED_NETMASK
+#if RTEMS_BSP_NETWORK_DRIVER_ATTACH == BSP_NE2000_NETWORK_DRIVER_ATTACH
+  ,
+  ethernet_address,
+  irno:9,
+  port:0xc100
+#endif
+}};
+#else
+#warning "NO KNOWN NETWORK DRIVER FOR THIS BSP -- YOU MAY HAVE TO EDIT networkconfig.h"
+#endif
+
+struct rtems_bsdnet_config rtems_bsdnet_config = {
+#ifdef NIC_NAME
+    netdriver_config,         /* link to next interface */
+    RTEMS_DO_BOOTP,           /* Use BOOTP to get network configuration */
+#else
+    0,
+    0,
+#endif
+    NETWORK_TASK_PRIORITY,    /* Network task priority */
+#if   defined(MEMORY_CUSTOM)
+    MEMORY_CUSTOM,
+#elif defined(MEMORY_SCARCE)
+    100*1024,                 /* MBUF space */
+    200*1024,                 /* MBUF cluster space */
+#elif defined(MEMORY_HUGE)
+    2*1024*1024,              /* MBUF space */
+    5*1024*1024,              /* MBUF cluster space */
+#else
+    180*1024,                 /* MBUF space */
+    350*1024,                 /* MBUF cluster space */
+#endif
+#if (!defined (RTEMS_USE_BOOTP)) && defined(ON_RTEMS_LAB_WINSYSTEMS)
+    "rtems",                /* Host name */
+    "nodomain.com",         /* Domain name */
+    "192.168.1.14",         /* Gateway */
+    "192.168.1.1",          /* Log host */
+    {"89.212.75.6"  },      /* Name server(s) */
+    {"192.168.1.1"  },      /* NTP server(s) */
+#else
+    NULL,                   /* Host name */
+    NULL,                   /* Domain name */
+    NULL,                   /* Gateway */
+    NULL,                   /* Log host */
+    { NULL },               /* Name server(s) */
+    { NULL },               /* NTP server(s) */
+#endif /* !RTEMS_USE_BOOTP */
+    0,                      /* efficiency */
+    0,                      /* udp TX buffer */
+    0,                      /* udp RX buffer */
+    0,                      /* tcp TX buffer */
+    0,                      /* tcp RX buffer */
+};
+#endif /* _RTEMS_NETWORKCONFIG_H_ */
--- a/test/rtemsTestHarness.c
+++ b/test/rtemsTestHarness.c
@@ -1,12 +1,38 @@
-/*
- * Copyright information and license terms for this software can be
- * found in the file LICENSE that is included with the distribution
- */
+#include <stdio.h>
+#include <stdlib.h>
+#include <rtems/rtems_bsdnet.h>
+#include <rtems/error.h>
+
+#include "rtemsNetworking.h"
+
+#include <epicsExit.h>
+#include <osdTime.h>

 extern void pvDatabaseAllTests(void);

-int main(int argc, char **argv)
+rtems_task
+Init (rtems_task_argument ignored)
 {
+  rtems_bsdnet_initialize_network ();
+  //rtems_bsdnet_show_if_stats ();
+
+  rtems_time_of_day timeOfDay;
+  if (rtems_clock_get(RTEMS_CLOCK_GET_TOD,&timeOfDay) != RTEMS_SUCCESSFUL) {
+    timeOfDay.year = 2014;
+    timeOfDay.month = 1;
+    timeOfDay.day = 1;
+    timeOfDay.hour = 0;
+    timeOfDay.minute = 0;
+    timeOfDay.second = 0;
+    timeOfDay.ticks = 0;
+
+    rtems_status_code ret = rtems_clock_set(&timeOfDay);
+    if (ret != RTEMS_SUCCESSFUL) {
+      printf("**** Can't set time %s\n", rtems_status_text(ret));
+    }
+  }
+  osdTimeRegister();
+  
  pvDatabaseAllTests();
-  return 0;
+  epicsExit(0);
 }
--- a/test/src/Makefile
+++ b/test/src/Makefile
@@ -3,12 +3,6 @@

 SRC_DIRS += $(PVDATABASE_TEST)/src

-
-TESTPROD_HOST += testPlugin
-testPlugin_SRCS += testPlugin.cpp
-testHarness_SRCS += testPlugin.cpp
-TESTS += testPlugin
-
 TESTPROD_HOST += testPVCopy
 testPVCopy_SRCS += testPVCopy.cpp
 testHarness_SRCS += testPVCopy.cpp
@@ -29,6 +23,7 @@ testLocalProvider_SRCS += testLocalProvider.cpp
 testHarness_SRCS += testLocalProvider.cpp
 TESTS += testLocalProvider

+
 TESTPROD_HOST += testPVAServer
 testPVAServer_SRCS += testPVAServer.cpp
 testHarness_SRCS += testPVAServer.cpp
--- a/test/src/listener.h
+++ b/test/src/listener.h
@@ -22,7 +22,6 @@
 #include <pv/pvTimeStamp.h>
 #include <pv/pvAlarm.h>
 #include <pv/pvDatabase.h>
-#include <pv/pvStructureCopy.h>

 #ifdef listenerEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
@@ -88,7 +87,7 @@ public:
 private:
    Listener(PVRecordPtr const & pvRecord)
    : pvCopy(
-          epics::pvCopy::PVCopy::create(
+          PVCopy::create(
              getPVDataCreate()->createPVStructure(
                  pvRecord->getPVRecordStructure()->getPVStructure()),
              CreateRequest::create()->createRequest(""),
@@ -97,7 +96,7 @@ private:
          recordName(pvRecord->getRecordName())
    {
    }
-    epics::pvCopy::PVCopyPtr pvCopy;
+    PVCopyPtr pvCopy;
    PVStructurePtr pvStructure;
    string recordName;
 };
--- a/test/src/testExampleRecord.cpp
+++ b/test/src/testExampleRecord.cpp
@@ -68,6 +68,7 @@ static void test()
        exampleRecord->unlock();
    }
    if(debug) {cout << "processed exampleDouble "  << endl; }
+    exampleRecord->destroy();
    recordName = "powerSupplyExample";
    PowerSupplyPtr psr;
    pvStructure = createPowerSupply();
@@ -126,6 +127,7 @@ static void test()
    testOk1(psr->getVoltage()==1.0);
    testOk1(psr->getPower()==1.0);
    testOk1(psr->getCurrent()==1.0);
+    psr->destroy();
 }

 MAIN(testExampleRecord)
--- a/test/src/testLocalProvider.cpp
+++ b/test/src/testLocalProvider.cpp
@@ -71,6 +71,7 @@ static void test()
        pvRecord->unlock();
    }
    if(debug) {cout << "processed exampleDouble "  << endl; }
+    channelProvider->destroy();
 }

 MAIN(testLocalProvider)
--- a/test/src/testPVAServer.cpp
+++ b/test/src/testPVAServer.cpp
@@ -67,6 +67,7 @@ static void test()
    ServerContext::shared_pointer ctx =
        startPVAServer("local",0,true,true);
    testOk1(ctx.get()!=0);
+    ctx->destroy();
 }

 MAIN(testPVAServer)
--- a/test/src/testPVCopy.cpp
+++ b/test/src/testPVCopy.cpp
@@ -37,7 +37,6 @@ using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvAccess;
-using namespace epics::pvCopy;
 using namespace epics::pvDatabase;

 static bool debug = false;
@@ -282,6 +281,7 @@ static void scalarTest()
    string request;
    PVStructurePtr pvRequest;
    PVCopyPtr pvCopy;
+    string builder;
    string valueNameRecord;
    string valueNameCopy;

@@ -313,6 +313,7 @@ static void scalarTest()
    pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
    valueNameCopy = "value";
    testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
+    pvRecord->destroy();
 }

 static void arrayTest()
@@ -323,6 +324,7 @@ static void arrayTest()
    string request;
    PVStructurePtr pvRequest;
    PVCopyPtr pvCopy;
+    string builder;
    string valueNameRecord;
    string valueNameCopy;

@@ -348,6 +350,7 @@ static void arrayTest()
    pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
    valueNameCopy = "value";
    testPVScalarArray(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
+    pvRecord->destroy();
 }

 static void powerSupplyTest()
@@ -358,6 +361,7 @@ static void powerSupplyTest()
    string request;
    PVStructurePtr pvRequest;
    PVCopyPtr pvCopy;
+    string builder;
    string valueNameRecord;
    string valueNameCopy;

@@ -391,6 +395,7 @@ static void powerSupplyTest()
    pvCopy = PVCopy::create(pvRecord->getPVRecordStructure()->getPVStructure(),pvRequest,"");
    valueNameCopy = "power.value";
    testPVScalar(valueNameRecord,valueNameCopy,pvRecord,pvCopy);
+    pvRecord->destroy();
 }

 MAIN(testPVCopy)
--- a/test/src/testPVRecord.cpp
+++ b/test/src/testPVRecord.cpp
@@ -28,7 +28,7 @@
 #include <pv/standardField.h>
 #include <pv/standardPVField.h>
 #include <pv/pvData.h>
-#include <pv/pvStructureCopy.h>
+#include <pv/pvCopy.h>
 #define epicsExportSharedSymbols
 #include "powerSupply.h"

@@ -37,7 +37,6 @@ using namespace std;
 using std::tr1::static_pointer_cast;
 using namespace epics::pvData;
 using namespace epics::pvDatabase;
-using namespace epics::pvCopy;
 using std::string;

 static bool debug = false;
@@ -70,6 +69,7 @@ static void scalarTest()
    if(pvRecord && debug) {
          cout << pvRecord << endl;
    }
+    pvRecord->destroy();
 }

 static void arrayTest()
@@ -81,6 +81,7 @@ static void arrayTest()
    if(pvRecord && debug) {
          cout << pvRecord << endl;
    }
+    pvRecord->destroy();
 }

 static void powerSupplyTest()
@@ -93,6 +94,7 @@ static void powerSupplyTest()
    if(pvRecord && debug) {
          cout << pvRecord << endl;
    }
+    pvRecord->destroy();
 }

 MAIN(testPVRecord)
--- a/test/src/testPlugin.cpp
+++ b/test/src/testPlugin.cpp
@@ -1,278 +0,0 @@
-/*testPluginMain.cpp */
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * EPICS pvData is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
- */
-/**
- * @author mrk
- */
-
-/* Author: Marty Kraimer */
-#include <epicsUnitTest.h>
-#include <testMain.h>
-
-#include <cstddef>
-#include <cstdlib>
-#include <cstddef>
-#include <string>
-#include <cstdio>
-#include <memory>
-#include <iostream>
-
-#include <epicsStdio.h>
-#include <epicsMutex.h>
-#include <epicsEvent.h>
-#include <epicsThread.h>
-
-#include <pv/standardField.h>
-#include <pv/standardPVField.h>
-#include <pv/channelProviderLocal.h>
-#include <pv/convert.h>
-#include <pv/pvStructureCopy.h>
-#include <pv/pvDatabase.h>
-#define epicsExportSharedSymbols
-#include "powerSupply.h"
-
-
-using namespace std;
-using std::tr1::static_pointer_cast;
-using namespace epics::pvData;
-using namespace epics::pvAccess;
-using namespace epics::pvCopy;
-using namespace epics::pvDatabase;
-
-static bool debug = true;
-
-static void deadbandTest()
-{
-    if(debug) {cout << endl << endl << "****deadbandTest****" << endl;}
-    bool result = false;
-    uint32 nset = 0;
-
-    PVStructurePtr pvRecordStructure(getStandardPVField()->scalar(pvDouble,""));
-    PVRecordPtr pvRecord(PVRecord::create("doubleRecord",pvRecordStructure));
-    PVStructurePtr pvRequest(CreateRequest::create()->createRequest("value[deadband=abs:1.0]"));
-    PVCopyPtr pvCopy(PVCopy::create(pvRecordStructure,pvRequest,""));
-    PVStructurePtr pvStructureCopy(pvCopy->createPVStructure());
-    BitSetPtr bitSet(new BitSet(pvStructureCopy->getNumberFields()));
-    PVDoublePtr pvValue(pvRecordStructure->getSubField<PVDouble>("value"));
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "initial"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << " pvRecordStructure\n" << pvRecordStructure
-             << "\n";
-    }
-    testOk1(result==true);
-    testOk1(nset==1);
-    pvValue->put(.1);
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "after pvValue"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << " pvRecordStructure\n" << pvRecordStructure
-             << "\n";
-    }
-    testOk1(result==false);
-    testOk1(nset==0);
-    pvValue->put(1.0);
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "after pvValue"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << " pvRecordStructure\n" << pvRecordStructure
-             << "\n";
-    }
-    testOk1(result==true);
-    testOk1(nset==1);
-}
-
-static void arrayTest()
-{
-    if(debug) {cout << endl << endl << "****arrayTest****" << endl;}
-    bool result = false;
-    uint32 nset = 0;
-    size_t n = 10;
-    shared_vector<double> values(n);
-    
-    PVStructurePtr pvRecordStructure(getStandardPVField()->scalarArray(pvDouble,""));
-    PVRecordPtr pvRecord(PVRecord::create("doubleArrayRecord",pvRecordStructure));
-    PVStructurePtr pvRequest(CreateRequest::create()->createRequest("value[array=1:3]"));
-    PVCopyPtr pvCopy(PVCopy::create(pvRecordStructure,pvRequest,""));
-    PVStructurePtr pvStructureCopy(pvCopy->createPVStructure());
-    BitSetPtr bitSet(new BitSet(pvStructureCopy->getNumberFields()));
-    PVDoubleArrayPtr pvValue(pvRecordStructure->getSubField<PVDoubleArray>("value"));
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "initial"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << "\n";
-    }
-    testOk1(result==false);
-    testOk1(nset==0);
-    for(size_t i=0; i<n; i++) values[i] = i + .06;
-    const shared_vector<const double> yyy(freeze(values));
-    pvValue->putFrom(yyy);
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "after pvValue"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << " pvRecordStructure\n" << pvRecordStructure
-             << "\n";
-    }
-    testOk1(result==true);
-    testOk1(nset==1);
-}
-
-static void timeStampTest()
-{
-    if(debug) {cout << endl << endl << "****timeStampTest****" << endl;}
-    bool result = false;
-    uint32 nset = 0;
-
-    PVStructurePtr pvRecordStructure(getStandardPVField()->scalar(pvDouble,"timeStamp"));
-    PVRecordPtr pvRecord(PVRecord::create("doubleRecord",pvRecordStructure));
-    PVStructurePtr pvRequest(CreateRequest::create()->createRequest("value,timeStamp[timestamp=current]"));
-    PVCopyPtr pvCopy(PVCopy::create(pvRecordStructure,pvRequest,""));
-    PVStructurePtr pvStructureCopy(pvCopy->createPVStructure());
-    BitSetPtr bitSet(new BitSet(pvStructureCopy->getNumberFields()));
-    PVDoublePtr pvValue(pvRecordStructure->getSubField<PVDouble>("value"));
-    if(debug) {
-        cout << "initial"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << " pvRecordStructure\n" << pvRecordStructure
-             << "\n";
-    }
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "after update"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << " pvRecordStructure\n" << pvRecordStructure
-             << "\n";
-    }
-    testOk1(result==true);
-    testOk1(nset==1);
-    pvRecord->process();
-    pvValue->put(1.0);
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "after pvValue"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << " pvRecordStructure\n" << pvRecordStructure
-             << "\n";
-    }
-    testOk1(result==true);
-    testOk1(nset==2);
-}
-
-static void ignoreTest()
-{
-    if(debug) {cout << endl << endl << "****ignoreTest****" << endl;}
-    bool result = false;
-    uint32 nset = 0;
-
-    PVStructurePtr pvRecordStructure(getStandardPVField()->scalar(pvDouble,"alarm,timeStamp"));
-    PVRecordPtr pvRecord(PVRecord::create("doubleRecord",pvRecordStructure));
-    PVStructurePtr pvRequest(CreateRequest::create()->createRequest("value,alarm[ignore=true],timeStamp[ignore=true]"));
-    PVCopyPtr pvCopy(PVCopy::create(pvRecordStructure,pvRequest,""));
-    PVStructurePtr pvStructureCopy(pvCopy->createPVStructure());
-    BitSetPtr bitSet(new BitSet(pvStructureCopy->getNumberFields()));
-    PVDoublePtr pvValue(pvRecordStructure->getSubField<PVDouble>("value"));
-    PVStringPtr pvMessage(pvRecordStructure->getSubField<PVString>("alarm.message"));
-    PVIntPtr pvUserTag(pvRecordStructure->getSubField<PVInt>("timeStamp.userTag"));
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "initial"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << "\n";
-    }
-    testOk1(result==false);
-    testOk1(nset==0);
-    pvMessage->put("test message");
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "after pvMessage"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << "\n";
-    }
-    testOk1(result==false);
-    testOk1(nset==1);
-    pvUserTag->put(50);
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "after pvMessage"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << "\n";
-    }
-    testOk1(result==false);
-    testOk1(nset==2);
-    pvValue->put(1.0);
-    result = pvCopy->updateCopySetBitSet(pvStructureCopy,bitSet);
-    nset = bitSet->cardinality();
-    if(debug) {
-        cout << "after pvValue"
-             << " result " << (result ? "true" : "false")
-             << " nset " << nset
-             << " bitSet " << *bitSet
-             << " pvStructureCopy\n" << pvStructureCopy
-             << "\n";
-    }
-    testOk1(result==true);
-    testOk1(nset==3);
-}
-
-MAIN(testPlugin)
-{
-    testPlan(22);
-    PVDatabasePtr pvDatabase(PVDatabase::getMaster());
-    deadbandTest();
-    arrayTest();
-    timeStampTest();
-    ignoreTest();
-    return 0;
-}
-
Author	SHA1	Message	Date
Andrew Johnson	4d565a89f0	Update module version and release date for V4.6.0-rc1	2016-08-26 16:36:16 -05:00
Ralph Lange	c4a665ed82	jenkins: fix CloudBees doc job (SourceForge upload)	2016-08-20 21:47:22 +02:00
Andrew Johnson	a96ec158bc	Set cloudbees branches	2016-08-01 13:30:58 -05:00