Reset DEVELOPMENT_FLAG for 7.0.0 release

Most of these changes were only committed on the release branch and
never pulled onto the master branch. Don't want to lose history.

.ci/travis-build.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e -x
+
+# set RTEMS to eg. "4.9" or "4.10"
+# requires qemu, bison, flex, texinfo, install-info
+if [ -n "$RTEMS" ]
+then
+  # find local qemu-system-i386
+  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
+  echo -n "Using QEMU: "
+  type qemu-system-i386 || echo "Missing qemu"
+  EXTRA=RTEMS_QEMU_FIXUPS=YES
+fi
+
+make -j2 $EXTRA
+
+if [ "$TEST" != "NO" ]
+then
+  make tapfiles
+  make -s test-results
+fi

.ci/travis-prepare.sh

@@ -0,0 +1,138 @@
+#!/bin/sh
+set -e -x
+
+CURDIR="$PWD"
+
+QDIR="$HOME/.cache/qemu"
+
+if [ -n "$RTEMS" -a "$TEST" = "YES" ]
+then
+  git clone --quiet --branch vme --depth 10 https://github.com/mdavidsaver/qemu.git "$HOME/.build/qemu"
+  cd "$HOME/.build/qemu"
+
+  HEAD=`git log -n1 --pretty=format:%H`
+  echo "HEAD revision $HEAD"
+
+  [ -e "$HOME/.cache/qemu/built" ] && BUILT=`cat "$HOME/.cache/qemu/built"`
+  echo "Cached revision $BUILT"
+
+  if [ "$HEAD" != "$BUILT" ]
+  then
+    echo "Building QEMU"
+    git submodule --quiet update --init
+
+    install -d "$HOME/.build/qemu/build"
+    cd         "$HOME/.build/qemu/build"
+
+    "$HOME/.build/qemu/configure" --prefix="$HOME/.cache/qemu/usr" --target-list=i386-softmmu --disable-werror
+    make -j2
+    make install
+
+    echo "$HEAD" > "$HOME/.cache/qemu/built"
+  fi
+fi
+
+cd "$CURDIR"
+
+cat << EOF > configure/RELEASE.local
+EPICS_BASE=$HOME/.source/epics-base
+EOF
+
+install -d "$HOME/.source"
+cd "$HOME/.source"
+
+add_base_module() {
+  MODULE=$1
+  BRANCH=$2
+  ( cd epics-base/modules && \
+  git clone --quiet --depth 5 --branch "$MODULE"/"$BRANCH" https://github.com/${REPOBASE:-epics-base}/epics-base.git "$MODULE" && \
+  cd "$MODULE" && git log -n1 )
+}
+
+if [ "$BRBASE" ]
+then
+  git clone --quiet --depth 5 --branch "$BRBASE" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
+  (cd epics-base && git log -n1 )
+else
+  git clone --quiet --depth 5 --branch core/"${BRCORE:-master}" https://github.com/${REPOBASE:-epics-base}/epics-base.git epics-base
+  ( cd epics-base && git log -n1 )
+  add_base_module libcom "${BRLIBCOM:-master}"
+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"
+  install -d /home/travis/.cache
+  curl -L "https://github.com/mdavidsaver/rsb/releases/download/travis-20160306-2/rtems${RTEMS}-i386-trusty-20190306-2.tar.gz" \
+  | tar -C /home/travis/.cache -xj
+
+  sed -i -e '/^RTEMS_VERSION/d' -e '/^RTEMS_BASE/d' epics-base/configure/os/CONFIG_SITE.Common.RTEMS
+  cat << EOF >> epics-base/configure/os/CONFIG_SITE.Common.RTEMS
+RTEMS_VERSION=$RTEMS
+RTEMS_BASE=/home/travis/.cache/rtems${RTEMS}-i386
+EOF
+  cat << EOF >> epics-base/configure/CONFIG_SITE
+CROSS_COMPILER_TARGET_ARCHS+=RTEMS-pc386
+EOF
+
+  # find local qemu-system-i386
+  export PATH="$HOME/.cache/qemu/usr/bin:$PATH"
+  echo -n "Using QEMU: "
+  type qemu-system-i386 || echo "Missing qemu"
+  EXTRA=RTEMS_QEMU_FIXUPS=YES
+fi
+
+make -j2 -C epics-base $EXTRA

.gitignore

@@ -1,15 +1,17 @@
-bin/
-lib/
-doc/
-include/
-db/
-dbd/
-documentation/html
-documentation/*.tag
+/cfg/
+/bin/
+/lib/
+/db/
+/dbd/
+/html/
+/include/
+/templates/
+/configure/*.local
+/configure/RELEASE.*
+/configure/CONFIG_SITE.*
+O.*/
+/QtC-*
 envPaths
-configure/*.local
-configure/RELEASE.*
-configure/CONFIG_SITE.*
-!configure/ExampleRELEASE.local
-**/O.*
-QtC-*
+*.orig
+*.log
+.*.swp

.travis.yml

@@ -0,0 +1,29 @@
+sudo: false
+dist: trusty
+language: c++
+compiler:
+  - gcc
+addons:
+  apt:
+    packages:
+    - libreadline6-dev
+    - libncurses5-dev
+    - perl
+    - clang
+    - g++-mingw-w64-i686
+install:
+ - ./.ci/travis-prepare.sh
+script:
+ - ./.ci/travis-build.sh
+env:
+ - BRCORE=master BRLIBCOM=master
+ - CMPLR=clang
+ - USR_CXXFLAGS=-std=c++11
+ - CMPLR=clang USR_CXXFLAGS=-std=c++11
+ - WINE=32 TEST=NO STATIC=YES
+ - WINE=32 TEST=NO STATIC=NO
+ - RTEMS=4.10 TEST=NO
+ - RTEMS=4.9 TEST=NO
+ - BRBASE=3.16
+ - BRBASE=3.15
+ - BRBASE=3.14

COPYRIGHT

@@ -1,31 +0,0 @@
-This software is in part copyrighted by the various organizations and
-individuals listed below. Permission to use it is set out in the file
-LICENSE that accompanies the software.
-
-In no event shall any copyright holder be liable to any party for
-direct, indirect, special, incidental, or consequential damages arising
-out of the use of this software, its documentation, or any derivatives
-thereof, even if they have been advised of the possibility of such
-damage.
-
-The copyright holders specifically disclaim any warranties, including,
-but not limited to, the implied warranties of merchantability, fitness
-for a particular purpose, and non-infringement. This software is
-provided on an "as is" basis, and the copyright holders have no
-obligation either collectively or individually to provide maintenance,
-support, updates, enhancements, or modifications.
-
-Copyright (c) 2006 - 2015 All rights reserved
-
-Martin R. Kraimer
-The University of Chicago, as Operator of Argonne National Laboratory.
-Deutsches Elektronen-Synchroton, Member of the Helmholtz Association,
-    (DESY), HAMBURG, GERMANY,
-BERLINER SPEICHERRING GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H.
-    (BESSY), BERLIN, GERMANY.
-COSYLAB (Control System Laboratory), Ljubljana, Slovenia.
-Brookhaven Science Associates, as Operator of Brookhaven
-    National Laboratory.
-Diamond Light Source Ltd., Didcot, United Kingdom.
-
-

LICENSE

@@ -1,14 +1,16 @@
+Copyright and License Terms
+---------------------------
 
-Copyright (c) 2006-2015 Martin R. Kraimer
-Copyright (c) 2006 The University of Chicago, as Operator of Argonne
+Copyright (c) 2006-2016 Martin R. Kraimer
+Copyright (c) 2006-2016 UChicago Argonne LLC, as Operator of Argonne
      National Laboratory.
 Copyright (c) 2006 Deutsches Elektronen-Synchrotron,
      Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
-Copyright (c) 2007-2015 Control System Laboratory,
+Copyright (c) 2007-2016 Control System Laboratory,
     (COSYLAB) Ljubljana Slovenia
-Copyright (c) 2010-2015 Brookhaven Science Associates, as Operator of Brookhaven
-    National Laboratory
-Copyright (c) 2011-2015 Diamond Light Source Limited,
+Copyright (c) 2010-2016 Brookhaven Science Associates, as Operator
+    of Brookhaven National Laboratory
+Copyright (c) 2011-2016 Diamond Light Source Limited,
     (DLS) Didcot, United Kingdom
 
 Permission is hereby granted, free of charge, to any person
@@ -34,81 +36,30 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ________________________________________________________________________
 
-This software is in part copyrighted by the University of Chicago (UofC)
+Additional Disclaimers
+----------------------
 
-In no event shall UofC be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-UofC has been advised of the possibility of such damage.
+This software is copyright in part by these institutions:
 
-UofC specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and UofC has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
+  * Brookhaven Science Associates, as Operator of Brookhaven
+    National Laboratory, New York, USA
+  * Control System Laboratory, Ljubljana, Slovenia
+  * Deutsches Elektronen-Synchroton, Member of the Helmholtz
+    Association, Hamburg, Germany
+  * Diamond Light Source Limited, Didcot, United Kingdom
+  * Helmholtz-Zentrum Berlin fuer Materialien und Energie m.b.H.,
+    Berlin, Germany.
+  * UChicage Argonne LLC, as Operator of Argonne National Laboratory,
+    Illinois, USA
 
-________________________________________________________________________
+In no event shall these institutions be liable to any party for direct,
+indirect, special, incidental, or consequential damages arising out of
+the use of this software, its documentation, or any derivatives thereof,
+even if advised of the possibility of such damage.
 
-This software is in part copyrighted by the BERLINER SPEICHERRING
-GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY.
-
-In no event shall BESSY be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-BESSY has been advised of the possibility of such damage.
-
-BESSY specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and BESSY has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
-
-________________________________________________________________________
-
-This software is in part copyrighted by the Deutsches Elektronen-Synchroton,
-    Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
-
-In no event shall DESY be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-DESY has been advised of the possibility of such damage.
-
-DESY specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and DESY has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
-
-______________________________________________________________________
-
-This software is in part copyrighted by the Brookhaven
-    National Laboratory (BNL).
-
-In no event shall BNL be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-BNL has been advised of the possibility of such damage.
-
-BNL specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and BNL has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
-
-________________________________________________________________________
-
-This software is in part copyrighted by Diamond Light Source Limited (DLS)
-
-In no event shall DLS be liable to any party for direct, indirect,
-special, incidental, or consequential damages arising out of the use of
-this software, its documentation, or any derivatives thereof, even if
-DLS has been advised of the possibility of such damage.
-
-DLS specifically disclaims any warranties, including, but not limited
-to, the implied warranties of merchantability, fitness for a particular
-purpose, and non-infringement.  This software is provided on an "as is"
-basis, and DLS has no obligation to provide maintenance, support,
-updates, enhancements, or modifications.
-
-________________________________________________________________________
+These institutions specifically disclaim any warranties, including, but
+not limited to, the implied warranties of merchantability, fitness for a
+particular purpose, and non-infringement. This software is provided on
+an "as is" basis, and these institutions have no obligation to provide
+maintenance, support, updates, enhancements, or modifications.
 

Makefile

@@ -11,4 +11,7 @@ src_DEPEND_DIRS = configure
 DIRS += testApp
 testApp_DEPEND_DIRS = src
 
+DIRS += examples
+examples_DEPEND_DIRS = src
+
 include $(TOP)/configure/RULES_TOP

README.html

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-  <title>EPICS pvData C++</title>
-</head>
-
-<body>
-<h1 style="text-align: center">EPICS pvData C++<br />
-Overview<br />
-2010.08.10</h1>
-CONTENTS 
-<hr />
-
-<h2 style="text-align: center">Introduction</h2>
-<hr />
-
-<p>This project has the begining of the C++ implementation of pvData. The
-following is done:</p>
-<dl>
-  <dt>introspection interfaces</dt>
-    <dd>The introspection interfaces for clients are described.</dd>
-  <dt>introspection implementation</dt>
-    <dd>The following have been implemented: Type, ScalarType, Field,
-    Scalar</dd>
-  <dt>test</dt>
-    <dd>A test of Scalar.</dd>
-  <dt>As mentioned below there are problems with the current
-  implementation.</dt>
-</dl>
-<hr />
-
-<h2 style="text-align: center">Building</h2>
-<hr />
-
-<p>The project is structured as an epics base client application. Edit
-configure/RELEASE so that it references your EPICS base and then just
-type:</p>
-<pre>   make</pre>
-
-<p>At the top. Then execute the test in the bin directory.</p>
-
-<p>pvDataApp has the following sub directories:</p>
-<dl>
-  <dt>pv</dt>
-    <dd>pvData.h has the interface descriptions for client code.</dd>
-  <dt>factory</dt>
-    <dd>FieldCreateFactory.cpp has the current implementation</dd>
-  <dt>test</dt>
-    <dd>Has a test for the current implementation.</dd>
-</dl>
-<hr />
-
-<h2 style="text-align: center">Questions about Classes</h2>
-<hr />
-
-<p>The pure virtual classes defined in pvData.h now work. But there are still
-some things that are not so nice. Amoung these are:</p>
-<ul>
-  <li>In FieldCreateFactory.cpp look for "WHY DO I". It asks why the derived
-    class must also define methods defined in the base class. If it does not
-    then a compilation error occurs. WHY??? </li>
-  <li>The toString methods have an argument of "std::string &amp;buf" instead
-    of "std::string *". Does this seem correct?</li>
-  <li>Can arguments and return descriptions be defined better?</li>
-  <li>Is const present everywhere it should be? Remember that introspection
-    classes are immutable.</li>
-  <li>The code is NOT thread safe. When we decide for sure what thread/lock
-    support to choose I will fix this.</li>
-</ul>
-
-<p>HELP WILL BE GREATLY APPRECIATED. because I am still coming up to speed
-with c++</p>
-<hr />
-
-<h2 style="text-align: center">Garbage Collection</h2>
-<hr />
-<p>Not yet implemented. Lets get class structure correct first.</p>
-</body>
-</html>

README.md

@@ -0,0 +1,57 @@
+pvaDataCPP
+==========
+
+pvDataCPP is a set of data types and utilities that form part of the EPICS V4 project.
+
+
+Further Info
+------------
+
+Consult the documents in the documentation directory, in particular
+
+* pvDataCPP.html
+* RELEASE_NOTES.md
+
+Also see the [EPICS Version 4 website](http://epics-pvdata.sourceforge.net)
+
+Prerequisites
+-------------
+
+The pvDataCPP  requires recent versions of the following software:
+
+1. EPICS Base (v3.14.12.3 or later)
+2. EPICS4 pvCommonCPP (4.1.0 or later)
+
+(pvCommonCPP may not be needed depending on host/compiler.)
+
+
+Building
+--------
+
+Building uses the make utility and the EPICS base build system.
+
+The build system needs the location of the prerequisites, e.g. by placing the
+lines of the form
+
+    PVCOMMON = /home/install/epicsV4/pvCommonCPP
+    EPICS_BASE = /home/install/epics/base
+
+pointing to the locations in a file called RELEASE.local
+in the configure directory or the parent directory of pvDataCPP.
+
+With this in place, to build type make
+
+    make
+
+To perform a clean build type
+
+    make clean uninstall
+
+To run the unit tests type
+
+    make runtests
+
+For more information on the EPICS build system consult the
+[Application Development guide](http://www.aps.anl.gov/epics/base/R3-14/12-docs/AppDevGuide.pdf).
+
+

configure/CONFIG_PVDATA_VERSION

@@ -0,0 +1,4 @@
+EPICS_PVD_MAJOR_VERSION = 7
+EPICS_PVD_MINOR_VERSION = 0
+EPICS_PVD_MAINTENANCE_VERSION = 0
+EPICS_PVD_DEVELOPMENT_FLAG = 0

configure/Makefile

@@ -2,6 +2,8 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
+CFG += CONFIG_PVDATA_VERSION
+
 TARGETS = $(CONFIG_TARGETS)
 CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
 

configure/RELEASE

@@ -1,25 +1,39 @@
-# pvDataCPP RELEASE - Location of external support modules
+# RELEASE - Location of external support modules
 #
-# IF YOU CHANGE this file or any file it includes you must
-# subsequently do a "gnumake rebuild" in the application's
-# top level directory.
+# 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.
 #
-# 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.
+# 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.
 #
 # 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!
 #
-# Create a file RELEASE.local pointing to your PVCOMMON
-# and EPICS_BASE build directories, e.g.
-#   PVCOMMON = /home/install/epicsV4/pvCommonCPP
-#   EPICS_BASE = /home/install/epics/base
+# 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.
 
+# Variables and paths to dependent modules:
+#MODULES = /path/to/modules
+#MYMODULE = $(MODULES)/my-module
+
+# If building the EPICS modules individually, set these:
+#EPICS_LIBCOM = $(MODULES)/libcom-3.17.0
+#EPICS_BASE = $(MODULES)/core-7.0.1
+
+# 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

documentation/.gitignore

@@ -0,0 +1,3 @@
+*.tag
+*.db
+html/

documentation/Makefile

@@ -0,0 +1,13 @@
+all: gen
+
+clean:
+	rm -rf doxygen_sqlite3.db html
+
+gen:
+	doxygen
+
+commit: gen
+	touch html/.nojekyll
+	./commit-gh.sh documentation/html/ html/.nojekyll html/*.* html/search/*.*
+
+.PHONY: all clean gen commit

documentation/RELEASE_NOTES.html

@@ -1,119 +0,0 @@
-<h1>Release 4.1 IN DEVELOPMENT</h1>
-<p>The main changes since release 4.0 are:</p>
-<ul>
-<li>Convert copy methods and equals operators (re)moved</li>
-<li>Convert::copyUnion now always copies between subfields.</li>
-<li>CreateRequest prevents a possible SEGFAULT.</li>
-<li>New stream operators for Field and PVField are provided.</li>
-<li>New method getAs that is like getSubField except that it throws exception</li>
-</ul>
-<h2>Convert copy methods and equals operators</h2>
-<p>Convert copy methods where moved and replaced with methods
-on PVField classes, i.e.</p>
-<pre><code>PVField::copy(const PVField&amp; from)
-</code></pre>
-<p>Methods</p>
-<pre><code>PVField::copyUnchecked(const PVField&amp; from)
-</code></pre>
-<p>where added to allow unchecked copies, to gain performance
-where checked are not needed (anymore).</p>
-<p>In addition:
-- isCompatibleXXX methods were removed in favour of Field::operator==.
-- equals methods were remove in favour of PVField::operator==.
-- operator== methods where moved to pvIntrospect.h and pvData.h</p>
-<h2>Convert::copyUnion</h2>
-<p>Before this method, depending on types for to and from,
-sometimes did a shallow cppy, i. e. just made to shared_ptr for to 
-share the same data as from.
-Now it always copies between the subfield of to and from.</p>
-<h2>CreateRequest change</h2>
-<p>createRequest could cause a SEGFAULT if passed a bad argument.
-This has been changed so the it returns a null pvStructure
-and provies an error.</p>
-<h2>New stream operators</h2>
-<p>New steam operators are available for Field and PVField.
-Before to print a Field (or any extension) or a PVField (or any extension)
-it was necessary to have code like:</p>
-<pre><code> void print(StructureConstPtr struct, PVStructurePtr pv)
- {
-     if(struct) {
-         cout &lt;&lt; *struct &lt;&lt; endl;
-     } else {
-         cout &lt;&lt; "nullptr\n"
-     }
-     if(pv) {
-         cout &lt;&lt; *.struct &lt;&lt; endl;
-     } else {
-         cout &lt;&lt; "nullptr\n"
-     }
- }
-</code></pre>
-<p>Now it can be done as follows:</p>
-<pre><code> void print(StructureConstPtr struct, PVStructurePtr pv)
- {
-     cout &lt;&lt; struct &lt;&lt; endl;
-     cout &lt;&lt; pv &lt;&lt; endl;
- }
-</code></pre>
-<h2>New method getAs that is like getSubField except that it throws exception</h2>
-<p><b>PVStructure</b> has a new template member <b>getAs(const char *name)</b>
-that is like <b>getSubField</b> except that it throws a runtime_error
-instead of returning null.</p>
-<h1>Release 4.0</h1>
-<p>The main changes since release 3.0.2 are:</p>
-<ul>
-<li>array semantics now enforce Copy On Write.</li>
-<li>String no longer defined.</li>
-<li>timeStamp and valueAlarm name changes</li>
-<li>toString replaced by stream I/O </li>
-<li>union is new type.</li>
-<li>copy is new.</li>
-<li>monitorPlugin is new.</li>
-</ul>
-<h2>New Semantics for Arrays</h2>
-<p>PVScalarArray, PVStructureArray, and PVUnionArray all enforce COW (Copy On Write) Semantics.
-In order to limit memory usage the storage for raw data is managed via a new shared_vector facility.
-This allows multiple instances of array data to use the shared raw data.
-COW is implemented via shared_vectors of const data, i. e. data that can not be modified.</p>
-<h2>String no longer defined</h2>
-<p>This is replaced by std::string.</p>
-<h2>timeStamp and valueAlarm name changes</h2>
-<p>In timeStamp nanoSeconds is changed to nanoseconds.</p>
-<p>In valueAlarm hystersis is changed to hysteresis</p>
-<h2>toString replaced by stream I/O</h2>
-<p>pvData.h and pvIntrospect no longer defines toString
-Instead they have stream support.
-pvIntrospect uses method dump and pvData uses dumpValue.
-For example:</p>
-<pre><code>  PVDoublePtr pvValue;
-  String buffer;
-  pvValue-&gt;toString(&amp;buffer);
-  cout &lt;&lt; buffer &lt;&lt; endl;
-  buffer.clear();
-  pvValue-&gt;getField()-&gt;toString(&amp;buffer);
-  cout &lt;&lt; buffer &lt;&lt; evdl;
-</code></pre>
-<p>is replaced by</p>
-<pre><code>  PVDoublePtr pvValue;
-  cout &lt;&lt; *pvValue &lt;&lt; endl
-  cout &lt;&lt; *pvValue-&gt;getField() &lt;&lt; endl;
-</code></pre>
-<h2>union is a new basic type.</h2>
-<p>There are two new basic types: union_t and unionArray.</p>
-<p>A union is like a structure that has a single subfield.
-There are two flavors:</p>
-<ul>
-<li><b>varient union</b> The field can have any type.</li>
-<li><b>union</b> The field can any of specified set of types.</li>
-</ul>
-<p>The field type can be dynamically changed.</p>
-<h2>copy</h2>
-<p>This consists of createRequest and pvCopy.
-createRequest was moved from pvAccess to here.
-pvCopy is moved from pvDatabaseCPP and now depends
-only on pvData, i. e. it no longer has any knowledge of PVRecord.</p>
-<h2>monitorPlugin</h2>
-<p>This is for is for use by code that implements pvAccess monitors.
-This is prototype and is subject to debate.</p>
-<h1>Release 3.0.2</h1>
-<p>This was the starting point for RELEASE_NOTES</p>

documentation/RELEASE_NOTES.md

@@ -1,171 +0,0 @@
-Release 4.1 IN DEVELOPMENT
-===========
-
-The main changes since release 4.0 are:
-
-* Convert copy methods and equals operators (re)moved
-* Convert::copyUnion now always copies between subfields.
-* CreateRequest prevents a possible SEGFAULT.
-* New stream operators for Field and PVField are provided.
-* New method getSubFieldT that is like getSubField except that it throws exception
-
-Convert copy methods and equals operators
------------------------------------------
-
-Convert copy methods where moved and replaced with methods
-on PVField classes, i.e.
-
-    PVField::copy(const PVField& from)
-
-Methods
-
-    PVField::copyUnchecked(const PVField& from)
-
-where added to allow unchecked copies, to gain performance
-where checked are not needed (anymore).
-
-In addition:
-- isCompatibleXXX methods were removed in favour of Field::operator==.
-- equals methods were remove in favour of PVField::operator==.
-- operator== methods where moved to pvIntrospect.h and pvData.h
-
-Convert::copyUnion
------------------
-
-Before this method, depending on types for to and from,
-sometimes did a shallow cppy, i. e. just made to shared_ptr for to 
-share the same data as from.
-Now it always copies between the subfield of to and from.
-
-CreateRequest change
---------------------
-
-createRequest could cause a SEGFAULT if passed a bad argument.
-This has been changed so the it returns a null pvStructure
-and provies an error.
-
-New stream operators
---------------------
-
-New steam operators are available for Field and PVField.
-Before to print a Field (or any extension) or a PVField (or any extension)
-it was necessary to have code like:
-
-     void print(StructureConstPtr struct, PVStructurePtr pv)
-     {
-         if(struct) {
-             cout << *struct << endl;
-         } else {
-             cout << "nullptr\n"
-         }
-         if(pv) {
-             cout << *.struct << endl;
-         } else {
-             cout << "nullptr\n"
-         }
-     }
-
-Now it can be done as follows:
-
-     void print(StructureConstPtr struct, PVStructurePtr pv)
-     {
-         cout << struct << endl;
-         cout << pv << endl;
-     }
-
-New method getSubFieldT that is like getSubField except that it throws exception
---------------------
-
-<b>PVStructure</b> has a new template member <b>getSubFieldT(std::string const &fieldName)</b>
-that is like <b>getSubField</b> except that it throws a runtime_error
-instead of returning null.
-
-Release 4.0
-===========
-
-The main changes since release 3.0.2 are:
-
-* array semantics now enforce Copy On Write.
-* String no longer defined.
-* timeStamp and valueAlarm name changes
-* toString replaced by stream I/O 
-* union is new type.
-* copy is new.
-* monitorPlugin is new.
-
-New Semantics for Arrays
---------
-
-PVScalarArray, PVStructureArray, and PVUnionArray all enforce COW (Copy On Write) Semantics.
-In order to limit memory usage the storage for raw data is managed via a new shared_vector facility.
-This allows multiple instances of array data to use the shared raw data.
-COW is implemented via shared_vectors of const data, i. e. data that can not be modified.
-
-
-String no longer defined
----------
-
-This is replaced by std::string.
-
-
-timeStamp and valueAlarm name changes
---------------
-
-In timeStamp nanoSeconds is changed to nanoseconds.
-
-In valueAlarm hystersis is changed to hysteresis
-
-
-toString replaced by stream I/O
----------
-
-pvData.h and pvIntrospect no longer defines toString
-Instead they have stream support.
-pvIntrospect uses method dump and pvData uses dumpValue.
-For example:
-
-      PVDoublePtr pvValue;
-      String buffer;
-      pvValue->toString(&buffer);
-      cout << buffer << endl;
-      buffer.clear();
-      pvValue->getField()->toString(&buffer);
-      cout << buffer << evdl;
-
-is replaced by
-
-      PVDoublePtr pvValue;
-      cout << *pvValue << endl
-      cout << *pvValue->getField() << endl;
-
-
-union is a new basic type.
-------------
-
-There are two new basic types: union_t and unionArray.
-
-A union is like a structure that has a single subfield.
-There are two flavors:
-
-* <b>varient union</b> The field can have any type.
-* <b>union</b> The field can any of specified set of types.
-
-The field type can be dynamically changed.
-
-copy 
-----
-
-This consists of createRequest and pvCopy.
-createRequest was moved from pvAccess to here.
-pvCopy is moved from pvDatabaseCPP and now depends
-only on pvData, i. e. it no longer has any knowledge of PVRecord.
-
-monitorPlugin
--------------
-
-This is for is for use by code that implements pvAccess monitors.
-This is prototype and is subject to debate.
-
-Release 3.0.2
-==========
-This was the starting point for RELEASE_NOTES

documentation/TODO.html

@@ -1,17 +0,0 @@
-<h1>TODO</h1>
-<h2>printer</h2>
-<p>pv/printer.h is not used.</p>
-<h2>doxygen</h2>
-<p>There is a lot of public code that does not have doxygen tags.</p>
-<h2>postMonitor: PVUnion, PVUnionArray, and PVStructureArray</h2>
-<p>PVUnion, PVUnionArray, and PVStructureArray all have elements
-that are treated like a top level field.</p>
-<p>Currently if a subField of any of these is changed postMonitor is not called for the field itself.</p>
-<p>David asked if this could be changed so that it is called.
-Marty thinks this may not be a good idea.</p>
-<h2>valueAlarm</h2>
-<p>normativeTypes.html describes valueAlarm only for a value field that has type
-double.
-The implementation also supports all the numeric scalar types.</p>
-<h2>monitorPlugin</h2>
-<p>A debate is on-going about what semantics should be.</p>

documentation/TODO.md

@@ -6,28 +6,9 @@ doxygen
 
 There is a lot of public code that does not have doxygen tags.
 
-
-postMonitor: PVUnion, PVUnionArray, and PVStructureArray
---------
-
-PVUnion, PVUnionArray, and PVStructureArray all have elements
-that are treated like a top level field.
-
-Currently if a subField of any of these is changed postMonitor is not called for the field itself.
-
-David asked if this could be changed so that it is called.
-Marty thinks this may not be a good idea.
-
-
 valueAlarm
 ---------
 
 normativeTypes.html describes valueAlarm only for a value field that has type
 double.
 The implementation also supports all the numeric scalar types.
-
-monitorPlugin
--------------
-
-A debate is on-going about what semantics should be.
-

documentation/commit-gh.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+set -e -x
+# Usage: commit-gh <sub-directory-prefix> <files...>
+#
+# Creates a commit containing only the files in the sub-directory provided as an argument
+#
+# Does not disturb the working copy or index
+
+prefix="$1"
+shift
+
+# Commit to this branch
+BRANCH=refs/heads/gh-pages
+
+# Use the main branch description as the gh-pages commit message
+MSG=`git describe --tags --always`
+
+# Scratch space
+TDIR=`mktemp -d -p $PWD`
+
+# Automatic cleanup of scratch space
+trap 'rm -rf $TDIR' INT TERM QUIT EXIT
+
+export GIT_INDEX_FILE="$TDIR/index"
+
+# Add listed files to a new (empty) index
+git update-index --add "$@"
+
+# Write the index into the repo, get tree hash
+TREE=`git write-tree --prefix="$prefix"`
+
+echo "TREE $TREE"
+git cat-file -p $TREE
+
+# Create a commit with our new tree
+# Reference current branch head as parent (if any)
+CMT=`git commit-tree -m "$MSG" $TREE`
+
+echo "COMMIT $CMT"
+git cat-file -p $CMT
+
+# Update the branch with the new commit tree hash
+git update-ref $BRANCH $CMT
+
+echo "Done"

documentation/copyandmonitor.html

@@ -1,679 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
-  <title>EPICS pvDataCPP: copy and monitor</title>
-  <link rel="stylesheet" type="text/css"
-  href="http://epics-pvdata.sourceforge.net/base.css" />
-  <link rel="stylesheet" type="text/css"
-  href="http://epics-pvdata.sourceforge.net/epicsv4.css" />
-  <style type="text/css">
-  /*<![CDATA[*/
-     .about { margin-left: 3em; margin-right: 3em; font-size: .83em}
-     table { margin-left: auto; margin-right: auto }
-     .diagram { text-align: center; margin: 2.5em 0 }
-     span.opt { color: grey }
-     span.nterm { font-style:italic }
-     span.term { font-family:courier }
-     span.user { font-family:courier }
-     span.user:before { content:"<" }
-     span.user:after { content:">" }
-     .nonnorm { font-style:italic }
-     p.ed { color: #AA0000 }
-     span.ed { color: #AA0000 }
-     p.ed.priv { display: inline; }
-     span.ed.priv { display: inline; }
-  /*]]>*/</style>
-  <!-- Script that generates the Table of Contents -->
-  <script type="text/javascript"
-  src="http://epics-pvdata.sourceforge.net/script/tocgen.js">
-  </script>
-</head>
-<body>
-
-
-<div id="toc">
-<h2 class="nocount" style="page-break-before: always">Table of Contents</h2>
-</div>
-<div id="contents" class="contents">
-
-<h2>support for copy and monitor</h2>
-<p><b>copy</b> and <b>monitor</b> are not used in this project.
-They are intended for use by pvAccess and by pvAccess servers.
-They are provided with this project because the code depends only on
-pvData itself.
-</p>
-<p>This document describes C++ specific code.
-<a href="http://epics-pvdata.sourceforge.net/informative/pvRequest.html">
-pvRequest.html</a>
-provides a language independent overview of <b>copy</b> and <b>monitor</b>.
-</p>
-<p>
-<b>NOTE:pvRequest.html</b> must be updated since it is based on an earlier version of pvCopy that
-had knowledge of PVRecord. The C++ version was implemented in pvDatabaseCPP
-and the Java version on pvIOCJava.
-At present only the C++ version of the new API for pvCopy is implemented.
-</p>
-<p>Copy provides:
-<dl>
-   <dt>createRequest</dt>
-     <dd>
-      The Channel create methods in pvAccess all have an argument
-      <b>PVStructure pvRequest</b>.<br />
-      Given an ascii string createRequest creates a PVStructure that provides
-      a pvData representation of the information from the ascii string.
-      It is this structure that can be passed to the channel create methods.<br />
-      The information in a pvRequest selects an arbitrary subset of the
-      fields in a top level structure that resides in the server.
-      In addition options can be specified. Both global and field specific
-      options can be specified.
-      </dd>
-   <dt>pvCopy</dt>
-     <dd>This is a facility used by channel providers.
-     It provides client specific code that manages a copy of an arbitrary
-     subset of the fields in a top level structure that resides in the
-     provider. It also allows provider access to options specified
-     by the client.
-     </dd>
-</dl>
-Monitor provides:
-<dl>
-  <dt>monitor</dt>
-    <dd>This is support code for channel providers that implement channel
-    monitor. It, together with the queue facility, provides support for
-    monitor queues.
-    </dd>
-  <dt>monitorPlugin</dt>
-    <dd>This is support for implementing monitor plugins.
-     A monitor plugin can be developed that has no knowledge
-     of pvAccess but only pvData.
-    </dd>
-</dl>
-</p>
-
-<h2>support for copy</h2>
-<p><b>copy</b> provides the ability to create a structure that has 
-a copy of an arbitrary subset of the fields in an existing top level
-structure. In addition it allows global options and field specific options.
-It has two main components: <b>createRequest</b> and <b>pvCopy</b>.
-Given a string createRequest creates a pvRequest, which is a PVStructure
-that has the format expected by <b>pvCopy</b>.
-</p>
-
-<h3>createRequest</h3>
-<p>This is mainly used by pvAccess clients. Given a request string it creates
-a pvRequest structure that can be passed to the pvAccess create methods.
-In turn pvAccess passes the pvRequest to a local channel provider which 
-then passes it to pvCopy.
-</p>
-<p>The definition of the public members is:</p>
-<pre>
-class CreateRequest {
-...
-     static CreateRequestPtr create();
-     virtual PVStructurePtr createRequest(std::string const &amp;request);
-     std::string getMessage();
-};
-</pre>
-<p>An example of how it is used is:</p>
-<pre>
-CreateRequestPtr createRequest = CreateRequest::create();
-PVStructurePtr pvRequest = createRequest-&gt;createRequest(request);
-if(pvRequest==NULL) {
-    std::string error = createRequest-&gt;getMessage();
-    // take some action
-} else {
-    //success do something
-}
-</pre>
-<h3>pvCopy</h3>
-<p>The definition of the public members is:</p>
-<pre>
-class epicsShareClass PVCopyTraverseMasterCallback
-{
-...
-    virtual void nextMasterPVField(PVFieldPtr const &amp;pvField);
-};
-
-class class epicsShareClass PVCopy
-{
-...
-    static PVCopyPtr create(
-        PVStructurePtr const &amp;pvMaster,
-        PVStructurePtr const &amp;pvRequest,
-        std::string const &amp; structureName);
-    PVStructurePtr getPVMaster();
-    void traverseMaster(PVCopyTraverseMasterCallbackPtr const &amp; callback);
-    StructureConstPtr getStructure();
-    PVStructurePtr createPVStructure();
-    size_t getCopyOffset(PVFieldPtr const  &amp;masterPVField);
-    size_t getCopyOffset(
-        PVStructurePtr const  &amp;masterPVStructure,
-        PVFieldPtr const  &amp;masterPVField);
-     PVFieldPtr getMasterPVField(std::size_t structureOffset);
-     void initCopy(
-        PVStructurePtr const  &amp;copyPVStructure,
-        BitSetPtr const  &amp;bitSet);
-     void updateCopySetBitSet(
-        PVStructurePtr const  &amp;copyPVStructure,
-        BitSetPtr const  &amp;bitSet);
-    void updateCopyFromBitSet(
-        PVStructurePtr const  &amp;copyPVStructure,
-        BitSetPtr const  &amp;bitSet);
-    void updateMaster(
-        PVStructurePtr const  &amp;copyPVStructure,
-        BitSetPtr const  &amp;bitSet);
-    PVStructurePtr getOptions(std::size_t fieldOffset);
-...
-};
-</pre>
-where
-<dl>
-   <dt>PVCopyTraverseMasterCallback::nextMasterPVField</dt>
-     <dd>
-       <b>PVCopyTraverseMasterCallback</b> is a callback which must
-       be implemented by the code that uses pvCopy, normally
-       the channel provider. It has the single method <b>nextMasterPVField</b>
-       <br />
-       <b>nextMasterPVField</b> is called for each field in the master
-       as a result of a call to <b>traverseMaster</b>.
-     </dd>
-   <dt>create</dt>
-      <dd>
-        This is the method for creating a PVCopy instance.<br/>
-        <dl>
-           <dt>pvMaster</dt>
-             <dd>the top level structure managed by the server.</dd>
-          <dt>pvRequest</dt>
-           <dd>selects the set of subfields desired
-         and options for each field.</dd>
-          <dt>structureName</dt>
-            <dd>the name for the top level of any PVStructure created.
-            </dd>
-        </dl>
-      </dd>
-   <dt>getPVMaster</dt>
-      <dd>
-       Gets the top level structure from pvMaster.
-      </dd>
-   <dt>traverseMaster</dt>
-      <dd>
-      Traverse all fields of the top level structure of pvMaster.
-      For each field the callback is called.
-      </dd>
-   <dt>getStructure</dt>
-      <dd>
-       Get the introspection interface for a PVStructure for e copy.
-      </dd>
-   <dt>createPVStructure</dt>
-      <dd>Create a copy instance.
-       Monitors keep a queue of monitor elements.
-     Since each element needs a PVStructure, multiple top level structures
-     will be created.
-      </dd>
-   <dt>getCopyOffset</dt>
-      <dd>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.
-      Two overloaded methods are provided. The first is called if
-      the field of master is not a structure. The second is for
-      subfields of a structure.
-      </dd>
-   <dt>getMasterPVField</dt>
-      <dd>
-       Given a offset in the copy get the corresponding field in pvMaster.
-      </dd>
-   <dt>initCopy</dt>
-      <dd>
-       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.
-       This means that bit set will have the value <b>{0}</b>.
-      </dd>
-   <dt>updateCopySetBitSet</dt>
-      <dd>
-      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.
-      </dd>
-   <dt>updateCopyFromBitSet</dt>
-      <dd>
-       For each set bit in bitSet set the field in copyPVStructure to the value
-      of the corresponding field in pvMaster.
-      </dd>
-   <dt>updateMaster</dt>
-      <dd>
-       For each set bit in bitSet set the field in pvMaster to the value
-      of the corresponding field in copyPVStructure.
-      
-      </dd>
-   <dt>getOptions</dt>
-      <dd>
-       Get the options for the field at the specified offset.
-      A NULL is returned if no options were specified for the field.
-      If options were specified,PVStructurePtr is 
-      a structure with a set of PVString subfields that specify name,value
-      pairs. name is the subField name and value is the subField value.
-      </dd>
-</dl>
-
-
-
-
-<h2>support for monitor</h2>
-<p>This consists of two components:
-<dl>
-   <dt>monitor</dt>
-     <dd>Used by code that implements pvAccess monitors.</dd>
-   <dt>monitorPlugin</dt>
-      <dd>Code that provides special semantics for monitors.</dd>
-</dl>
-</p>
-<h3>monitor</h3>
-<pre>
-class MonitorElement {
-    MonitorElement(PVStructurePtr const &amp; pvStructurePtr);
-    PVStructurePtr pvStructurePtr;
-    BitSetPtr changedBitSet;
-    BitSetPtr overrunBitSet;
-};
-
-class Monitor {
-    virtual Status start() = 0;
-    virtual Status stop() = 0;
-    virtual MonitorElementPtr poll() = 0;
-    virtual void release(MonitorElementPtr const &amp; monitorElement) = 0;
-};
-
-class MonitorRequester : public virtual Requester {
-    virtual void monitorConnect(Status const &amp; status,
-        MonitorPtr const &amp; monitor, StructureConstPtr const &amp; structure) = 0;
-    virtual void monitorEvent(MonitorPtr const &amp; monitor) = 0;
-    virtual void unlisten(MonitorPtr const &amp; monitor) = 0;
-};
-</pre>
-<h4>monitorElement</h4>
-<p><b>MonitorElement</b> holds the data for one element of a monitor queue.
-It has the fields:
-<dl>
-  <dt>pvStructurePtr</dt>
-    <dd>A top level structure with data values at the time the monitors occurs.</dd>
-  <dt>changedBitSet</dt>
-     <dd>Shows which fields have changed since the previous monitor.</dd>
-  <dt>overrunBitSet</dt>
-     <dd>Shows which fields have changed more han once since the previous monitor.</dd>
-</dl>
-</p>
-<h4>monitorElement queue</h4>
-<p>
-A queue of monitor elements must be implemented by any channel provider that implements
-<b>Channel::createMonitor</b>.
-For an example implementation look at pvDatabaseCPP.
-It has the following:
-<pre>
-typedef Queue&lt;MonitorElement&gt; MonitorElementQueue;
-typedef std::tr1::shared_ptr&lt;MonitorElementQueue&gt; MonitorElementQueuePtr;
-
-class MultipleElementQueue :
-    public ElementQueue
-{
-public:
-    POINTER_DEFINITIONS(MultipleElementQueue);
-    virtual ~MultipleElementQueue(){}
-    MultipleElementQueue(
-        MonitorLocalPtr const &amp;monitorLocal,
-        MonitorElementQueuePtr const &amp;queue,
-        size_t nfields);
-    virtual void destroy(){}
-    virtual Status start();
-    virtual Status stop();
-    virtual bool dataChanged();
-    virtual MonitorElementPtr poll();
-    virtual void release(MonitorElementPtr const &amp;monitorElement);
-...
-};
-</pre>
-<h4>Monitor</h4>
-<p><b>Monitor</b> must be implemented by any channel provider that implements
-<b>Channel::createMonitor</b>.
-Remote PVAccess also implements Monitor on the client side.
-Note that each client has it's own queue that is not shared with other client.
-</p>
-<p>Monitor has the following methods:</p>
-<dl>
-   <dt>start</dt>
-     <dd>
-      Start monitoring.
-      This will result in a an initial monitor that has the current value
-      of all fields.
-     </dd>
-   <dt>stop</dt>
-     <dd>
-      Stop monitoring.
-     </dd>
-   <dt>poll</dt>
-     <dd>
-      Called to get a monitor element.
-      If no new elements are available then a null pointer is returned.
-     </dd>
-   <dt>release</dt>
-     <dd>
-      Release the monitor element.
-      The caller owns the monitor element between the calls to poll and release.
-     </dd>
-<dl>
-</dl>
-<h4>MonitorRequester</h4>
-<p>This must be implemented by a pvAccess client.
-It has the methods:</p>
-<dl>
-  <dt>monitorConnect</dt>
-     <dd>
-      A monitor has either connected of disconnected.
-     </dd>
-  <dt>monitorEvent</dt>
-     <dd>
-      A new monitor element is available.
-     </dd>
-  <dt>unlisten</dt>
-     <dd>
-      The channel is going away. The client cam no longer access the monitor.
-     </dd>
-</dl>
-
-<h3>monitorPlugin</h3>
-<pre>
-class MonitorPlugin
-{
-    virtual std::string const &amp; getName() = 0;
-    virtual bool causeMonitor(
-        PVFieldPtr const &amp;pvField,
-        PVStructurePtr const &amp;pvTop,
-        MonitorElementPtr const &amp;monitorElement) = 0;
-    virtual void monitorDone(
-        MonitorElementPtr const &amp;monitorElement);
-    virtual void startMonitoring();
-    virtual void stopMonitoring();
-    virtual void beginGroupPut();
-    virtual void endGroupPut();
-};
-
-class MonitorPluginCreator
-{
-    virtual MonitorPluginPtr create(
-        FieldConstPtr const &amp;field,
-        StructureConstPtr const &amp;top,
-        PVStructurePtr const &amp;pvFieldOptions) = 0;
-     virtual std::string const &amp; getName() = 0;
-}
-
-class MonitorPluginManager
-{
-    static MonitorPluginManagerPtr get();
-    bool addPlugin(
-         std::string const &amp;pluginName,
-         MonitorPluginCreatorPtr const &amp;creator);
-    MonitorPluginCreatorPtr findPlugin(std::string const &amp;pluginName);
-    void showNames();
-};
-
-</pre>
-<h4>MonitorPlugin</h4>
-<p><b>MonitorPlugin</b> must be implemented by the plugin implementation.
-It has methods:</p>
-<dl>
-   <dt>getName</dt>
-     <dd>Get the name of the plugin.</dd>
-   <dt>causeMonitor</dt>
-     <dd>
-       Should the value of pvField cause a monitor to be raised.
-       pvField and pvTop are fields in the top level structure
-       being monitored. monitorElement has the top level structure
-       for the copy</b>.
-       The implementation should <b>not</b> modify the fields in the structure
-        being monitored.
-        Called with pvTop locked.
-     </dd>
-   <dt>monitorDone</dt>
-     <dd>
-       Called just before monitorElement will be given to client.
-       The plugin can change the data values and bitSets in monitorElement.
-        Called with pvTop unlocked.
-    </dd>
-   <dt>startMonitoring</dt>
-     <dd>
-      Monitoring is starting.
-     </dd>
-   <dt>stopMonitoring</dt>
-     <dd>
-      Monitoring is being stopped.
-     </dd>
-   <dt>beginGroupPut</dt>
-     <dd>
-      A set of puts is starting.
-        Called with pvTop locked.
-     </dd>
-   <dt>endGroupPut</dt>
-     <dd>
-      The set of puts is complete.
-        Called with pvTop locked.
-     </dd>
-</dl>
-<h4>MonitorPluginCreator</h4>
-<p><b>MonitorPluginCreator</b> must also be implemented by the plugin implementation.
-It is called for each field instance that has options of the from
-<b>[plugin=name...]</b> where <b>name</b> is the name of the plugin.
-Note that a plugin instance will belong to a single client.
-It has methods:</p>
-<dl>
-   <dt>getName</dt>
-     <dd>Get the name of the plugin.</dd>
-   <dt>create</dt>
-     <dd>
-     Create a new plugin instance.
-     If the arguments are not compatible with the plugin a NULL shared pointer is
-     returned.<br/>
-    pvFieldOptions is
-      a structure with a set of PVString subfields that specify <b>name,value</b>
-      pairs. name is the subField name and value is the subField value.<br/>
-     Note that a plugin will below to a single client.
-    </dd>
-<dl>
-<h4>MonitorPluginManager</h4>
-<p><b>MonitorPluginManager</b> has the methods:</p>
-<dl>
-   <dt>get</dt>
-     <dd>
-     MonitorPluginManager is a singleton.
-     The first call to get will create the single instance.
-     Further calls will return the single instance.
-     </dd>
-   <dt>addPlugin</dt>
-     <dd>
-     Add a new plugin.
-     </dd>
-   <dt>findPlugin</dt>
-     <dd>
-      Find a plugin. A NULL shared pointer is returned if it has not been added.
-     </dd>
-   <dt>showNames</dt>
-     <dd>
-      Show the names of all plugins that have been added.
-     </dd>
-</dl>
-<p><b>NOTE:</b>
-Should the method <b>causeMonitor</b> 
-have arguments <b>pvField</b> and <b>pvTop</b>
-be defined so that they can not be modified.
-This would be possible if the following was defined:
-<pre>
-typedef std::tr1::shared_ptr&lt;const PVField&gt; PVFieldConstPtr;
-typedef std::tr1::shared_ptr&lt;const PVStructure&gt; PVStructureConstPtr;
-</pre>
-then the definition for causeMonitor could be:
-<pre>
-virtual bool causeMonitor(
-        PVFieldConstPtr const &amp;pvField,
-        PVStructureConstPtr const &amp;pvTop,
-        MonitorElementPtr const &amp;monitorElement) = 0;
-</pre>
-But just adding these definitions is not sufficient.
-In addition all methods defined in pvDataCPP must be checked.
-In particular many of the methods in <b>Convert</b> must have
-their arguments modified.
-Big job.
-</p>
-<h2>monitorPlugin example</h2>
-<h3>Example Plugin Overview</h3>
-<p>This section describes an example plugin that:</p>
-<ul>
-   <li>Only raises monitors when a field changes value.<br />
-     If no plugin is provided
-     the default is to raise a monitor when a put is issued to a field.</li>
-   <li>Optionally a change will not raise a monitor.<br />
-     The change will, however,
-     appear if a put to another field raise a monitor.</li>
-</ul>
-<p>As an example assume that a channel provided by pvAccess has a top level structure
-that represents a power supply.</p>
-<pre>
-structure powerSupply
-    structure alarm
-    structure timeStamp
-    structure power
-       double value
-       structure alarm
-       structure display
-    structure voltage
-       double value
-       structure alarm
-       structure display
-    structure current
-       double value
-       structure alarm
-       structure display
-</pre>
-<p>A pvAccess client wants to create a monitor on the powerSupply as follows:
-The client wants a top level structure that looks like:
-<pre>
-structure powerSupply
-    structure alarm
-    structure timeStamp
-    structure power
-       double value
-    structure voltage
-       double value
-    structure current
-       double value
-</pre>
-In addition the client wants monitors to occur only when one of the monitored
-fields changes value but not just because a put occured.
-Also if only the timeStamp changes value then that should not cause a monitor.
-</p>
-<p>The example monitor plugin implements the semantics the
-client wants. It can be attached to any field via the following options:
-<pre>
-[plugin=onChange,raiseMonitor=value]
-</pre>
-This plugin will trigger a monitor for the field only if the field changes
-value. In addition <b>value</b> equals <b>false</b> means do not raise a monitor
-for changes to this field.
-But if a change to another field does cause a monitor the change to this field
-will be passed to the client.
-</p>
-<p>
-Assume that the client has already connected to the channel.
-The client can then issue the commands:</p>
-<pre>
-std::string request("field(alarm[plugin=onChange]");
-request += ",timeStamp[plugin=onChange,raiseMonitor=false]";
-request += ",power.value[plugin=onChange";
-request += ",voltage.value[plugin=onChange";
-request += ",current.value[plugin=onChange";
-
-PVStructurePtr pvRequest = createRequest-&gt;createRequest(request);
-
-MonitorPtr monitor = channel-&gt;createMonitor(monitorRequester,pvRequest);
-</pre>
-<h3>Example Plugin Code</h3>
-<p>The header file to create the example has the definition:</p>
-<pre>
-class ExampleMonitorPlugin{
-public:
-    static void create();
-};
-</pre>
-<p>The implementation is:</p>
-<pre>
-class OnChangePlugin : public MonitorPlugin
-{
-public:
-    virtual ~OnChangePlugin(){}
-    OnChangePlugin() {}
-    bool init(
-        FieldConstPtr const &amp;field,
-        StructureConstPtr const &amp;top,
-        PVStructurePtr const &amp;pvFieldOptions)
-   {
-        pvField = getPVDataCreate()-&gt;createPVField(field);
-        raiseMonitor = true;
-        if(pvFieldOptions!=NULL) {
-            PVStringPtr pvString =
-                pvFieldOptions-&gt;getSubField&lt;PVString&gt;("raiseMonitor");
-                if(pvString!=NULL) {
-                    std::string value = pvString-&gt;get();
-                    if(value.compare("false")==0) raiseMonitor = false;
-                }
-        }
-        return true;
-   }
-   virtual std::string &amp;getName(){return pluginName;}
-   virtual bool causeMonitor(
-        PVFieldPtr const &amp;pvNew,
-        PVStructurePtr const &amp;pvTop,
-        MonitorElementPtr const &amp;monitorElement)
-   {
-       bool isSame = convert-&gt;equals(pvNew,pvField);
-       if(isSame) return false;
-       convert-&gt;copy(pvNew,pvField);
-       return raiseMonitor;
-   }
-private:
-   PVFieldPtr pvField;
-   bool raiseMonitor;
-};
-class OnChangePluginCreator : public MonitorPluginCreator
-{
-public:
-    virtual std::string &amp;getName(){return pluginName;}
-    virtual MonitorPluginPtr create(
-        FieldConstPtr const &amp;field,
-        StructureConstPtr const &amp;top,
-        PVStructurePtr const &amp;pvFieldOptions)
-   {
-       OnChangePluginPtr plugin(new OnChangePlugin());
-       bool result = plugin-&gt;init(field,top,pvFieldOptions);
-       if(!result) return MonitorPluginPtr();
-       return plugin;
-   }
-
-};
-
-void ExampleMonitorPlugin::create()
-{
-    static OnChangePluginCreatorPtr plugin;
-    static Mutex mutex;
-    Lock xx(mutex);
-    if(plugin==NULL) {
-        plugin = OnChangePluginCreatorPtr(new OnChangePluginCreator());
-        MonitorPluginManager::get()-&gt;addPlugin(pluginName,plugin);
-    }
-}
-</pre>
-
-
-</div>
-</body>
-</html>

documentation/mainpage.h

@@ -0,0 +1,58 @@
+#ifndef MAINPAGE_H
+#define MAINPAGE_H
+/**
+@mainpage pvDataCPP documentation
+
+- [Download](https://sourceforge.net/projects/epics-pvdata/files/)
+- @htmlonly <a href="modules.html">API components</a> @endhtmlonly
+- @ref release_notes
+
+The epics::pvData namespace.
+See pv/pvData.h header.
+
+@code
+#include <pv/pvData.h>
+#include <pv/createRequest.h>
+@endcode
+
+- Type description epics::pvData::Field and sub-classes
+- Value container epics::pvData::PVField and sub-classes
+- POD array handling epics::pvData::shared_vector
+- pvRequest parsing epics::pvData::createRequest()
+
+Define a structure type and create a container with default values.
+
+@code
+epics::pvData::StructureConstPtr stype; // aka std::tr1::shared_ptr<const epics::pvData::Structure>
+stype = epics::pvData::getFieldCreate()->createFieldBuilder()
+                        ->add("fld1", epics::pvData::pvInt)
+                        ->addNestedStructure("sub")
+                            ->add("fld2", epics::pvData::pvString)
+                        ->endNested()
+                        ->createStructure();
+
+epics::pvData::PVStructuretPtr value; // aka std::tr1::shared_ptr<epics::pvData::PVStructure>
+value = epics::pvData::getPVDataCreate()->createPVStructure(stype);
+
+value->getSubField<epics::pvData::PVInt>("fld1")->put(4); // store integer 4
+value->getSubField<epics::pvData::PVScalar>("sub.fld2")->putFrom(4.2); // convert and store string "4.2"
+@endcode
+
+is equivalent to the following pseudo-code.
+
+@code
+struct stype {
+    epics::pvData::int32 fld1;
+    struct {
+        std::string fld2;
+    } sub;
+};
+stype value;
+value.fld1 = 4;
+value.fld2 = epics::pvData::castUnsafe<std::string>(4.2);
+@endcode
+
+*/
+
+#endif /* MAINPAGE_H */
+

documentation/pvDataCPPCookbook.txt

@@ -1,179 +0,0 @@
-pvDataCPP cookbook
-------------------
-
-
-Creating introspection data interfaces
-
-// create a scalar
-getFieldCreate()->createScalar(pvDouble);
-
-// create a scalar array
-getFieldCreate()->createScalarArray(pvDouble);
-
-// create a structure
-getFieldCreate()->createFieldBuilder()->
-    setId("enum_t")->
-    add("index", pvDouble)->
-    addArray("choices", pvString)->
-    createStructure();
-
-// create a structure (cntd.)
-StructureConstPtr enum_t = 
-    getFieldCreate()->createFieldBuilder()->
-        setId("enum_t")->
-        add("index", pvInt)->
-        addArray("choices", pvString)->
-        createStructure();
-
-// create a structure (cntd.)
-StructureConstPtr ntEnum = 
-    getFieldCreate()->createFieldBuilder()->
-        setId("epics:nt/NTEnum:1.0")->
-        add("value", enum_t)->
-        addNestedStructure("timeStamp")->
-            setId("time_t")->
-            add("secondsPastEpoch", pvLong)->
-            add("nanoseconds", pvInt)->
-            add("userTag", pvInt)->
-            endNested()->
-        createStructure();
-
-// create an union == same as structure
-
----
-
-Creating data containers
-
-// create a scalar
-PVDouble::shared_pointer doubleValue = getPVDataCreate()->createPVScalar<PVDouble>();
-
-// create a scalar array
-PVDoubleArray::shared_pointer doubleArrayValue = getPVDataCreate()->createPVScalarArray<PVDouble>();
-
-// create a structure 
-PVStructure::shared_pointer struct = getPVDataCreate()->createPVStructure(ntEnum);
-
-// create an union
-PVUnion::shared_pointer pvUnion = getPVDataCreate()->createPVUnion(unionIF);
-
-// create a structure array
-PVStructureArray::shared_pointer structArray = getPVDataCreate()->createPVStructureArray(ntEnum);
-
-
-// scalar usage
-PVInt::shared_pointer index = struct->getSubField<PVInt>("value.index");
-int32 ix = index->get();
-index->put(3);
-std::cout << *index << std::endl;
-
-
-// using <<=, >>= operators to get/set
-*doubleValue <<= 12.3;
-
-double val;
-*doubleValue >>= val;
-
-
-
-// array usage
-PVStringArray::shared_pointer choices = struct->getSubField<PVStringArray>("value.choices");
-
-// use view() to access read-only data
-PVStringArray::const_svector data(choices->view());
-for (std::size_t i = 0; i < data.size(); i++)
-    std::cout << data[i] << std::endl;
-    
-// use replace() to put new data
-PVStringArray::svector newdata;
-newdata.push_back("zero");
-newdata.push_back("one");
-newdata.push_back("two");
-choices->replace(freeze(newdata));
-
-// (add more use-cases) here
-
-// print entire array
-std::cout << *choices << std::endl;
-
-// print elmenet at index == 1
-std::cout << format::array_at(1) << *choices << std::endl;
-
-----
-
-Union handling
-
-
-Union::const_shared_pointer punion =
-    getFieldCreate()->createFieldBuilder()->
-        add("doubleValue", pvDouble)->
-        add("intValue", pvInt)->
-        createUnion();
-                            
-PVUnion::shared_pointer u = getPVDataCreate()->createPVUnion(punion);
-
-// select and put
-// this create a new instance of PVDouble (everytime select() is called)
-PVDouble::shared_pointer doubleValue = u->select<PVDouble>("doubleValue");
-doubeValue->put(12);
-// select using index (and direct put)
-u->select<PVDouble>(0)->put(12);
-// select using existing PVField (PVUnion stores by-reference)
-u->set("doubleValue", doubleValue);
-
-// get selected field name or index
-std::string selectedFN = u->getSelectedFieldName();
-int32 selectedIndex = u->getSelectedIndex();
-
-// get currently selected (knowing it's PVDouble)
-PVDouble value = u->get<PVDouble>();
-
-
-
-Variant Union handling
-
-
-PVUnion::shared_pointer any = getPVDataCreate()->createPVVariantUnion();
-
-PVDouble::shared_pointer doubleValue = getPVDataCreate()->createPVScalar<PVDouble>();
-doubleValue->put(12.8);
-any->set(doubleValue);
-
-PVDouble::shared_pointer doubleValue2 = any->get<PVDouble>();
-
-// variant union work by-reference (pointers match also)
-// doubleValue.get() == doubleValue2.get()
-
-
-
-------
-
-Convert
-
-
-// convert to int
-int32 i = doubleValue->getAs<int32>();
-
-// from int
-doubleValue->putFrom<int32>(i);
-
-// from string
-doubleValue->putFrom<std::string>("12.3");
-
-// from scalar field
-doubleValue->assign(pvScalar);
-
-
-
-// convert to int array
-PVIntArray::const_svector intData;
-doubleArrayValue->getAs<int32>(intData);
-
-// from string array
-PVStringArray::svector labels;
-labels.push_back("zero");
-labels.push_back("one");
-labels.push_back("two");
-doubleArrayValue->putFrom<std::string>(labels);
-
-// from scalar array 
-doubleArrayValue->assign(pvScalarArray);

documentation/release_notes.h

@@ -0,0 +1,378 @@
+/**
+
+@page release_notes Release Notes
+
+Release 7.0 (XYZ 2017)
+======================
+
+- Removals
+ - Remove requester.h, monitor.h, and destroyable.h..  Migrated to the pvAccessCPP module.
+ - Previously deprecated monitorPlugin.h is removed.
+ - Remove pv/messageQueue.h and epics::pvData::MessageQueue
+- Deprecate the following utility classes, to be removed in 8.0.
+ - epics::pvData::Queue
+ - epics::pvData::Executor
+ - epics::pvData::TimeFunction
+- Additions
+ - Add pv/pvdVersion.h which is included by pv/pvIntrospect.h
+ - Add epics::pvData::createRequest() function.  Alternative to epics::pvData::CreateRequest class which throws on error.
+ - epics::pvData::FieldBuilder allow Structure defintion to be changed/appended
+ - Add epics::pvData::ValueBuilder like FieldBuilder also sets initial values.
+  - Can also be constructed using an existing PVStructure to allow "editing".
+ - Add debugPtr.h wrapper with reference tracking to assist in troubleshooting shared_ptr related ref. loops.
+ - Add @ref pvjson utilities
+
+
+Release 6.0.1
+=============
+
+The changes since release 6.0.0 are:
+
+* Fix "Problem building pvDataCPP for win32-x86-mingw" (issue #42)
+* In src/misc/bitSet.cpp #include "algorithm" required for MSVS 2015
+* In testApp/misc/testTypeCast.cpp print (u)int8 values as integers
+* Minor documentation updates
+
+
+Release 6.0.0 (Aug. 2016)
+=======================
+
+The main changes since release 5.0.4 are:
+
+* Linux shared library version added
+* Headers have been moved into pv directories
+* Bitset functions declared const where possible
+* Bitset::swap added
+* Requester::message has default implementation
+* Serialization/deserialization helpers added
+* Non-template getSubField char* overload added
+* MonitorPlugin deprecated
+* Field name validation performed
+* Now builds for Cygwin and MinGW targets
+* Fix for debug build issue.
+* New license file replaces LICENSE and COPYRIGHT
+
+Shared library version added
+----------------------------
+
+Linux shared library version numbers have been added by setting SHRLIB_VERSION
+(to 6.0 in this case). So shared object will be libpvData.so.6.0 instead of
+libpvData.so.
+
+Headers have been moved into pv directories
+-------------------------------------------
+
+E.g. src/property/alarm.h -> src/property/pv/alarm.h
+
+This facilitates using some IDEs such as Qt Creator.
+
+Requester::message has default implementation
+---------------------------------------------
+
+Requester::message is no longer pure virtual. Default implementation sends
+string to std::cerr.
+
+Serialization/deserialization helpers added
+-------------------------------------------
+
+A helper function, serializeToVector, has been added which serializes a
+Serializable object into a standard vector of UInt8s.
+
+Similarly a function deserializeFromVector deserializes a standard vector into
+a Deserializable object.
+
+A function deserializeFromBuffer deserializes a ByteBuffer into a
+Deserializable object.
+
+Field name validation performed
+-------------------------------
+
+On creating a Structure or Union the field names are now validated.
+
+Valid characters for a field name are upper or lowercase letters, numbers and
+underscores and intial numbers are invalid, i.e. names must be of the form
+[A-Za-z_][A-Za-z0-9_]*.
+
+Now builds for Cygwin and MinGW targets
+---------------------------------------
+
+Includes cross-compiling MinGW on Linux.
+
+
+Release 5.0.4
+=============
+
+The changes since release 5.0.3 are:
+
+* Fixed bitset serialization (issue #24)
+* Fixed truncation in BitSet::or_and (issue #27)
+
+Fixed bitset serialization (issue #24)
+--------------------------------------
+
+C++ bitset serialization was not consistent with the C++ deserialization and
+Java code in some instances (depending on the endianness of the serializer and
+deserializer) when the number of bits was 56-63 modulo 64. C++ serialization
+has been fixed.
+
+Fix exposed issue in deserialization on 32-bit platforms which
+has also been corrected.
+
+Fixed truncation in BitSet::or_and (issue #27)
+----------------------------------------------
+
+If n, n1 and n2 words are used to store the values of the bitsets bitset,
+bitset1 and bitset2 respectively then max(n, min(n1,n2)) words are needed
+to store bitset.or_(bitset1, bitset2).
+
+Previously min(n1,n2) words were used and the result would be truncated in
+some instances. This has been fixed.
+
+
+Release 5.0.3
+=============
+
+The only change since release 5.0.2 is:
+
+Fixed buffer overflow in PVUnion::serialize() (issue #20)
+---------------------------------------------------------
+
+A PVUnion whose stored value was null was serialized without checking
+whether the buffer had sufficient capacity. This has been fixed by calling
+ensureBuffer().
+
+
+Release 5.0.2 (Sep. 2015)
+=========================
+
+The main changes since release 4.0 are:
+
+- Deprecated getXXXField() methods have been removed from PVStructure
+- Convert copy methods and equals operators (re)moved
+- Convert::copyUnion now always copies between subfields.
+- New method getSubFieldT, like getSubField except it throws an exception
+- findSubField method removed from PVStructure
+- New stream operators for Field and PVField are provided
+- New template versions of Structure::getField
+- Fixes for static initialisation order issues
+- CreateRequest prevents a possible SEGFAULT
+
+
+Deprecated getXXXField methods have been removed from PVStructure
+-------------------------------------------------------------------
+
+The following methods have been removed from PVStructure
+
+- getBooleanField
+- getByteField, getShortField, getIntField, getLongField
+- getUByteField, getUShortField, getUIntField, getULongField
+- getStringField
+- getStructureField, getUnionField
+- getScalarArrayField, getStructureArrayField, getUnionArrayField
+
+Use template getSubField instead, e.g. use
+
+    getSubField< PVInt >(fieldName)
+
+in place of
+
+    getIntField(fieldName)
+
+
+Convert copy methods and equals operators
+-----------------------------------------
+
+Convert copy methods where moved and replaced with methods
+on PVField classes, i.e.
+
+    PVField::copy(const PVField& from)
+
+Methods
+
+    PVField::copyUnchecked(const PVField& from)
+
+were added to allow unchecked copies, to gain performance
+where checked are not needed (anymore).
+
+In addition:
+- isCompatibleXXX methods were removed in favour of Field::operator==.
+- equals methods were remove in favour of PVField::operator==.
+- operator== methods where moved to pvIntrospect.h and pvData.h
+
+
+Convert::copyUnion
+-----------------
+
+Before this method, depending on types for to and from,
+sometimes did a shallow copy, i.e. just made to shared_ptr for to 
+share the same data as from.
+Now it always copies between the subfield of to and from.
+
+
+New method getSubFieldT, like getSubField except it throws an exception
+--------------------
+
+PVStructure has a new template member
+
+    getSubFieldT(std::string const &fieldName)
+
+that is like `getSubField()` except that it throws a runtime_error
+instead of returning null.
+
+
+findSubField method removed from PVStructure
+--------------------------------------------
+
+This was mainly used in the implementation of getSubField. With a change to
+the latter, findSubField was removed.
+
+
+New stream operators
+--------------------
+
+New steam operators are available for Field and PVField.
+Before to print a Field (or any extension) or a PVField (or any extension)
+it was necessary to have code like:
+
+     void print(StructureConstPtr struc, PVStructurePtr pv)
+     {
+         if(struc) {
+             cout << *struc << endl;
+         } else {
+             cout << "nullptr\n"
+         }
+         if(pv) {
+             cout << *.struc << endl;
+         } else {
+             cout << "nullptr\n"
+         }
+     }
+
+Now it can be done as follows:
+
+     void print(StructureConstPtr struc, PVStructurePtr pv)
+     {
+         cout << struc << endl;
+         cout << pv << endl;
+     }
+
+
+New template version of Structure::getField
+--------------------------------------------
+
+A new template getField method has been added to Structure
+
+    template<typename FT >
+    std::tr1::shared_ptr< const FT > getField(std::string const &fieldName) const
+
+Can be used, for example, as follows:
+
+    StructurePtr tsStruc = struc->getField<Structure>("timeStamp");
+
+
+Fixes for static initialisation order issues
+--------------------------------------------
+
+Certain static builds (in particular Windows builds) of applications using
+pvData had issues due to PVStructure::DEFAULT_ID being used before being initialised. This has been fixed.
+
+
+CreateRequest change
+--------------------
+
+createRequest could cause a SEGFAULT if passed a bad argument.
+This has been changed so the it returns a null pvStructure
+and provides an error.
+
+
+Release 4.0.3
+=============
+
+The main changes since release 3.0.2 are:
+
+- array semantics now enforce Copy On Write.
+- String no longer defined.
+- timeStamp and valueAlarm name changes
+- toString replaced by stream I/O 
+- union is new type.
+- copy is new.
+- monitorPlugin is new.
+
+New Semantics for Arrays
+--------
+
+PVScalarArray, PVStructureArray, and PVUnionArray all enforce COW (Copy On Write) Semantics.
+In order to limit memory usage the storage for raw data is managed via a new shared_vector facility.
+This allows multiple instances of array data to use the shared raw data.
+COW is implemented via shared_vectors of const data, i. e. data that can not be modified.
+
+
+String no longer defined
+---------
+
+This is replaced by std::string.
+
+
+timeStamp and valueAlarm name changes
+--------------
+
+In timeStamp nanoSeconds is changed to nanoseconds.
+
+In valueAlarm hysteresis is changed to hysteresis
+
+
+toString replaced by stream I/O
+---------
+
+pvData.h and pvIntrospect no longer defines toString
+Instead they have stream support.
+pvIntrospect uses method dump and pvData uses dumpValue.
+For example:
+
+      PVDoublePtr pvValue;
+      String buffer;
+      pvValue->toString(&buffer);
+      cout << buffer << endl;
+      buffer.clear();
+      pvValue->getField()->toString(&buffer);
+      cout << buffer << evdl;
+
+is replaced by
+
+      PVDoublePtr pvValue;
+      cout << *pvValue << endl
+      cout << *pvValue->getField() << endl;
+
+
+union is a new basic type.
+------------
+
+There are two new basic types: union_t and unionArray.
+
+A union is like a structure that has a single subfield.
+There are two flavors:
+
+- *variant union* The field can have any type.
+- *union* The field can any of specified set of types.
+
+The field type can be dynamically changed.
+
+copy 
+----
+
+This consists of createRequest and pvCopy.
+createRequest was moved from pvAccess to here.
+pvCopy is moved from pvDatabaseCPP and now depends
+only on pvData, i.e. it no longer has any knowledge of PVRecord.
+
+monitorPlugin
+-------------
+
+This is for is for use by code that implements pvAccess monitors.
+This is prototype and is subject to debate.
+
+Release 3.0.2
+==========
+This was the starting point for RELEASE_NOTES
+
+*/

examples/Makefile

@@ -0,0 +1,14 @@
+# Makefile for the examples
+# make sure they compile
+
+TOP = ..
+include $(TOP)/configure/CONFIG
+
+PROD_LIBS += pvData Com
+
+TESTPROD_HOST += unittest
+unittest_SRCS += unittest.cpp
+
+include $(TOP)/configure/RULES
+
+

examples/unittest.cpp

@@ -0,0 +1,30 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+/* c++ unittest skeleton */
+
+#include <stdexcept>
+
+#include <testMain.h>
+
+#include <pv/pvUnitTest.h>
+#include <pv/epicsException.h>
+
+namespace {
+void testCase1() {
+    testEqual(1+1, 2);
+}
+} // namespace
+
+MAIN(testUnitTest)
+{
+    testPlan(1);
+    try {
+        testCase1();
+    }catch(std::exception& e){
+        PRINT_EXCEPTION(e); // print stack trace if thrown with THROW_EXCEPTION()
+        testAbort("Unhandled exception: %s", e.what());
+    }
+    return testDone();
+}

jenkins/cloudbees_build

@@ -6,16 +6,30 @@
 #
 # Author: Ralph Lange <ralph.lange@gmx.de>
 # Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-# Copyright (C) 2014-2015 ITER Organization.
+# Copyright (C) 2014-2016 ITER Organization.
 # All rights reserved. Use is subject to license terms.
 
+installTool () {
+    local module=$1
+    local version=$2
+
+    wget -nv https://openepics.ci.cloudbees.com/job/${module}-${version}_Build/lastSuccessfulBuild/artifact/${module,,}-${version}.CB-dist.tar.gz
+    tar -xzf ${module,,}-${version}.CB-dist.tar.gz
+}
+
+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
+    tar -xzf ${module}.CB-dist.tar.gz
+}
+
 ###########################################
-# Determine EPICS Base version
+# Defaults for EPICS Base
 
-DEFAULT_BASE=3.14.12.5
-
-BASE=${1:-${DEFAULT_BASE}}
-USE_MB=${2:-"MB_NO"}
+DEFAULT_BASE=3.15.4
+BASE=${BASE:-${DEFAULT_BASE}}
 
 ###########################################
 # Fetch and unpack dependencies
@@ -26,8 +40,8 @@ rm -fr ${STUFF}
 mkdir -p ${STUFF}
 cd ${STUFF}
 
-wget -nv https://openepics.ci.cloudbees.com/job/Base-${BASE}_Build/lastSuccessfulBuild/artifact/base-${BASE}.CB-dist.tar.gz
-tar -xzf base-${BASE}.CB-dist.tar.gz
+installTool Boost 1.61.0
+installTool Base ${BASE}
 
 ###########################################
 # Build
@@ -53,4 +67,4 @@ make runtests
 ###########################################
 # Create distribution
 
-tar czf pvData.CB-dist.tar.gz lib include COPYRIGHT LICENSE
+tar czf pvData.CB-dist.tar.gz lib include LICENSE

jenkins/cloudbees_doc

@@ -6,15 +6,39 @@
 #
 # Author: Ralph Lange <ralph.lange@gmx.de>
 # Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-# Copyright (C) 2014-2015 ITER Organization.
+# Copyright (C) 2014-2016 ITER Organization.
 # All rights reserved. Use is subject to license terms.
 
+installTool () {
+    local module=$1
+    local version=$2
+
+    wget -nv https://openepics.ci.cloudbees.com/job/${module}-${version}_Build/lastSuccessfulBuild/artifact/${module,,}-${version}.CB-dist.tar.gz
+    tar -xzf ${module,,}-${version}.CB-dist.tar.gz
+}
+
+installE4 () {
+    local module=$1
+    local branch=$2
+
+    # 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
+}
+
 ###########################################
-# Determine EPICS Base version
+# Defaults for EPICS Base and parameters
 
-DEFAULT_BASE=3.14.12.5
-
-BASE=${1:-${DEFAULT_BASE}}
+BASE=3.15.4
+PUBLISH=${PUBLISH:-NO}
+BRANCH=${BRANCH:-master}
+MB=NO_MICROBENCH
 
 ###########################################
 # Fetch and unpack dependencies
@@ -25,16 +49,14 @@ rm -fr ${STUFF}
 mkdir -p ${STUFF}
 cd ${STUFF}
 
-wget -nv https://openepics.ci.cloudbees.com/job/Doxygen-1.8.3_Build/lastSuccessfulBuild/artifact/doxygen-1.8.3.CB-dist.tar.gz
-tar -xzf doxygen-1.8.3.CB-dist.tar.gz
+installTool Doxygen 1.8.11
 
 ###########################################
 # Generate
 
 cd ${WORKSPACE}
 
-wget -nv https://openepics.ci.cloudbees.com/job/pvDataCPP_Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz
-tar -xzf pvData.CB-dist.tar.gz
+installE4 pvData ${BRANCH}
 
 export PATH=${STUFF}/bin:${PATH}
 
@@ -43,4 +65,10 @@ doxygen
 ###########################################
 # Publish
 
-rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvDataCPP/tip
+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/pvDataCPP/${PUBLISH}/
+
+    rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/pvDataCPP/${PUBLISH}/
+fi

src/Makefile

@@ -3,9 +3,6 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 
-INSTALL_INCLUDE = $(INSTALL_LOCATION)/include/pv
-USR_INCLUDES += -I$(INSTALL_LOCATION)/include
-
 PVDATA_SRC = $(TOP)/src
 
 include $(PVDATA_SRC)/misc/Makefile
@@ -14,11 +11,26 @@ include $(PVDATA_SRC)/factory/Makefile
 include $(PVDATA_SRC)/property/Makefile
 include $(PVDATA_SRC)/copy/Makefile
 include $(PVDATA_SRC)/pvMisc/Makefile
-include $(PVDATA_SRC)/monitor/Makefile
+include $(PVDATA_SRC)/json/Makefile
 
 LIBRARY = pvData
 
 pvData_LIBS += Com
 
+EXPANDVARS += EPICS_PVD_MAJOR_VERSION
+EXPANDVARS += EPICS_PVD_MINOR_VERSION
+EXPANDVARS += EPICS_PVD_MAINTENANCE_VERSION
+EXPANDVARS += EPICS_PVD_DEVELOPMENT_FLAG
+
+EXPANDFLAGS += $(foreach var,$(EXPANDVARS),-D$(var)="$(strip $($(var)))")
+
+# shared library ABI version.
+SHRLIB_VERSION = $(EPICS_PVD_MAJOR_VERSION).$(EPICS_PVD_MINOR_VERSION).$(EPICS_PVD_MAINTENANCE_VERSION)
+
 include $(TOP)/configure/RULES
 
+# Can't use EXPAND as generated headers must appear
+# in O.Common, but EXPAND emits rules for O.$(T_A)
+../O.Common/pv/pvdVersionNum.h: ../pv/pvdVersionNum.h@
+	$(MKDIR) $(COMMON_DIR)/pv
+	$(EXPAND_TOOL) $(EXPANDFLAGS) $($@_EXPANDFLAGS) $< $@

src/copy/Makefile

@@ -2,8 +2,8 @@
 
 SRC_DIRS += $(PVDATA_SRC)/copy
 
-INC += createRequest.h
-INC += pvCopy.h
+INC += pv/createRequest.h
+INC += pv/pvCopy.h
 
 LIBSRCS += createRequest.cpp
 LIBSRCS += pvCopy.cpp

src/copy/createRequest.cpp

@@ -1,12 +1,13 @@
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * pvAccessCPP is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 
 #include <string>
 #include <sstream>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 
 #include <pv/pvData.h>
@@ -21,13 +22,13 @@ using std::endl;
 using std::string;
 using std::vector;
 
-namespace epics { namespace pvData {
+namespace {
+using namespace epics::pvData;
 
 static PVDataCreatePtr pvDataCreate = getPVDataCreate();
 static FieldCreatePtr fieldCreate = getFieldCreate();
 
-class CreateRequestImpl : public CreateRequest {
-private:
+struct CreateRequestImpl {
 
     struct Node 
     {
@@ -53,12 +54,7 @@ private:
     string fullFieldName;
 
 
-public:
-    CreateRequestImpl()
-    {
-        fullFieldName = "";
-    }
-private:
+    CreateRequestImpl() {}
          
 
     void removeBlanks(string& str)
@@ -74,8 +70,7 @@ private:
         size_t openBrace = request.find('{', index+1);
         size_t closeBrace = request.find('}', index+1);
         if(openBrace == string::npos && closeBrace == string::npos){
-             message = request + " mismatched {}";
-             throw std::logic_error("message");
+             throw std::runtime_error(request + " mismatched {}");
         }
         if (openBrace != string::npos && openBrace!=0) {
             if(openBrace<closeBrace) return findMatchingBrace(request,openBrace,numOpen+1);
@@ -90,14 +85,12 @@ private:
         for(size_t i=index+1; i< request.size(); ++i) {
             if(request[i] == ']') {
                 if(i==index+1) {
-                     message = request + " mismatched []";
-                     throw std::logic_error("message");
+                     throw std::runtime_error(request + " mismatched []");
                 }
                 return i;
             }
         }
-        message = request + " missing ]";
-        throw std::logic_error("message");
+        throw std::runtime_error(request + " missing ]");
     }
 
     size_t findEndField(string& request) {
@@ -152,7 +145,7 @@ private:
         string const & request)
     {
         if(request.length()<=1) {
-            throw std::logic_error("logic error empty options");
+            throw std::runtime_error("logic error empty options");
         }
         vector<Node> top;
         vector<string> items = split(request);
@@ -162,8 +155,7 @@ private:
             string item = items[j];
             size_t equals = item.find('=');
             if(equals==string::npos || equals==0) {
-                message = item + " illegal option " + request;
-                throw std::logic_error("message");
+                throw std::runtime_error(item + " illegal option " + request);
             }
             top.push_back(Node(item.substr(0,equals)));
             string name = fullFieldName + "._options." + item.substr(0,equals);
@@ -212,7 +204,7 @@ private:
         if(end==0) end = request.size();
         string name = request.substr(0,end);
         if(name.size()<1) {
-            throw std::logic_error("null field name " + request);
+            throw std::runtime_error("null field name " + request);
         }
         string saveFullName = fullFieldName;
         fullFieldName += "." + name;
@@ -235,7 +227,7 @@ private:
         if(chr=='.') {
             request = request.substr(end+1);
             if(request.size()==string::npos || request.size()<1) {
-                throw std::logic_error("null field name " + request);
+                throw std::runtime_error("null field name " + request);
             }
             Node subNode(name);
             if(optionNode.name.size()>0) subNode.nodes.push_back(optionNode);
@@ -256,11 +248,11 @@ private:
         if(chr=='{') {
             size_t endBrace = findEndField(request);
             if((end+1)>=(endBrace-1)) {
-                throw std::logic_error("illegal syntax " + request);
+                throw std::runtime_error("illegal syntax " + request);
             }
             string subRequest = request.substr(end+1,endBrace-1 -end -1);
             if(subRequest.size()<1) {
-                throw std::logic_error("empty {} " + request);
+                throw std::runtime_error("empty {} " + request);
             }
             Node subNode(name);
             if(optionNode.name.size()>0) subNode.nodes.push_back(optionNode);
@@ -276,7 +268,7 @@ private:
             createSubNode(node,request);
             return;
         }
-        throw std::logic_error("logic error");
+        throw std::runtime_error("logic error");
     }
 
     FieldConstPtr createSubStructure(vector<Node> & nodes)
@@ -317,12 +309,11 @@ private:
         return structure;
     }
 
-public:
 
-    virtual PVStructurePtr createRequest(
+    PVStructurePtr createRequest(
         string const & crequest)
     {
-        try {
+        {
             string request = crequest;
             if (!request.empty()) removeBlanks(request);
             if (request.empty())
@@ -356,20 +347,17 @@ public:
             if(numParan!=0) {
                 ostringstream oss;
                 oss << "mismatched () " << numParan;
-                message = oss.str();
-                return PVStructurePtr();
+                throw std::runtime_error(oss.str());
             }
             if(numBrace!=0) {
                 ostringstream oss;
                 oss << "mismatched {} " << numBrace;
-                message = oss.str();
-                return PVStructurePtr();
+                throw std::runtime_error(oss.str());
             }
             if(numBracket!=0) {
                 ostringstream oss;
                 oss << "mismatched [] " << numBracket;
-                message = oss.str();
-                return PVStructurePtr();
+                throw std::runtime_error(oss.str());
             }
             vector<Node> top;
             try {
@@ -378,9 +366,8 @@ public:
                     size_t openBracket = request.find('[', offsetRecord);
                     size_t closeBracket = request.find(']', openBracket);
                     if(closeBracket==string::npos) {
-                        message = request.substr(offsetRecord) +
-                            "record[ does not have matching ]";
-                        return PVStructurePtr();
+                        throw std::runtime_error(request.substr(offsetRecord) +
+                            "record[ does not have matching ]");
                     }
                     if(closeBracket-openBracket > 3) {
                         Node node("record");
@@ -396,9 +383,8 @@ public:
                     size_t openParan = request.find('(', offsetField);
                     size_t closeParan = request.find(')', openParan);
                     if(closeParan==string::npos) {
-                        message = request.substr(offsetField)
-                                + " field( does not have matching )";
-                        return PVStructurePtr();
+                        throw std::runtime_error(request.substr(offsetField)
+                                + " field( does not have matching )");
                     }
                     if(closeParan>openParan+1) {
                         createSubNode(node,request.substr(openParan+1,closeParan-openParan-1));
@@ -411,9 +397,8 @@ public:
                     size_t openParan = request.find('(', offsetGetField);
                     size_t closeParan = request.find(')', openParan);
                     if(closeParan==string::npos) {
-                        message = request.substr(offsetField)
-                                + " getField( does not have matching )";
-                        return PVStructurePtr();
+                        throw std::runtime_error(request.substr(offsetField)
+                                + " getField( does not have matching )");
                     }
                     if(closeParan>openParan+1) {
                         createSubNode(node,request.substr(openParan+1,closeParan-openParan-1));
@@ -426,9 +411,8 @@ public:
                     size_t openParan = request.find('(', offsetPutField);
                     size_t closeParan = request.find(')', openParan);
                     if(closeParan==string::npos) {
-                        message = request.substr(offsetField)
-                                + " putField( does not have matching )";
-                        return PVStructurePtr();
+                        throw std::runtime_error(request.substr(offsetField)
+                                + " putField( does not have matching )");
                     }
                     if(closeParan>openParan+1) {
                         createSubNode(node,request.substr(openParan+1,closeParan-openParan-1));
@@ -436,9 +420,7 @@ public:
                     top.push_back(node);
                 }
             } catch (std::exception &e) {
-                string xxx = e.what();
-                message = "while creating Structure exception " + xxx;
-                return PVStructurePtr();
+                throw std::runtime_error(std::string("while creating Structure exception ")+e.what());
             }
             size_t num = top.size();
             StringArray names(num);
@@ -466,20 +448,39 @@ public:
             }
             optionList.clear();
             return pvStructure;
-        } catch (std::exception &e) {
-             message = e.what();
-             return PVStructurePtr();
         }
     }
 
 
 };
 
+} // namespace
+
+namespace epics {namespace pvData {
+
 CreateRequest::shared_pointer CreateRequest::create()
 {
-    CreateRequest::shared_pointer createRequest(new CreateRequestImpl());
+    CreateRequest::shared_pointer createRequest(new CreateRequest());
     return createRequest;
 }
 
-}}
+PVStructure::shared_pointer CreateRequest::createRequest(std::string const & request)
+{
+    message.clear();
+    try {
+        return ::createRequest(request);
+    } catch(std::exception& e) {
+        message = e.what();
+        return PVStructure::shared_pointer();
+    }
+}
+
+PVStructure::shared_pointer createRequest(std::string const & request)
+{
+    CreateRequestImpl I;
+    return I.createRequest(request);
+}
+
+
+}} // namespace
 

src/copy/pv/createRequest.h

@@ -1,8 +1,7 @@
 /*createRequest.h*/
-/**
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * pvDataCPP is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 
 #ifndef CREATEREQUEST_H
@@ -33,17 +32,16 @@ class epicsShareClass CreateRequest {
      * @returns A shared pointer to the new instance.
      */
     static CreateRequest::shared_pointer create();
-    virtual ~CreateRequest() {};
+    ~CreateRequest() {};
     /**
     * Create a request structure for the create calls in Channel.
     * See the package overview documentation for details.
     * @param request The field request. See the package overview documentation for details.
-    * @param requester The requester;
     * @return The request PVStructure if a valid request was given.
     * If a NULL PVStructure is returned then getMessage will return
     * the reason.
     */
-    virtual PVStructure::shared_pointer createRequest(std::string const & request) = 0;
+    PVStructure::shared_pointer createRequest(std::string const & request);
     /**
      * Get the error message of createRequest returns NULL
      * return the error message
@@ -54,6 +52,14 @@ protected:
     std::string message;
 };
 
+/** Parse and build pvRequest structure.
+ *
+ @params request the Request string to be parsed.  eg. "field(value)"
+ @returns The resulting strucuture.  Never NULL
+ @throws std::exception for various parsing errors
+ */
+epicsShareExtern
+PVStructure::shared_pointer createRequest(std::string const & request);
 
 }}
 

src/copy/pv/pvCopy.h

@@ -1,8 +1,7 @@
 /* pvCopy.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  * @author Marty Kraimer
@@ -76,7 +75,7 @@ public:
         PVStructurePtr const &pvRequest,
         std::string const & structureName);
     virtual ~PVCopy(){}
-    virtual void destroy();
+    void destroy();
     /**
      * Get the top-level structure of master
      * @returns The master top-level structure.
@@ -116,8 +115,8 @@ public:
         PVStructurePtr const  &masterPVStructure,
         PVFieldPtr const  &masterPVField);
     /**
-     * Given a offset in the copy get the corresponding field in pvMaster.
-     * @param offset The offset in the copy.
+     * Given an offset in the copy get the corresponding field in pvMaster.
+     * @param structureOffset The offset in the copy.
      */
     PVFieldPtr getMasterPVField(std::size_t structureOffset);
     /**
@@ -159,7 +158,7 @@ public:
         BitSetPtr const  &bitSet);
     /**
      * Get the options for the field at the specified offset.
-     * @param offset the offset in copy.
+     * @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

src/copy/pvCopy.cpp

@@ -1,8 +1,7 @@
 /* pvCopy.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  * @author Marty Kraimer
@@ -13,6 +12,8 @@
 #include <memory>
 #include <sstream>
 
+#include <epicsThread.h>
+
 #define epicsExportSharedSymbols
 
 #include <pv/thread.h>
@@ -40,13 +41,6 @@ static void newLine(string *buffer, int indentLevel)
     *buffer += string(indentLevel*4, ' ');
 }
 
-static PVCopyPtr NULLPVCopy;
-static FieldConstPtr NULLField;
-static StructureConstPtr NULLStructure;
-static PVStructurePtr NULLPVStructure;
-static CopyNodePtr NULLCopyNode;
-static CopyMasterNodePtr NULLCopyMasterNode;
-
 struct CopyNode {
     CopyNode()
     : isStructure(false),
@@ -79,12 +73,12 @@ PVCopyPtr PVCopy::create(
     if(structureName.size()>0) {
         if(pvRequest->getStructure()->getNumberFields()>0) {
             pvStructure = pvRequest->getSubField<PVStructure>(structureName);
-            if(!pvStructure) return NULLPVCopy;
+            if(!pvStructure) return PVCopyPtr();
         }
-    } else if(pvStructure->getSubField("field")) {
+    } else if(pvStructure->getSubField<PVStructure>("field")) {
         pvStructure = pvRequest->getSubField<PVStructure>("field");
     }
-    PVCopyPtr pvCopy = PVCopyPtr(new PVCopy(pvMaster));
+    PVCopyPtr pvCopy(new PVCopy(pvMaster));
     bool result = pvCopy->init(pvStructure);
     if(!result) pvCopy.reset();
     return pvCopy;
@@ -146,7 +140,7 @@ PVStructurePtr PVCopy::getOptions(std::size_t fieldOffset)
     while(true) {
         if(!node->isStructure) {
             if(node->structureOffset==fieldOffset) return node->options;
-            return NULLPVStructure;
+            return PVStructurePtr();
         }
         CopyStructureNodePtr structNode = static_pointer_cast<CopyStructureNode>(node);
         CopyNodePtrArrayPtr nodes = structNode->nodes;
@@ -157,7 +151,7 @@ PVStructurePtr PVCopy::getOptions(std::size_t fieldOffset)
             if(fieldOffset>=soff && fieldOffset<soff+node->nfields) {
                 if(fieldOffset==soff) return node->options;
                 if(!node->isStructure) {
-                    return NULLPVStructure;
+                    return PVStructurePtr();
                 }
                 okToContinue = true;
                 break;
@@ -348,7 +342,7 @@ bool PVCopy::init(epics::pvData::PVStructurePtr const &pvRequest)
     if(len==string::npos) entireMaster = true;
     if(len==0) entireMaster = true;
     PVStructurePtr pvOptions;
-    if(len==1 && pvRequest->getSubField("_options")) {
+    if(len==1) {
         pvOptions = pvRequest->getSubField<PVStructure>("_options");
     }
     if(entireMaster) {
@@ -391,7 +385,7 @@ StructureConstPtr PVCopy::createStructure(
     PVFieldPtrArray const &pvFromRequestFields = pvFromRequest->getPVFields();
     StringArray const &fromRequestFieldNames = pvFromRequest->getStructure()->getFieldNames();
     size_t length = pvFromRequestFields.size();
-    if(length==0) return NULLStructure;
+    if(length==0) return StructureConstPtr();
     FieldConstPtrArray fields; fields.reserve(length);
     StringArray fieldNames; fields.reserve(length);
     for(size_t i=0; i<length; ++i) {
@@ -421,7 +415,7 @@ StructureConstPtr PVCopy::createStructure(
         fields.push_back(field);
     }
     size_t numsubfields = fields.size();
-    if(numsubfields==0) return NULLStructure;
+    if(numsubfields==0) return StructureConstPtr();
     return getFieldCreate()->createStructure(fieldNames, fields);
 }
 
@@ -441,11 +435,8 @@ CopyNodePtr PVCopy::createStructureNodes(
         PVFieldPtr copyPVField = copyPVFields[i];
         string fieldName = copyPVField->getFieldName();
         
-        PVStructurePtr requestPVStructure = static_pointer_cast<PVStructure>(
-              pvFromRequest->getSubField(fieldName));
-        PVStructurePtr pvSubFieldOptions;
-        PVFieldPtr pvField = requestPVStructure->getSubField("_options");
-        if(pvField) pvSubFieldOptions = static_pointer_cast<PVStructure>(pvField);
+        PVStructurePtr requestPVStructure = pvFromRequest->getSubField<PVStructure>(fieldName);
+        PVStructurePtr pvSubFieldOptions = requestPVStructure->getSubField<PVStructure>("_options");
         PVFieldPtr pvMasterField;
         PVFieldPtrArray const & pvMasterFields = pvMasterStructure->getPVFields();
         for(size_t j=0; i<pvMasterFields.size(); j++ ) {
@@ -551,7 +542,7 @@ void PVCopy::updateStructureNodeFromBitSet(
     CopyNodePtrArrayPtr  nodes = structureNode->nodes;
     for(size_t i=0; i<nodes->size(); i++) {
         CopyNodePtr node = (*nodes)[i];
-        PVFieldPtr pvField = pvCopy->getSubField(node->structureOffset);
+        PVFieldPtr pvField = pvCopy->getSubFieldT(node->structureOffset);
         if(node->isStructure) {
             PVStructurePtr xxx = static_pointer_cast<PVStructure>(pvField);
             CopyStructureNodePtr subStructureNode =
@@ -632,7 +623,7 @@ CopyMasterNodePtr PVCopy::getCopyOffset(
             if(masterNode) return masterNode;
         }
     }
-    return NULLCopyMasterNode;
+    return CopyMasterNodePtr();
 }
 
 CopyMasterNodePtr PVCopy::getMasterNode(
@@ -652,7 +643,7 @@ CopyMasterNodePtr PVCopy::getMasterNode(
             static_pointer_cast<CopyStructureNode>(node);
         return  getMasterNode(subNode,structureOffset);
     }
-    return NULLCopyMasterNode;
+    return CopyMasterNodePtr();
 }
 
 }}

src/factory/Compare.cpp

@@ -1,7 +1,6 @@
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  * @author mes
@@ -272,7 +271,7 @@ bool compareField(const PVUnion* left, const PVUnion* right)
         
     if (ls->isVariant())
     {
-        PVFieldPtr lval = left->get();
+        const PVField::const_shared_pointer& lval = left->get();
         if (lval.get() == 0)
             return right->get().get() == 0;
         else

src/factory/Convert.cpp

@@ -1,8 +1,7 @@
 /* Convert.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -13,6 +12,8 @@
 #include <stdexcept>
 #include <typeinfo>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>

src/factory/FieldCreateFactory.cpp

@@ -1,14 +1,13 @@
 /*FieldCreateFactory.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
@@ -19,11 +18,15 @@
 #include <stdexcept>
 #include <sstream>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
+#include <pv/reftrack.h>
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>
 #include <pv/factory.h>
 #include <pv/serializeHelper.h>
+#include <pv/localStaticLock.h>
 
 using std::tr1::static_pointer_cast;
 using std::size_t;
@@ -33,12 +36,17 @@ namespace epics { namespace pvData {
 
 static DebugLevel debugLevel = lowDebug;
 
+size_t Field::num_instances;
+
+
 Field::Field(Type type)
     : m_fieldType(type)
 {
+    REFTRACE_INCREMENT(num_instances);
 }
 
 Field::~Field() {
+    REFTRACE_DECREMENT(num_instances);
 }
 
 
@@ -604,6 +612,41 @@ Union::Union (
 
 Union::~Union() { }
 
+int32 Union::guess(Type t, ScalarType s) const
+{
+    if(t!=scalar && t!=scalarArray)
+        THROW_EXCEPTION2(std::logic_error, "PVUnion::guess() only support scalar and scalarArray");
+
+    int32 ret = -1;
+    for(size_t i=0, N=fields.size(); i<N; i++)
+    {
+        if(fields[i]->getType()!=t)
+            continue;
+
+        ScalarType type;
+        switch(fields[i]->getType()) {
+        case scalar:
+            type = static_cast<const Scalar*>(fields[i].get())->getScalarType();
+            break;
+        case scalarArray:
+            type = static_cast<const ScalarArray*>(fields[i].get())->getElementType();
+            break;
+        default:
+            continue;
+        }
+
+        if(type==s) {
+            // exact match
+            ret = i;
+            break; // we're done
+
+        } else if(ret==-1) {
+            // first partial match
+            ret = i;
+        }
+    }
+    return ret;
+}
 
 string Union::getID() const
 {
@@ -700,18 +743,97 @@ void Union::deserialize(ByteBuffer* /*buffer*/, DeserializableControl* /*control
     throw std::runtime_error("not valid operation, use FieldCreate::deserialize instead");
 }
 
+FieldBuilder::FieldBuilder()
+    :fieldCreate(getFieldCreate())
+    ,idSet(false)
+    ,nestedClassToBuild(structure)
+    ,nestedArray(false)
+    ,createNested(true)
+{}
 
-FieldBuilder::FieldBuilder() : fieldCreate(getFieldCreate()), idSet(false) {}
+FieldBuilder::FieldBuilder(const Structure* S)
+    :fieldCreate(getFieldCreate())
+    ,id(S->getID())
+    ,idSet(!id.empty())
+    ,fieldNames(S->getFieldNames())
+    ,fields(S->getFields())
+    ,parentBuilder()
+    ,nestedClassToBuild(structure)
+    ,nestedName()
+    ,nestedArray(false)
+    ,createNested(false)
+{}
+
+FieldBuilder::FieldBuilder(const FieldBuilderPtr & _parentBuilder,
+                           const std::string& name,
+                           const Structure* S)
+    :fieldCreate(_parentBuilder->fieldCreate)
+    ,id(S->getID())
+    ,idSet(!id.empty())
+    ,fieldNames(S->getFieldNames())
+    ,fields(S->getFields())
+    ,parentBuilder(_parentBuilder)
+    ,nestedClassToBuild(structure)
+    ,nestedName(name)
+    ,nestedArray(false)
+    ,createNested(false)
+{}
+
+FieldBuilder::FieldBuilder(const FieldBuilderPtr & _parentBuilder,
+                           const std::string& name,
+                           const StructureArray* S)
+    :fieldCreate(getFieldCreate())
+    ,id(S->getStructure()->getID())
+    ,idSet(!id.empty())
+    ,fieldNames(S->getStructure()->getFieldNames())
+    ,fields(S->getStructure()->getFields())
+    ,parentBuilder(_parentBuilder)
+    ,nestedClassToBuild(structure)
+    ,nestedName(name)
+    ,nestedArray(true)
+    ,createNested(false)
+{}
+
+FieldBuilder::FieldBuilder(const FieldBuilderPtr & _parentBuilder,
+                           const std::string& name,
+                           const Union* S)
+    :fieldCreate(getFieldCreate())
+    ,id(S->getID())
+    ,idSet(!id.empty())
+    ,fieldNames(S->getFieldNames())
+    ,fields(S->getFields())
+    ,parentBuilder(_parentBuilder)
+    ,nestedClassToBuild(union_)
+    ,nestedName(name)
+    ,nestedArray(false)
+    ,createNested(false)
+{}
+
+FieldBuilder::FieldBuilder(const FieldBuilderPtr & _parentBuilder,
+                           const std::string& name,
+                           const UnionArray* S)
+    :fieldCreate(getFieldCreate())
+    ,id(S->getUnion()->getID())
+    ,idSet(!id.empty())
+    ,fieldNames(S->getUnion()->getFieldNames())
+    ,fields(S->getUnion()->getFields())
+    ,parentBuilder(_parentBuilder)
+    ,nestedClassToBuild(union_)
+    ,nestedName(name)
+    ,nestedArray(true)
+    ,createNested(false)
+{}
 
 FieldBuilder::FieldBuilder(FieldBuilderPtr const & _parentBuilder,
 			string const & _nestedName,
-			Type _nestedClassToBuild, bool _nestedArray) :
-		fieldCreate(getFieldCreate()),
-		idSet(false),
-		parentBuilder(_parentBuilder),
-		nestedClassToBuild(_nestedClassToBuild),
-		nestedName(_nestedName),
-		nestedArray(_nestedArray)
+            Type _nestedClassToBuild, bool _nestedArray)
+    :fieldCreate(_parentBuilder->fieldCreate)
+    ,idSet(false)
+    ,parentBuilder(_parentBuilder)
+    ,nestedClassToBuild(_nestedClassToBuild)
+    ,nestedName(_nestedName)
+    ,nestedArray(_nestedArray)
+    ,createNested(true)
 {}
 
 void FieldBuilder::reset()
@@ -731,56 +853,57 @@ FieldBuilderPtr FieldBuilder::setId(string const & id)
 
 FieldBuilderPtr FieldBuilder::add(string const & name, ScalarType scalarType)
 {
-    fields.push_back(fieldCreate->createScalar(scalarType)); fieldNames.push_back(name); 
-	return shared_from_this();
+    return add(name, fieldCreate->createScalar(scalarType));
 }
 
 FieldBuilderPtr FieldBuilder::addBoundedString(std::string const & name, std::size_t maxLength)
 {
-    fields.push_back(fieldCreate->createBoundedString(maxLength)); fieldNames.push_back(name);
-    return shared_from_this();
+    return add(name, fieldCreate->createBoundedString(maxLength));
 }
 
 FieldBuilderPtr FieldBuilder::add(string const & name, FieldConstPtr const & field)
 {
-    fields.push_back(field); fieldNames.push_back(name);
+    const Field* cur = findField(name, field->getType());
+    if(!cur) {
+        fields.push_back(field); fieldNames.push_back(name);
+    } else if(*cur!=*field) {
+        THROW_EXCEPTION2(std::runtime_error, "duplicate field name w/ different type : "+name);
+    } // else exact duplicate is silently ignored
 	return shared_from_this();
 }
 
 FieldBuilderPtr FieldBuilder::addArray(string const & name, ScalarType scalarType)
 {
-    fields.push_back(fieldCreate->createScalarArray(scalarType)); fieldNames.push_back(name);
-	return shared_from_this();
+    return add(name, fieldCreate->createScalarArray(scalarType));
 }
 
 FieldBuilderPtr FieldBuilder::addFixedArray(string const & name, ScalarType scalarType, size_t size)
 {
-    fields.push_back(fieldCreate->createFixedScalarArray(scalarType, size)); fieldNames.push_back(name);
-    return shared_from_this();
+    return add(name, fieldCreate->createFixedScalarArray(scalarType, size));
 }
 
 FieldBuilderPtr FieldBuilder::addBoundedArray(string const & name, ScalarType scalarType, size_t size)
 {
-    fields.push_back(fieldCreate->createBoundedScalarArray(scalarType, size)); fieldNames.push_back(name);
-    return shared_from_this();
+    return add(name, fieldCreate->createBoundedScalarArray(scalarType, size));
 }
 
 FieldBuilderPtr FieldBuilder::addArray(string const & name, FieldConstPtr const & element)
 {
+    FieldConstPtr fld;
     switch (element->getType())
     {
         case structure:
-            fields.push_back(fieldCreate->createStructureArray(static_pointer_cast<const Structure>(element)));
+            fld = fieldCreate->createStructureArray(static_pointer_cast<const Structure>(element));
             break;
         case union_:
-            fields.push_back(fieldCreate->createUnionArray(static_pointer_cast<const Union>(element)));
+            fld = fieldCreate->createUnionArray(static_pointer_cast<const Union>(element));
             break;
         case scalar:
 
             if (std::tr1::dynamic_pointer_cast<const BoundedString>(element).get())
                 THROW_EXCEPTION2(std::invalid_argument, "bounded string arrays are not supported");
 
-            fields.push_back(fieldCreate->createScalarArray(static_pointer_cast<const Scalar>(element)->getScalarType()));
+            fld = fieldCreate->createScalarArray(static_pointer_cast<const Scalar>(element)->getScalarType());
             break;
         // scalarArray?
         default:
@@ -789,8 +912,7 @@ FieldBuilderPtr FieldBuilder::addArray(string const & name, FieldConstPtr const
             THROW_EXCEPTION2(std::invalid_argument, msg.str());
     }
     
-    fieldNames.push_back(name);
-	return shared_from_this();
+    return add(name, fld);
 }
 
 FieldConstPtr FieldBuilder::createFieldInternal(Type type)
@@ -840,48 +962,111 @@ UnionConstPtr FieldBuilder::createUnion()
     return field;
 }
 
+const Field* FieldBuilder::findField(const std::string& name, Type ftype)
+{
+    // linear search on the theory that the number of fields is small
+    for(size_t i=0; i<fieldNames.size(); i++)
+    {
+        if(name!=fieldNames[i])
+            continue;
+
+        if(fields[i]->getType()!=ftype)
+            THROW_EXCEPTION2(std::invalid_argument, "nested field not required type: "+name);
+
+        return fields[i].get();
+    }
+    return 0;
+}
+
 FieldBuilderPtr FieldBuilder::addNestedStructure(string const & name)
 {
+    const Field *cur = findField(name, structure);
+    if(cur) {
+        return FieldBuilderPtr(new FieldBuilder(shared_from_this(), name,
+                                                static_cast<const Structure*>(cur)));
+    }
     return FieldBuilderPtr(new FieldBuilder(shared_from_this(), name, structure, false));
 }
 
 
 FieldBuilderPtr FieldBuilder::addNestedUnion(string const & name)
 {
+    const Field *cur = findField(name, union_);
+    if(cur) {
+        return FieldBuilderPtr(new FieldBuilder(shared_from_this(), name,
+                                                static_cast<const Union*>(cur)));
+    }
     return FieldBuilderPtr(new FieldBuilder(shared_from_this(), name, union_, false));
 }
 
 
 FieldBuilderPtr FieldBuilder::addNestedStructureArray(string const & name)
 {
+    const Field *cur = findField(name, structureArray);
+    if(cur) {
+        return FieldBuilderPtr(new FieldBuilder(shared_from_this(), name,
+                                                static_cast<const StructureArray*>(cur)));
+    }
     return FieldBuilderPtr(new FieldBuilder(shared_from_this(), name, structure, true));
 }
 
 FieldBuilderPtr FieldBuilder::addNestedUnionArray(string const & name)
 {
+    const Field *cur = findField(name, unionArray);
+    if(cur) {
+        return FieldBuilderPtr(new FieldBuilder(shared_from_this(), name,
+                                                static_cast<const UnionArray*>(cur)));
+    }
     return FieldBuilderPtr(new FieldBuilder(shared_from_this(), name, union_, true));
 }
 
 FieldBuilderPtr FieldBuilder::endNested()
 {
-    if (!parentBuilder.get())
-        THROW_EXCEPTION2(std::runtime_error, "this method can only be called to create nested fields");
+    if (!parentBuilder)
+        THROW_EXCEPTION2(std::runtime_error, "FieldBuilder::endNested() can only be called to create nested fields");
         
     FieldConstPtr nestedField = createFieldInternal(nestedClassToBuild);
-    if (nestedArray)
-        parentBuilder->addArray(nestedName, nestedField);
-    else
-        parentBuilder->add(nestedName, nestedField);
-        
-    return parentBuilder;
-}
 
+    if(createNested) {
+        if (nestedArray)
+            parentBuilder->addArray(nestedName, nestedField);
+        else
+            parentBuilder->add(nestedName, nestedField);
+        return parentBuilder;
+    } else {
+        for(size_t i=0, N = parentBuilder->fieldNames.size(); i<N; i++)
+        {
+            if(nestedName!=parentBuilder->fieldNames[i])
+                continue;
+
+            if(nestedArray) {
+                if(nestedClassToBuild==structure)
+                    parentBuilder->fields[i] = fieldCreate->createStructureArray(std::tr1::static_pointer_cast<const Structure>(nestedField));
+                else if(nestedClassToBuild==union_)
+                    parentBuilder->fields[i] = fieldCreate->createUnionArray(std::tr1::static_pointer_cast<const Union>(nestedField));
+                else
+                    throw std::logic_error("bad nested class");
+            } else {
+                parentBuilder->fields[i] = nestedField;
+            }
+            return parentBuilder;
+        }
+        // this only reached if bug in ctor
+        THROW_EXCEPTION2(std::logic_error, "no nested field field?");
+    }
+}
 
 FieldBuilderPtr FieldCreate::createFieldBuilder() const
 {
     return FieldBuilderPtr(new FieldBuilder());
 }
 
+FieldBuilderPtr FieldCreate::createFieldBuilder(StructureConstPtr S) const
+{
+    FieldBuilderPtr ret(new FieldBuilder(S.get()));
+    return ret;
+}
+
 ScalarConstPtr FieldCreate::createScalar(ScalarType scalarType) const
 {
     if(scalarType<0 || scalarType>MAX_SCALAR_TYPE) {
@@ -947,9 +1132,53 @@ StructureConstPtr FieldCreate::createStructure () const
       return createStructure(fieldNames,fields);
 }
 
+namespace {
+bool xisalnum(char c)
+{
+    return (c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9');
+}
+
+void validateFieldName(const std::string& n)
+{
+    // enforce [A-Za-z_][A-Za-z0-9_]*
+    if(n.size()==0)
+        throw std::invalid_argument("zero length field names not allowed");
+    if(n[0]>='0' && n[0]<='9') {
+        std::ostringstream msg;
+        msg<<"Field name \""<<n<<"\" must begin with A-Z, a-z, or '_'";
+        throw std::invalid_argument(msg.str());
+    }
+    for(size_t i=0, N=n.size(); i<N; i++)
+    {
+        char c = n[i];
+        if(xisalnum(c)) {}
+        else {
+            switch(c){
+            case '_':
+                break;
+            default:
+            {
+                std::ostringstream msg;
+                msg<<"Invalid charactor '"<<c<<"' ("<<(int)c<<") in field name \""<<n<<"\" "
+                     "must be A-Z, a-z, 0-9, or '_'";
+                throw std::invalid_argument(msg.str());
+            }
+            }
+        }
+    }
+}
+
+void validateFieldNames(const StringArray& l)
+{
+    for(StringArray::const_iterator it=l.begin(), end=l.end(); it!=end; ++it)
+        validateFieldName(*it);
+}
+}
+
 StructureConstPtr FieldCreate::createStructure (
     StringArray const & fieldNames,FieldConstPtrArray const & fields) const
 {
+      validateFieldNames(fieldNames);
       // TODO use std::make_shared
       std::tr1::shared_ptr<Structure> sp(new Structure(fieldNames,fields), Field::Deleter());
       StructureConstPtr structure = sp;
@@ -961,6 +1190,7 @@ StructureConstPtr FieldCreate::createStructure (
     StringArray const & fieldNames,
     FieldConstPtrArray const & fields) const
 {
+      validateFieldNames(fieldNames);
       // TODO use std::make_shared
       std::tr1::shared_ptr<Structure> sp(new Structure(fieldNames,fields,id), Field::Deleter());
       StructureConstPtr structure = sp;
@@ -979,6 +1209,7 @@ StructureArrayConstPtr FieldCreate::createStructureArray(
 UnionConstPtr FieldCreate::createUnion (
     StringArray const & fieldNames,FieldConstPtrArray const & fields) const
 {
+      validateFieldNames(fieldNames);
       // TODO use std::make_shared
       std::tr1::shared_ptr<Union> sp(new Union(fieldNames,fields), Field::Deleter());
       UnionConstPtr punion = sp;
@@ -990,6 +1221,7 @@ UnionConstPtr FieldCreate::createUnion (
     StringArray const & fieldNames,
     FieldConstPtrArray const & fields) const
 {
+      validateFieldNames(fieldNames);
       // TODO use std::make_shared
       std::tr1::shared_ptr<Union> sp(new Union(fieldNames,fields,id), Field::Deleter());
       UnionConstPtr punion = sp;
@@ -1039,6 +1271,7 @@ StructureConstPtr FieldCreate::appendFields(
     StringArray const & fieldNames,
     FieldConstPtrArray const & fields) const
 {
+    validateFieldNames(fieldNames);
     StringArray const & oldNames = structure->getFieldNames();
     FieldConstPtrArray const & oldFields = structure->getFields();
     size_t oldLen = oldNames.size();
@@ -1221,14 +1454,17 @@ FieldConstPtr FieldCreate::deserialize(ByteBuffer* buffer, DeserializableControl
 }
 
 // TODO replace with non-locking singleton pattern
-FieldCreatePtr FieldCreate::getFieldCreate()
+const FieldCreatePtr& FieldCreate::getFieldCreate()
 {
 	LOCAL_STATIC_LOCK;
 	static FieldCreatePtr fieldCreate;
 	static Mutex mutex;
 
 	Lock xx(mutex);
-    if(fieldCreate.get()==0) fieldCreate = FieldCreatePtr(new FieldCreate());
+    if(fieldCreate.get()==0) {
+        fieldCreate = FieldCreatePtr(new FieldCreate());
+        registerRefCounter("Field", &Field::num_instances);
+    }
     return fieldCreate;
 }
 
@@ -1256,10 +1492,6 @@ FieldCreate::FieldCreate()
     variantUnionArray = sua;
 }
 
-FieldCreatePtr getFieldCreate() {
-    return FieldCreate::getFieldCreate();
-}
-
 }}
 
 namespace std{

src/factory/Makefile

@@ -2,7 +2,7 @@
 
 SRC_DIRS += $(PVDATA_SRC)/factory
 
-INC += factory.h
+INC += pv/factory.h
 LIBSRCS += TypeFunc.cpp
 LIBSRCS += FieldCreateFactory.cpp
 LIBSRCS += PVField.cpp

src/factory/PVArray.cpp

@@ -1,8 +1,7 @@
 /*PVArray.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk

src/factory/PVDataCreateFactory.cpp

@@ -1,14 +1,13 @@
 /*PVDataCreateFactory.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
  */
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(NOMINMAX)
 #define NOMINMAX
 #endif
 
@@ -17,12 +16,15 @@
 #include <string>
 #include <cstdio>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>
 #include <pv/pvData.h>
 #include <pv/factory.h>
 #include <pv/serializeHelper.h>
+#include <pv/reftrack.h>
 
 using std::tr1::static_pointer_cast;
 using std::size_t;
@@ -58,135 +60,62 @@ template<> const ScalarType PVFloatArray::typeCode = pvFloat;
 template<> const ScalarType PVDoubleArray::typeCode = pvDouble;
 template<> const ScalarType PVStringArray::typeCode = pvString;
 
-/** Default storage for scalar values
- */
-template<typename T>
-class BasePVScalar : public PVScalarValue<T> {
-public:
-    typedef T  value_type;
-    typedef T* pointer;
-    typedef const T* const_pointer;
-
-    BasePVScalar(ScalarConstPtr const & scalar);
-    virtual ~BasePVScalar();
-    virtual T get() const ;
-    virtual void put(T val);
-    virtual void serialize(ByteBuffer *pbuffer,
-        SerializableControl *pflusher) const;
-    virtual void deserialize(ByteBuffer *pbuffer,
-        DeserializableControl *pflusher);
-private:
-    T value;
-};
 
 template<typename T>
-BasePVScalar<T>::BasePVScalar(ScalarConstPtr const & scalar)
-    : PVScalarValue<T>(scalar),value(0)
-{}
-//Note: '0' is a suitable default for all POD types (not string)
+PVScalarValue<T>::~PVScalarValue() {}
 
 template<typename T>
-BasePVScalar<T>::~BasePVScalar() {}
-
-template<typename T>
-T BasePVScalar<T>::get() const  { return value;}
-
-template<typename T>
-void BasePVScalar<T>::put(T val)
-{
-    value = val;
-    PVField::postPut();
-}
-
-template<typename T>
-void BasePVScalar<T>::serialize(ByteBuffer *pbuffer,
+void PVScalarValue<T>::serialize(ByteBuffer *pbuffer,
     SerializableControl *pflusher) const {
     pflusher->ensureBuffer(sizeof(T));
-    pbuffer->put(value);
+    pbuffer->put(storage.value);
+}
+
+template<>
+void PVScalarValue<std::string>::serialize(ByteBuffer *pbuffer,
+    SerializableControl *pflusher) const {
+    SerializeHelper::serializeString(storage.value, pbuffer, pflusher);
 }
 
 template<typename T>
-void BasePVScalar<T>::deserialize(ByteBuffer *pbuffer,
+void PVScalarValue<T>::deserialize(ByteBuffer *pbuffer,
     DeserializableControl *pflusher)
 {
     pflusher->ensureData(sizeof(T));
-    value = pbuffer->GET(T);
+    storage.value = pbuffer->GET(T);
 }
 
-typedef BasePVScalar<boolean> BasePVBoolean;
-typedef BasePVScalar<int8> BasePVByte;
-typedef BasePVScalar<int16> BasePVShort;
-typedef BasePVScalar<int32> BasePVInt;
-typedef BasePVScalar<int64> BasePVLong;
-typedef BasePVScalar<uint8> BasePVUByte;
-typedef BasePVScalar<uint16> BasePVUShort;
-typedef BasePVScalar<uint32> BasePVUInt;
-typedef BasePVScalar<uint64> BasePVULong;
-typedef BasePVScalar<float> BasePVFloat;
-typedef BasePVScalar<double> BasePVDouble;
+template<>
+void PVScalarValue<std::string>::deserialize(ByteBuffer *pbuffer,
+    DeserializableControl *pflusher)
+{
+    storage.value = SerializeHelper::deserializeString(pbuffer, pflusher);
+    // TODO: check for violations of maxLength?
+}
 
-// BasePVString is special case, since it implements SerializableArray
-class BasePVString : public PVString {
-public:
-    typedef string value_type;
-    typedef string* pointer;
-    typedef const string* const_pointer;
-
-    BasePVString(ScalarConstPtr const & scalar);
-    virtual ~BasePVString();
-    virtual string get() const ;
-    virtual void put(string val);
-    virtual void serialize(ByteBuffer *pbuffer,
-        SerializableControl *pflusher) const;
-    virtual void deserialize(ByteBuffer *pbuffer,
-        DeserializableControl *pflusher);
-    virtual void serialize(ByteBuffer *pbuffer,
-        SerializableControl *pflusher, size_t offset, size_t count) const;
-private:
-    string value;
-    std::size_t maxLength;
-};
-
-BasePVString::BasePVString(ScalarConstPtr const & scalar)
-    : PVString(scalar),value()
+PVString::PVString(ScalarConstPtr const & scalar)
+    : PVScalarValue<std::string>(scalar)
 {
     BoundedStringConstPtr boundedString = std::tr1::dynamic_pointer_cast<const BoundedString>(scalar);
     if (boundedString.get())
-        maxLength = boundedString->getMaximumLength();
+        storage.maxLength = boundedString->getMaximumLength();
     else
-        maxLength = 0;
+        storage.maxLength = 0;
 }
 
-BasePVString::~BasePVString() {}
-
-string BasePVString::get() const  { return value;}
-
-void BasePVString::put(string val)
-{
-    if (maxLength > 0 && val.length() > maxLength)
-        throw std::overflow_error("string too long");
-
-    value = val;
-    postPut();
-}
-
-void BasePVString::serialize(ByteBuffer *pbuffer,
+/* mixing overrides (virtual functions) and overloads (different argument lists) is fun...
+ * we override all overloads to avoid the "hides overloaded virtual function" warning from clang.
+ * In this case we don't need/want to, so just delegate to the base class.
+ */
+void PVString::serialize(ByteBuffer *pbuffer,
     SerializableControl *pflusher) const
-{
-    SerializeHelper::serializeString(value, pbuffer, pflusher);
-}
+{PVScalarValue<std::string>::serialize(pbuffer, pflusher);}
 
-void BasePVString::deserialize(ByteBuffer *pbuffer,
-    DeserializableControl *pflusher)
-{
-    value = SerializeHelper::deserializeString(pbuffer, pflusher);
-}
-
-void BasePVString::serialize(ByteBuffer *pbuffer,
+void PVString::serialize(ByteBuffer *pbuffer,
     SerializableControl *pflusher, size_t offset, size_t count) const
 {
 	// check bounds
-	const size_t length = /*(value == null) ? 0 :*/ value.length();
+    const size_t length = storage.value.length();
 	/*if (offset < 0) offset = 0;
 	else*/ if (offset > length) offset = length;
 	//if (count < 0) count = length;
@@ -196,10 +125,10 @@ void BasePVString::serialize(ByteBuffer *pbuffer,
 		count = maxCount;
 	
 	// write
-	SerializeHelper::serializeSubstring(value, offset, count, pbuffer, pflusher);
+    SerializeHelper::serializeSubstring(storage.value, offset, count, pbuffer, pflusher);
 }
 
-void PVArray::checkLength(size_t len)
+void PVArray::checkLength(size_t len) const
 {
     Array::ArraySizeType type = getArray()->getArraySizeType();
     if (type != Array::variable)
@@ -212,61 +141,26 @@ void PVArray::checkLength(size_t len)
     }
 }
 
-/** Default storage for arrays
- */
 template<typename T>
-class DefaultPVArray : public PVValueArray<T> {
-public:
-    typedef T* pointer;
-    typedef const T* const_pointer;
-    typedef std::vector<T> vector;
-    typedef const std::vector<T> const_vector;
-    typedef std::tr1::shared_ptr<vector> shared_vector;
-
-    typedef ::epics::pvData::shared_vector<T> svector;
-    typedef ::epics::pvData::shared_vector<const T> const_svector;
-
-    DefaultPVArray(ScalarArrayConstPtr const & scalarArray);
-    virtual ~DefaultPVArray();
-
-    virtual size_t getLength() const {return value.size();}
-    virtual size_t getCapacity() const {return value.capacity();}
-
-    virtual void setCapacity(size_t capacity);
-    virtual void setLength(size_t length);
-
-    virtual const_svector view() const {return value;}
-    virtual void swap(const_svector &other);
-    virtual void replace(const const_svector& next);
-
-    // from Serializable
-    virtual void serialize(ByteBuffer *pbuffer,SerializableControl *pflusher) const;
-    virtual void deserialize(ByteBuffer *pbuffer,DeserializableControl *pflusher);
-    virtual void serialize(ByteBuffer *pbuffer,
-         SerializableControl *pflusher, size_t offset, size_t count) const;
-private:
-    const_svector value;
-};
-
-template<typename T>
-DefaultPVArray<T>::DefaultPVArray(ScalarArrayConstPtr const & scalarArray)
-: PVValueArray<T>(scalarArray),
-    value()
+PVValueArray<T>::PVValueArray(ScalarArrayConstPtr const & scalarArray)
+    :base_t(scalarArray)
+    ,value()
   
-{
-    ArrayConstPtr array = this->getArray();
-    if (array->getArraySizeType() == Array::fixed)
-    {
-        // this->setLength(array->getMaximumCapacity());
-        this->setCapacityMutable(false);
-    }
-}
+{}
+
+PVValueArray<PVStructurePtr>::PVValueArray(StructureArrayConstPtr const & structureArray)
+    :base_t(structureArray)
+    ,structureArray(structureArray)
+
+{}
+
+PVValueArray<PVUnionPtr>::PVValueArray(UnionArrayConstPtr const & unionArray)
+    :base_t(unionArray)
+    ,unionArray(unionArray)
+{}
 
 template<typename T>
-DefaultPVArray<T>::~DefaultPVArray()
-{ }
-template<typename T>
-void DefaultPVArray<T>::setCapacity(size_t capacity)
+void PVValueArray<T>::setCapacity(size_t capacity)
 {
     if(this->isCapacityMutable()) {
         this->checkLength(capacity);
@@ -277,7 +171,7 @@ void DefaultPVArray<T>::setCapacity(size_t capacity)
 }
 
 template<typename T>
-void DefaultPVArray<T>::setLength(size_t length)
+void PVValueArray<T>::setLength(size_t length)
 {
     if(this->isImmutable())
         THROW_EXCEPTION2(std::logic_error, "immutable");
@@ -294,7 +188,7 @@ void DefaultPVArray<T>::setLength(size_t length)
 }
 
 template<typename T>
-void DefaultPVArray<T>::replace(const const_svector& next)
+void PVValueArray<T>::replace(const const_svector& next)
 {
     this->checkLength(next.size());
 
@@ -303,7 +197,7 @@ void DefaultPVArray<T>::replace(const const_svector& next)
 }
 
 template<typename T>
-void DefaultPVArray<T>::swap(const_svector &other)
+void PVValueArray<T>::swap(const_svector &other)
 {
     if (this->isImmutable())
         THROW_EXCEPTION2(std::logic_error, "immutable");
@@ -315,13 +209,13 @@ void DefaultPVArray<T>::swap(const_svector &other)
 
 
 template<typename T>
-void DefaultPVArray<T>::serialize(ByteBuffer *pbuffer,
+void PVValueArray<T>::serialize(ByteBuffer *pbuffer,
             SerializableControl *pflusher) const {
     serialize(pbuffer, pflusher, 0, this->getLength());
 }
 
 template<typename T>
-void DefaultPVArray<T>::deserialize(ByteBuffer *pbuffer,
+void PVValueArray<T>::deserialize(ByteBuffer *pbuffer,
         DeserializableControl *pcontrol) {
 
     size_t size = this->getArray()->getArraySizeType() == Array::fixed ?
@@ -370,7 +264,7 @@ void DefaultPVArray<T>::deserialize(ByteBuffer *pbuffer,
 }
 
 template<typename T>
-void DefaultPVArray<T>::serialize(ByteBuffer *pbuffer,
+void PVValueArray<T>::serialize(ByteBuffer *pbuffer,
         SerializableControl *pflusher, size_t offset, size_t count) const
 {
     //TODO: avoid incrementing the ref counter...
@@ -414,7 +308,7 @@ void DefaultPVArray<T>::serialize(ByteBuffer *pbuffer,
 // specializations for string
 
 template<>
-void DefaultPVArray<string>::deserialize(ByteBuffer *pbuffer,
+void PVValueArray<string>::deserialize(ByteBuffer *pbuffer,
         DeserializableControl *pcontrol) {
 
     size_t size = this->getArray()->getArraySizeType() == Array::fixed ?
@@ -441,7 +335,7 @@ void DefaultPVArray<string>::deserialize(ByteBuffer *pbuffer,
 }
 
 template<>
-void DefaultPVArray<string>::serialize(ByteBuffer *pbuffer,
+void PVValueArray<string>::serialize(ByteBuffer *pbuffer,
         SerializableControl *pflusher, size_t offset, size_t count) const {
 
     const_svector temp(value);
@@ -457,19 +351,6 @@ void DefaultPVArray<string>::serialize(ByteBuffer *pbuffer,
     }
 }
 
-typedef DefaultPVArray<boolean> DefaultPVBooleanArray;
-typedef DefaultPVArray<int8> BasePVByteArray;
-typedef DefaultPVArray<int16> BasePVShortArray;
-typedef DefaultPVArray<int32> BasePVIntArray;
-typedef DefaultPVArray<int64> BasePVLongArray;
-typedef DefaultPVArray<uint8> BasePVUByteArray;
-typedef DefaultPVArray<uint16> BasePVUShortArray;
-typedef DefaultPVArray<uint32> BasePVUIntArray;
-typedef DefaultPVArray<uint64> BasePVULongArray;
-typedef DefaultPVArray<float> BasePVFloatArray;
-typedef DefaultPVArray<double> BasePVDoubleArray;
-typedef DefaultPVArray<string> BasePVStringArray;
-
 // Factory
 
 PVDataCreate::PVDataCreate()
@@ -563,29 +444,29 @@ PVScalarPtr PVDataCreate::createPVScalar(ScalarConstPtr const & scalar)
      ScalarType scalarType = scalar->getScalarType();
      switch(scalarType) {
      case pvBoolean:
-         return PVScalarPtr(new BasePVBoolean(scalar));
+         return PVScalarPtr(new PVBoolean(scalar));
      case pvByte:
-         return PVScalarPtr(new BasePVByte(scalar));
+         return PVScalarPtr(new PVByte(scalar));
      case pvShort:
-         return PVScalarPtr(new BasePVShort(scalar));
+         return PVScalarPtr(new PVShort(scalar));
      case pvInt:
-         return PVScalarPtr(new BasePVInt(scalar));
+         return PVScalarPtr(new PVInt(scalar));
      case pvLong:
-         return PVScalarPtr(new BasePVLong(scalar));
+         return PVScalarPtr(new PVLong(scalar));
      case pvUByte:
-         return PVScalarPtr(new BasePVUByte(scalar));
+         return PVScalarPtr(new PVUByte(scalar));
      case pvUShort:
-         return PVScalarPtr(new BasePVUShort(scalar));
+         return PVScalarPtr(new PVUShort(scalar));
      case pvUInt:
-         return PVScalarPtr(new BasePVUInt(scalar));
+         return PVScalarPtr(new PVUInt(scalar));
      case pvULong:
-         return PVScalarPtr(new BasePVULong(scalar));
+         return PVScalarPtr(new PVULong(scalar));
      case pvFloat:
-         return PVScalarPtr(new BasePVFloat(scalar));
+         return PVScalarPtr(new PVFloat(scalar));
      case pvDouble:
-         return PVScalarPtr(new BasePVDouble(scalar));
+         return PVScalarPtr(new PVDouble(scalar));
      case pvString:
-         return PVScalarPtr(new BasePVString(scalar));
+         return PVScalarPtr(new PVString(scalar));
      }
      throw std::logic_error("PVDataCreate::createPVScalar should never get here");
 }
@@ -610,29 +491,29 @@ PVScalarArrayPtr PVDataCreate::createPVScalarArray(
 {
      switch(scalarArray->getElementType()) {
      case pvBoolean:
-           return PVScalarArrayPtr(new DefaultPVBooleanArray(scalarArray));
+           return PVScalarArrayPtr(new PVBooleanArray(scalarArray));
      case pvByte:
-           return PVScalarArrayPtr(new BasePVByteArray(scalarArray));
+           return PVScalarArrayPtr(new PVByteArray(scalarArray));
      case pvShort:
-           return PVScalarArrayPtr(new BasePVShortArray(scalarArray));
+           return PVScalarArrayPtr(new PVShortArray(scalarArray));
      case pvInt:
-           return PVScalarArrayPtr(new BasePVIntArray(scalarArray));
+           return PVScalarArrayPtr(new PVIntArray(scalarArray));
      case pvLong:
-           return PVScalarArrayPtr(new BasePVLongArray(scalarArray));
+           return PVScalarArrayPtr(new PVLongArray(scalarArray));
      case pvUByte:
-           return PVScalarArrayPtr(new BasePVUByteArray(scalarArray));
+           return PVScalarArrayPtr(new PVUByteArray(scalarArray));
      case pvUShort:
-           return PVScalarArrayPtr(new BasePVUShortArray(scalarArray));
+           return PVScalarArrayPtr(new PVUShortArray(scalarArray));
      case pvUInt:
-           return PVScalarArrayPtr(new BasePVUIntArray(scalarArray));
+           return PVScalarArrayPtr(new PVUIntArray(scalarArray));
      case pvULong:
-           return PVScalarArrayPtr(new BasePVULongArray(scalarArray));
+           return PVScalarArrayPtr(new PVULongArray(scalarArray));
      case pvFloat:
-           return PVScalarArrayPtr(new BasePVFloatArray(scalarArray));
+           return PVScalarArrayPtr(new PVFloatArray(scalarArray));
      case pvDouble:
-           return PVScalarArrayPtr(new BasePVDoubleArray(scalarArray));
+           return PVScalarArrayPtr(new PVDoubleArray(scalarArray));
      case pvString:
-           return PVScalarArrayPtr(new BasePVStringArray(scalarArray));
+           return PVScalarArrayPtr(new PVStringArray(scalarArray));
      }
      throw std::logic_error("PVDataCreate::createPVScalarArray should never get here");
      
@@ -725,21 +606,35 @@ PVUnionPtr PVDataCreate::createPVUnion(PVUnionPtr const & unionToClone)
 
 // TODO not thread-safe (local static initializers)
 // TODO replace with non-locking singleton pattern
-PVDataCreatePtr PVDataCreate::getPVDataCreate()
+const PVDataCreatePtr& PVDataCreate::getPVDataCreate()
 {
     static PVDataCreatePtr pvDataCreate;
     static Mutex mutex;
     Lock xx(mutex);
 
-    if(pvDataCreate.get()==0) pvDataCreate = PVDataCreatePtr(new PVDataCreate());
+    if(pvDataCreate.get()==0) {
+        registerRefCounter("PVField", &PVField::num_instances);
+        pvDataCreate = PVDataCreatePtr(new PVDataCreate());
+    }
     return pvDataCreate;
 }
 
-PVDataCreatePtr getPVDataCreate() {
-     return PVDataCreate::getPVDataCreate();
-}
+// explicitly instanciate to ensure that windows
+// builds emit exported symbols for inline'd methods
+template class PVScalarValue<boolean>;
+template class PVScalarValue<int8>;
+template class PVScalarValue<uint8>;
+template class PVScalarValue<int16>;
+template class PVScalarValue<uint16>;
+template class PVScalarValue<int32>;
+template class PVScalarValue<uint32>;
+template class PVScalarValue<int64>;
+template class PVScalarValue<uint64>;
+template class PVScalarValue<float>;
+template class PVScalarValue<double>;
+template class PVScalarValue<std::string>;
 
-}}
+}} // namespace epics::pvData
 
 namespace std{
     std::ostream& operator<<(std::ostream& o, const epics::pvData::PVField *ptr)

src/factory/PVField.cpp

@@ -1,8 +1,7 @@
 /*PVField.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -12,10 +11,13 @@
 #include <string>
 #include <cstdio>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvData.h>
 #include <pv/factory.h>
+#include <pv/reftrack.h>
 
 using std::tr1::const_pointer_cast;
 using std::size_t;
@@ -23,16 +25,20 @@ using std::string;
 
 namespace epics { namespace pvData {
 
+size_t PVField::num_instances;
+
 PVField::PVField(FieldConstPtr field)
-: notImplemented("not implemented"),
-  parent(NULL),field(field),
+: parent(NULL),field(field),
   fieldOffset(0), nextFieldOffset(0),
   immutable(false)
 {
+    REFTRACE_INCREMENT(num_instances);
 }
 
 PVField::~PVField()
-{ }
+{
+    REFTRACE_DECREMENT(num_instances);
+}
 
 
 size_t PVField::getFieldOffset() const
@@ -54,14 +60,8 @@ size_t PVField::getNumberFields() const
 }
 
 
-bool PVField::isImmutable() const {return immutable;}
-
 void PVField::setImmutable() {immutable = true;}
 
-const FieldConstPtr & PVField::getField() const {return field;}
-
-PVStructure *PVField::getParent() const {return parent;}
-
 void PVField::postPut() 
 {
    if(postHandler.get()!=NULL) postHandler->postPut();
@@ -97,7 +97,7 @@ std::ostream& operator<<(std::ostream& o, const PVField& f)
 string PVField::getFullName() const
 {
     string ret(fieldName);
-    for(PVField *fld=getParent(); fld; fld=fld->getParent())
+    for(const PVField *fld=getParent(); fld; fld=fld->getParent())
     {
         if(fld->getFieldName().size()==0) break;
         ret = fld->getFieldName() + '.' + ret;

src/factory/PVScalar.cpp

@@ -1,8 +1,7 @@
 /*PVScalar.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -29,22 +28,4 @@ namespace epics { namespace pvData {
     {
        return static_pointer_cast<const Scalar>(PVField::getField());
     }
-
-    template<>
-    std::ostream& PVScalarValue<int8>::dumpValue(std::ostream& o) const
-    {
-        return o << static_cast<int>(get());
-    }
-
-    template<>
-    std::ostream& PVScalarValue<uint8>::dumpValue(std::ostream& o) const
-    {
-    	return o << static_cast<unsigned int>(get());
-    }
-
-    template<>
-    std::ostream& PVScalarValue<boolean>::dumpValue(std::ostream& o) const
-    {
-        return o << std::boolalpha << static_cast<bool>(get());
-    }
 }}

src/factory/PVScalarArray.cpp

@@ -1,8 +1,7 @@
 /*PVScalarArray.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk

src/factory/PVStructure.cpp

@@ -1,8 +1,7 @@
 /*PVStructure.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -25,25 +24,6 @@ using std::string;
 
 namespace epics { namespace pvData {
 
-PVFieldPtr PVStructure::nullPVField;
-PVBooleanPtr PVStructure::nullPVBoolean;
-PVBytePtr PVStructure::nullPVByte;
-PVShortPtr PVStructure::nullPVShort;
-PVIntPtr PVStructure::nullPVInt;
-PVLongPtr PVStructure::nullPVLong;
-PVUBytePtr PVStructure::nullPVUByte;
-PVUShortPtr PVStructure::nullPVUShort;
-PVUIntPtr PVStructure::nullPVUInt;
-PVULongPtr PVStructure::nullPVULong;
-PVFloatPtr PVStructure::nullPVFloat;
-PVDoublePtr PVStructure::nullPVDouble;
-PVStringPtr PVStructure::nullPVString;
-PVStructurePtr PVStructure::nullPVStructure;
-PVStructureArrayPtr PVStructure::nullPVStructureArray;
-PVUnionPtr PVStructure::nullPVUnion;
-PVUnionArrayPtr PVStructure::nullPVUnionArray;
-PVScalarArrayPtr PVStructure::nullPVScalarArray;
-
 PVStructure::PVStructure(StructureConstPtr const & structurePtr)
 : PVField(structurePtr),
   structurePtr(structurePtr),
@@ -52,7 +32,6 @@ PVStructure::PVStructure(StructureConstPtr const & structurePtr)
     size_t numberFields = structurePtr->getNumberFields();
     FieldConstPtrArray const & fields = structurePtr->getFields();
     StringArray const & fieldNames = structurePtr->getFieldNames();
-//    PVFieldPtrArray * xxx = const_cast<PVFieldPtrArray *>(&pvFields);
     pvFields.reserve(numberFields);
     PVDataCreatePtr pvDataCreate = getPVDataCreate();
     for(size_t i=0; i<numberFields; i++) {
@@ -95,7 +74,7 @@ void PVStructure::setImmutable()
     PVField::setImmutable();
 }
 
-StructureConstPtr PVStructure::getStructure() const
+const StructureConstPtr& PVStructure::getStructure() const
 {
     return structurePtr;
 }
@@ -105,50 +84,42 @@ const PVFieldPtrArray & PVStructure::getPVFields() const
     return pvFields;
 }
 
-PVFieldPtr  PVStructure::getSubField(string const &fieldName) const
+PVFieldPtr  PVStructure::getSubFieldImpl(size_t fieldOffset, bool throws) const
 {
-    PVField * field = getSubFieldImpl(fieldName.c_str(), false);
-    if (field)
-       return field->shared_from_this();
-    else
-       return PVFieldPtr();
-}
+    const PVStructure *current = this;
 
-
-PVFieldPtr  PVStructure::getSubField(size_t fieldOffset) const
-{
-    if(fieldOffset<=getFieldOffset()) {
-        return nullPVField;
-    }
-    if(fieldOffset>getNextFieldOffset()) return nullPVField;
-    size_t numFields = pvFields.size();
-    for(size_t i=0; i<numFields; i++) {
-        PVFieldPtr pvField  = pvFields[i];
-        if(pvField->getFieldOffset()==fieldOffset) return pvFields[i];
-        if(pvField->getNextFieldOffset()<=fieldOffset) continue;
-        if(pvField->getField()->getType()==structure) {
-            PVStructure *pvStructure = static_cast<PVStructure *>(pvField.get());
-            return pvStructure->getSubField(fieldOffset);
+recurse:
+    // we don't permit self lookup
+    if(fieldOffset<=current->getFieldOffset() || fieldOffset>=current->getNextFieldOffset()) {
+        if(throws) {
+            std::stringstream ss;
+            ss << "Failed to get field with offset "
+               << fieldOffset << " (Invalid offset)" ;
+            throw std::runtime_error(ss.str());
+        } else {
+            return PVFieldPtr();
         }
     }
+
+    for(size_t i=0, numFields = current->pvFields.size(); i<numFields; i++) {
+        const PVFieldPtr& pvField  = current->pvFields[i];
+
+        if(pvField->getFieldOffset()==fieldOffset) {
+            return pvField;
+
+        } else if(pvField->getNextFieldOffset()<=fieldOffset) {
+            continue;
+
+        } else if(pvField->getField()->getType()==structure) {
+            current = static_cast<PVStructure *>(pvField.get());
+            goto recurse;
+        }
+    }
+    // the first test against current->getNextFieldOffset() would avoid this
     throw std::logic_error("PVStructure.getSubField: Logic error");
 }
 
-PVFieldPtr PVStructure::getSubFieldT(std::size_t fieldOffset) const
-{
-    PVFieldPtr pvField = getSubField(fieldOffset);
-    if (pvField.get())
-        return pvField;
-    else
-    {
-        std::stringstream ss;
-        ss << "Failed to get field with offset "
-           << fieldOffset << "(Invalid offset)" ;
-        throw std::runtime_error(ss.str());
-    }
-}
-
-PVField* PVStructure::getSubFieldImpl(const char *name, bool throws) const
+PVFieldPtr PVStructure::getSubFieldImpl(const char *name, bool throws) const
 {
     const PVStructure *parent = this;
     if(!name)
@@ -156,7 +127,7 @@ PVField* PVStructure::getSubFieldImpl(const char *name, bool throws) const
         if (throws)
             throw std::invalid_argument("Failed to get field: (Field name is NULL string)");
         else
-            return NULL;
+            return PVFieldPtr();
     }
     const char *fullName = name;
     while(true) {
@@ -172,7 +143,7 @@ PVField* PVStructure::getSubFieldImpl(const char *name, bool throws) const
                 throw std::runtime_error(ss.str());
             }
             else
-                return NULL;
+                return PVFieldPtr();
         }
         size_t N = sep-name;
         if(N==0)
@@ -185,7 +156,7 @@ PVField* PVStructure::getSubFieldImpl(const char *name, bool throws) const
                 throw std::runtime_error(ss.str());
             }
             else
-                return NULL;
+                return PVFieldPtr();
         }
 
         const PVFieldPtrArray& pvFields = parent->getPVFields();
@@ -212,7 +183,7 @@ PVField* PVStructure::getSubFieldImpl(const char *name, bool throws) const
                 throw std::runtime_error(ss.str());   
             }
             else
-                return NULL;
+                return PVFieldPtr();
         }
 
         if(*sep) {
@@ -229,18 +200,32 @@ PVField* PVStructure::getSubFieldImpl(const char *name, bool throws) const
                     throw std::runtime_error(ss.str());
                 }
                 else
-                    return NULL;
+                    return PVFieldPtr();
             }
             child = NULL;
             name = sep+1; // skip past '.'
             // loop around to new parent
 
         } else {
-            return child;
+            return child->shared_from_this();
         }
     }
 }
 
+void PVStructure::throwBadFieldType(const char *name)
+{
+    std::ostringstream ss;
+    ss << "Failed to get field: " << name << " (Field has wrong type)";
+    throw std::runtime_error(ss.str());
+}
+
+void PVStructure::throwBadFieldType(std::size_t fieldOffset)
+{
+    std::stringstream ss;
+    ss << "Failed to get field with offset "
+       << fieldOffset << " (Field has wrong type)";
+    throw std::runtime_error(ss.str());
+}
 
 void PVStructure::serialize(ByteBuffer *pbuffer,
         SerializableControl *pflusher) const {
@@ -259,9 +244,8 @@ void PVStructure::deserialize(ByteBuffer *pbuffer,
 
 void PVStructure::serialize(ByteBuffer *pbuffer,
         SerializableControl *pflusher, BitSet *pbitSet) const {
-	PVStructure* nonConstThis = const_cast<PVStructure*>(this);
-    size_t numberFields = nonConstThis->getNumberFields();
-    size_t offset = nonConstThis->getFieldOffset();
+    size_t numberFields = this->getNumberFields();
+    size_t offset = this->getFieldOffset();
     int32 next = pbitSet->nextSetBit(static_cast<uint32>(offset));
 
     // no more changes or no changes in this structure
@@ -275,7 +259,7 @@ void PVStructure::serialize(ByteBuffer *pbuffer,
 
     size_t fieldsSize = pvFields.size();
     for(size_t i = 0; i<fieldsSize; i++) {
-        PVFieldPtr pvField = pvFields[i];
+        PVField* pvField = pvFields[i].get();
         offset = pvField->getFieldOffset();
         int32 inumberFields = static_cast<int32>(pvField->getNumberFields());
         next = pbitSet->nextSetBit(static_cast<uint32>(offset));
@@ -289,8 +273,7 @@ void PVStructure::serialize(ByteBuffer *pbuffer,
         if(inumberFields==1) {
             pvField->serialize(pbuffer, pflusher);
         } else {
-            PVStructurePtr pvStructure = std::tr1::static_pointer_cast<PVStructure>(pvField);
-            pvStructure->serialize(pbuffer, pflusher, pbitSet);
+            static_cast<PVStructure*>(pvField)->serialize(pbuffer, pflusher, pbitSet);
        }
     }
 }

src/factory/PVStructureArray.cpp

@@ -1,8 +1,7 @@
 /*PVStructureArray.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk

src/factory/PVUnion.cpp

@@ -1,8 +1,7 @@
 /*PVUnion.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mse
@@ -26,7 +25,7 @@ using std::string;
 namespace epics { namespace pvData {
 	
 #define PVUNION_UNDEFINED_INDEX -1
-int32 PVUnion::UNDEFINED_INDEX = PVUNION_UNDEFINED_INDEX;
+const int32 PVUnion::UNDEFINED_INDEX = PVUNION_UNDEFINED_INDEX;
 
 PVDataCreatePtr PVUnion::pvDataCreate(getPVDataCreate());
 
@@ -41,24 +40,7 @@ PVUnion::PVUnion(UnionConstPtr const & unionPtr)
 
 #undef PVUNION_UNDEFINED_INDEX
 
-PVUnion::~PVUnion()
-{
-}
-
-UnionConstPtr PVUnion::getUnion() const
-{
-    return unionPtr;
-}
-
-PVFieldPtr PVUnion::get() const
-{
-    return value;
-}
-
-int32 PVUnion::getSelectedIndex() const
-{
-    return selector;
-}
+PVUnion::~PVUnion() {}
 
 string PVUnion::getSelectedFieldName() const
 {
@@ -71,8 +53,11 @@ string PVUnion::getSelectedFieldName() const
 
 PVFieldPtr PVUnion::select(int32 index)
 {
+    if (variant && index != UNDEFINED_INDEX)
+        throw std::invalid_argument("index out of bounds");
+
     // no change
-    if (selector == index)
+    if (selector == index && !variant)
         return value;
 
     if (index == UNDEFINED_INDEX)
@@ -81,9 +66,7 @@ PVFieldPtr PVUnion::select(int32 index)
         value.reset();
         return value;
     }
-    else if (variant)
-        throw std::invalid_argument("index out of bounds");
-    else if (index < 0 || index > static_cast<int32>(unionPtr->getFields().size()))
+    else if (index < 0 || size_t(index) >= unionPtr->getFields().size())
         throw std::invalid_argument("index out of bounds");
 
     FieldConstPtr field = unionPtr->getField(index);
@@ -100,11 +83,6 @@ PVFieldPtr PVUnion::select(string const & fieldName)
         throw std::invalid_argument("no such fieldName");
 	return select(index);
 }
-	
-void PVUnion::set(PVFieldPtr const & value)
-{
-    set(selector, value);
-}
 
 void PVUnion::set(int32 index, PVFieldPtr const & value)
 {
@@ -115,14 +93,14 @@ void PVUnion::set(int32 index, PVFieldPtr const & value)
         if (index == UNDEFINED_INDEX)
         {
             // for undefined index we accept only null values
-            if (value.get())
+            if (value)
 				throw std::invalid_argument("non-null value for index == UNDEFINED_INDEX");
         }
-        else if (index < 0 || index > static_cast<int32>(unionPtr->getFields().size()))
+        else if (index < 0 || size_t(index) >= unionPtr->getFields().size())
             throw std::invalid_argument("index out of bounds");
-
-        // value type must match
-        if (value->getField() != unionPtr->getField(index))
+        else if (!value)
+            throw std::invalid_argument("Can't set defined index w/ NULL");
+        else if (value->getField() != unionPtr->getField(index))
 			throw std::invalid_argument("selected field and its introspection data do not match");
     }
 
@@ -137,7 +115,7 @@ void PVUnion::set(string const & fieldName, PVFieldPtr const & value)
     if (index == -1)
         throw std::invalid_argument("no such fieldName");
 
-	set(index, value);
+    set(index, value);
 }
 
 void PVUnion::serialize(ByteBuffer *pbuffer, SerializableControl *pflusher) const
@@ -145,10 +123,10 @@ void PVUnion::serialize(ByteBuffer *pbuffer, SerializableControl *pflusher) cons
     if (variant)
     {
         // write introspection data
-        if (value.get() == 0)
+        if (value.get() == 0) {
+            pflusher->ensureBuffer(1);
             pbuffer->put((int8)-1);
-        else
-        {
+        }else {
             pflusher->cachedSerialize(value->getField(), pbuffer);
             value->serialize(pbuffer, pflusher);
         }
@@ -203,7 +181,7 @@ std::ostream& PVUnion::dumpValue(std::ostream& o) const
     o << format::indent() << getUnion()->getID() << ' ' << getFieldName() << std::endl;
     {
     	format::indent_scope s(o);
-		PVFieldPtr fieldField = get();
+        const PVField::const_shared_pointer& fieldField = get();
 		if (fieldField.get() == NULL)
 		  o << format::indent() << "(none)" << std::endl;
 		else
@@ -232,7 +210,7 @@ void PVUnion::copy(const PVUnion& from)
 void PVUnion::copyUnchecked(const PVUnion& from)
 {
 
-    PVFieldPtr fromValue = from.get();
+    const PVField::const_shared_pointer& fromValue = from.get();
     if (from.getUnion()->isVariant())
     {
         if (fromValue.get() == 0)

src/factory/PVUnionArray.cpp

@@ -1,8 +1,7 @@
 /*PVUnionArray.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk

src/factory/StandardField.cpp

@@ -1,8 +1,7 @@
 /* StandardField.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -11,6 +10,8 @@
 #include <cstdio>
 #include <stdexcept>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>
@@ -643,7 +644,7 @@ StructureConstPtr StandardField::enumeratedAlarm()
     return enumeratedAlarmField;
 }
 
-StandardFieldPtr StandardField::getStandardField()
+const StandardFieldPtr &StandardField::getStandardField()
 {
     static StandardFieldPtr standardFieldCreate;
     static Mutex mutex;
@@ -657,10 +658,4 @@ StandardFieldPtr StandardField::getStandardField()
     return standardFieldCreate;
 }
 
-
-
-StandardFieldPtr getStandardField() {
-    return StandardField::getStandardField();
-}
-
 }}

src/factory/StandardPVField.cpp

@@ -1,8 +1,7 @@
 /* StandardPVField.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -10,6 +9,8 @@
 #include <string>
 #include <stdexcept>
 
+#include <epicsMutex.h>
+
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/pvIntrospect.h>
@@ -68,7 +69,7 @@ PVStructurePtr StandardPVField::enumerated(StringArray const &choices)
     PVStructurePtr pvStructure = pvDataCreate->createPVStructure(field);
     PVStringArray::svector cdata(choices.size());
     std::copy(choices.begin(), choices.end(), cdata.begin());
-    pvStructure->getSubField<PVStringArray>("choices")->replace(freeze(cdata));
+    pvStructure->getSubFieldT<PVStringArray>("choices")->replace(freeze(cdata));
     return pvStructure;
 }
 
@@ -79,7 +80,7 @@ PVStructurePtr StandardPVField::enumerated(
     PVStructurePtr pvStructure =  pvDataCreate->createPVStructure(field);
     PVStringArray::svector cdata(choices.size());
     std::copy(choices.begin(), choices.end(), cdata.begin());
-    pvStructure->getSubField<PVStringArray>("value.choices")->replace(freeze(cdata));
+    pvStructure->getSubFieldT<PVStringArray>("value.choices")->replace(freeze(cdata));
     return pvStructure;
 }
 

src/factory/TypeFunc.cpp

@@ -1,8 +1,7 @@
 /*TypeFunc.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk

src/factory/factory.h

@@ -1,18 +0,0 @@
-/*factory.h*/
-/**
- * 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
- */
-#ifndef FACTORY_H
-#define FACTORY_H
-
-namespace epics { namespace pvData {
-
-    enum DebugLevel{noDebug,lowDebug,highDebug};
-
-}}
-#endif /*FACTORY_H */

src/factory/printer.cpp

@@ -1,8 +1,7 @@
 /* printer.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
  
 #include <deque>

src/factory/pv/factory.h

@@ -0,0 +1,17 @@
+/*factory.h*/
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+/**
+ *  @author mrk
+ */
+#ifndef FACTORY_H
+#define FACTORY_H
+
+namespace epics { namespace pvData {
+
+    enum DebugLevel{noDebug,lowDebug,highDebug};
+
+}}
+#endif /*FACTORY_H */

src/factory/pvSubArrayCopy.cpp

@@ -1,7 +1,6 @@
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  * @author Marty Kraimer

src/json/Makefile

@@ -0,0 +1,10 @@
+# This is a Makefile fragment, see ../Makefile
+
+SRC_DIRS += $(PVDATA_SRC)/json
+
+INC += pv/json.h
+
+LIBSRCS += parsehelper.cpp
+LIBSRCS += parseany.cpp
+LIBSRCS += parseinto.cpp
+LIBSRCS += print.cpp

src/json/parseany.cpp

@@ -0,0 +1,284 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+#include <sstream>
+
+#define epicsExportSharedSymbols
+#include <pv/pvdVersion.h>
+#include <pv/pvData.h>
+#include <pv/valueBuilder.h>
+
+#if EPICS_VERSION_INT>=VERSION_INT(3,15,0,1)
+
+#include "pv/json.h"
+
+namespace pvd = epics::pvData;
+using pvd::yajl::integer_arg;
+using pvd::yajl::size_arg;
+
+namespace {
+
+struct context {
+
+    unsigned depth;
+
+    enum state_t {
+        Undefined,
+        Key,
+        Array,
+    } state;
+
+    pvd::shared_vector<void> arr;
+
+    pvd::ValueBuilder root,
+                     *cur;
+
+    std::string msg,
+                key;
+
+    context() :depth(0u), state(Undefined), cur(&root) {}
+};
+
+#define TRY context *self = (context*)ctx; try
+
+#define CATCH() catch(std::exception& e) { self->msg = e.what(); return 0; }
+
+int jtree_null(void * ctx)
+{
+    TRY {
+        self->msg = "NULL value not permitted";
+        return 0;
+    }CATCH()
+}
+
+int jtree_boolean(void * ctx, int boolVal)
+{
+    TRY {
+        if(self->depth==0) throw std::runtime_error("Bare value not supported");
+        switch(self->state) {
+        case context::Key:
+            self->cur = &self->cur->add<pvd::pvBoolean>(self->key, boolVal);
+            self->key.clear();
+            self->state = context::Undefined;
+            break;
+        case context::Array:
+        {
+            if(self->arr.size()>0 && self->arr.original_type()!=pvd::pvBoolean)
+                throw std::runtime_error("Mixed type array not supported");
+            pvd::shared_vector<pvd::boolean> arr(pvd::static_shared_vector_cast<pvd::boolean>(self->arr));
+            arr.push_back(boolVal);
+            self->arr = pvd::static_shared_vector_cast<void>(arr);
+            break;
+        }
+        default:
+            throw std::logic_error("boolean in bad state");
+        }
+        return 1;
+    }CATCH()
+}
+
+int jtree_integer(void * ctx, integer_arg integerVal)
+{
+    TRY {
+        if(self->depth==0) throw std::runtime_error("Bare value not supported");
+        switch(self->state) {
+        case context::Key:
+            self->cur = &self->cur->add<pvd::pvLong>(self->key, integerVal);
+            self->key.clear();
+            self->state = context::Undefined;
+            break;
+        case context::Array:
+        {
+            if(self->arr.size()>0 && self->arr.original_type()!=pvd::pvLong)
+                throw std::runtime_error("Mixed type array not supported");
+            pvd::shared_vector<pvd::int64> arr(pvd::static_shared_vector_cast<pvd::int64>(self->arr));
+            arr.push_back(integerVal);
+            self->arr = pvd::static_shared_vector_cast<void>(arr);
+            break;
+        }
+        default:
+            throw std::logic_error("int64 in bad state");
+        }
+        return 1;
+    }CATCH()
+}
+
+int jtree_double(void * ctx, double doubleVal)
+{
+    TRY {
+        if(self->depth==0) throw std::runtime_error("Bare value not supported");
+        switch(self->state) {
+        case context::Key:
+            self->cur = &self->cur->add<pvd::pvDouble>(self->key, doubleVal);
+            self->key.clear();
+            self->state = context::Undefined;
+            break;
+        case context::Array:
+        {
+            if(self->arr.size()>0 && self->arr.original_type()!=pvd::pvDouble)
+                throw std::runtime_error("Mixed type array not supported");
+            pvd::shared_vector<double> arr(pvd::static_shared_vector_cast<double>(self->arr));
+            arr.push_back(doubleVal);
+            self->arr = pvd::static_shared_vector_cast<void>(arr);
+            break;
+        }
+        default:
+            throw std::logic_error("double in bad state");
+        }
+        return 1;
+    }CATCH()
+}
+
+int jtree_string(void * ctx, const unsigned char * stringVal,
+                    size_arg stringLen)
+{
+    TRY {
+        if(self->depth==0) throw std::runtime_error("Bare value not supported");
+        std::string sval((const char*)stringVal, stringLen);
+        switch(self->state) {
+        case context::Key:
+            self->cur = &self->cur->add<pvd::pvString>(self->key, sval);
+            self->key.clear();
+            self->state = context::Undefined;
+            break;
+        case context::Array:
+        {
+            if(self->arr.size()>0 && self->arr.original_type()!=pvd::pvString)
+                throw std::runtime_error("Mixed type array not supported");
+            pvd::shared_vector<std::string> arr(pvd::static_shared_vector_cast<std::string>(self->arr));
+            arr.push_back(sval);
+            self->arr = pvd::static_shared_vector_cast<void>(arr);
+            break;
+        }
+        default:
+            throw std::logic_error("double in bad state");
+        }
+        return 1;
+    }CATCH()
+}
+
+int jtree_start_map(void * ctx)
+{
+    TRY {
+        if(self->depth>0) {
+            if(self->key.empty())
+                throw std::logic_error("anonymous dict not top level?");
+            self->cur = &self->cur->addNested(self->key);
+            self->key.clear();
+        }
+        self->depth++;
+        return 1;
+    }CATCH()
+}
+
+int jtree_map_key(void * ctx, const unsigned char * key,
+                     size_arg stringLen)
+{
+    TRY {
+        if(!self->key.empty())
+            throw std::logic_error("double key?");
+        if(stringLen==0)
+            throw std::runtime_error("empty key not allowed");
+        self->key = std::string((const char*)key, stringLen);
+        self->state = context::Key;
+        return 1;
+    }CATCH()
+}
+
+int jtree_end_map(void * ctx)
+{
+    TRY {
+        if(self->depth>1)
+            self->cur = &self->cur->endNested();
+        else if(self->depth==0)
+            throw std::logic_error("Unbalenced dict");
+        self->depth--;
+        return 1;
+    }CATCH()
+}
+
+int jtree_start_array(void * ctx)
+{
+    TRY {
+        if(self->depth==0) throw std::runtime_error("Bare array not supported");
+        if(self->state!=context::Key)
+            throw std::logic_error("bare array not supported");
+        self->state = context::Array;
+        return 1;
+    }CATCH()
+}
+int jtree_end_array(void * ctx)
+{
+    TRY {
+        if(self->state!=context::Array)
+            throw std::logic_error("Bad array parse");
+        self->cur = &self->cur->add(self->key, pvd::freeze(self->arr));
+        self->key.clear();
+        self->state = context::Undefined;
+        return 1;
+    }CATCH()
+}
+
+
+yajl_callbacks jtree_cbs = {
+    &jtree_null,
+    &jtree_boolean,
+    &jtree_integer,
+    &jtree_double,
+    NULL, // number
+    &jtree_string,
+    &jtree_start_map,
+    &jtree_map_key,
+    &jtree_end_map,
+    &jtree_start_array,
+    &jtree_end_array,
+};
+
+struct handler {
+    yajl_handle handle;
+    handler(yajl_handle handle) :handle(handle)
+    {
+        if(!handle)
+            throw std::runtime_error("Failed to allocate yajl handle");
+    }
+    ~handler() {
+        yajl_free(handle);
+    }
+    operator yajl_handle() { return handle; }
+};
+
+} // namespace
+
+namespace epics{namespace pvData{
+
+epics::pvData::PVStructure::shared_pointer
+parseJSON(std::istream& strm)
+{
+#ifndef EPICS_YAJL_VERSION
+    yajl_parser_config conf;
+    memset(&conf, 0, sizeof(conf));
+    conf.allowComments = 1;
+    conf.checkUTF8 = 1;
+#endif
+
+    context ctxt;
+
+#ifndef EPICS_YAJL_VERSION
+    handler handle(yajl_alloc(&jtree_cbs, &conf, NULL, &ctxt));
+#else
+    handler handle(yajl_alloc(&jtree_cbs, NULL, &ctxt));
+
+    yajl_config(handle, yajl_allow_comments, 1);
+#endif
+
+    if(!yajl_parse_helper(strm, handle))
+        throw std::runtime_error(ctxt.msg);
+
+    return ctxt.cur->buildPVStructure();
+}
+
+}} // namespace epics::pvData
+
+#endif // EPICS_VERSION_INT

src/json/parsehelper.cpp

@@ -0,0 +1,122 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+#include <stdexcept>
+#include <sstream>
+
+#define epicsExportSharedSymbols
+#include <pv/pvdVersion.h>
+
+#if EPICS_VERSION_INT>=VERSION_INT(3,15,0,1)
+
+#include "pv/json.h"
+
+namespace {
+
+void check_trailing(const std::string& line)
+{
+    size_t idx = line.find_first_not_of(" \t\n\r");
+    if(idx==line.npos) return;
+    // TODO: detect the end of potentially multi-line comments...
+    // for now trailing comments not allowed
+    throw std::runtime_error("Trailing junk");
+}
+
+} // namespace
+
+namespace epics{namespace pvData{
+
+bool yajl_parse_helper(std::istream& src,
+                       yajl_handle handle)
+{
+    unsigned linenum=0;
+#ifndef EPICS_YAJL_VERSION
+    bool done = false;
+#endif
+
+    std::string line;
+    while(std::getline(src, line)) {
+        linenum++;
+
+#ifndef EPICS_YAJL_VERSION
+        if(done) {
+            check_trailing(line);
+            continue;
+        }
+#endif
+
+        yajl_status sts = yajl_parse(handle, (const unsigned char*)line.c_str(), line.size());
+
+        switch(sts) {
+        case yajl_status_ok: {
+            size_t consumed = yajl_get_bytes_consumed(handle);
+
+            if(consumed<line.size()) {
+                check_trailing(line.substr(consumed));
+            }
+
+#ifndef EPICS_YAJL_VERSION
+            done = true;
+#endif
+            break;
+        }
+        case yajl_status_client_canceled:
+            return false;
+#ifndef EPICS_YAJL_VERSION
+        case yajl_status_insufficient_data:
+            // continue with next line
+            break;
+#endif
+        case yajl_status_error:
+        {
+            std::ostringstream msg;
+            unsigned char *raw = yajl_get_error(handle, 1, (const unsigned char*)line.c_str(), line.size());
+            if(!raw) {
+                msg<<"Unknown error on line "<<linenum;
+            } else {
+                try {
+                    msg<<"Error on line "<<linenum<<" : "<<(const char*)raw;
+                }catch(...){
+                    yajl_free_error(handle, raw);
+                    throw;
+                }
+                yajl_free_error(handle, raw);
+            }
+            throw std::runtime_error(msg.str());
+        }
+        }
+    }
+
+    if(!src.eof() || src.bad()) {
+        std::ostringstream msg;
+        msg<<"I/O error after line "<<linenum;
+        throw std::runtime_error(msg.str());
+
+#ifndef EPICS_YAJL_VERSION
+    } else if(!done) {
+        switch(yajl_parse_complete(handle)) {
+#else
+    } else {
+        switch(yajl_complete_parse(handle)) {
+#endif
+        case yajl_status_ok:
+            break;
+        case yajl_status_client_canceled:
+            return false;
+#ifndef EPICS_YAJL_VERSION
+        case yajl_status_insufficient_data:
+            throw std::runtime_error("unexpected end of input");
+#endif
+        case yajl_status_error:
+            throw std::runtime_error("Error while completing parsing");
+        }
+    }
+
+    return true;
+}
+
+}} // namespace epics::pvData
+
+#endif // EPICS_VERSION_INT

src/json/parseinto.cpp

@@ -0,0 +1,342 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+#include <vector>
+#include <sstream>
+
+#define epicsExportSharedSymbols
+#include <pv/pvdVersion.h>
+#include <pv/pvData.h>
+#include <pv/valueBuilder.h>
+#include <pv/bitSet.h>
+
+#if EPICS_VERSION_INT>=VERSION_INT(3,15,0,1)
+
+#include "pv/json.h"
+
+namespace pvd = epics::pvData;
+using pvd::yajl::integer_arg;
+using pvd::yajl::size_arg;
+
+namespace {
+struct context {
+
+    std::string msg;
+
+    struct frame {
+        pvd::PVFieldPtr fld;
+        pvd::BitSet *assigned;
+        frame(const pvd::PVFieldPtr& fld, pvd::BitSet *assigned)
+            :fld(fld), assigned(assigned)
+        {}
+    };
+
+    typedef std::vector<frame> stack_t;
+    stack_t stack;
+
+    context(const pvd::PVFieldPtr& root, pvd::BitSet *assigned)
+    {
+        stack.push_back(frame(root, assigned));
+    }
+};
+
+#define TRY context *self = (context*)ctx; assert(!self->stack.empty()); try
+
+#define CATCH() catch(std::exception& e) { if(self->msg.empty()) self->msg = e.what(); return 0; }
+
+int jtree_null(void * ctx)
+{
+    TRY {
+        self->msg = "NULL value not permitted";
+        return 0;
+    }CATCH()
+}
+
+template<typename PVScalarT, typename PVArrayT>
+void valueAssign(context *self, typename PVScalarT::value_type val)
+{
+    assert(!self->stack.empty());
+    context::frame& back = self->stack.back();
+    pvd::Type type(back.fld->getField()->getType());
+    if(type==pvd::scalar) {
+        pvd::PVScalar* fld(static_cast<pvd::PVScalar*>(back.fld.get()));
+
+        fld->putFrom(val);
+        if(back.assigned)
+            back.assigned->set(fld->getFieldOffset());
+        self->stack.pop_back();
+        // structure at the top of the stack
+
+    } else if(type==pvd::scalarArray) {
+        pvd::PVScalarArray *fld(static_cast<pvd::PVScalarArray*>(back.fld.get()));
+
+        pvd::shared_vector<const void> carr;
+        fld->getAs(carr);
+
+        switch(carr.original_type())
+        {
+#define CASE_STRING
+#define CASE_REAL_INT64
+#define CASE(BASETYPE, PVATYPE, DBFTYPE, PVACODE) case epics::pvData::pv##PVACODE: { \
+            pvd::shared_vector<const PVATYPE> arr(pvd::static_shared_vector_cast<const PVATYPE>(carr)); \
+            pvd::shared_vector<PVATYPE> tarr(pvd::thaw(arr)); \
+            tarr.push_back(pvd::castUnsafe<PVATYPE>(val)); \
+            carr = pvd::static_shared_vector_cast<const void>(pvd::freeze(tarr)); \
+            } break;
+#include <pv/typemap.h>
+#undef CASE
+#undef CASE_REAL_INT64
+#undef CASE_STRING
+        }
+
+        fld->putFrom(carr);
+
+        // leave array field at top of stack
+
+    } else if(type==pvd::union_) {
+        pvd::PVUnion* fld(static_cast<pvd::PVUnion*>(back.fld.get()));
+        pvd::UnionConstPtr utype(fld->getUnion());
+
+        if(utype->isVariant()) {
+            typename PVScalarT::shared_pointer elem(pvd::getPVDataCreate()->createPVScalar<PVScalarT>());
+
+            elem->put(val);
+
+            fld->set(elem);
+
+        } else {
+            // attempt automagic assignment
+
+            const pvd::StringArray& names = utype->getFieldNames();
+            const pvd::FieldConstPtrArray types = utype->getFields();
+            assert(names.size()==types.size());
+
+            bool assigned = false;
+            for(size_t i=0, N=names.size(); i<N; i++) {
+                if(types[i]->getType()!=pvd::scalar) continue;
+
+                pvd::PVScalarPtr ufld(fld->select<pvd::PVScalar>(i));
+                try{
+                    ufld->putFrom(val);
+                    assigned = true;
+                }catch(std::runtime_error&){
+                    if(i==N-1)
+                        throw;
+                    continue;
+                }
+
+                break;
+            }
+            if(!assigned)
+                throw std::runtime_error("Unable to select union member");
+        }
+        if(back.assigned)
+            back.assigned->set(fld->getFieldOffset());
+        self->stack.pop_back();
+        // structure back at the top of the stack
+
+    } else {
+        throw std::invalid_argument("Can't assign value");
+    }
+}
+
+int jtree_boolean(void * ctx, int boolVal)
+{
+    TRY {
+        valueAssign<pvd::PVBoolean, pvd::PVBooleanArray>(self, !!boolVal);
+        return 1;
+    }CATCH()
+}
+
+int jtree_integer(void * ctx, integer_arg integerVal)
+{
+    TRY {
+        valueAssign<pvd::PVLong, pvd::PVLongArray>(self, integerVal);
+        return 1;
+    }CATCH()
+}
+
+int jtree_double(void * ctx, double doubleVal)
+{
+    TRY {
+        valueAssign<pvd::PVDouble, pvd::PVDoubleArray>(self, doubleVal);
+        return 1;
+    }CATCH()
+}
+
+int jtree_string(void * ctx, const unsigned char * stringVal,
+                    size_arg stringLen)
+{
+    TRY {
+        std::string val((const char*)stringVal, stringLen);
+        valueAssign<pvd::PVString, pvd::PVStringArray>(self, val);
+        return 1;
+    }CATCH()
+}
+
+int jtree_start_map(void * ctx)
+{
+    TRY {
+        assert(!self->stack.empty());
+
+        context::frame& back = self->stack.back();
+        pvd::Type type = back.fld->getField()->getType();
+        if(type==pvd::structure) {
+            // will fill in
+        } else if(type==pvd::structureArray) {
+            // starting new element in structure array
+            pvd::PVStructureArray* sarr(static_cast<pvd::PVStructureArray*>(back.fld.get()));
+
+            pvd::PVStructurePtr elem(pvd::getPVDataCreate()->createPVStructure(sarr->getStructureArray()->getStructure()));
+
+            self->stack.push_back(context::frame(elem, 0));
+        } else {
+            throw std::runtime_error("Can't map (sub)structure");
+        }
+
+        assert(self->stack.back().fld->getField()->getType()==pvd::structure);
+        return 1;
+    }CATCH()
+}
+
+int jtree_map_key(void * ctx, const unsigned char * key,
+                     size_arg stringLen)
+{
+    TRY {
+        assert(!self->stack.empty());
+        std::string name((const char*)key, stringLen);
+
+        // start_map() ensures we have a structure at the top of the stack
+        pvd::PVStructure *fld = static_cast<pvd::PVStructure*>(self->stack.back().fld.get());
+
+        try {
+            self->stack.push_back(context::frame(fld->getSubFieldT(name), self->stack.back().assigned));
+        }catch(std::runtime_error& e){
+            std::ostringstream strm;
+            strm<<"At "<<fld->getFullName()<<" : "<<e.what()<<"\n";
+            throw std::runtime_error(strm.str());
+        }
+
+        return 1;
+    }CATCH()
+}
+
+int jtree_end_map(void * ctx)
+{
+    TRY {
+        assert(!self->stack.empty());
+        assert(self->stack.back().fld->getField()->getType()==pvd::structure);
+
+        context::frame elem(self->stack.back());
+        self->stack.pop_back();
+
+        if(!self->stack.empty() && self->stack.back().fld->getField()->getType()==pvd::structureArray) {
+            // append element to struct array
+            pvd::PVStructureArray *sarr = static_cast<pvd::PVStructureArray*>(self->stack.back().fld.get());
+
+            pvd::PVStructureArray::const_svector cval;
+            sarr->swap(cval);
+
+            pvd::PVStructureArray::svector val(pvd::thaw(cval));
+
+            val.push_back(std::tr1::static_pointer_cast<pvd::PVStructure>(elem.fld));
+
+            sarr->replace(pvd::freeze(val));
+        }
+
+        return 1;
+    }CATCH()
+}
+
+int jtree_start_array(void * ctx)
+{
+    TRY {
+        assert(!self->stack.empty());
+        pvd::PVFieldPtr& back(self->stack.back().fld);
+        pvd::Type type = back->getField()->getType();
+        if(type!=pvd::structureArray && type!=pvd::scalarArray)
+            throw std::runtime_error("Can't assign array");
+
+        return 1;
+    }CATCH()
+}
+int jtree_end_array(void * ctx)
+{
+    TRY {
+        assert(!self->stack.empty());
+
+        if(self->stack.back().assigned)
+            self->stack.back().assigned->set(self->stack.back().fld->getFieldOffset());
+        self->stack.pop_back();
+        return 1;
+    }CATCH()
+}
+
+
+yajl_callbacks jtree_cbs = {
+    &jtree_null,
+    &jtree_boolean,
+    &jtree_integer,
+    &jtree_double,
+    NULL, // number
+    &jtree_string,
+    &jtree_start_map,
+    &jtree_map_key,
+    &jtree_end_map,
+    &jtree_start_array,
+    &jtree_end_array,
+};
+
+struct handler {
+    yajl_handle handle;
+    handler(yajl_handle handle) :handle(handle)
+    {
+        if(!handle)
+            throw std::runtime_error("Failed to allocate yajl handle");
+    }
+    ~handler() {
+        yajl_free(handle);
+    }
+    operator yajl_handle() { return handle; }
+};
+
+} // namespace
+
+namespace epics{namespace pvData{
+
+epicsShareFunc
+void parseJSON(std::istream& strm,
+               const PVField::shared_pointer& dest,
+               BitSet *assigned)
+{
+#ifndef EPICS_YAJL_VERSION
+    yajl_parser_config conf;
+    memset(&conf, 0, sizeof(conf));
+    conf.allowComments = 1;
+    conf.checkUTF8 = 1;
+#endif
+
+    context ctxt(dest, assigned);
+
+#ifndef EPICS_YAJL_VERSION
+    handler handle(yajl_alloc(&jtree_cbs, &conf, NULL, &ctxt));
+#else
+    handler handle(yajl_alloc(&jtree_cbs, NULL, &ctxt));
+
+    yajl_config(handle, yajl_allow_comments, 1);
+#endif
+
+
+    if(!yajl_parse_helper(strm, handle))
+        throw std::runtime_error(ctxt.msg);
+
+    if(!ctxt.stack.empty())
+        throw std::logic_error("field stack not empty");
+}
+
+}} // namespace epics::pvData
+
+#endif // EPICS_VERSION_INT
+

src/json/print.cpp

@@ -0,0 +1,170 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+#include <vector>
+#include <sstream>
+
+#define epicsExportSharedSymbols
+#include <pv/pvdVersion.h>
+#include <pv/pvData.h>
+#include <pv/valueBuilder.h>
+
+#if EPICS_VERSION_INT>=VERSION_INT(3,15,0,1)
+
+#include "pv/json.h"
+
+namespace pvd = epics::pvData;
+
+namespace {
+
+struct args {
+    std::ostream& strm;
+    const pvd::JSONPrintOptions& opts;
+
+    unsigned indent;
+
+    args(std::ostream& strm,
+         const pvd::JSONPrintOptions& opts)
+        :strm(strm)
+        ,opts(opts)
+        ,indent(opts.indent)
+    {}
+
+    void doIntent() {
+        if(!opts.multiLine) return;
+        strm.put('\n');
+        unsigned i=indent;
+        while(i--) strm.put(' ');
+    }
+};
+
+void show_field(args& A, const pvd::PVField* fld);
+
+void show_struct(args& A, const pvd::PVStructure* fld)
+{
+    const pvd::StructureConstPtr& type = fld->getStructure();
+    const pvd::PVFieldPtrArray& children = fld->getPVFields();
+
+    const pvd::StringArray& names = type->getFieldNames();
+
+    A.strm.put('{');
+    A.indent++;
+
+    for(size_t i=0, N=names.size(); i<N; i++)
+    {
+        if(i!=0)
+            A.strm.put(',');
+        A.doIntent();
+        A.strm<<'\"'<<names[i]<<"\": ";
+        show_field(A, children[i].get());
+    }
+
+    A.indent--;
+    A.doIntent();
+    A.strm.put('}');
+}
+
+void show_field(args& A, const pvd::PVField* fld)
+{
+    switch(fld->getField()->getType())
+    {
+    case pvd::scalar:
+    {
+        const pvd::PVScalar *scalar=static_cast<const pvd::PVScalar*>(fld);
+        if(scalar->getScalar()->getScalarType()==pvd::pvString) {
+            A.strm<<'\"'<<scalar->getAs<std::string>()<<'\"';
+        } else {
+            A.strm<<scalar->getAs<std::string>();
+        }
+    }
+        break;
+    case pvd::scalarArray:
+    {
+        const pvd::PVScalarArray *scalar=static_cast<const pvd::PVScalarArray*>(fld);
+        const bool isstring = scalar->getScalarArray()->getElementType()==pvd::pvString;
+
+        pvd::shared_vector<const void> arr;
+        scalar->getAs<void>(arr);
+
+        pvd::shared_vector<const std::string> sarr(pvd::shared_vector_convert<const std::string>(arr));
+
+        A.strm.put('[');
+        for(size_t i=0, N=sarr.size(); i<N; i++) {
+            if(i!=0)
+                A.strm.put(',');
+            if(isstring)
+                A.strm.put('\"');
+            A.strm<<sarr[i];
+            if(isstring)
+                A.strm.put('\"');
+        }
+        A.strm.put(']');
+    }
+        break;
+    case pvd::structure:
+        show_struct(A, static_cast<const pvd::PVStructure*>(fld));
+        break;
+    case pvd::structureArray:
+    {
+        pvd::PVStructureArray::const_svector arr(static_cast<const pvd::PVStructureArray*>(fld)->view());
+        A.strm.put('[');
+        A.indent++;
+
+        for(size_t i=0, N=arr.size(); i<N; i++) {
+            if(i!=0)
+                A.strm.put(',');
+            A.doIntent();
+            if(arr[i])
+                show_struct(A, arr[i].get());
+            else
+                A.strm<<"NULL";
+        }
+
+        A.indent--;
+        A.doIntent();
+        A.strm.put(']');
+    }
+        break;
+    case pvd::union_:
+    {
+        const pvd::PVUnion *U=static_cast<const pvd::PVUnion*>(fld);
+        const pvd::PVField::const_shared_pointer& C(U->get());
+
+        if(!C) {
+            A.strm<<"null";
+        } else {
+            show_field(A, C.get());
+        }
+    }
+        break;
+    default:
+        if(A.opts.ignoreUnprintable)
+            A.strm<<"// unprintable field type";
+        else
+            throw std::runtime_error("Encountered unprintable field type");
+    }
+}
+
+} // namespace
+
+namespace epics{namespace pvData{
+
+JSONPrintOptions::JSONPrintOptions()
+    :multiLine(true)
+    ,ignoreUnprintable(true)
+    ,indent(0)
+{}
+
+void printJSON(std::ostream& strm,
+               const PVField::const_shared_pointer& val,
+               const JSONPrintOptions& opts)
+{
+    args A(strm, opts);
+    show_field(A, val.get());
+}
+
+}} // namespace epics::pvData
+
+#endif // EPICS_VERSION_INT

src/json/pv/json.h

@@ -0,0 +1,127 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+#ifndef PV_JSON_H
+#define PV_JSON_H
+
+#include <istream>
+#include <ostream>
+#include <string>
+#include <map>
+
+#include <pv/pvdVersion.h>
+#include <pv/pvData.h>
+
+#if EPICS_VERSION_INT>=VERSION_INT(3,15,0,1)
+
+#ifdef epicsExportSharedSymbols
+#   define pvjson_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
+#include <yajl_parse.h>
+
+#ifdef pvjson_epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#   include "shareLib.h"
+#endif
+
+#include <shareLib.h>
+
+namespace epics{namespace pvData{
+
+class BitSet;
+
+/** @defgroup pvjson JSON print/parse
+ *
+ * Printing PVField as JSON and parsing JSON into PVField.
+ *
+ * @{
+ */
+
+//! Options used during printing
+struct epicsShareClass JSONPrintOptions
+{
+    bool multiLine;        //!< include new lines
+    bool ignoreUnprintable;//!< ignore union/union array when encountered
+    unsigned indent;       //!< Initial indentation (# of spaces)
+    JSONPrintOptions();
+};
+
+/** Print PVStructure as JSON
+ *
+ * Restrictions:
+ *
+ * - No support for union or array of union
+ */
+epicsShareFunc
+void printJSON(std::ostream& strm,
+               const PVField::const_shared_pointer& val,
+               const JSONPrintOptions& opts = JSONPrintOptions());
+
+/** Parse JSON text into a PVStructure
+ *
+ * Restrictions:
+ *
+ * - Top level must be {}  dict/object
+ * - field values must be number, string, array, or dict/object
+ * - array values must be number or string
+ */
+epicsShareFunc
+PVStructure::shared_pointer parseJSON(std::istream& strm);
+
+/** Parse JSON and store into the provided PVStructure.
+ *
+ * Restrictions:
+ *
+ * - array of union not supported
+ * - Only scalar value assigned to union
+ *
+ * @param strm Read JSON text from stream
+ * @param dest Store in fields of this structure
+ * @param assigned Which fields of _dest_ were assigned. (Optional)
+ * @throws std::runtime_error on failure.  dest and assigned may be modified.
+ */
+epicsShareFunc
+void parseJSON(std::istream& strm,
+               const PVField::shared_pointer& dest,
+               BitSet *assigned=0);
+
+
+/** Wrapper around yajl_parse()
+ *
+ * Parse entire input stream.
+ * Errors if extranious non-whitespace found after the point were parsing completes.
+ *
+ * @param src The stream from which input charactors are read
+ * @param handle A parser handle previously allocated with yajl_alloc().  Not free'd on success or failure.
+ *
+ * @returns true if parsing completes successfully.  false if parsing cancelled by callback.  throws other errors
+ *
+ * @note The form of this call depends on EPICS_YAJL_VERSION
+ */
+epicsShareFunc
+bool yajl_parse_helper(std::istream& src,
+                       yajl_handle handle);
+
+namespace yajl {
+// undef implies API version 0
+#ifndef EPICS_YAJL_VERSION
+typedef long integer_arg;
+typedef unsigned size_arg;
+#else
+typedef long long integer_arg;
+typedef size_t size_arg;
+#endif
+} // namespace epics::pvData::yajl
+
+/** @} */
+
+}} // namespace epics::pvData
+
+#else
+#  error JSON parser requires EPICS Base >= 3.15.0.1
+#endif // EPICS_VERSION_INT
+
+#endif // PV_JSON_H

src/misc/Makefile

@@ -2,42 +2,43 @@
 
 SRC_DIRS += $(PVDATA_SRC)/misc
 
-INC += noDefaultMethods.h
-INC += lock.h
-INC += requester.h
-INC += serialize.h
-INC += bitSet.h
-INC += byteBuffer.h
-INC += epicsException.h
-INC += serializeHelper.h
-INC += event.h
-INC += thread.h
-INC += executor.h
-INC += timeFunction.h
-INC += timer.h
-INC += queue.h
-INC += messageQueue.h
-INC += destroyable.h
-INC += status.h
-INC += sharedPtr.h
-INC += localStaticLock.h
-INC += typeCast.h
-INC += sharedVector.h
-INC += templateMeta.h
-INC += current_function.h
+INC += pv/noDefaultMethods.h
+INC += pv/lock.h
+INC += pv/serialize.h
+INC += pv/bitSet.h
+INC += pv/byteBuffer.h
+INC += pv/epicsException.h
+INC += pv/serializeHelper.h
+INC += pv/event.h
+INC += pv/thread.h
+INC += pv/executor.h
+INC += pv/timeFunction.h
+INC += pv/timer.h
+INC += pv/queue.h
+INC += pv/status.h
+INC += pv/sharedPtr.h
+INC += pv/debugPtr.h
+INC += pv/localStaticLock.h
+INC += pv/typeCast.h
+INC += pv/sharedVector.h
+INC += pv/templateMeta.h
+INC += pv/current_function.h
+INC += pv/pvUnitTest.h
+INC += pv/reftrack.h
+INC += pv/anyscalar.h
 
 LIBSRCS += byteBuffer.cpp
 LIBSRCS += bitSet.cpp
 LIBSRCS += epicsException.cpp
-LIBSRCS += requester.cpp
 LIBSRCS += serializeHelper.cpp
 LIBSRCS += event.cpp
 LIBSRCS += executor.cpp
 LIBSRCS += timeFunction.cpp
 LIBSRCS += timer.cpp
 LIBSRCS += status.cpp
-LIBSRCS += messageQueue.cpp
 LIBSRCS += localStaticLock.cpp
 LIBSRCS += typeCast.cpp
 LIBSRCS += parseToPOD.cpp
-
+LIBSRCS += pvUnitTest.cpp
+LIBSRCS += debugPtr.cpp
+LIBSRCS += reftrack.cpp

src/misc/bitSet.cpp

@@ -1,8 +1,7 @@
 /* bitSet.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mes
@@ -10,12 +9,38 @@
 #include <string.h>
 #include <stdio.h>
 #include <iostream>
+#include <stdexcept>
+#include <algorithm>
+
+#include <epicsMutex.h>
 
 #define epicsExportSharedSymbols
 #include <pv/lock.h>
 #include <pv/serializeHelper.h>
 #include <pv/bitSet.h>
 
+/*
+ * BitSets are packed into arrays of "words."  Currently a word is
+ * a long, which consists of 64 bits, requiring 6 address bits.
+ * The choice of word size is determined purely by performance concerns.
+ */
+#define ADDRESS_BITS_PER_WORD 6u
+#define BITS_PER_WORD  (1u << ADDRESS_BITS_PER_WORD)
+#define BYTES_PER_WORD sizeof(uint64)
+#define BIT_INDEX_MASK (BITS_PER_WORD - 1u)
+
+/** Used to shift left or right for a partial word mask */
+#define WORD_MASK ~((uint64)0)
+
+// index of work containing this bit
+#define WORD_INDEX(bitn) ((bitn)>>ADDRESS_BITS_PER_WORD)
+// bit offset within word
+#define WORD_OFFSET(bitn) ((bitn)&BIT_INDEX_MASK)
+
+// the words vector should be size()d as small as posible,
+// so the last word should always have a bit set when the set is not empty
+#define CHECK_POST() assert(words.empty() || words.back()!=0)
+
 namespace epics { namespace pvData {
  
     BitSet::shared_pointer BitSet::create(uint32 nbits)
@@ -23,90 +48,76 @@ namespace epics { namespace pvData {
         return BitSet::shared_pointer(new BitSet(nbits));
     }
     
-    BitSet::BitSet() : words(0), wordsLength(0), wordsInUse(0) {
-        initWords(BITS_PER_WORD);
+    BitSet::BitSet() {}
 
+    BitSet::BitSet(uint32 nbits)
+    {
+        words.reserve((nbits == 0) ? 1 : WORD_INDEX(nbits-1) + 1);
     }
 
-    BitSet::BitSet(uint32 nbits) : words(0), wordsLength(0), wordsInUse(0) {
-        initWords(nbits);
+#if __cplusplus>=201103L
+    BitSet::BitSet(std::initializer_list<uint32> I)
+    {
+        // optimistically guess that highest bit is last (not required)
+        words.reserve((I.size() == 0) ? 1 : WORD_INDEX(*(I.end()-1)) + 1);
 
+        for(uint32 idx : I)
+        {
+            set(idx);
+        }
     }
+#endif
 
-    BitSet::~BitSet() {
-        delete[] words;
-    }
-
-    void BitSet::initWords(uint32 nbits) {
-        uint32 length = (nbits <= 0) ? 1 : wordIndex(nbits-1) + 1;
-        if (words) delete[] words;
-        words = new uint64[length];
-        memset(words, 0, sizeof(uint64)*length);
-        wordsLength = length;
-    }
+    BitSet::~BitSet() {}
 
     void BitSet::recalculateWordsInUse() {
-        // wordsInUse is unsigned
-        if (wordsInUse == 0)
-            return;
-
-        // Traverse the bitset until a used word is found
-        int32 i;
-        for (i = (int32)wordsInUse-1; i >= 0; i--)
-            if (words[i] != 0)
+        // step back from the end to find the first non-zero element
+        size_t nsize = words.size();
+        for(; nsize; nsize--) {
+            if(words[nsize-1])
                 break;
-
-        wordsInUse = i+1; // The new logical size
+        }
+        words.resize(nsize);
+        CHECK_POST();
     }
 
     void BitSet::ensureCapacity(uint32 wordsRequired) {
-        if (wordsLength < wordsRequired) {
-
-            // create and copy
-            uint64* newwords = new uint64[wordsRequired];
-            memset(newwords, 0, sizeof(uint64)*wordsRequired);
-            memcpy(newwords, words, sizeof(uint64)*wordsLength);
-            if (words) delete[] words;
-            words = newwords;
-            wordsLength = wordsRequired;
-        }
+        words.resize(std::max(words.size(), (size_t)wordsRequired), 0);
     }
 
     void BitSet::expandTo(uint32 wordIndex) {
-        uint32 wordsRequired = wordIndex+1;
-        if (wordsInUse < wordsRequired) {
-            ensureCapacity(wordsRequired);
-            wordsInUse = wordsRequired;
+        ensureCapacity(wordIndex+1);
+    }
+
+    BitSet& BitSet::flip(uint32 bitIndex) {
+
+        uint32 wordIdx = WORD_INDEX(bitIndex);
+        expandTo(wordIdx);
+
+        words[wordIdx] ^= (((uint64)1) << WORD_OFFSET(bitIndex));
+
+        recalculateWordsInUse();
+        return *this;
+    }
+
+    BitSet& BitSet::set(uint32 bitIndex) {
+
+        uint32 wordIdx = WORD_INDEX(bitIndex);
+        expandTo(wordIdx);
+
+        words[wordIdx] |= (((uint64)1) << WORD_OFFSET(bitIndex));
+        return *this;
+    }
+
+    BitSet& BitSet::clear(uint32 bitIndex) {
+
+        uint32 wordIdx = WORD_INDEX(bitIndex);
+        if (wordIdx < words.size()) {
+            words[wordIdx] &= ~(((uint64)1) << WORD_OFFSET(bitIndex));
+
+            recalculateWordsInUse();
         }
-    }
-
-    void BitSet::flip(uint32 bitIndex) {
-
-        uint32 wordIdx = wordIndex(bitIndex);
-        expandTo(wordIdx);
-
-        words[wordIdx] ^= (((uint64)1) << (bitIndex % BITS_PER_WORD));
-
-        recalculateWordsInUse();
-    }
-
-    void BitSet::set(uint32 bitIndex) {
-
-        uint32 wordIdx = wordIndex(bitIndex);
-        expandTo(wordIdx);
-
-        words[wordIdx] |= (((uint64)1) << (bitIndex % BITS_PER_WORD));
-    }
-
-    void BitSet::clear(uint32 bitIndex) {
-
-        uint32 wordIdx = wordIndex(bitIndex);
-        if (wordIdx >= wordsInUse)
-            return;
-
-        words[wordIdx] &= ~(((uint64)1) << (bitIndex % BITS_PER_WORD));
-
-        recalculateWordsInUse();
+        return *this;
     }
 
     void BitSet::set(uint32 bitIndex, bool value) {
@@ -117,14 +128,13 @@ namespace epics { namespace pvData {
     }
 
     bool BitSet::get(uint32 bitIndex) const {
-        uint32 wordIdx = wordIndex(bitIndex);
-        return ((wordIdx < wordsInUse)
-            && ((words[wordIdx] & (((uint64)1) << (bitIndex % BITS_PER_WORD))) != 0));
+        uint32 wordIdx = WORD_INDEX(bitIndex);
+        return ((wordIdx < words.size())
+            && ((words[wordIdx] & (((uint64)1) << WORD_OFFSET(bitIndex))) != 0));
     }
 
     void BitSet::clear() {
-        while (wordsInUse > 0)
-            words[--wordsInUse] = 0;
+        words.clear();
     }
 
     uint32 BitSet::numberOfTrailingZeros(uint64 i) {
@@ -153,8 +163,8 @@ namespace epics { namespace pvData {
 
     int32 BitSet::nextSetBit(uint32 fromIndex) const {
 
-        uint32 u = wordIndex(fromIndex);
-        if (u >= wordsInUse)
+        uint32 u = WORD_INDEX(fromIndex);
+        if (u >= words.size())
             return -1;
 
         uint64 word = words[u] & (WORD_MASK << (fromIndex % BITS_PER_WORD));
@@ -162,7 +172,7 @@ namespace epics { namespace pvData {
         while (true) {
             if (word != 0)
                 return (u * BITS_PER_WORD) + numberOfTrailingZeros(word);
-            if (++u == wordsInUse)
+            if (++u == words.size())
                 return -1;
             word = words[u];
         }
@@ -171,8 +181,8 @@ namespace epics { namespace pvData {
     int32 BitSet::nextClearBit(uint32 fromIndex) const {
         // Neither spec nor implementation handle bitsets of maximal length.
 
-        uint32 u = wordIndex(fromIndex);
-        if (u >= wordsInUse)
+        uint32 u = WORD_INDEX(fromIndex);
+        if (u >= words.size())
             return fromIndex;
 
         uint64 word = ~words[u] & (WORD_MASK << (fromIndex % BITS_PER_WORD));
@@ -180,79 +190,77 @@ namespace epics { namespace pvData {
         while (true) {
             if (word != 0)
                 return (u * BITS_PER_WORD) + numberOfTrailingZeros(word);
-            if (++u == wordsInUse)
-                return wordsInUse * BITS_PER_WORD;
+            if (++u == words.size())
+                return words.size() * BITS_PER_WORD;
             word = ~words[u];
         }
     }
 
     bool BitSet::isEmpty() const {
-        return (wordsInUse == 0);
+        return words.empty();
     }
 
     uint32 BitSet::cardinality() const {
         uint32 sum = 0;
-        for (uint32 i = 0; i < wordsInUse; i++)
+        for (uint32 i = 0; i < words.size(); i++)
             sum += bitCount(words[i]);
         return sum;
     }
 
     uint32 BitSet::size() const {
-        return wordsLength * BITS_PER_WORD;
+        return words.size() * BITS_PER_WORD;
+    }
+
+    bool BitSet::logical_and(const BitSet& set) const
+    {
+        size_t nwords = std::min(words.size(), set.words.size());
+        for(size_t i=0; i<nwords; i++) {
+            if(words[i] & set.words[i])
+                return true;
+        }
+        return false;
+    }
+    bool BitSet::logical_or(const BitSet& set) const
+    {
+        return !words.empty() || !set.words.empty();
     }
 
     BitSet& BitSet::operator&=(const BitSet& set) {
         // Check for self-assignment!
         if (this == &set) return *this;
 
-        while (wordsInUse > set.wordsInUse)
-            words[--wordsInUse] = 0;
+        // the result length will be <= the shorter of the two inputs
+        words.resize(std::min(words.size(), set.words.size()), 0);
 
-        // Perform logical AND on words in common
-        for (uint32 i = 0; i < wordsInUse; i++)
+        for(size_t i=0, e=words.size(); i<e; i++)
             words[i] &= set.words[i];
 
         recalculateWordsInUse();
-
         return *this;
     }
 
     BitSet& BitSet::operator|=(const BitSet& set) {
         // Check for self-assignment!
         if (this == &set) return *this;
-        uint32 wordsInCommon = wordsInUse;
-        if(wordsInUse>set.wordsInUse) wordsInCommon = set.wordsInUse;
-        if (wordsInUse < set.wordsInUse) {
-            ensureCapacity(set.wordsInUse);
-            wordsInUse = set.wordsInUse;
-        }
-        // Perform logical OR on words in common
-        for (uint32 i =0; i < wordsInCommon; i++) {
+
+        // result length will be the same as the longer of the two inputs
+        words.resize(std::max(words.size(), set.words.size()), 0);
+
+        // since we expand w/ zeros, then iterate using the size of the other vector
+        for(size_t i=0, e=set.words.size(); i<e; i++)
             words[i] |= set.words[i];
-         }
-        // Copy any remaining words
-        for(uint32 i=wordsInCommon; i<set.wordsInUse; ++i) {
-            words[i] = set.words[i];
-        }
-        // recalculateWordsInUse() is not needed
+
+        CHECK_POST();
         return *this;
     }
 
     BitSet& BitSet::operator^=(const BitSet& set) {
-        uint32 wordsInCommon = wordsInUse;
-        if(wordsInUse>set.wordsInUse) wordsInCommon = set.wordsInUse;
-        if (wordsInUse < set.wordsInUse) {
-            ensureCapacity(set.wordsInUse);
-            wordsInUse = set.wordsInUse;
-        }
-        // Perform logical OR on words in common
-        for (uint32 i =0; i < wordsInCommon; i++) {
+        // result length will <= the longer of the two inputs
+        words.resize(std::max(words.size(), set.words.size()), 0);
+
+        for(size_t i=0, e=set.words.size(); i<e; i++)
             words[i] ^= set.words[i];
-         }
-        // Copy any remaining words
-        for(uint32 i=wordsInCommon; i<set.wordsInUse; ++i) {
-            words[i] = set.words[i];
-        }
+
         recalculateWordsInUse();
         return *this;
     }
@@ -260,32 +268,27 @@ namespace epics { namespace pvData {
 
     BitSet& BitSet::operator=(const BitSet &set) {
         // Check for self-assignment!
-        if (this == &set) return *this;
-
-        // we ensure that words array size is adequate (and not wordsInUse to ensure capacity to the future)
-        if (wordsLength < set.wordsLength)
-        {
-            if (words) delete[] words;
-            words = new uint64[set.wordsLength];
-            wordsLength = set.wordsLength;
+        if (this != &set) {
+            words = set.words;
         }
-        memcpy(words, set.words, sizeof(uint64)*set.wordsInUse);
-        wordsInUse = set.wordsInUse;
-
         return *this;
     }
 
-    void BitSet::or_and(const BitSet& set1, const BitSet& set2) {
-        uint32 inUse = (set1.wordsInUse < set2.wordsInUse) ? set1.wordsInUse : set2.wordsInUse;
+    void BitSet::swap(BitSet& set)
+    {
+        words.swap(set.words);
+    }
 
-        ensureCapacity(inUse);
-        wordsInUse = inUse;
+    void BitSet::or_and(const BitSet& set1, const BitSet& set2) {
+
+        const size_t andlen = std::min(set1.words.size(), set2.words.size());
+        words.resize(std::max(words.size(), andlen), 0);
 
         // Perform logical AND on words in common
-        for (uint32 i = 0; i < inUse; i++)
+        for (uint32 i = 0; i < andlen; i++)
             words[i] |= (set1.words[i] & set2.words[i]);
 
-        // recalculateWordsInUse()...
+        recalculateWordsInUse();
     }
 
     bool BitSet::operator==(const BitSet &set) const
@@ -293,11 +296,11 @@ namespace epics { namespace pvData {
         if (this == &set)
             return true;
 
-        if (wordsInUse != set.wordsInUse)
+        if (words.size() != set.words.size())
             return false;
 
         // Check words in use by both BitSets
-        for (uint32 i = 0; i < wordsInUse; i++)
+        for (uint32 i = 0; i < words.size(); i++)
             if (words[i] != set.words[i])
                 return false;
 
@@ -310,56 +313,55 @@ namespace epics { namespace pvData {
     }
 
     void BitSet::serialize(ByteBuffer* buffer, SerializableControl* flusher) const {
-    
-        uint32 n = wordsInUse;
+
+        uint32 n = words.size();
         if (n == 0) {
             SerializeHelper::writeSize(0, buffer, flusher);
             return;
         }
-        uint32 len = 8 * (n-1);
+        uint32 len = BYTES_PER_WORD * (n-1); // length excluding bits in the last word
+        // count non-zero bytes in the last word
         for (uint64 x = words[n - 1]; x != 0; x >>= 8)
             len++;
-    
+
         SerializeHelper::writeSize(len, buffer, flusher);
         flusher->ensureBuffer(len);
-    
-        for (uint32 i = 0; i < n - 1; i++)
+
+        n = len / 8; 
+        for (uint32 i = 0; i < n; i++)
             buffer->putLong(words[i]);
-    
-        for (uint64 x = words[n - 1]; x != 0; x >>= 8)
-            buffer->putByte((int8) (x & 0xff));
+
+        if (n < words.size())
+            for (uint64 x = words[words.size() - 1]; x != 0; x >>= 8)
+                buffer->putByte((int8) (x & 0xff));
     }
-    
+
     void BitSet::deserialize(ByteBuffer* buffer, DeserializableControl* control) {
-    
+
         uint32 bytes = static_cast<uint32>(SerializeHelper::readSize(buffer, control));	// in bytes
-    
-        wordsInUse = (bytes + 7) / 8;
-        if (wordsInUse > wordsLength)
-        {
-            if (words) delete[] words;
-            words = new uint64[wordsInUse];
-            wordsLength = wordsInUse;
-        }
-        
+
+        size_t wordsInUse = (bytes + 7) / BYTES_PER_WORD;
+        words.resize(wordsInUse);
+
         if (wordsInUse == 0)
             return;
-    
+
         control->ensureData(bytes);
-    
+
         uint32 i = 0;
         uint32 longs = bytes / 8;
         while (i < longs)
             words[i++] = buffer->getLong();
-    
+
         for (uint32 j = i; j < wordsInUse; j++)
             words[j] = 0;
-    
+
         for (uint32 remaining = (bytes - longs * 8), j = 0; j < remaining; j++)
-            words[i] |= (buffer->getByte() & 0xffL) << (8 * j);
-    
+            words[i] |= (buffer->getByte() & 0xffLL) << (8 * j);
+
+        recalculateWordsInUse(); // Sender shouldn't add extra zero bytes, but don't fail it it does
     }
-    
+
     epicsShareExtern std::ostream& operator<<(std::ostream& o, const BitSet& b)
     {
         o << '{';

src/misc/byteBuffer.cpp

@@ -1,8 +1,10 @@
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mse
  */
+
+#define epicsExportSharedSymbols
+#include <pv/byteBuffer.h>

src/misc/debugPtr.cpp

@@ -0,0 +1,165 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+
+#if __cplusplus>=201103L
+
+#include <epicsMutex.h>
+#include <epicsGuard.h>
+
+#define epicsExportSharedSymbols
+#include <pv/debugPtr.h>
+
+namespace {
+typedef epicsGuard<epicsMutex> Guard;
+}
+
+namespace epics {
+namespace debug {
+
+// joins together a group of ptr_base instances
+// which all have the same dtor
+struct tracker {
+    epicsMutex mutex;
+    ptr_base::ref_set_t refs;
+};
+
+void shared_ptr_base::track_new()
+{
+    if(track) {
+        Guard G(track->mutex);
+        track->refs.insert(this);
+    }
+    snap_stack();
+}
+
+// create new tracker if ptr!=nullptr, otherwise clear
+void shared_ptr_base::track_new(void* ptr)
+{
+    track_clear();
+    if(ptr){
+        track.reset(new tracker);
+        Guard G(track->mutex);
+        track->refs.insert(this);
+    }
+    snap_stack();
+}
+
+void shared_ptr_base::track_assign(const shared_ptr_base &o)
+{
+    if(track!=o.track) {
+        track_clear();
+        track = o.track;
+        if(track) {
+            Guard G(track->mutex);
+            track->refs.insert(this);
+        }
+        snap_stack();
+    }
+}
+
+void shared_ptr_base::track_clear()
+{
+    if(track) {
+        Guard G(track->mutex);
+        track->refs.erase(this);
+    }
+    track.reset();
+#ifndef EXCEPT_USE_NONE
+    m_depth = 0;
+#endif
+}
+
+void shared_ptr_base::swap(shared_ptr_base &o)
+{
+    // we cheat a bit here to avoid lock order, and to lock only twice
+    if(track) {
+        Guard G(track->mutex);
+        track->refs.insert(&o);
+        track->refs.erase(this);
+    }
+    track.swap(o.track);
+    if(track) {
+        Guard G(track->mutex);
+        track->refs.insert(this);
+        track->refs.erase(&o);
+    }
+    //TODO: keep original somehow???
+    snap_stack();
+    o.snap_stack();
+}
+
+void shared_ptr_base::snap_stack()
+{
+    if(!track) {
+#ifndef EXCEPT_USE_NONE
+        m_depth = 0;
+#endif
+        return;
+    }
+#if defined(EXCEPT_USE_BACKTRACE)
+    {
+        m_depth=backtrace(m_stack,EXCEPT_DEPTH);
+    }
+#else
+    {}
+#endif
+
+}
+
+void shared_ptr_base::show_stack(std::ostream& strm) const
+{
+    strm<<"ptr "<<this;
+#ifndef EXCEPT_USE_NONE
+    if(m_depth<=0) return;
+#endif
+#if 0 && defined(EXCEPT_USE_BACKTRACE)
+    {
+
+        char **symbols=backtrace_symbols(m_stack, m_depth);
+
+        strm<<": ";
+        for(int i=0; i<m_depth; i++) {
+            strm<<symbols[i]<<", ";
+        }
+
+        std::free(symbols);
+    }
+#elif !defined(EXCEPT_USE_NONE)
+    {
+        strm<<": ";
+        for(int i=0; i<m_depth; i++) {
+            strm<<std::hex<<m_stack[i]<<" ";
+        }
+    }
+#endif
+
+}
+
+void ptr_base::show_refs(std::ostream& strm, bool self, bool weak) const
+{
+    if(!track) {
+        strm<<"# No refs\n";
+    } else {
+        Guard G(track->mutex);
+        for(auto ref : track->refs) {
+            if(!self && ref==this) continue;
+            strm<<'#';
+            ref->show_stack(strm);
+            strm<<'\n';
+        }
+    }
+}
+
+void ptr_base::spy_refs(ref_set_t &refs) const
+{
+    if(track) {
+        Guard G(track->mutex);
+        refs.insert(track->refs.begin(), track->refs.end());
+    }
+}
+
+}} // namespace epics::debug
+
+#endif // __cplusplus>=201103L

src/misc/destroyable.h

@@ -1,41 +0,0 @@
-/* destroyable.h */
-/**
- * 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 mse
- */
-#ifndef DESTROYABLE_H
-#define DESTROYABLE_H
-
-#include <pv/sharedPtr.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvData { 
-
-
-        /**
-         * @brief Instance declaring destroy method.
-         * 
-         * @author mse
-         */
-        class epicsShareClass Destroyable {
-            public:
-            POINTER_DEFINITIONS(Destroyable);
-            /**
-             * Destroy this instance.
-             */
-            virtual void destroy() = 0;
-            
-            protected:
-            /**
-             * Do not allow delete on this instance and derived classes, destroy() must be used instead.
-             */ 
-            virtual ~Destroyable() {};
-        };
-
-}}
-#endif  /* DESTROYABLE_H */

src/misc/epicsException.cpp

@@ -1,7 +1,6 @@
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mes
@@ -10,6 +9,7 @@
 #include <sstream>
 #include <cstdio>
 #include <cstring>
+#include <cstdlib>
 #include <string>
 
 #define epicsExportSharedSymbols
@@ -50,7 +50,7 @@ ExceptionMixin::show() const
             out<<symbols[i]<<"\n";
         }
 
-        free(symbols);
+        std::free(symbols);
     }
 
 #endif

src/misc/event.cpp

@@ -1,8 +1,7 @@
 /* event.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk

src/misc/executor.cpp

@@ -1,8 +1,7 @@
 /* executor.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -13,6 +12,15 @@
 #include <string>
 #include <cstdio>
 
+#include <epicsEvent.h>
+#include <epicsMutex.h>
+#include <epicsThread.h>
+
+// Suppress deprecation warnings for the implementation
+#include <compilerDependencies.h>
+#undef EPICS_DEPRECATED
+#define EPICS_DEPRECATED
+
 #define epicsExportSharedSymbols
 #include <pv/executor.h>
 

src/misc/localStaticLock.cpp

@@ -1,8 +1,7 @@
 /* localStaticLock.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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mse

src/misc/messageQueue.cpp

@@ -1,116 +0,0 @@
-/* messageQueue.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
- */
-#include <string>
-
-#define epicsExportSharedSymbols
-#include <pv/messageQueue.h>
-
-using std::string;
-
-namespace epics { namespace pvData { 
-
-MessageNode::MessageNode()
-: messageType(infoMessage)
-{}
-
-string MessageNode::getMessage() const
-{
-    return message;
-}
-
-MessageType MessageNode::getMessageType() const
-{
-    return messageType;
-}
-
-MessageQueuePtr MessageQueue::create(int size)
-{
-    MessageNodePtrArray nodeArray;
-    nodeArray.reserve(size);
-    for(int i=0; i<size; i++) {
-        nodeArray.push_back(
-            MessageNodePtr(new MessageNode()));
-    }
-    return std::tr1::shared_ptr<MessageQueue>(new MessageQueue(nodeArray));
-}
-
-MessageQueue::MessageQueue(MessageNodePtrArray &data)
-: Queue<MessageNode>(data),
-  overrun(0)
-{ }
-
-MessageQueue::~MessageQueue()
-{
-}
-
-MessageNodePtr &MessageQueue::get() {
-    if(getNumberUsed()==0) return nullNode;
-    lastGet = getUsed();
-    return lastGet;
-}
-
-void MessageQueue::release() {
-    if(lastGet.get()==NULL) return;
-    releaseUsed(lastGet);
-    lastGet.reset();
-}
-bool MessageQueue::put(string message,MessageType messageType,bool replaceLast)
-{
-    MessageNodePtr node = getFree();
-    if(node.get()!= NULL) {
-        node->message = message;
-        node->messageType = messageType;
-        lastPut = node;
-        setUsed(node);
-        return true;
-    }
-    overrun++;
-    if(replaceLast) {
-        node = lastPut;
-        node->message = message;
-        node->messageType = messageType;
-        return true;
-    }
-    return false;
-}
-
-bool MessageQueue::isEmpty()
-{
-    int free = getNumberFree();
-    if(free==capacity()) return true;
-    return false;
-}
-
-bool MessageQueue::isFull()
-{
-    if(getNumberFree()==0) return true;
-    return false;
-}
-
-int MessageQueue::getClearOverrun()
-{
-    int num = overrun;
-    overrun = 0;
-    return num;
-}
-
-MessageQueuePtr createMessageQueue(int size)
-{
-    MessageNodePtrArray nodeArray;
-    nodeArray.reserve(size);
-    for(int i=0; i<size; i++) {
-        nodeArray.push_back(
-            MessageNodePtr(new MessageNode()));
-    }
-    return std::tr1::shared_ptr<MessageQueue>(new MessageQueue(nodeArray));
-}
-
-
-}}

src/misc/messageQueue.h

@@ -1,129 +0,0 @@
-/* messageQueue.h */
-/**
- * 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
- */
-#ifndef MESSAGEQUEUE_H
-#define MESSAGEQUEUE_H
-#include <memory>
-#include <vector>
-#include <cstddef>
-#include <stdexcept>
-
-#include <pv/pvType.h>
-#include <pv/requester.h>
-#include <pv/queue.h>
-
-#include <shareLib.h>
-
-namespace epics { namespace pvData { 
-
-class MessageNode;
-class MessageQueue;
-typedef std::tr1::shared_ptr<MessageNode> MessageNodePtr;
-typedef std::vector<MessageNodePtr> MessageNodePtrArray;
-typedef std::tr1::shared_ptr<MessageQueue> MessageQueuePtr;
-
-/**
- * @brief A node that can be put on a MessageQueue.
- *
- */
-class epicsShareClass MessageNode {
-public:
-    /**
-     * Constructor
-     */
-    MessageNode();
-    /**
-     * 
-     * Get the message value.
-     * @return The message value.
-     */
-    std::string getMessage() const;
-    /** 
-     * Get the message type.
-     * @return The message type which is defined in Requester.
-     */
-    MessageType getMessageType() const;
-private:
-    std::string message;
-    MessageType messageType;
-    friend class MessageQueue;
-};
-
-/**
- * @brief A bounded queue for messages.
- *
- *
- */
-class epicsShareClass MessageQueue : public Queue<MessageNode> {
-public:
-    POINTER_DEFINITIONS(MessageQueue);
-    /**
-     * Factory method to create a MessageQueue.
-     * @param size The number of MessageNodes in the queue.
-     * @return shared_ptr to MessageQueue.
-     */
-    static MessageQueuePtr create(int size);
-    /**
-     * Constructor
-     * @param nodeArray an array of shared_ptr to MessageNodes,
-     */
-    MessageQueue(MessageNodePtrArray &nodeArray);
-    /**
-     * Destructor
-     */
-    virtual ~MessageQueue();
-    /**
-     * get the next MessageNode of the queue.
-     * @return A shared_ptr to the MessageNode.
-     * This will be a null pointer if queue is empty.
-     * If get is successful then release for this MessageNode
-     * must be called before another get can be issued.
-     */
-    MessageNodePtr &get();
-    /**
-     * Release the MessageNode that was returned by the previous call to get.
-     */
-    void release();
-    /**
-     * 
-     * put a message into the message queue
-     * @param message The message string.
-     * @param messageType The message type as defined in Requester,
-     * @param replaceLast If true and queue is full then replace.
-     * @return (false,true) if a message (was not, was) put in queiue.
-     */
-    bool put(std::string message,MessageType messageType,bool replaceLast);
-    /**
-     * Is queue empty?
-     * @return (false,true) if (is not, is) empty.
-     */
-    bool isEmpty() ;
-    /**
-     * Is queue full?
-     * @return (false,true) if (is not, is) full.
-     */
-    bool isFull() ;
-    /**
-     * 
-     * Clear number of times queue was overrun and return the number
-     * of times the queue was overrun.
-     */
-    int getClearOverrun();
-private:
-    MessageNodePtr nullNode;
-    MessageNodePtr lastGet;
-    MessageNodePtr lastPut;
-    uint32 overrun;
-};
-
-}}
-#endif  /* MESSAGEQUEUE_H */
-
-
-

src/misc/noDefaultMethods.h

@@ -1,42 +0,0 @@
-/* noDefaultMethods.h */
-/**
- * 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
- */
-#ifndef NO_DEFAULT_METHODS_H
-#define NO_DEFAULT_METHODS_H
-
-#include <shareLib.h>
-
-namespace epics { namespace pvData { 
-/* This is based on Item 6 of 
- * Effective C++, Third Edition, Scott Meyers
- */
-
-/**
- * @brief Base class for not allowing default methods.
- *
- * Note that copy constructor a copy methods are declared private.
- */
-class epicsShareClass NoDefaultMethods {
-protected:
-    /**
-     * Constructor
-     */
-    NoDefaultMethods(){};
-    /**
-     * Destructor
-     */
-    ~NoDefaultMethods(){}
-    private:
-    // do not implement
-    NoDefaultMethods(const NoDefaultMethods&);
-    NoDefaultMethods & operator=(const NoDefaultMethods &);
-};
-
-}}
-#endif  /* NO_DEFAULT_METHODS_H */

src/misc/parseToPOD.cpp

@@ -1,3 +1,7 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
 #include <ctype.h>
 #include <stdio.h>
 #include <errno.h>
@@ -12,7 +16,7 @@
 #include <epicsConvert.h>
 
 #define epicsExportSharedSymbols
-#include "typeCast.h"
+#include "pv/typeCast.h"
 
 using std::string;
 
@@ -27,7 +31,7 @@ using std::string;
 #endif
 
 #if EPICS_VERSION_INT < VERSION_INT(3,15,0,1)
-/* integer conversion primitives added to epicsStdlib.c in 3.15.0.1 */
+/* These integer conversion primitives added to epicsStdlib.c in 3.15.0.1 */
 
 #define S_stdlib_noConversion 1 /* No digits to convert */
 #define S_stdlib_extraneous   2 /* Extraneous characters */
@@ -249,18 +253,19 @@ epicsParseFloat(const char *str, float *to, char **units)
 }
 #endif
 
-// MS Visual Studio 2013 defines strtoll, etc.
-#if defined(_WIN32)
-#  if (_MSC_VER >= 1800)
-#    define WIN_NEEDS_OLL_FUNC 0
-#  else
-#    define WIN_NEEDS_OLL_FUNC 1
-#  endif
+// Sometimes we have to provide our own copy of strtoll()
+#if defined(_WIN32) && !defined(_MINGW)
+// On Windows with MSVC, Base-3.15 provides strtoll()
+#    define NEED_OLL_FUNCS (EPICS_VERSION_INT < VERSION_INT(3,15,0,1))
+#elif defined(vxWorks)
+// On VxWorks, Base-3.15 provides strtoll()
+#    define NEED_OLL_FUNCS (EPICS_VERSION_INT < VERSION_INT(3,15,0,1))
 #else
-#  define WIN_NEEDS_OLL_FUNC 0
+// Other architectures all provide strtoll()
+#    define NEED_OLL_FUNCS 0
 #endif
 
-#if defined(NEED_LONGLONG) && (defined(__vxworks) || WIN_NEEDS_OLL_FUNC)
+#if defined(NEED_LONGLONG) && NEED_OLL_FUNCS
 static
 long long strtoll(const char *ptr, char ** endp, int base)
 {
@@ -308,8 +313,10 @@ noconvert:
     return 0;
 }
 
-#if defined(__vxworks)
-/* vxworks version of std::istringstream >>uint64_t is buggy, we use out own implementation */
+#if defined(vxWorks)
+/* The VxWorks version of std::istringstream >> uint64_t is buggy,
+ * provide our own implementation
+ */
 static
 unsigned long long strtoull(const char *nptr, char **endptr, int base)
 {
@@ -551,9 +558,10 @@ void parseToPOD(const string& in, float *out) {
 void parseToPOD(const string& in, double *out) {
     int err = epicsParseDouble(in.c_str(), out, NULL);
     if(err)   handleParseError(err);
-#if defined(__vxworks)
-    /* vxWorks strtod returns [-]epicsINF when it should return ERANGE error
-     * if [-]epicsINF is returned and first char is a digit then translate this into ERANGE error
+#if defined(vxWorks)
+    /* vxWorks strtod returns [-]epicsINF when it should return ERANGE error.
+     * If [-]epicsINF is returned and the first char is a digit we translate
+     * this into an ERANGE error
      */
     else if (*out == epicsINF || *out == -epicsINF) {
         const char* s = in.c_str();

src/misc/pv/anyscalar.h

@@ -0,0 +1,332 @@
+#ifndef PV_ANYSCALAR_H
+#define PV_ANYSCALAR_H
+
+#if __cplusplus>=201103L
+#  include <type_traits>
+#endif
+
+#include <ostream>
+#include <exception>
+#include <map>
+
+#include <epicsAssert.h>
+
+#include <pv/templateMeta.h>
+#include <pv/typeCast.h>
+#include <pv/pvIntrospect.h> /* for ScalarType enum */
+
+namespace epics{namespace pvData{
+namespace detail {
+
+// special mangling for AnyScalar ctor to map from argument type to storage type.
+// allow construction from constants.
+template <typename T>
+struct any_storage_type { typedef T type; };
+template<> struct any_storage_type<int> { typedef int32 type; };
+template<> struct any_storage_type<unsigned> { typedef uint32 type; };
+template<> struct any_storage_type<char*> { typedef std::string type; };
+template<> struct any_storage_type<const char*> { typedef std::string type; };
+
+#if __cplusplus>=201103L
+// std::max() isn't constexpr until c++14 :(
+constexpr size_t cmax(size_t A, size_t B) {
+    return A>B ? A : B;
+}
+#endif
+
+}// namespace detail
+
+/** A type-safe variant union capable of holding
+ *  any of the PVD scalar types (POD or string)
+ *
+ @code
+ AnyScalar A(5);
+ assert(A.type()==pvInt);
+ assert(A.ref<int32>()==5);
+ assert(A.as<int32>()==5);
+ assert(A.as<double>()==5.0);
+ assert(A.ref<double>()==5.0); // throws AnyScalar::bad_cast
+ @endcode
+ */
+class AnyScalar {
+public:
+    struct bad_cast : public std::exception {
+#if __cplusplus>=201103L
+        bad_cast() noexcept {}
+        virtual ~bad_cast() noexcept {}
+        virtual const char* what() const noexcept
+#else
+        bad_cast() throw() {}
+        virtual ~bad_cast() throw() {}
+        virtual const char* what() const throw()
+#endif
+        { return "bad_cast() type mis-match"; }
+    };
+
+private:
+    ScalarType _stype;
+
+    // always reserve enough storage for std::string or double (assumed worst case)
+#if __cplusplus>=201103L
+
+    struct wrap_t {
+        typename std::aligned_storage<detail::cmax(sizeof(std::string), sizeof(double)),
+                                      detail::cmax(alignof(std::string), alignof(double))
+        >::type blob[1];
+    } _wrap;
+#else
+    struct wrap_t {
+        union blob_t {
+            char data[sizeof(std::string)];
+            double align_f; // assume std::string alignment <= 8
+        } blob[1];
+    } _wrap;
+#endif
+
+    // assumed largest non-string type
+    typedef double _largest_blob;
+
+    template<typename T>
+    inline T& _as() {
+        return *reinterpret_cast<T*>(_wrap.blob);
+    }
+    template<typename T>
+    inline const T& _as() const {
+        return *reinterpret_cast<const T*>(_wrap.blob);
+    }
+public:
+    AnyScalar() : _stype((ScalarType)-1) {}
+
+    template<typename T>
+    explicit AnyScalar(T v)
+    {
+        typedef typename meta::strip_const<T>::type T2;
+        typedef typename detail::any_storage_type<T2>::type TT;
+
+        STATIC_ASSERT(sizeof(TT)<=sizeof(_wrap.blob));
+
+        new (_wrap.blob) TT(v);
+
+        // this line fails to compile when type T can't be mapped to one of
+        // the PVD scalar types.
+        _stype = (ScalarType)ScalarTypeID<TT>::value;
+    }
+
+    AnyScalar(const AnyScalar& o)
+        :_stype(o._stype)
+    {
+        if(o._stype==pvString) {
+            new (_wrap.blob) std::string(o._as<std::string>());
+        } else if(o._stype!=(ScalarType)-1) {
+            memcpy(_wrap.blob, o._wrap.blob, sizeof(_largest_blob));
+        }
+    }
+
+#if __cplusplus>=201103L
+    AnyScalar(AnyScalar&& o)
+        :_stype(o._stype)
+    {
+        typedef std::string string;
+        if(o._stype==pvString) {
+            new (_wrap.blob) std::string();
+            _as<std::string>() = std::move(o._as<std::string>());
+            o._as<string>().~string();
+        } else if(o._stype!=(ScalarType)-1) {
+            memcpy(_wrap.blob, o._wrap.blob, sizeof(_largest_blob));
+        }
+        o._stype = (ScalarType)-1;
+    }
+#endif
+
+    ~AnyScalar() {
+        if(_stype==pvString) {
+            typedef std::string string;
+            _as<string>().~string();
+        }
+        // other types need no cleanup
+    }
+
+    AnyScalar& operator=(const AnyScalar& o) {
+        AnyScalar(o).swap(*this);
+        return *this;
+    }
+
+    template<typename T>
+    AnyScalar& operator=(T v) {
+        AnyScalar(v).swap(*this);
+        return *this;
+    }
+
+#if __cplusplus>=201103L
+    AnyScalar& operator=(AnyScalar&& o) {
+        if(_stype==pvString) {
+            typedef std::string string;
+            _as<string>().~string();
+        }
+        _stype = (ScalarType)-1;
+        swap(o);
+        return *this;
+    }
+#endif
+
+    void swap(AnyScalar& o) {
+        typedef std::string string;
+        switch((int)_stype) {
+        case -1:
+            switch((int)o._stype) {
+            case -1:
+                // nil <-> nil
+                break;
+            case pvString:
+                // nil <-> string
+                new (_wrap.blob) std::string();
+                _as<std::string>().swap(o._as<std::string>());
+                o._as<std::string>().~string();
+                break;
+            default:
+                // nil <-> non-string
+                memcpy(_wrap.blob, o._wrap.blob, sizeof(_largest_blob));
+                break;
+            }
+            break;
+        case pvString:
+            switch((int)o._stype) {
+            case -1:
+                // string <-> nil
+                new (o._wrap.blob) std::string();
+                _as<std::string>().swap(o._as<std::string>());
+                _as<std::string>().~string();
+                break;
+            case pvString:
+                // string <-> string
+                _as<std::string>().swap(o._as<std::string>());
+                break;
+            default: {
+                // string <-> non-string
+                std::string temp;
+                temp.swap(_as<std::string>());
+
+                _as<std::string>().~string();
+
+                memcpy(_wrap.blob, o._wrap.blob, sizeof(_largest_blob));
+
+                new (o._wrap.blob) std::string();
+                temp.swap(o._as<std::string>());
+            }
+                break;
+            }
+            break;
+        default:
+            switch((int)o._stype) {
+            case -1:
+                // non-string <-> nil
+                memcpy(o._wrap.blob, _wrap.blob, sizeof(_largest_blob));
+                break;
+            case pvString: {
+                // non-string <-> string
+                std::string temp;
+                temp.swap(o._as<std::string>());
+
+                o._as<std::string>().~string();
+
+                memcpy(o._wrap.blob, _wrap.blob, sizeof(_largest_blob));
+
+                new (_wrap.blob) std::string();
+                temp.swap(_as<std::string>());
+            }
+                break;
+            default:
+                // non-string <-> non-string
+                _largest_blob temp;
+                memcpy(&temp, _wrap.blob, sizeof(_largest_blob));
+                memcpy(_wrap.blob, o._wrap.blob, sizeof(_largest_blob));
+                memcpy(o._wrap.blob, &temp, sizeof(_largest_blob));
+                // std::swap(o._wrap.blob, _wrap.blob); // gcc <=4.3 doesn't like this
+                break;
+            }
+            break;
+        }
+        std::swap(_stype, o._stype);
+    }
+
+    inline ScalarType type() const {
+        return _stype;
+    }
+
+    void* unsafe() { return _wrap.blob; }
+    const void* unsafe() const { return _wrap.blob; }
+
+    inline bool empty() const { return _stype==(ScalarType)-1; }
+
+#if __cplusplus>=201103L
+    explicit operator bool() const { return !empty(); }
+#else
+private:
+    typedef void (AnyScalar::*bool_type)(AnyScalar&);
+public:
+    operator bool_type() const { return !empty() ? &AnyScalar::swap : 0; }
+#endif
+
+    /** Return reference to wrapped value */
+    template<typename T>
+    // T -> strip_const -> map to storage type -> add reference
+    typename detail::any_storage_type<typename meta::strip_const<T>::type>::type&
+    ref() {
+        typedef typename meta::strip_const<T>::type T2;
+        typedef typename detail::any_storage_type<T2>::type TT;
+
+        if(_stype!=(ScalarType)ScalarTypeID<TT>::value)
+            throw bad_cast();
+        return _as<TT>();
+    }
+
+    template<typename T>
+    // T -> strip_const -> map to storage type -> add const reference
+    typename meta::decorate_const<typename detail::any_storage_type<typename meta::strip_const<T>::type>::type>::type&
+    ref() const {
+        typedef typename meta::strip_const<T>::type T2;
+        typedef typename detail::any_storage_type<T2>::type TT;
+
+        if(_stype!=(ScalarType)ScalarTypeID<TT>::value)
+            throw bad_cast();
+        return _as<TT>();
+    }
+
+    /** copy out wrapped value, with a value conversion. */
+    template<typename T>
+    T as() const {
+        typedef typename meta::strip_const<T>::type T2;
+        typedef typename detail::any_storage_type<T2>::type TT;
+
+        if(_stype==(ScalarType)-1)
+            throw bad_cast();
+        TT ret;
+        castUnsafeV(1, (ScalarType)ScalarTypeID<T2>::value, &ret,
+                                   _stype, _wrap.blob);
+        return ret;
+    }
+
+private:
+    friend std::ostream& operator<<(std::ostream& strm, const AnyScalar& v);
+};
+
+inline
+std::ostream& operator<<(std::ostream& strm, const AnyScalar& v)
+{
+    switch(v.type()) {
+#define CASE(BASETYPE, PVATYPE, DBFTYPE, PVACODE) case pv ## PVACODE: strm<<v._as<PVATYPE>(); break;
+#define CASE_REAL_INT64
+#define CASE_STRING
+#include "pv/typemap.h"
+#undef CASE
+#undef CASE_REAL_INT64
+#undef CASE_STRING
+    default:
+        strm<<"(nil)"; break;
+    }
+    return strm;
+}
+
+}} // namespace epics::pvData
+
+#endif // PV_ANYSCALAR_H

src/misc/pv/bitSet.h

@@ -1,8 +1,7 @@
 /* bitSet.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mse
@@ -10,7 +9,11 @@
 #ifndef BITSET_H
 #define BITSET_H
 
-#include <stdexcept>
+#if __cplusplus>=201103L
+#  include <initializer_list>
+#endif
+
+#include <vector>
 
 #include <pv/pvType.h>
 #include <pv/serialize.h>
@@ -27,15 +30,15 @@ namespace epics { namespace pvData {
      * @brief A vector of bits.
      *
      * This class implements a vector of bits that grows as needed. Each
-     * component of the bit set has a {@code bool} value. The
-     * bits of a {@code BitSet} are indexed by nonnegative integers.
-     * Individual indexed bits can be examined, set, or cleared. One
-     * {@code BitSet} may be used to modify the contents of another
-     * {@code BitSet} through logical AND, logical inclusive OR, and
-     * logical exclusive OR operations.
+     * component of the bit set has a @c bool value. The bits of a
+     * @c BitSet are indexed by nonnegative integers. Individual
+     * indexed bits can be examined, set, or cleared. One @c BitSet may
+     * be used to modify the contents of another @c BitSet through
+     * logical AND, logical inclusive OR, and logical exclusive OR
+     * operations.
      *
      * <p>By default, all bits in the set initially have the value
-     * {@code false}.
+     * @c false.
      *
      * <p>Every bit set has a current size, which is the number of bits
      * of space currently in use by the bit set. Note that the size is
@@ -43,8 +46,8 @@ namespace epics { namespace pvData {
      * implementation. The length of a bit set relates to logical length
      * of a bit set and is defined independently of implementation.
      *
-     * <p>A {@code BitSet} is not safe for multithreaded use without
-     * external synchronization.
+     * <p>A @c BitSet is not safe for multithreaded use without external
+     * synchronization.
      *
      * Based on Java implementation.
      */
@@ -53,19 +56,29 @@ namespace epics { namespace pvData {
         POINTER_DEFINITIONS(BitSet);
         static BitSetPtr create(uint32 nbits);
         /**
-         * Creates a new bit set. All bits are initially {@code false}.
+         * Creates a new bit set. All bits are initially @c false.
          */
         BitSet();
 
         /**
          * Creates a bit set whose initial size is large enough to explicitly
-         * represent bits with indices in the range {@code 0} through
-         * {@code nbits-1}. All bits are initially {@code false}.
+         * represent bits with indices in the range @c 0 through
+         * @c nbits-1. All bits are initially @c false.
          *
          * @param  nbits the initial size of the bit set
          */
         BitSet(uint32 nbits);
 
+#if __cplusplus>=201103L
+        /** Initialize from a list of indicies
+         @code
+         BitSet X({1, 5});
+         assert(X.get(1) && X.get(5));
+         @endcode
+         */
+        BitSet(std::initializer_list<uint32> I);
+#endif
+
         /**
          * Destructor.
          */
@@ -77,21 +90,21 @@ namespace epics { namespace pvData {
          *
          * @param  bitIndex the index of the bit to flip
          */
-        void flip(uint32 bitIndex);
+        BitSet& flip(uint32 bitIndex);
 
         /**
-         * Sets the bit at the specified index to {@code true}.
+         * Sets the bit at the specified index to @c true.
          *
          * @param  bitIndex a bit index
          */
-        void set(uint32 bitIndex);
+        BitSet& set(uint32 bitIndex);
 
         /**
-         * Sets the bit specified by the index to {@code false}.
+         * Sets the bit specified by the index to @c false.
          *
          * @param  bitIndex the index of the bit to be cleared
          */
-        void clear(uint32 bitIndex);
+        BitSet& clear(uint32 bitIndex);
 
         /**
          * Sets the bit at the specified index to the specified value.
@@ -103,9 +116,8 @@ namespace epics { namespace pvData {
 
         /**
          * Returns the value of the bit with the specified index. The value
-         * is {@code true} if the bit with the index {@code bitIndex}
-         * is currently set in this {@code BitSet}; otherwise, the result
-         * is {@code false}.
+         * is @c true if the bit with the index @c bitIndex is currently
+         * set in this @c BitSet; otherwise, the result is @c false.
          *
          * @param  bitIndex   the bit index
          * @return the value of the bit with the specified index
@@ -113,16 +125,16 @@ namespace epics { namespace pvData {
         bool get(uint32 bitIndex) const;
 
         /**
-         * Sets all of the bits in this BitSet to {@code false}.
+         * Sets all of the bits in this BitSet to @c false.
          */
         void clear();
 
         /**
-         * Returns the index of the first bit that is set to {@code true}
-         * that occurs on or after the specified starting index. If no such
-         * bit exists then {@code -1} is returned.
+         * Returns the index of the first bit that is set to @c true that
+         * occurs on or after the specified starting index. If no such bit
+         * exists then @c -1 is returned.
          *
-         * <p>To iterate over the {@code true} bits in a {@code BitSet},
+         * <p>To iterate over the @c true bits in a @c BitSet,
          * use the following loop:
          *
          *  <pre> {@code
@@ -131,13 +143,13 @@ namespace epics { namespace pvData {
          * }}</pre>
          *
          * @param  fromIndex the index to start checking from (inclusive)
-         * @return the index of the next set bit, or {@code -1} if there
+         * @return the index of the next set bit, or @c -1 if there
          *         is no such bit
          */
         int32 nextSetBit(uint32 fromIndex) const;
 
         /**
-         * Returns the index of the first bit that is set to {@code false}
+         * Returns the index of the first bit that is set to @c false
          * that occurs on or after the specified starting index.
          *
          * @param  fromIndex the index to start checking from (inclusive)
@@ -146,61 +158,66 @@ namespace epics { namespace pvData {
         int32 nextClearBit(uint32 fromIndex) const;
 
         /**
-         * Returns true if this {@code BitSet} contains no bits that are set
-         * to {@code true}.
+         * Returns true if this @c BitSet contains no bits that are set
+         * to @c true.
          *
-         * @return indicating whether this {@code BitSet} is empty
+         * @return indicating whether this @c BitSet is empty
          */
         bool isEmpty() const;
 
         /**
-         * Returns the number of bits set to {@code true} in this {@code BitSet}.
+         * Returns the number of bits set to @c true in this @c BitSet.
          *
-         * @return the number of bits set to {@code true} in this {@code BitSet}
+         * @return the number of bits set to @c true in this @c BitSet
          */
         uint32 cardinality() const;
 
         /**
          * Returns the number of bits of space actually in use by this
-         * {@code BitSet} to represent bit values.
+         * @c BitSet to represent bit values.
          * The maximum element in the set is the size - 1st element.
          *
          * @return the number of bits currently in this bit set
          */
         uint32 size() const;
 
+        //! Returns true if any bit is set in both *this and other
+        bool logical_and(const BitSet& other) const;
+        //! Returns true if any bit is set in both *this or other
+        bool logical_or(const BitSet& other) const;
+
         /**
-         * Performs a logical <b>AND</b> of this target bit set with the
+         * Performs a bitwise <b>AND</b> of this target bit set with the
          * argument bit set. This bit set is modified so that each bit in it
-         * has the value {@code true} if and only if it both initially
-         * had the value {@code true} and the corresponding bit in the
-         * bit set argument also had the value {@code true}.
+         * has the value @c true if and only if it both initially
+         * had the value @c true and the corresponding bit in the
+         * bit set argument also had the value @c true.
          *
          * @param set a bit set
          */
         BitSet& operator&=(const BitSet& set);
 
         /**
-         * Performs a logical <b>OR</b> of this bit set with the bit set
+         * Performs a bitwise <b>OR</b> of this bit set with the bit set
          * argument. This bit set is modified so that a bit in it has the
-         * value {@code true} if and only if it either already had the
-         * value {@code true} or the corresponding bit in the bit set
-         * argument has the value {@code true}.
+         * value @c true if and only if it either already had the
+         * value @c true or the corresponding bit in the bit set
+         * argument has the value @c true.
          *
          * @param set a bit set
          */
         BitSet& operator|=(const BitSet& set);
 
         /**
-         * Performs a logical <b>XOR</b> of this bit set with the bit set
+         * Performs a bitwise <b>XOR</b> of this bit set with the bit set
          * argument. This bit set is modified so that a bit in it has the
-         * value {@code true} if and only if one of the following
+         * value @c true if and only if one of the following
          * statements holds:
          * <ul>
-         * <li>The bit initially has the value {@code true}, and the
-         *     corresponding bit in the argument has the value {@code false}.
-         * <li>The bit initially has the value {@code false}, and the
-         *     corresponding bit in the argument has the value {@code true}.
+         * <li>The bit initially has the value @c true, and the
+         *     corresponding bit in the argument has the value @c false.
+         * <li>The bit initially has the value @c false, and the
+         *     corresponding bit in the argument has the value @c true.
          * </ul>
          *
          * @param  set a bit set
@@ -212,6 +229,9 @@ namespace epics { namespace pvData {
           */
         BitSet& operator=(const BitSet &set);
 
+        //! Swap contents
+        void swap(BitSet& set);
+
         /**
          * Perform AND operation on <code>set1</code> and <code>set2</code>,
          * and OR on result and this instance.
@@ -234,42 +254,11 @@ namespace epics { namespace pvData {
 
     private:
 
-        /*
-         * BitSets are packed into arrays of "words."  Currently a word is
-         * a long, which consists of 64 bits, requiring 6 address bits.
-         * The choice of word size is determined purely by performance concerns.
-         */
-        static const uint32 ADDRESS_BITS_PER_WORD = 6;
-        static const uint32 BITS_PER_WORD = 1 << ADDRESS_BITS_PER_WORD;
-        static const uint32 BIT_INDEX_MASK = BITS_PER_WORD - 1;
-
-        /** Used to shift left or right for a partial word mask */
-        static const uint64 WORD_MASK = ~((uint64)0);
-
+        typedef std::vector<uint64> words_t;
         /** The internal field corresponding to the serialField "bits". */
-        uint64* words;
-
-        /** The internal field corresponding to the size of words[] array. */
-        uint32 wordsLength;
-
-        /** The number of words in the logical size of this BitSet. */
-        uint32 wordsInUse;
-
+        words_t words;
 
     private:
-
-        /**
-         * Given a bit index, return word index containing it.
-         */
-        static inline uint32 wordIndex(uint32 bitIndex) {
-            return bitIndex >> ADDRESS_BITS_PER_WORD;
-        }
-
-        /**
-         * Creates a new word array.
-         */
-        void initWords(uint32 nbits);
-
         /**
          * Sets the field wordsInUse to the logical size in words of the bit set.
          * WARNING: This method assumes that the number of words actually in use is

src/misc/pv/byteBuffer.h

@@ -1,8 +1,7 @@
 /* byteBuffer.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mse
@@ -11,193 +10,158 @@
 #define BYTEBUFFER_H
 
 #include <string>
-#include <string.h>
-
-#ifdef epicsExportSharedSymbols
-#define byteBufferepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
+#include <cstring>
+#include <cstdlib>
 
 #include <epicsEndian.h>
+#include <shareLib.h>
+#include <epicsAssert.h>
 
-#ifdef byteBufferepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef byteBufferepicsExportSharedSymbols
-#endif
-
+#include <pv/templateMeta.h>
 #include <pv/pvType.h>
 #include <pv/epicsException.h>
 
-#include <shareLib.h>
 
-namespace epics { 
-    namespace pvData {
-        
-/*
-TODO can be used:
+#ifndef EPICS_ALWAYS_INLINE
+#  define EPICS_ALWAYS_INLINE inline
+#endif
 
-MS Visual C++:
+/* various compilers provide builtins for byte order swaps.
+ * conditions based on boost endian library
+ */
+#if defined(__GNUC__) && ((__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=3))
 
-You include intrin.h and call the following functions:
+#if (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=8)
+#define _PVA_swap16(X) __builtin_bswap16(X)
+#endif
 
-For 16 bit numbers:
-unsigned short _byteswap_ushort(unsigned short value);
+#define _PVA_swap32(X) __builtin_bswap32(X)
+#define _PVA_swap64(X) __builtin_bswap64(X)
 
-For 32 bit numbers:
-unsigned long _byteswap_ulong(unsigned long value);
+#elif defined(__clang__)
 
-For 64 bit numbers:
-unsigned __int64 _byteswap_uint64(unsigned __int64 value);
-*/
+#if __has_builtin(__builtin_bswap16)
+#define _PVA_swap16(X) __builtin_bswap16(X)
+#endif
+#if __has_builtin(__builtin_bswap32)
+#define _PVA_swap32(X) __builtin_bswap32(X)
+#endif
+#if __has_builtin(__builtin_bswap64)
+#define _PVA_swap64(X) __builtin_bswap64(X)
+#endif
 
-/*
-For floats and doubles it's more difficult as with plain integers as these may or not may be in the host machines byte-order.
-You can get little-endian floats on big-endian machines and vice versa.
-*/
+#elif defined(_MSC_VER)
 
-
-
-#define GCC_VERSION_SINCE(major, minor, patchlevel) \
-  (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
-   ((__GNUC__ > (major)) ||  \
-    (__GNUC__ == (major) && __GNUC_MINOR__ > (minor)) || \
-    (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ >= (patchlevel))))
-    
- 
-#if GCC_VERSION_SINCE(4,3,0)
-
-#define swap32(x) __builtin_bswap32(x)
-#define swap64(x) __builtin_bswap64(x)
-
-#define __byte_swap16(x) \
-        (((x) >> 8) | \
-         ((x) << 8))
-
-static inline uint16_t
-swap16(uint16_t _x)
-{
-    return (__byte_swap16(_x));
-}
-
-#else
-
-
-#define __byte_swap16(x) \
-        (((x) >> 8) | \
-         ((x) << 8))
-
-#define __byte_swap32(x) \
-        ((((x) & 0xff000000) >> 24) | \
-         (((x) & 0x00ff0000) >>  8) | \
-         (((x) & 0x0000ff00) <<  8) | \
-         (((x) & 0x000000ff) << 24))
-
-#define __byte_swap64(x) \
-        (((x) >> 56) | \
-        (((x) >> 40) & 0xff00) | \
-        (((x) >> 24) & 0xff0000) | \
-        (((x) >> 8)  & 0xff000000) | \
-        (((x) << 8)  & ((uint64_t)0xff << 32)) | \
-        (((x) << 24) & ((uint64_t)0xff << 40)) | \
-        (((x) << 40) & ((uint64_t)0xff << 48)) | \
-        (((x) << 56)))
-   
-static inline uint16_t
-swap16(uint16_t _x)
-{
-    return (__byte_swap16(_x));
-}
-
-static inline uint32_t
-swap32(uint32_t _x)
-{
-    return (__byte_swap32(_x));
-}
-
-static inline uint64_t
-swap64(uint64_t _x)
-{
-    return (__byte_swap64(_x));
-}
+#define _PVA_swap16(X) _byteswap_ushort(X)
+#define _PVA_swap32(X) _byteswap_ulong(X)
+#define _PVA_swap64(X) _byteswap_uint64(X)
 
 #endif
 
+namespace epics {namespace pvData {
 
+namespace detail {
 template<typename T>
-inline T swap(T val) { return val; }  // not valid
-
+struct asInt {
+    static EPICS_ALWAYS_INLINE T from(T v) { return v; }
+    static EPICS_ALWAYS_INLINE T to(T v) { return v; }
+};
 template<>
-inline int16 swap(int16 val)
-{
-    return swap16(val);
-}
-
+struct asInt<float> {
+    union pun {float f; uint32 i;};
+    static EPICS_ALWAYS_INLINE float from(uint32 v) {
+        pun P;
+        P.i = v;
+        return P.f;
+    }
+    static EPICS_ALWAYS_INLINE uint32 to(float v) {
+        pun P;
+        P.f = v;
+        return P.i;
+    }
+};
 template<>
-inline int32 swap(int32 val)
-{
-    return swap32(val);
-}
+struct asInt<double> {
+    union pun {double f; uint64 i;};
+    static EPICS_ALWAYS_INLINE double from(uint64 v) {
+        pun P;
+        P.i = v;
+        return P.f;
+    }
+    static EPICS_ALWAYS_INLINE uint64 to(double v) {
+        pun P;
+        P.f = v;
+        return P.i;
+    }
+};
 
+template<int N>
+struct swap; // no default
 template<>
-inline int64 swap(int64 val)
-{
-    return swap64(val);
-}
+struct swap<1> {
+    static EPICS_ALWAYS_INLINE uint8 op(uint8 v) { return v; }
+};
+template<>
+struct swap<2> {
+    static EPICS_ALWAYS_INLINE uint16 op(uint16 v) {
+#ifdef _PVA_swap16
+        return _PVA_swap16(v);
+#else
+        return (((v) >> 8) | ((v) << 8));
+#endif
+    }
+};
+template<>
+struct swap<4> {
+    static EPICS_ALWAYS_INLINE uint32 op(uint32 v) {
+#ifdef _PVA_swap32
+        return _PVA_swap32(v);
+#else
+        return ((((v) & 0xff000000) >> 24) |
+                (((v) & 0x00ff0000) >>  8) |
+                (((v) & 0x0000ff00) <<  8) |
+                (((v) & 0x000000ff) << 24));
+#endif
+    }
+};
+template<>
+struct swap<8> {
+#ifdef _PVA_swap64
+    static EPICS_ALWAYS_INLINE uint64 op(uint64 v) {
+        return _PVA_swap64(v);
+    }
+#else
+    static inline uint64 op(uint64 v) {
+        return (((v) >> 56) | \
+                (((v) >> 40) & 0x0000ff00) | \
+                (((v) >> 24) & 0x00ff0000) | \
+                (((v) >> 8)  & 0xff000000) | \
+                (((v) << 8)  & ((uint64_t)0xff << 32)) | \
+                (((v) << 24) & ((uint64_t)0xff << 40)) | \
+                (((v) << 40) & ((uint64_t)0xff << 48)) | \
+                (((v) << 56)));
+    }
+#endif
+};
 
-template<>
-inline uint16 swap(uint16 val)
-{
-    return swap16(val);
-}
+#undef _PVA_swap16
+#undef _PVA_swap32
+#undef _PVA_swap64
 
-template<>
-inline uint32 swap(uint32 val)
-{
-    return swap32(val);
-}
+} // namespace detail
 
-template<>
-inline uint64 swap(uint64 val)
+//! Unconditional byte order swap.
+//! defined for integer and floating point types
+template<typename T>
+EPICS_ALWAYS_INLINE T swap(T val)
 {
-    return swap64(val);
-}
-
-template<>
-inline float swap(float val)
-{
-    union {
-        int32 i;
-        float f;
-    } conv;
-    conv.f = val;
-    conv.i = swap32(conv.i);
-    return conv.f;
-}
-
-template<>
-inline double swap(double val)
-{
-    union {
-        int64 i;
-        double d;
-    } conv;
-    conv.d = val;
-    conv.i = swap64(conv.i);
-    return conv.d;
+    return detail::asInt<T>::from(
+                detail::swap<sizeof(T)>::op(
+                    detail::asInt<T>::to(val)));
 }
 
 #define is_aligned(POINTER, BYTE_COUNT) \
-    (((std::ptrdiff_t)(const void *)(POINTER)) % (BYTE_COUNT) == 0)
-
-/*template <bool ENDIANESS_SUPPORT = false,
-          bool UNALIGNED_ACCESS = false,
-          bool ADAPTIVE_ACCESS = true,
-          bool USE_INLINE_MEMCPY = true>*/
-
-#define ENDIANESS_SUPPORT true
-#define UNALIGNED_ACCESS true
-#define ADAPTIVE_ACCESS true
-#define USE_INLINE_MEMCPY true
+    (((std::size_t)(POINTER)) % (BYTE_COUNT) == 0)
 
 #if defined (__GNUC__) && (__GNUC__ < 3)
 #define GET(T) get((T*)0)
@@ -208,7 +172,7 @@ inline double swap(double val)
 /**
  * @brief This class implements a Bytebuffer that is like the java.nio.ByteBuffer.
  * 
- * <p>A {@code BitSet} is not safe for multithreaded use without
+ * <p>A @c BitSet is not safe for multithreaded use without
  * external synchronization.
  *
  * Based on Java implementation.
@@ -224,19 +188,20 @@ public:
      * Must be one of EPICS_BYTE_ORDER,EPICS_ENDIAN_LITTLE,EPICS_ENDIAN_BIG.
      */
     ByteBuffer(std::size_t size, int byteOrder = EPICS_BYTE_ORDER) :
-        _buffer(0), _size(size),
+        _buffer((char*)std::malloc(size)), _size(size),
         _reverseEndianess(byteOrder != EPICS_BYTE_ORDER),
         _reverseFloatEndianess(byteOrder != EPICS_FLOAT_WORD_ORDER),
         _wrapped(false)
     {
-        _buffer = (char*)malloc(size);
+        if(!_buffer)
+            throw std::bad_alloc();
         clear();
     }
 
     /**
-     * Constructor for wrapping existing buffers.
+     * Constructor for wrapping an existing buffer.
      * Given buffer will not be released by the ByteBuffer instance.
-     * @param  buffer    Existing buffer.
+     * @param  buffer    Existing buffer.  May not be NULL.
      * @param  size      The number of bytes.
      * @param  byteOrder The byte order.
      * Must be one of EPICS_BYTE_ORDER,EPICS_ENDIAN_LITTLE,EPICS_ENDIAN_BIG.
@@ -247,6 +212,8 @@ public:
         _reverseFloatEndianess(byteOrder != EPICS_FLOAT_WORD_ORDER),
         _wrapped(true)
     {
+        if(!_buffer)
+            throw std::invalid_argument("ByteBuffer can't be constructed with NULL");
         clear();
     }
     /**
@@ -254,7 +221,7 @@ public:
      */
     ~ByteBuffer()
     {
-        if (_buffer && !_wrapped) free(_buffer);
+        if (_buffer && !_wrapped) std::free(_buffer);
     }
     /**
      * Set the byte order.
@@ -271,7 +238,7 @@ public:
      * Get the raw buffer data.
      * @return the raw buffer data.
      */
-    inline const char* getBuffer()
+    inline const char* getBuffer() const
     {
         return _buffer;
     }
@@ -285,8 +252,18 @@ public:
         _limit = _buffer + _size;
     }
     /**
-     * Makes a buffer ready for a new sequence of channel-write or relative get operations:
-     * It sets the limit to the current position and then sets the position to zero. 
+     * Makes a buffer ready to read out previously written values.
+     *
+     * Typically _limit==_buffer+_size is the initial state, but this is not
+     * required.
+     *
+     * V _buffer             V _position          V _limit         V _buffer+_size
+     * |_______written_______|____uninitialized___|____allocated___|
+     *
+     * becomes
+     *
+     * V _buffer/_position   V _limit                              V _buffer+size
+     * |_______written_______|________________allocated____________|
      */
     inline void flip() {
         _limit = _position;
@@ -295,6 +272,16 @@ public:
     /**
      * Makes a buffer ready for re-reading the data that it already contains:
      * It leaves the limit unchanged and sets the position to zero.
+     *
+     * Note that this may allow reading of uninitialized values.  flip() should be considered
+     *
+     * V _buffer             V _position          V _limit         V _buffer+_size
+     * |_______written_______|____uninitialized___|____allocated___|
+     *
+     * becomes
+     *
+     * V _buffer/_position                        V _limit         V _buffer+size
+     * |_______written_______|____uninitialized___|____allocated___|
      */
     inline void rewind() {
         _position = _buffer;
@@ -303,9 +290,9 @@ public:
      * Returns the current position.
      * @return The current position in the raw data.
      */
-    inline std::size_t getPosition()
+    inline std::size_t getPosition() const
     {
-        return (std::size_t)(((std::ptrdiff_t)(const void *)_position) - ((std::ptrdiff_t)(const void *)_buffer));
+        return _position - _buffer;
     }
     /**
      * Sets the buffer position.
@@ -316,16 +303,18 @@ public:
      */
     inline void setPosition(std::size_t pos)
     {
+        assert(pos<=_size);
         _position = _buffer + pos;
+        assert(_position<=_limit);
     }
     /**
      * Returns this buffer's limit. 
      *
      * @return The offset into the raw buffer.
      */
-    inline std::size_t getLimit()
+    inline std::size_t getLimit() const
     {
-        return (std::size_t)(((std::ptrdiff_t)(const void *)_limit) - ((std::ptrdiff_t)(const void *)_buffer));
+        return _limit - _buffer;
     }
     /**
      * Sets this buffer's limit.
@@ -337,23 +326,25 @@ public:
      */
     inline void setLimit(std::size_t limit)
     {
+        assert(limit<=_size);
         _limit = _buffer + limit;
+        assert(_position<=_limit);
     }
     /**
      * Returns the number of elements between the current position and the limit.
      *
      * @return The number of elements remaining in this buffer.
      */
-    inline std::size_t getRemaining()
+    inline std::size_t getRemaining() const
     {
-        return (std::size_t)(((std::ptrdiff_t)(const void *)_limit) - ((std::ptrdiff_t)(const void *)_position));
+        return _limit - _position;
     }
     /**
      * Returns The size, i.e. capacity of the raw data buffer in bytes.
      *
      * @return The size of the raw data buffer.
      */
-    inline std::size_t getSize()
+    inline std::size_t getSize() const
     {
         return _size;
     }
@@ -371,9 +362,9 @@ public:
      * @param  value The value to be put into the byte buffer.
      */
     template<typename T>
-    inline void put(std::size_t index, T value);
+    inline void put(std::size_t index, T value) const;
     /**
-     * Get the new object from  the byte buffer. The item MUST have type {@code T}.
+     * Get the new object from  the byte buffer. The item MUST have type @c T.
      * The position is adjusted based on the type.
      *
      * @return The object.
@@ -387,24 +378,25 @@ public:
 #endif
     /**
      * Get the new object from  the byte buffer at the specified index.
-     * The item MUST have type {@code T}.
+     * The item MUST have type @c T.
      * The position is adjusted based on the type.
      *
      * @param index The location in the byte buffer.
      * @return The object.
      */
     template<typename T>
-    inline T get(std::size_t index);
+    inline T get(std::size_t index) const;
     /**
      * Put a sub-array of bytes into the byte buffer.
      * The position is increased by the count.
      *
-     * @param  src    The source array.
-     * @param  offset The starting position within src.
-     * @param  count  The number of bytes to put into the byte buffer,
+     * @param  src        The source array.
+     * @param  src_offset The starting position within src.
+     * @param  count      The number of bytes to put into the byte buffer.
+     *                    Must be less than getRemaining()
      */
     inline void put(const char* src, std::size_t src_offset, std::size_t count) {
-        //if(count>getRemaining()) THROW_BASE_EXCEPTION("buffer overflow");
+        assert(count<=getRemaining());
         memcpy(_position, src + src_offset, count);
         _position += count;
     }
@@ -412,17 +404,18 @@ public:
      * Get a sub-array of bytes from the byte buffer.
      * The position is increased by the count.
      *
-     * @param  dest    The destination array.
-     * @param  offset The starting position within src.
-     * @param  count  The number of bytes to put into the byte buffer,
+     * @param  dest        The destination array.
+     * @param  dest_offset The starting position within src.
+     * @param  count       The number of bytes to put into the byte buffer.
+     *                     Must be less than getRemaining()
      */
     inline void get(char* dest, std::size_t dest_offset, std::size_t count) {
-        //if(count>getRemaining()) THROW_BASE_EXCEPTION("buffer overflow");
+        assert(count<=getRemaining());
         memcpy(dest + dest_offset, _position, count);
         _position += count;
     }
     /**
-     * Put an array of type {@code T} into the byte buffer.
+     * Put an array of type @c T into the byte buffer.
      * The position is adjusted.
      *
      * @param  values The input array.
@@ -431,7 +424,7 @@ public:
     template<typename T>
     inline void putArray(const T* values, std::size_t count);
     /**
-     * Get an array of type {@code T} from the byte buffer.
+     * Get an array of type @c T from the byte buffer.
      * The position is adjusted.
      *
      * @param  values The destination array.
@@ -444,19 +437,26 @@ public:
      * @return (false,true) if (is, is not) the EPICS_BYTE_ORDER
      */
     template<typename T>
-    inline bool reverse()
+    EPICS_ALWAYS_INLINE bool reverse() const
     {
-        return _reverseEndianess;
+        return sizeof(T)>1 && _reverseEndianess;
     }
     /**
-     * Adjust position so that it is aligned to the specified size.
-     * Size MUST be a power of 2.
-     * @param  size The alignment requirement.
+     * Adjust position to the next multiple of 'size.
+     * @param  size The alignment requirement, must be a power of 2. (unchecked)
+     * @param  fill value to use for padding bytes (default '\0').
+     *
+     * @note This alignment is absolute, not necessarily with respect to _buffer.
      */
-    inline void align(std::size_t size)
+    inline void align(std::size_t size, char fill='\0')
     {
-        const std::size_t k = size - 1;
-        _position = (char*)((((std::ptrdiff_t)(const void *)_position) + k) & ~(k));
+        const std::size_t k = size - 1, bufidx = (std::size_t)_position;
+        if(bufidx&k) {
+            std::size_t npad = size-(bufidx&k);
+            assert(npad<=getRemaining());
+            std::fill(_position, _position+npad, fill);
+            _position += npad;
+        }
     }
     /**
      * Put a boolean value into the byte buffer.
@@ -637,54 +637,54 @@ public:
     /**
      * Get a boolean value from the byte buffer at the specified index.
      *
-     * @param  double The offset in the byte buffer.
+     * @param  index The offset in the byte buffer.
      * @return The value.
      */
     inline double getDouble (std::size_t  index) { return get<double>(index); }
 
     // TODO remove
-    inline const char* getArray()
+    inline const char* getArray() const
     {
         return _buffer;
     }
 
     
 private:
-    char* _buffer;
+    char* const _buffer;
     char* _position;
     char* _limit;
-    std::size_t  _size;
+    const std::size_t  _size;
     bool _reverseEndianess; 
     bool _reverseFloatEndianess;
-    bool _wrapped;
+    const bool _wrapped;
 };
 
     template<>
-    inline bool ByteBuffer::reverse<bool>()
+    inline bool ByteBuffer::reverse<bool>() const
     {
         return false;
     }
 
     template<>
-    inline bool ByteBuffer::reverse<int8>()
+    inline bool ByteBuffer::reverse<int8>() const
     {
         return false;
     }
 
     template<>
-    inline bool ByteBuffer::reverse<uint8>()
+    inline bool ByteBuffer::reverse<uint8>() const
     {
         return false;
     }
 
     template<>
-    inline bool ByteBuffer::reverse<float>()
+    inline bool ByteBuffer::reverse<float>() const
     {
         return _reverseFloatEndianess;
     }
 
     template<>
-    inline bool ByteBuffer::reverse<double>()
+    inline bool ByteBuffer::reverse<double>() const
     {
         return _reverseFloatEndianess;
     }
@@ -694,96 +694,26 @@ private:
     template<typename T>
     inline void ByteBuffer::put(T value)
     {
-        // this avoids int8 specialization, compiler will take care if optimization, -O2 or more
-        if (sizeof(T) == 1)
-        {
-            *(_position++) = (int8)value;
-            return;
-        }
+        assert(sizeof(T)<=getRemaining());
 
-        if (ENDIANESS_SUPPORT && reverse<T>())
-        {
+        if(reverse<T>())
             value = swap<T>(value);
-        }
-
-        if (UNALIGNED_ACCESS)
-        {
-            // NOTE: some CPU handle unaligned access pretty good (e.g. x86)
-            *((T*)_position) = value;
-            _position += sizeof(T);
-        }
-        else
-        {
-            // NOTE: this check and branching does not always pay off
-            if (ADAPTIVE_ACCESS && is_aligned(_position, sizeof(T)))
-            {
-                *((T*)_position) = value;
-                _position += sizeof(T);
-            }
-            else
-            {
-                if (USE_INLINE_MEMCPY)
-                {
-                    // NOTE: it turns out that this compiler can optimize this with inline code, e.g. gcc
-                    memcpy(_position, &value, sizeof(T));
-                    _position += sizeof(T);
-                }
-                else
-                {
-                    // NOTE: compiler should optimize this and unroll the loop
-                    for (size_t i = 0; i < sizeof(T); i++)
-                        _position[i] = ((char*)&value)[i];
-                    _position += sizeof(T);
-                }
-            }
-        }
 
+        //assert(is_aligned(_position, sizeof(T)));
+        *((T*)_position) = value;
+        _position += sizeof(T);
     }
 
     template<typename T>
-    inline void ByteBuffer::put(std::size_t index, T value)
+    inline void ByteBuffer::put(std::size_t index, T value) const
     {
-        // this avoids int8 specialization, compiler will take care if optimization, -O2 or more
-        if (sizeof(T) == 1)
-        {
-            *(_buffer + index) = (int8)value;
-            return;
-        }
+        assert(_buffer+index<=_limit);
 
-        if (ENDIANESS_SUPPORT && reverse<T>())
-        {
+        if(reverse<T>())
             value = swap<T>(value);
-        }
-
-        if (UNALIGNED_ACCESS)
-        {
-            // NOTE: some CPU handle unaligned access pretty good (e.g. x86)
-            *((T*)(_buffer + index)) = value;
-        }
-        else
-        {
-            // NOTE: this check and branching does not always pay off
-            if (ADAPTIVE_ACCESS && is_aligned(_position, sizeof(T)))
-            {
-                *((T*)(_buffer + index)) = value;
-            }
-            else
-            {
-                if (USE_INLINE_MEMCPY)
-                {
-                    // NOTE: it turns out that this compiler can optimize this with inline code, e.g. gcc
-                    memcpy(_buffer + index, &value, sizeof(T));
-                }
-                else
-                {
-                    // NOTE: compiler should optimize this and unroll the loop
-                    char *p = _buffer + index;
-                    for (size_t i = 0; i < sizeof(T); i++)
-                        p[i] = ((char*)&value)[i];
-                }
-            }
-        }
 
+        //assert(is_aligned(_buffer+index, sizeof(T))); //TODO: special case for targets which support unaligned access
+        *((T*)(_buffer+index)) = value;
     }
 
 #if defined (__GNUC__) && (__GNUC__ < 3)
@@ -794,160 +724,65 @@ private:
     inline T ByteBuffer::get()
 #endif
     {
-        // this avoids int8 specialization, compiler will take care if optimization, -O2 or more
-        if (sizeof(T) == 1)
-        {
-            return (int8)(*(_position++));
-        }
+        assert(sizeof(T)<=getRemaining());
 
+        //assert(is_aligned(_position, sizeof(T)));
+        T value = *((T*)_position);
+        _position += sizeof(T);
 
-        T value;
-
-        if (UNALIGNED_ACCESS)
-        {
-            // NOTE: some CPU handle unaligned access pretty good (e.g. x86)
-            value = *((T*)_position);
-            _position += sizeof(T);
-        }
-        else
-        {
-            // NOTE: this check and branching does not always pay off
-            if (ADAPTIVE_ACCESS && is_aligned(_position, sizeof(T)))
-            {
-                value = *((T*)_position);
-                _position += sizeof(T);
-            }
-            else
-            {
-                if (USE_INLINE_MEMCPY)
-                {
-                    // NOTE: it turns out that this compiler can optimize this with inline code, e.g. gcc
-                    memcpy(&value, _position, sizeof(T));
-                    _position += sizeof(T);
-                }
-                else
-                {
-                    // NOTE: compiler should optimize this and unroll the loop
-                    for (size_t i = 0; i < sizeof(T); i++)
-                        ((char*)&value)[i] = _position[i];
-                    _position += sizeof(T);
-                }
-            }
-        }
-
-        if (ENDIANESS_SUPPORT && reverse<T>())
-        {
+        if(reverse<T>())
             value = swap<T>(value);
-        }
-
         return value;
     }
 
     template<typename T>
-    inline T ByteBuffer::get(std::size_t index)
+    inline T ByteBuffer::get(std::size_t index) const
     {
-        // this avoids int8 specialization, compiler will take care if optimization, -O2 or more
-        if (sizeof(T) == 1)
-        {
-            return (int8)(*(_buffer + index));
-        }
+        assert(_buffer+index<=_limit);
 
+        //assert(is_aligned(_position, sizeof(T)));
+        T value = *((T*)(_buffer + index));
 
-        T value;
-
-        if (UNALIGNED_ACCESS)
-        {
-            // NOTE: some CPU handle unaligned access pretty good (e.g. x86)
-            value = *((T*)(_buffer + index));
-        }
-        else
-        {
-            // NOTE: this check and branching does not always pay off
-            if (ADAPTIVE_ACCESS && is_aligned(_position, sizeof(T)))
-            {
-                value = *((T*)(_buffer + index));
-            }
-            else
-            {
-                if (USE_INLINE_MEMCPY)
-                {
-                    // NOTE: it turns out that this compiler can optimize this with inline code, e.g. gcc
-                    memcpy(&value, _buffer + index, sizeof(T));
-                }
-                else
-                {
-                    // NOTE: compiler should optimize this and unroll the loop
-                    char* p = _buffer + index;
-                    for (size_t i = 0; i < sizeof(T); i++)
-                        ((char*)&value)[i] = p[i];
-                }
-            }
-        }
-
-        if (ENDIANESS_SUPPORT && reverse<T>())
-        {
+        if(reverse<T>())
             value = swap<T>(value);
-        }
-
         return value;
     }
 
     template<typename T>
     inline void ByteBuffer::putArray(const T* values, std::size_t count)
     {
-        // this avoids int8 specialization, compiler will take care if optimization, -O2 or more
-        if (sizeof(T) == 1)
-        {
-            put((const char*)values, 0, count);
-            return;
-        }
-
-        T* start = (T*)_position;
-
-        size_t n = sizeof(T)*count;
         // we require aligned arrays...
-        memcpy(_position, values, n);
-        _position += n;
+        //assert(is_aligned(_position, sizeof(T)));
+        T* start = (T*)_position;
+        size_t n = sizeof(T)*count; // bytes
+        assert(n<=getRemaining());
 
-        // ... so that we can be fast changing endianness
-        if (ENDIANESS_SUPPORT && reverse<T>())
-        {
-            for (std::size_t i = 0; i < count; i++)
-            {
-                *start = swap<T>(*start);
-                start++;
-            }
+        if (reverse<T>()) {
+            for(std::size_t i=0; i<count; i++)
+                start[i] = swap<T>(values[i]);
+        } else {
+            memcpy(start, values, n);
         }
+        _position += n;
     }
 
     template<typename T>
     inline void ByteBuffer::getArray(T* values, std::size_t count)
     {
-        // this avoids int8 specialization, compiler will take care if optimization, -O2 or more
-        if (sizeof(T) == 1)
-        {
-            get((char*)values, 0, count);
-            return;
-        }
-
-        T* start = (T*)values;
-
-        size_t n = sizeof(T)*count;
         // we require aligned arrays...
-        memcpy(values, _position, n);
-        _position += n;
+        //assert(is_aligned(_position, sizeof(T)));
+        const T* start = (T*)_position;
+        size_t n = sizeof(T)*count; // bytes
+        assert(n<=getRemaining());
 
-        // ... so that we can be fast changing endianness
-        if (ENDIANESS_SUPPORT && reverse<T>())
-        {
-            for (std::size_t i = 0; i < count; i++)
-            {
-                *start = swap<T>(*start);
-                start++;
-            }
+        if (reverse<T>()) {
+            for(std::size_t i=0; i<count; i++)
+                values[i] = swap<T>(start[i]);
+        } else {
+            memcpy(values, start, n);
         }
+        _position += n;
     }
 
-    }
-}
+}}
 #endif  /* BYTEBUFFER_H */

src/misc/pv/debugPtr.h

@@ -0,0 +1,328 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+/* Author:  Michael Davidsaver */
+/* wrapper around shared_ptr which tracks backwards references.
+ * Can help to find ref. leaks, loops, and other exciting bugs.
+ * See comments in sharedPtr.h
+ */
+#ifndef DEBUGPTR_H
+#define DEBUGPTR_H
+
+#if __cplusplus<201103L
+#  error c++11 required
+#endif
+
+#include <ostream>
+#include <memory>
+#include <set>
+
+#include <pv/epicsException.h>
+
+#include <shareLib.h>
+
+//! User code should test this macro
+//! before calling epics::debug::shared_ptr::show_refs()
+#define HAVE_SHOW_REFS
+
+namespace epics {
+namespace debug {
+
+struct tracker;
+class shared_ptr_base;
+
+class epicsShareClass ptr_base {
+    friend class shared_ptr_base;
+    template<typename A>
+    friend class shared_ptr;
+    template<typename A>
+    friend class weak_ptr;
+protected:
+    typedef std::shared_ptr<tracker> track_t;
+    track_t track;
+
+    ptr_base() noexcept : track() {}
+    ptr_base(const track_t& track) :track(track) {}
+    ptr_base(const ptr_base&) = delete;
+    ptr_base(ptr_base&&) = delete;
+
+    ptr_base& operator=(const ptr_base&) = delete;
+
+public:
+    typedef std::set<const shared_ptr_base *> ref_set_t;
+    void show_refs(std::ostream&, bool self=true, bool weak=false) const;
+    void spy_refs(ref_set_t&) const;
+};
+
+class epicsShareClass weak_ptr_base : public ptr_base {
+protected:
+    weak_ptr_base() {}
+    weak_ptr_base(const track_t& track) :ptr_base(track) {}
+};
+
+class epicsShareClass shared_ptr_base : public ptr_base {
+protected:
+    shared_ptr_base() noexcept
+#ifndef EXCEPT_USE_NONE
+        :m_stack(), m_depth(0)
+#endif
+    {}
+    shared_ptr_base(const track_t& track) :ptr_base(track)
+  #ifndef EXCEPT_USE_NONE
+      ,m_stack(), m_depth(0)
+  #endif
+    {}
+    ~shared_ptr_base() {track_clear();}
+
+    // add ourselves to tracker
+    void track_new();
+    // create new tracker if ptr!=nullptr, otherwise clear
+    void track_new(void* ptr);
+    // copy tracker and add ourself
+    void track_assign(const shared_ptr_base& o);
+    void track_clear();
+    void swap(shared_ptr_base& o);
+    void snap_stack();
+
+#ifndef EXCEPT_USE_NONE
+    void *m_stack[EXCEPT_DEPTH];
+    int m_depth; // always <= EXCEPT_DEPTH
+#endif
+
+public:
+    void show_stack(std::ostream&) const;
+};
+
+
+
+template<typename T>
+class shared_ptr;
+template<typename T>
+class weak_ptr;
+template<class Base>
+class enable_shared_from_this;
+
+template<typename Store, typename Actual>
+inline void
+do_enable_shared_from_this(const shared_ptr<Store>& dest,
+                            enable_shared_from_this<Actual>* self
+                            );
+
+template<typename T>
+inline void
+do_enable_shared_from_this(const shared_ptr<T>&, ...) {}
+
+template<typename T>
+class shared_ptr : public shared_ptr_base {
+    typedef ::std::shared_ptr<T> real_type;
+
+    real_type real;
+
+    template<typename A>
+    friend class shared_ptr;
+    template<typename A>
+    friend class weak_ptr;
+
+    // ctor for casts
+    shared_ptr(const real_type& r, const ptr_base::track_t& t)
+        :shared_ptr_base(t), real(r)
+    {track_new();}
+public:
+    typedef typename real_type::element_type element_type;
+    typedef weak_ptr<T> weak_type;
+
+    // new NULL
+    shared_ptr() noexcept {}
+    // copy existing same type
+    shared_ptr(const shared_ptr& o) :shared_ptr_base(o.track), real(o.real) {track_new();}
+    // copy existing of implicitly castable type
+    template<typename A>
+    shared_ptr(const shared_ptr<A>& o) :shared_ptr_base(o.track), real(o.real) {track_new();}
+
+    // construct around new pointer
+    template<typename A, class ... Args>
+    explicit shared_ptr(A* a, Args ... args) : shared_ptr_base(), real(a, args...) {
+        track_new(a);
+        do_enable_shared_from_this(*this, a);
+    }
+
+    // make strong ref from weak
+    template<typename A>
+    shared_ptr(const weak_ptr<A>& o) :shared_ptr_base(o.track), real(o.real) {track_new();}
+
+    // takeover from unique_ptr
+    template<typename A>
+    shared_ptr(std::unique_ptr<A>&& a) : shared_ptr_base(), real(a.release()) {track_new();}
+
+    ~shared_ptr() {}
+
+    shared_ptr& operator=(const shared_ptr& o) {
+        if(this!=&o) {
+            real = o.real;
+            track_assign(o);
+        }
+        return *this;
+    }
+    template<typename A>
+    shared_ptr& operator=(const shared_ptr<A>& o) {
+        if(get()!=o.get()) {
+            real = o.real;
+            track_assign(o);
+        }
+        return *this;
+    }
+
+    void reset() noexcept { real.reset(); track_clear(); }
+    template<typename A, class ... Args>
+    void reset(A* a, Args ... args)
+    {
+        real.reset(a, args...);
+        track_new(a);
+        do_enable_shared_from_this(*this, a);
+    }
+    void swap(shared_ptr &o) noexcept
+    {
+        if(this!=&o) {
+            real.swap(o.real);
+            shared_ptr_base::swap(o);
+        }
+    }
+
+    // proxy remaining to underlying shared_ptr
+
+    T* get() const noexcept { return real.get(); }
+    typename std::add_lvalue_reference<T>::type operator*() const noexcept { return *real; }
+    T* operator->() const noexcept { return real.get(); }
+    long use_count() const noexcept { return real.use_count(); }
+    bool unique() const noexcept { return real.unique(); }
+    explicit operator bool() const noexcept { return bool(real); }
+
+    bool operator==(const shared_ptr<T>& o) const { return real==o.real; }
+    bool operator!=(const shared_ptr<T>& o) const { return real!=o.real; }
+    bool operator<(const shared_ptr<T>& o) const { return real<o.real; }
+
+    template<typename A>
+    bool owner_before(const shared_ptr<A>& o) { return real.owner_before(o); }
+    template<typename A>
+    bool owner_before(const weak_ptr<A>& o) { return real.owner_before(o); }
+
+    template<typename TO, typename FROM>
+    friend
+    shared_ptr<TO> static_pointer_cast(const shared_ptr<FROM>& src);
+    template<typename TO, typename FROM>
+    friend
+    shared_ptr<TO> const_pointer_cast(const shared_ptr<FROM>& src);
+    template<typename TO, typename FROM>
+    friend
+    shared_ptr<TO> dynamic_pointer_cast(const shared_ptr<FROM>& src);
+    template<typename Store, typename Actual>
+    friend void
+    do_enable_shared_from_this(const shared_ptr<Store>& dest,
+                                enable_shared_from_this<Actual>* self
+                                );
+};
+
+template<typename TO, typename FROM>
+shared_ptr<TO> static_pointer_cast(const shared_ptr<FROM>& src) {
+    return shared_ptr<TO>(std::static_pointer_cast<TO>(src.real), src.track);
+}
+
+template<typename TO, typename FROM>
+shared_ptr<TO> const_pointer_cast(const shared_ptr<FROM>& src) {
+    return shared_ptr<TO>(std::const_pointer_cast<TO>(src.real), src.track);
+}
+
+template<typename TO, typename FROM>
+shared_ptr<TO> dynamic_pointer_cast(const shared_ptr<FROM>& src) {
+    return shared_ptr<TO>(std::dynamic_pointer_cast<TO>(src.real), src.track);
+}
+
+template<typename T>
+class weak_ptr : public weak_ptr_base {
+    typedef ::std::weak_ptr<T> real_type;
+
+    real_type real;
+
+    template<typename A>
+    friend class shared_ptr;
+    template<typename A>
+    friend class weak_ptr;
+
+public:
+    typedef typename real_type::element_type element_type;
+    typedef weak_ptr<T> weak_type;
+
+    // new NULL
+    weak_ptr() noexcept {}
+    // copy existing same type
+    weak_ptr(const weak_ptr& o) :weak_ptr_base(o.track), real(o.real) {}
+    // copy existing of similar type
+    template<typename A>
+    weak_ptr(const weak_ptr<A>& o) :weak_ptr_base(o.track), real(o.real) {}
+
+    // create week ref from strong ref
+    template<typename A>
+    weak_ptr(const shared_ptr<A>& o) :weak_ptr_base(o.track), real(o.real) {}
+
+    ~weak_ptr() {}
+
+    weak_ptr& operator=(const weak_ptr& o) {
+        if(this!=&o) {
+            real = o.real;
+            track = o.track;
+        }
+        return *this;
+    }
+    template<typename A>
+    weak_ptr& operator=(const shared_ptr<A>& o) {
+        real = o.real;
+        track = o.track;
+        return *this;
+    }
+
+    shared_ptr<T> lock() const noexcept { return shared_ptr<T>(real.lock(), track); }
+    void reset() noexcept { track.reset(); real.reset(); }
+
+    long use_count() const noexcept { return real.use_count(); }
+    bool unique() const noexcept { return real.unique(); }
+};
+
+template<class Base>
+class enable_shared_from_this {
+    mutable weak_ptr<Base> xxInternalSelf;
+
+    template<typename Store, typename Actual>
+    friend
+    void
+    do_enable_shared_from_this(const shared_ptr<Store>& dest,
+                                enable_shared_from_this<Actual>* self
+                                );
+public:
+    shared_ptr<Base> shared_from_this() const {
+        return shared_ptr<Base>(xxInternalSelf);
+    }
+};
+
+template<typename Store, typename Actual>
+inline void
+do_enable_shared_from_this(const shared_ptr<Store>& dest,
+                            enable_shared_from_this<Actual>* self
+                            )
+{
+    shared_ptr<Actual> actual(dynamic_pointer_cast<Actual>(dest));
+    if(!actual)
+        throw std::logic_error("epics::debug::enabled_shared_from_this fails");
+    self->xxInternalSelf = actual;
+}
+
+}} // namespace epics::debug
+
+template<typename T>
+inline std::ostream& operator<<(std::ostream& strm, const epics::debug::shared_ptr<T>& ptr)
+{
+    strm<<ptr.get();
+    return strm;
+}
+
+#endif // DEBUGPTR_H

src/misc/pv/epicsException.h

@@ -1,10 +1,9 @@
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /*
- * epicsException.hpp
+ * epicsException.h
  *
  *  Created on: Oct 20, 2010
  *      Author: Matej Sekoranja
@@ -34,19 +33,14 @@
 #ifndef EPICSEXCEPTION_H_
 #define EPICSEXCEPTION_H_
 
-#ifdef _WIN32
-#pragma warning( push )
-#pragma warning(disable: 4275) // warning C4275: non dll-interface class used as base for dll-interface class (std::logic_error)
+#if defined(_WIN32) && !defined(NOMINMAX)
+#define NOMINMAX
 #endif
 
 #include <stdexcept>
 #include <string>
-
 #include <cstdio>
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include <shareLib.h>
 
 // Users may redefine this for a large size if desired
@@ -58,7 +52,7 @@
 #  include <execinfo.h>
 #  include <cxxabi.h>
 #  define EXCEPT_USE_BACKTRACE
-#elif defined(_WIN32) && !defined(__MINGW__) && !defined(SKIP_DBGHELP)
+#elif defined(_WIN32) && !defined(_MINGW) && !defined(SKIP_DBGHELP)
 #  define _WINSOCKAPI_
 #  include <windows.h>
 #  include <dbghelp.h>
@@ -67,6 +61,12 @@
 #  define EXCEPT_USE_NONE
 #endif
 
+#if defined(_WIN32) && !defined(_MINGW)
+#pragma warning( push )
+#pragma warning(disable: 4275) // non dll-interface class used as base for dll-interface class (std::logic_error)
+#pragma warning(disable: 4251) // class std::string needs to have dll-interface to be used by clients
+#endif
+
 namespace epics { namespace pvData {
 
 
@@ -175,17 +175,17 @@ do { \
 
 #define PRINT_EXCEPTION2(EI, FP) \
 do { \
-    ExceptionMixin *_em_p=dynamic_cast<ExceptionMixin*>(&EI); \
+    ::epics::pvData::ExceptionMixin *_em_p=dynamic_cast< ::epics::pvData::ExceptionMixin*>(&EI); \
     if (_em_p) {_em_p->print(FP);} \
 }while(0)
 
 #define PRINT_EXCEPTION(EI) PRINT_EXCEPTION2(EI,stderr)
 
-#ifndef __GNUC__
+#if !defined(__GNUC__) || __GNUC__ < 4
 #  define SHOW_EXCEPTION(EI) ::epics::pvData::detail::showException(EI)
 #else
 #  define SHOW_EXCEPTION(EI) \
-    ({ ExceptionMixin *_mx=dynamic_cast<ExceptionMixin*>(&(EI)); \
+    ({ ::epics::pvData::ExceptionMixin *_mx=dynamic_cast< ::epics::pvData::ExceptionMixin*>(&(EI)); \
                            _mx ? _mx->show() : std::string(); \
                        })
 #endif
@@ -228,7 +228,7 @@ private:
     mutable std::string base_msg;
 };
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(_MINGW)
 #pragma warning( pop )
 #endif
 

src/misc/pv/event.h

@@ -1,8 +1,7 @@
 /* event.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -13,22 +12,12 @@
 #include <memory>
 #include <vector>
 
-#ifdef epicsExportSharedSymbols
-#define eventepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include <epicsEvent.h>
-
-#ifdef eventepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef eventepicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
 #include <pv/pvType.h>
 #include <pv/sharedPtr.h>
 
-#include <shareLib.h>
 
 namespace epics { namespace pvData { 
 

src/misc/pv/executor.h

@@ -1,8 +1,7 @@
 /* executor.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -12,6 +11,8 @@
 
 #include <memory>
 
+#include <compilerDependencies.h>
+
 #include <pv/pvType.h>
 #include <pv/lock.h>
 #include <pv/event.h>
@@ -31,7 +32,7 @@ typedef std::tr1::shared_ptr<Executor> ExecutorPtr;
  * @brief A command to be called by Executor
  *
  */
-class epicsShareClass Command {
+class epicsShareClass EPICS_DEPRECATED Command {
 public:
     POINTER_DEFINITIONS(Command);
     /**
@@ -53,7 +54,7 @@ private:
  * @brief A class that executes commands.
  *
  */
-class epicsShareClass Executor : public Runnable{
+class epicsShareClass EPICS_DEPRECATED Executor : public Runnable{
 public:
     POINTER_DEFINITIONS(Executor);
     /**

src/misc/pv/localStaticLock.h

@@ -1,8 +1,7 @@
 /* localStaticLock.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mse

src/misc/pv/lock.h

@@ -1,8 +1,7 @@
 /* lock.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -12,21 +11,11 @@
 
 #include <stdexcept>
 
-#ifdef epicsExportSharedSymbols
-#define lockepicsExportSharedSymbols
-#undef epicsExportSharedSymbols
-#endif
-
 #include <epicsMutex.h>
-
-#ifdef lockepicsExportSharedSymbols
-#define epicsExportSharedSymbols
-#undef lockepicsExportSharedSymbols
-#endif
+#include <shareLib.h>
 
 #include <pv/noDefaultMethods.h>
 
-#include <shareLib.h>
 
 /* This is based on item 14 of 
  * Effective C++, Third Edition, Scott Meyers
@@ -44,7 +33,8 @@ typedef epicsMutex Mutex;
  * This is based on item 14 of 
  *  * Effective C++, Third Edition, Scott Meyers
  */
-class epicsShareClass Lock : private NoDefaultMethods {
+class Lock {
+    EPICS_NOT_COPYABLE(Lock)
 public:
     /**
      * Constructor

src/misc/pv/noDefaultMethods.h

@@ -0,0 +1,65 @@
+/* noDefaultMethods.h */
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+/**
+ *  @author mrk
+ */
+#ifndef NO_DEFAULT_METHODS_H
+#define NO_DEFAULT_METHODS_H
+
+#include <shareLib.h>
+
+/** @macro EPICS_NOT_COPYABLE(CLASS)
+ *  @brief Disable implicit copyable
+ *
+ * Prevent the default copy constructor and assignment
+ * operator from being usable.
+ *
+ * For >= C++11 explicitly disable.  Attempts to copy/assign will
+ * fail to compile.
+ *
+ * For C++98 make these private, and don't implement them.
+ * User code will fail to compile, implementation code will fail to link.
+ @code
+    struct MyClass {
+        EPICS_NOT_COPYABLE(MyClass)
+    public:
+        ...
+    };
+ @code
+ *
+ * @note This macro contains 'private:'.
+ */
+#if __cplusplus>=201103L
+#  define EPICS_NOT_COPYABLE(CLASS) private: CLASS(const CLASS&) = delete; CLASS& operator=(const CLASS&) = delete;
+#else
+#  define EPICS_NOT_COPYABLE(CLASS) private: CLASS(const CLASS&); CLASS& operator=(const CLASS&);
+#endif
+
+namespace epics { namespace pvData {
+
+/**
+ * @brief Base class for not allowing default methods.
+ *
+ * Note that copy constructor a copy methods are declared private.
+ *
+ * @deprecated Deprecated in favor of EPICS_NOT_COPYABLE() pvDataCPP 7.0.0
+ */
+class NoDefaultMethods {
+public:
+    NoDefaultMethods() {}
+private:
+#if __cplusplus>=201103L
+    NoDefaultMethods(const NoDefaultMethods&) = delete;
+    NoDefaultMethods & operator=(const NoDefaultMethods &) = delete;
+#else
+    // do not implement
+    NoDefaultMethods(const NoDefaultMethods&);
+    NoDefaultMethods & operator=(const NoDefaultMethods &);
+#endif
+};
+
+}}
+#endif  /* NO_DEFAULT_METHODS_H */

src/misc/pv/pvUnitTest.h

@@ -0,0 +1,188 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+#ifndef PVUNITTEST_H
+#define PVUNITTEST_H
+
+#include <sstream>
+#include <typeinfo>
+
+#include <epicsUnitTest.h>
+
+#include <pv/sharedPtr.h>
+#include <pv/epicsException.h>
+#include <pv/pvData.h>
+
+namespace detail {
+
+template<class C, void (C::*M)()>
+void test_method(const char *kname, const char *mname)
+{
+    try {
+        testDiag("------- %s::%s --------", kname, mname);
+        C inst;
+        (inst.*M)();
+    } catch(std::exception& e) {
+        PRINT_EXCEPTION(e);
+        testAbort("unexpected exception: %s", e.what());
+    }
+}
+
+class epicsShareClass testPassx
+{
+    std::ostringstream strm;
+    const bool dotest, pass;
+    bool alive;
+public:
+    testPassx() :dotest(false), pass(false), alive(true) {}
+    explicit testPassx(bool r) :dotest(true), pass(r), alive(true) {}
+    ~testPassx();
+    template<typename T>
+    inline testPassx& operator<<(T v) {
+        strm<<v;
+        return *this;
+    }
+
+    // allow testPassx to be returned
+    // move ctor masquerading as copy ctor
+    testPassx(testPassx& o);
+private:
+    testPassx& operator=(const testPassx&);
+};
+
+template<typename LHS, typename RHS>
+inline testPassx testEqualx(const char *nLHS, const char *nRHS, LHS l, RHS r)
+{
+    return testPassx(l==r)<<nLHS<<" ("<<l<<") == "<<nRHS<<" ("<<r<<")";
+}
+
+template<typename LHS, typename RHS>
+inline testPassx testNotEqualx(const char *nLHS, const char *nRHS, LHS l, RHS r)
+{
+    return testPassx(l!=r)<<nLHS<<" ("<<l<<") != "<<nRHS<<" ("<<r<<")";
+}
+
+}//namespace detail
+
+/** @defgroup testhelpers Unit testing helpers
+ *
+ * Helper functions for writing unit tests.
+ *
+ @include unittest.cpp
+ *
+ * @{
+ */
+
+/** Run a class method as a test.
+ *
+ * Each invocation of TEST_METHOD() constructs a new instance of 'klass' on the stack.
+ * Thus constructor and destructor can be used for common test setup and tear down.
+ @code
+ namespace { // anon
+     struct MyTest {
+           MyTest() { } // setup
+           ~MyTest() { } // tear down
+           void test1() {}
+           void test2() {}
+     };
+ } // namespace anon
+ MAIN(somename) {
+       testPlan(0);
+       TEST_METHOD(MyTest, test1)
+       TEST_METHOD(MyTest, test2)
+       return testDone();
+ }
+ @endcode
+ */
+#define TEST_METHOD(klass, method) ::detail::test_method<klass, &klass::method>(#klass, #method)
+
+/** Compare equality.  print left and right hand values and expression strings
+ *
+ @code
+ int x=5;
+ testEqual(x, 5);
+ // prints "ok 1 - x (5) == 5 (5)\n"
+ testEqual(x, 6)<<" oops";
+ // prints "not ok 1 - x (5) == 6 (6) oops\n"
+ @endcode
+ */
+#define testEqual(LHS, RHS) ::detail::testEqualx(#LHS, #RHS, LHS, RHS)
+
+#define testNotEqual(LHS, RHS) ::detail::testNotEqualx(#LHS, #RHS, LHS, RHS)
+
+/** Pass/fail from boolean
+ *
+ @code
+ bool y=true;
+ testTrue(y);
+ // prints "ok 1 - y\n"
+ testTrue(!y)<<" oops";
+ // prints "not ok 1 - !y oops\n"
+ @endcode
+ */
+#define testTrue(B) ::detail::testPassx(!!(B))<<#B
+
+/** Test that a given block throws an exception
+ *
+ @code
+ testThrows(std::runtime_error, somefunc(5))
+ @endcode
+ */
+#define testThrows(EXC, CODE) try{ CODE; testFail("unexpected success of " #CODE); }catch(EXC& e){testPass("catch expected exception: %s", e.what());}
+
+/** Print test output w/o testing
+ *
+ @code
+ testShow()<<"Foo";
+ @endcode
+ */
+#define testShow() ::detail::testPassx()
+
+/** Compare value of PVStructure field
+ *
+ @code
+ PVStructurePtr x(.....);
+ testFieldEqual<epics::pvData::PVInt>(x, "alarm.severity", 1);
+ @endcode
+ */
+template<typename PVD>
+::detail::testPassx
+testFieldEqual(const std::tr1::shared_ptr<const epics::pvData::PVStructure>& val, const char *name, typename PVD::value_type expect)
+{
+    if(!val) {
+        return ::detail::testPassx(false)<<" null structure pointer";
+    }
+    typename PVD::const_shared_pointer fval(val->getSubField<PVD>(name));
+    if(!fval) {
+        epics::pvData::PVUnion::const_shared_pointer uval(val->getSubField<epics::pvData::PVUnion>(name));
+        if(uval)
+            fval = uval->get<PVD>();
+    }
+    if(!fval) {
+        return ::detail::testPassx(false)<<" field '"<<name<<"' with type "<<typeid(PVD).name()<<" does not exist";
+    } else {
+        typename PVD::value_type actual(fval->get());
+        return ::detail::testPassx(actual==expect)<<name<<" ("<<actual<<") == "<<expect;
+    }
+}
+
+template<typename PVD>
+::detail::testPassx
+testFieldEqual(const std::tr1::shared_ptr<const epics::pvData::PVStructure>& val, const char *name, typename PVD::const_svector expect)
+{
+    if(!val) {
+        return ::detail::testPassx(false)<<" null structure pointer";
+    }
+    typename PVD::const_shared_pointer fval(val->getSubField<PVD>(name));
+    if(!fval) {
+        return ::detail::testPassx(false)<<" field '"<<name<<"' with type "<<typeid(PVD).name()<<" does not exist";
+    } else {
+        typename PVD::const_svector actual(fval->view());
+        return ::detail::testPassx(actual==expect)<<name<<" ("<<actual<<") == "<<expect;
+    }
+}
+
+/** @} */
+
+#endif // PVUNITTEST_H

src/misc/pv/queue.h

@@ -1,8 +1,7 @@
 /* queue.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -14,6 +13,7 @@
 #include <cstddef>
 #include <stdexcept>
 
+#include <compilerDependencies.h>
 #include <pv/sharedPtr.h>
 
 namespace epics { namespace pvData { 
@@ -25,7 +25,7 @@ namespace epics { namespace pvData {
  * but must create a std::vector of shared_ptr to queueElements.
  */
 template <typename T>
-class Queue
+class EPICS_DEPRECATED Queue
 {
 public:
     POINTER_DEFINITIONS(Queue);
@@ -65,7 +65,7 @@ public:
      * @return a shared_ptr to the queue element.
      * This is null if queue was full.
      */
-    queueElementPtr & getFree();
+    queueElementPtr getFree();
     /**
      * Set the element returned by getFree as used.
      * Until this is called getUsed will not return it.
@@ -78,14 +78,13 @@ public:
      * @return a shared_ptr to the queue element.
      * This is null if no used element is available.`
      */
-    queueElementPtr & getUsed();
+    queueElementPtr getUsed();
     /**
      * Release the element obtained by the most recent call to getUsed.
      * @param element The element.
      */
     void releaseUsed(queueElementPtr const &element);
 private:
-    queueElementPtr nullElement;
     queueElementPtrArray elements;
     // TODO use size_t instead
     int size;
@@ -134,9 +133,9 @@ void Queue<T>::clear()
 }
 
 template <typename T>
-std::tr1::shared_ptr<T> & Queue<T>::getFree()
+std::tr1::shared_ptr<T> Queue<T>::getFree()
 {
-    if(numberFree==0) return nullElement;
+    if(numberFree==0) return queueElementPtr();
     numberFree--;
     int ind = nextGetFree;
     std::tr1::shared_ptr<T> queueElement = elements[nextGetFree++];
@@ -155,9 +154,9 @@ void Queue<T>::setUsed(std::tr1::shared_ptr<T> const &element)
 }
 
 template <typename T>
-std::tr1::shared_ptr<T> & Queue<T>::getUsed()
+std::tr1::shared_ptr<T> Queue<T>::getUsed()
 {
-    if(numberUsed==0) return nullElement;
+    if(numberUsed==0) return queueElementPtr();
     int ind = nextGetUsed;
     std::tr1::shared_ptr<T> queueElement = elements[nextGetUsed++];
     if(nextGetUsed>=size) nextGetUsed = 0;

src/misc/pv/reftrack.h

@@ -0,0 +1,141 @@
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
+ */
+#ifndef REFTRACK_H
+#define REFTRACK_H
+
+#ifdef __cplusplus
+
+#include <map>
+#include <string>
+#include <ostream>
+
+#include <stdlib.h>
+
+#include <epicsVersion.h>
+
+#ifndef VERSION_INT
+#  define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
+#endif
+
+#ifndef EPICS_VERSION_INT
+#  define EPICS_VERSION_INT VERSION_INT(EPICS_VERSION, EPICS_REVISION, EPICS_MODIFICATION, EPICS_PATCH_LEVEL)
+#endif
+
+#if EPICS_VERSION_INT>=VERSION_INT(3,15,1,0)
+#  include <epicsAtomic.h>
+#  define REFTRACK_USE_ATOMIC
+#endif
+
+#ifdef REFTRACK_USE_ATOMIC
+#  define REFTRACE_INCREMENT(counter) ::epics::atomic::increment(counter)
+#  define REFTRACE_DECREMENT(counter) ::epics::atomic::decrement(counter)
+#else
+#  define REFTRACE_INCREMENT(counter) do{}while(0)
+#  define REFTRACE_DECREMENT(counter) do{}while(0)
+#endif
+
+#include <shareLib.h>
+
+namespace epics {
+
+//! Register new global reference counter
+epicsShareFunc
+void registerRefCounter(const char *name, const size_t* counter);
+
+//! Remove registration of global reference counter (if dynamically allocated)
+epicsShareFunc
+void unregisterRefCounter(const char *name, const size_t* counter);
+
+//! Fetch current value of single reference counter
+epicsShareFunc
+size_t readRefCounter(const char *name);
+
+//! Represent a snapshot of many reference counters
+class epicsShareClass RefSnapshot
+{
+public:
+    //! A single count
+    struct Count {
+        size_t current;
+        long delta; //!< current - previous
+        Count() :current(0u), delta(0) {}
+        explicit Count(size_t c, long d) :current(c), delta(d) {}
+        bool operator==(const Count& o) const
+        { return current==o.current && delta==o.delta; }
+    };
+
+private:
+    typedef std::map<std::string, Count> cnt_map_t;
+    cnt_map_t counts;
+public:
+    typedef cnt_map_t::const_iterator iterator;
+    typedef cnt_map_t::const_iterator const_iterator;
+
+    /** Fetch values of all reference counters.
+     *
+     * This involves many atomic reads, not a single operation.
+     */
+    void update();
+
+    const Count& operator[](const std::string& name) const;
+
+    iterator begin() const { return counts.begin(); }
+    iterator end() const { return counts.end(); }
+    size_t size() const { return counts.size(); }
+
+    inline void swap(RefSnapshot& o)
+    {
+        counts.swap(o.counts);
+    }
+
+    /** Compute the difference lhs - rhs
+     *
+     * Returned RefSnapshot has Count::current=lhs.current
+     * and Count::delta= lhs.current - rhs.current
+     */
+    RefSnapshot operator-(const RefSnapshot& rhs) const;
+};
+
+//! Print all counters with a non-zero delta
+epicsShareFunc
+std::ostream& operator<<(std::ostream& strm, const RefSnapshot& snap);
+
+//! Helper to run a thread which periodically prints (via show() )
+//! global reference counter deltas.
+class epicsShareClass RefMonitor
+{
+    struct Impl;
+    Impl *impl;
+public:
+    RefMonitor();
+    virtual ~RefMonitor();
+
+    void start(double period=10.0);
+    void stop();
+    bool running() const;
+
+    //! call show() with current snapshot
+    void current();
+protected:
+    //! Default prints to stderr
+    //! @param complete when false show only non-zero delta, when true show non-zero count or delta
+    virtual void show(const RefSnapshot& snap, bool complete=false);
+};
+
+} // namespace epics
+
+extern "C" {
+#endif /* __cplusplus */
+
+/** Fetch and print current snapshot
+ * @return NULL or a char* which must be free()'d
+ */
+char* epicsRefSnapshotCurrent();
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif // REFTRACK_H

src/misc/pv/serialize.h

@@ -1,8 +1,7 @@
 /* serialize.h */
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /**
  *  @author mrk
@@ -10,6 +9,8 @@
 #ifndef SERIALIZE_H
 #define SERIALIZE_H
 
+#include <epicsTypes.h>
+
 #include <pv/byteBuffer.h>
 #include <pv/sharedPtr.h>
 
@@ -52,14 +53,18 @@ namespace epics { namespace pvData {
          */
         virtual void alignBuffer(std::size_t alignment) =0;
         /**
-         * method for serializing array data.
-         * This should only be used for arrays of primitive types.
-         * i. e. boolean,byte,...,double.
-         * It can not be called for string, structure, or union arrays.
+         * Method for serializing primitive array data.
+         * Hook for supplying custom serialization implementation.
+         * The serialization implementation need not be provided.
+         * Returns true if method performs serialization, false otherwise.
+         * This should only be used for arrays of primitive types,
+         * i. e. boolean, byte,..., double.
+         * It cannot be called for string, structure, or union arrays.
          * @param existingBuffer the existing buffer from the caller.
          * @param toSerialize location of data to be put into buffer.
          * @param elementCount number of elements.
          * @param elementSize element size.
+         * @returns true if serialization performed, else false.
          */
         virtual bool directSerialize(
             ByteBuffer *existingBuffer,
@@ -102,14 +107,18 @@ namespace epics { namespace pvData {
          */
         virtual void alignData(std::size_t alignment) =0;
         /**
-         * method for deserializing array data.
+         * Method for deserializing array data.
+         * Hook for supplying custom deserialization implementation.
+         * The deserialization implementation need not be provided.
+         * Returns true if method performs deserialization, false otherwise.
          * This should only be used for arrays of primitive types.
-         * i. e. boolean,byte,...,double.
-         * It can not be called for string, structure, or union arrays.
+         * i.e. boolean, byte,..., double.
+         * It cannot be called for string, structure, or union arrays.
          * @param existingBuffer the existing buffer from the caller.
          * @param deserializeTo location of data.
          * @param elementCount number of elements.
          * @param elementSize element size.
+         * @returns true if deserialization performed, else false.
          */
         virtual bool directDeserialize(
             ByteBuffer *existingBuffer,
@@ -118,7 +127,6 @@ namespace epics { namespace pvData {
             std::size_t elementSize) = 0;
         /**
          * deserialize via cache
-         * @param field instance to be deserialized
          * @param buffer buffer to be deserialized from
          */
         virtual std::tr1::shared_ptr<const Field> cachedDeserialize(
@@ -151,6 +159,41 @@ namespace epics { namespace pvData {
             DeserializableControl *flusher) = 0;
     };
 
+    /**
+     * @brief Push serialize and append to the provided byte vector.
+     * No caching is done.  Only complete serialization.
+     *
+     * @param S A Serializable object
+     * @param byteOrder Byte order to write (EPICS_ENDIAN_LITTLE or EPICS_ENDIAN_BIG)
+     * @param out The output vector.  Results are appended
+     */
+    void epicsShareFunc serializeToVector(const Serializable *S,
+                           int byteOrder,
+                           std::vector<epicsUInt8>& out);
+
+    /**
+     * @brief deserializeFromBuffer Deserialize into S from provided vector
+     * @param S A Serializeable object.  The current contents will be replaced
+     * @param in The input buffer (byte order of this buffer is used)
+     * @throws std::logic_error if input buffer is too small.  State of S is then undefined.
+     */
+    void epicsShareFunc deserializeFromBuffer(Serializable *S,
+                               ByteBuffer& in);
+
+    /**
+     * @brief deserializeFromBuffer Deserialize into S from provided vector
+     * @param S A Serializeable object.  The current contents will be replaced
+     * @param byteOrder Byte order to write (EPICS_ENDIAN_LITTLE or EPICS_ENDIAN_BIG)
+     * @param in The input vector
+     * @throws std::logic_error if input buffer is too small.  State of S is then undefined.
+     */
+    inline void deserializeFromVector(Serializable *S,
+                                      int byteOrder,
+                                      const std::vector<epicsUInt8>& in)
+    {
+        ByteBuffer B((char*)&in[0], in.size(), byteOrder); // we promise not the modify 'in'
+        deserializeFromBuffer(S, B);
+    }
 
     /**
      * @brief Class for serializing bitSets.
@@ -166,7 +209,7 @@ namespace epics { namespace pvData {
          * Serialize field into given buffer.
          * @param buffer serialization buffer.
          * @param flusher flush interface.
-         * &param bitSet The bitSet to serialize.
+         * @param bitSet The bitSet to serialize.
          */
         virtual void serialize(ByteBuffer *buffer,
             SerializableControl *flusher,BitSet *bitSet) const = 0;
@@ -174,7 +217,7 @@ namespace epics { namespace pvData {
          * Deserialize buffer.
          * @param buffer serialization buffer.
          * @param flusher deserialization control.
-         * &param bitSet The bitSet to deserialize.
+         * @param bitSet The bitSet to deserialize.
          */
         virtual void deserialize(ByteBuffer *buffer,
             DeserializableControl *flusher,BitSet *bitSet) = 0;
@@ -196,7 +239,7 @@ namespace epics { namespace pvData {
          * Serialize field into given buffer.
          * @param buffer serialization buffer.
          * @param flusher flush interface.
-         * &param offset offset in elements.
+         * @param offset offset in elements.
          * @param count number of elements
          */
         virtual void serialize(

src/misc/pv/serializeHelper.h

@@ -1,7 +1,6 @@
-/**
- * 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.
+/*
+ * Copyright information and license terms for this software can be
+ * found in the file LICENSE that is included with the distribution
  */
 /*
  * serializeHelper.h
@@ -27,23 +26,30 @@ namespace epics {
          * @brief Serialization helper.
          *
          */
-        class epicsShareClass SerializeHelper : public NoDefaultMethods {
+        class epicsShareClass SerializeHelper {
+            EPICS_NOT_COPYABLE(SerializeHelper)
         public:
 
             /**
-             * Serialize array size.
+             * Serialize the specified array size into the specified
+             * buffer, flushing when necessary.
+             * The specified SerializableControl manages any flushing
+             * required.
              *
              * @param[in] s size to encode
              * @param[in] buffer serialization buffer
-             * @param[in] flusher flusher
+             * @param[in] flusher SerializableControl to manage the flushing
              */
             static void writeSize(std::size_t s, ByteBuffer* buffer,
                     SerializableControl* flusher);
 
             /**
              * Deserialize array size.
+             * The specified DeserializableControl ensures
+             * sufficient bytes are available.
              *
              * @param[in] buffer deserialization buffer.
+             * @param[in] control the DeserializableControl.
              * @returns array size.
              */
             static std::size_t readSize(ByteBuffer* buffer,
@@ -63,7 +69,7 @@ namespace epics {
              * std::string serialization helper method.
              *
              * @param[in] value std::string to serialize
-             * @param[in] offset start of the substring in {@code value}
+             * @param[in] offset start of the substring in value
              * @param[in] count the number of characters to write
              * @param[in] buffer serialization buffer
              * @param[in] flusher flusher