Set module version number for release

ByteBuffer::align() does not work as expected
on some RTEMS targets where malloc() returns
buffers aligned only to 4 bytes.

SerializableControl::alignBuffer() and
DeserializableControl::alignData() are implemented,
but never called, in this module and pvAccessCPP.
ByteBuffer::align() is only needed to implement
these two methods.

Leave non-pure virtual stubs to assist in migration.

.github/workflows/ci-scripts-build.yml

@@ -0,0 +1,305 @@
+# .github/workflows/ci-scripts-build.yml for use with EPICS Base ci-scripts
+# (see: https://github.com/epics-base/ci-scripts)
+
+# This is YAML - indentation levels are crucial
+
+# Workflow name, shared by all branches
+
+name: pvData
+
+# Trigger on pushes and PRs to any branch
+on:
+  push:
+    paths-ignore:
+      - 'documentation/*'
+      - 'startup/*'
+      - '.appveyor/*'
+      - '.tools/*'
+      - '.gitattributes'
+      - '**/*.html'
+      - '**/*.md'
+  pull_request:
+    paths-ignore:
+      - 'documentation/*'
+      - 'startup/*'
+      - '.appveyor/*'
+      - '.tools/*'
+      - '.gitattributes'
+      - '**/*.html'
+      - '**/*.md'
+
+env:
+    SETUP_PATH: .ci-local:.ci
+    EPICS_TEST_IMPRECISE_TIMING: YES
+    EPICS_TEST_TIMEOUT: 300 # 5 min (RTEMS epicsMessageQueue is slowest)
+
+jobs:
+  native:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    # Set environment variables from matrix parameters
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+      BASE: ${{ matrix.base }}
+      WINE: ${{ matrix.wine }}
+      RTEMS: ${{ matrix.rtems }}
+      RTEMS_TARGET: ${{ matrix.rtems_target }}
+      EXTRA: ${{ matrix.extra }}
+      TEST: ${{ matrix.test }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # Job names also name artifacts, character limitations apply
+        include:
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            wine: "64"
+            name: "Ub-20 gcc-9 + MinGW"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: static
+            base: "7.0"
+            wine: "64"
+            name: "Ub-20 gcc-9 + MinGW, static"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: static
+            base: "7.0"
+            extra: "CMD_CXXFLAGS=-std=c++11"
+            name: "Ub-20 gcc-9 C++11, static"
+
+          - os: ubuntu-20.04
+            cmp: clang
+            configuration: default
+            base: "7.0"
+            name: "Ub-20 clang-10"
+
+          - os: ubuntu-20.04
+            cmp: clang
+            configuration: default
+            base: "7.0"
+            extra: "CMD_CXXFLAGS=-std=c++11"
+            name: "Ub-20 clang-10 C++11"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            rtems: "5"
+            rtems_target: RTEMS-pc686-qemu
+            name: "Ub-20 gcc-9 + RT-5.1 pc686"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            rtems: "5"
+            rtems_target: RTEMS-beatnik
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 beatnik"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            rtems: "5"
+            rtems_target: RTEMS-xilinx_zynq_a9_qemu
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 xilinx_zynq_a9_qemu"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            rtems: "5"
+            rtems_target: RTEMS-uC5282
+            test: NO
+            name: "Ub-20 gcc-9 + RT-5.1 uC5282"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            rtems: "4.10"
+            name: "Ub-20 gcc-9 + RT-4.10"
+            rtems_target: RTEMS-pc386-qemu
+            test: NO
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            rtems: "4.9"
+            name: "Ub-20 gcc-9 + RT-4.9"
+            rtems_target: RTEMS-pc386-qemu
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            base: "3.15"
+            name: "Ub-20 3.15"
+
+          - os: macos-latest
+            cmp: clang
+            configuration: default
+            base: "7.0"
+            name: "MacOS clang-12"
+
+          - os: windows-2019
+            cmp: vs2019
+            configuration: default
+            base: "7.0"
+            name: "Win2019 MSC-19"
+
+          - os: windows-2019
+            cmp: vs2019
+            configuration: static
+            base: "7.0"
+            name: "Win2019 MSC-19, static"
+
+          - os: windows-2019
+            cmp: vs2019
+            configuration: debug
+            base: "7.0"
+            name: "Win2019 MSC-19, debug"
+
+          - os: windows-2019
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+            name: "Win2019 mingw"
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@master
+    - name: "apt-get install"
+      run: |
+        sudo apt-get update
+        sudo apt-get -y install qemu-system-x86 g++-mingw-w64-x86-64 gdb
+      if: runner.os == 'Linux'
+    - name: Prepare and compile dependencies
+      run: python .ci/cue.py prepare
+    - name: Build main module
+      run: python .ci/cue.py build
+    - name: Run main module tests
+      run: python .ci/cue.py -T 60M test
+    - name: Upload tapfiles Artifact
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: tapfiles ${{ matrix.name }}
+        path: '**/O.*/*.tap'
+        if-no-files-found: ignore
+    - name: Collect and show test results
+      if: ${{ always() }}
+      run: python .ci/cue.py -T 5M test-results
+
+  docker:
+    name: ${{ matrix.name }}
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ matrix.image }}
+    # Set environment variables from matrix parameters
+    env:
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+      BASE: ${{ matrix.base }}
+      EXTRA: ${{ matrix.extra }}
+      TEST: ${{ matrix.test }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # Job names also name artifacts, character limitations apply
+        include:
+          - name: "CentOS-7 3.16"
+            image: centos:7
+            cmp: gcc
+            configuration: default
+            base: "3.16"
+
+          - name: "CentOS-7 3.15"
+            image: centos:7
+            cmp: gcc
+            configuration: default
+            base: "3.15"
+
+          - name: "CentOS-7"
+            image: centos:7
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+
+          - name: "CentOS-8"
+            image: centos:8
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+
+          - name: "Fedora-33"
+            image: fedora:33
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+
+          - name: "Fedora-latest"
+            image: fedora:latest
+            cmp: gcc
+            configuration: default
+            base: "7.0"
+
+    steps:
+    - name: "Build newer Git"
+      # actions/checkout@v2 wants git >=2.18
+      # centos:7 has 1.8
+      if: matrix.image=='centos:7'
+      run: |
+        yum -y install curl make gcc curl-devel expat-devel gettext-devel openssl-devel zlib-devel perl-ExtUtils-MakeMaker
+        curl https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.29.0.tar.gz | tar -xz
+        cd git-*
+        make -j2 prefix=/usr/local all
+        make prefix=/usr/local install
+        cd ..
+        rm -rf git-*
+        type -a git
+        git --version
+    - name: "Redhat setup"
+      run: |
+        dnfyum() {
+            dnf -y "$@" || yum -y "$@"
+            return $?
+        }
+        dnfyum install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
+        git --version || dnfyum install git
+        # rather than just bite the bullet and link python3 -> python,
+        # people would rather just break all existing scripts...
+        [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python
+        python --version
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@master
+    - name: Prepare and compile dependencies
+      run: python .ci/cue.py prepare
+    - name: Build main module
+      run: python .ci/cue.py build
+    - name: Run main module tests
+      run: python .ci/cue.py -T 20M test
+    - name: Upload tapfiles Artifact
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: tapfiles ${{ matrix.name }}
+        path: '**/O.*/*.tap'
+        if-no-files-found: ignore
+    - name: Collect and show test results
+      if: ${{ always() }}
+      run: python .ci/cue.py -T 5M test-results

.travis.yml

@@ -1,94 +0,0 @@
-# .travis.yml for use with EPICS Base ci-scripts
-# (see: https://github.com/epics-base/ci-scripts)
-
-language: cpp
-compiler: gcc
-dist: bionic
-
-cache:
-  directories:
-  - $HOME/.cache
-
-env:
-  global:
-    - SETUP_PATH=.ci-local
-
-addons:
-  apt:
-    packages:
-    # for all EPICS builds
-    - libreadline6-dev
-    - libncurses5-dev
-    - perl
-    # for clang compiler
-    - clang
-    # for mingw builds (32bit and 64bit)
-    - g++-mingw-w64-i686
-    - g++-mingw-w64-x86-64
-    # for RTEMS cross builds
-    - qemu-system-x86
-
-install:
-  - python .ci/cue.py prepare
-
-script:
-  - python .ci/cue.py build
-  - python .ci/cue.py test-results
-
-jobs:
-  include:
-
-# Windows builds
-
-  - env: BASE=7.0
-    os: windows
-    compiler: vs2017
-
-  - env: BASE=7.0
-    os: windows
-
-# Different configurations of default gcc and clang
-
-  - env: BASE=7.0
-
-  - env: BASE=7.0
-    compiler: clang
-
-  - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
-
-  - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
-    compiler: clang
-
-# Trusty: compiler versions very close to RHEL 7
-
-  - env: BASE=7.0
-    dist: trusty
-
-  - env: BASE=7.0 EXTRA="CMD_CXXFLAGS=-std=c++11"
-    dist: trusty
-
-  - env: BASE=3.15 EXTRA="CMD_CXXFLAGS=-std=c++11"
-    dist: trusty
-
-# Cross-compilations to Windows using MinGW and WINE
-    
-  - env: BASE=7.0 WINE=32 TEST=NO BCFG=static
-
-  - env: BASE=7.0 WINE=64 TEST=NO
-
-# Other gcc versions (added as an extra package)
-
-  - env: BASE=7.0
-    compiler: gcc-6
-    addons: { apt: { packages: ["g++-6"], sources: ["ubuntu-toolchain-r-test"] } }
-
-  - env: BASE=7.0
-    compiler: gcc-7
-    addons: { apt: { packages: ["g++-7"], sources: ["ubuntu-toolchain-r-test"] } }
-
-# MacOS build
-
-  - env: BASE=7.0
-    os: osx
-    compiler: clang
-    addons: { homebrew: { packages: ["re2c"], update: true } }

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "PVData C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 8.0.3
+PROJECT_NUMBER         = 8.0.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

configure/CONFIG_PVDATA_VERSION

@@ -2,7 +2,7 @@
 
 EPICS_PVD_MAJOR_VERSION = 8
 EPICS_PVD_MINOR_VERSION = 0
-EPICS_PVD_MAINTENANCE_VERSION = 3
+EPICS_PVD_MAINTENANCE_VERSION = 5
 
 # Development flag, set to zero for release versions
 

documentation/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "PVData C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 8.0.3
+PROJECT_NUMBER         = 8.0.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

documentation/release_notes.dox

@@ -2,6 +2,21 @@
 
 @page release_notes Release Notes
 
+Release 8.0.5 (Sep 2022)
+========================
+
+- Compatible changes
+ - Internal changes to use the YAJL API for generating JSON and JSON-5 output.
+
+Release 8.0.4 (Feb 2021)
+========================
+
+- Incompatible changes
+ - Remove ByteBuffer::align()
+- Compatible changes
+ - Deprecate SerializableControl::alignBuffer() and DeserializableControl::alignData()
+ - shared_vector_convert<>() fix convert of empty, untyped, array
+
 Release 8.0.3 (July 2020)
 =========================
 

src/json/print.cpp

@@ -6,6 +6,9 @@
 #include <vector>
 #include <sstream>
 
+#include <errlog.h>
+#include <yajl_gen.h>
+
 #define epicsExportSharedSymbols
 #include <pv/pvdVersion.h>
 #include <pv/pvData.h>
@@ -16,28 +19,94 @@
 namespace pvd = epics::pvData;
 
 namespace {
+using namespace pvd::yajl;
+
+void yg(yajl_gen_status sts) {
+    const char *msg = "<\?\?\?>";
+    switch(sts) {
+    case yajl_gen_status_ok:
+    case yajl_gen_generation_complete:
+        return;
+#define CASE(STS) case STS: msg = #STS; break
+    CASE(yajl_gen_keys_must_be_strings);
+    CASE(yajl_gen_in_error_state);
+    CASE(yajl_gen_no_buf);
+    CASE(yajl_gen_invalid_number);
+    CASE(yajl_max_depth_exceeded);
+#ifdef EPICS_YAJL_VERSION
+    CASE(yajl_gen_invalid_string);
+#endif
+#undef CASE
+    }
+    throw std::runtime_error(msg);
+}
+
+static
+void stream_printer(void * ctx,
+                    const char * str,
+                    size_arg len)
+{
+    std::ostream *strm = (std::ostream*)ctx;
+    strm->write(str, len);
+}
 
 struct args {
-    std::ostream& strm;
+    yajl_gen handle;
     const pvd::JSONPrintOptions& opts;
 
-    unsigned indent;
+    std::string indent;
 
     args(std::ostream& strm,
          const pvd::JSONPrintOptions& opts)
-        :strm(strm)
-        ,opts(opts)
-        ,indent(opts.indent)
-    {}
+        :opts(opts)
+        ,indent(opts.indent, ' ')
+    {
+#ifndef EPICS_YAJL_VERSION
+        yajl_gen_config conf;
+        conf.beautify = opts.multiLine;
+        conf.indentString = indent.c_str();
+        if(!(handle = yajl_gen_alloc2(stream_printer, NULL, NULL, &strm)))
+            throw std::bad_alloc();
 
-    void doIntent() {
-        if(!opts.multiLine) return;
-        strm.put('\n');
-        unsigned i=indent;
-        while(i--) strm.put(' ');
+        if(opts.json5) {
+            static bool warned;
+            if(!warned) {
+                warned = true;
+                errlogPrintf("Warning: Ignoring request to print JSON5.  Update Base >= 7.0.6.1");
+            }
+        }
+#else
+        if(!(handle = yajl_gen_alloc(NULL)))
+            throw std::bad_alloc();
+        if(opts.multiLine) {
+            yajl_gen_config(handle, yajl_gen_beautify, 1);
+            yajl_gen_config(handle, yajl_gen_indent_string, indent.c_str());
+        } else {
+            yajl_gen_config(handle, yajl_gen_beautify, 0);
+        }
+#  if EPICS_VERSION_INT>=VERSION_INT(7,0,6,1)
+        yajl_gen_config(handle, yajl_gen_json5, (int)opts.json5);
+#  else
+    if(opts.json5) {
+        static bool warned;
+        if(!warned) {
+            warned = true;
+            errlogPrintf("Warning: Ignoring request to print JSON5.  Update Base >= 7.0.6.1");
+        }
+    }
+#  endif
+        yajl_gen_config(handle, yajl_gen_print_callback, stream_printer, &strm);
+#endif
+    }
+    ~args() {
+        yajl_gen_free(handle);
     }
 };
 
+void yg_string(yajl_gen handle, const std::string& s) {
+    yg(yajl_gen_string(handle, (const unsigned char*)s.c_str(), s.size()));
+}
+
 void show_field(args& A, const pvd::PVField* fld, const pvd::BitSet *mask);
 
 void show_struct(args& A, const pvd::PVStructure* fld, const pvd::BitSet *mask)
@@ -47,26 +116,17 @@ void show_struct(args& A, const pvd::PVStructure* fld, const pvd::BitSet *mask)
 
     const pvd::StringArray& names = type->getFieldNames();
 
-    A.strm.put('{');
-    A.indent++;
+    yg(yajl_gen_map_open(A.handle));
 
-    bool first = true;
     for(size_t i=0, N=names.size(); i<N; i++)
     {
         if(mask && !mask->get(children[i]->getFieldOffset())) continue;
 
-        if(first)
-            first = false;
-        else
-            A.strm.put(',');
-        A.doIntent();
-        A.strm<<'\"'<<names[i]<<"\": ";
+        yg_string(A.handle, names[i]);
         show_field(A, children[i].get(), mask);
     }
 
-    A.indent--;
-    A.doIntent();
-    A.strm.put('}');
+    yg(yajl_gen_map_close(A.handle));
 }
 
 void show_field(args& A, const pvd::PVField* fld, const pvd::BitSet *mask)
@@ -76,34 +136,59 @@ void show_field(args& A, const pvd::PVField* fld, const pvd::BitSet *mask)
     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>();
+        switch(scalar->getScalar()->getScalarType()) {
+        case pvd::pvString: yg_string(A.handle, scalar->getAs<std::string>()); break;
+        case pvd::pvBoolean: yg(yajl_gen_bool(A.handle, scalar->getAs<pvd::boolean>())); break;
+        case pvd::pvDouble:
+        case pvd::pvFloat: yg(yajl_gen_double(A.handle, scalar->getAs<double>())); break;
+        // case pvd::pvULong: // can't always be exactly represented...
+        default:
+            yg(yajl_gen_integer(A.handle, scalar->getAs<pvd::int64>())); break;
         }
     }
         return;
     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));
+        yg(yajl_gen_array_open(A.handle));
 
-        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('\"');
+        switch(arr.original_type()) {
+        case pvd::pvString: {
+            pvd::shared_vector<const std::string> sarr(pvd::shared_vector_convert<const std::string>(arr));
+            for(size_t i=0, N=sarr.size(); i<N; i++) {
+                yg_string(A.handle, sarr[i]);
+            }
+            break;
         }
-        A.strm.put(']');
+        case pvd::pvBoolean: {
+            pvd::shared_vector<const pvd::boolean> sarr(pvd::shared_vector_convert<const pvd::boolean>(arr));
+            for(size_t i=0, N=sarr.size(); i<N; i++) {
+                yg(yajl_gen_bool(A.handle, sarr[i]));
+            }
+            break;
+        }
+        case pvd::pvDouble:
+        case pvd::pvFloat: {
+            pvd::shared_vector<const double> sarr(pvd::shared_vector_convert<const double>(arr));
+            for(size_t i=0, N=sarr.size(); i<N; i++) {
+                yg(yajl_gen_double(A.handle, sarr[i]));
+            }
+            break;
+        }
+        default: {
+            pvd::shared_vector<const pvd::int64> sarr(pvd::shared_vector_convert<const pvd::int64>(arr));
+            for(size_t i=0, N=sarr.size(); i<N; i++) {
+                yg(yajl_gen_integer(A.handle, sarr[i]));
+            }
+            break;
+        }
+        }
+
+        yg(yajl_gen_array_close(A.handle));
     }
         return;
     case pvd::structure:
@@ -112,22 +197,16 @@ void show_field(args& A, const pvd::PVField* fld, const pvd::BitSet *mask)
     case pvd::structureArray:
     {
         pvd::PVStructureArray::const_svector arr(static_cast<const pvd::PVStructureArray*>(fld)->view());
-        A.strm.put('[');
-        A.indent++;
+        yg(yajl_gen_array_open(A.handle));
 
         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(), 0);
             else
-                A.strm<<"NULL";
+                yg(yajl_gen_null(A.handle));
         }
 
-        A.indent--;
-        A.doIntent();
-        A.strm.put(']');
+        yg(yajl_gen_array_close(A.handle));
     }
         return;
     case pvd::union_:
@@ -136,7 +215,7 @@ void show_field(args& A, const pvd::PVField* fld, const pvd::BitSet *mask)
         const pvd::PVField::const_shared_pointer& C(U->get());
 
         if(!C) {
-            A.strm<<"null";
+            yg(yajl_gen_null(A.handle));
         } else {
             show_field(A, C.get(), 0);
         }
@@ -145,29 +224,23 @@ void show_field(args& A, const pvd::PVField* fld, const pvd::BitSet *mask)
     case pvd::unionArray: {
         const pvd::PVUnionArray *U=static_cast<const pvd::PVUnionArray*>(fld);
         pvd::PVUnionArray::const_svector arr(U->view());
-        A.strm.put('[');
-        A.indent++;
+
+        yg(yajl_gen_array_open(A.handle));
 
         for(size_t i=0, N=arr.size(); i<N; i++) {
-            if(i!=0)
-                A.strm.put(',');
-            A.doIntent();
             if(arr[i])
                 show_field(A, arr[i].get(), 0);
             else
-                A.strm<<"NULL";
+                yg(yajl_gen_null(A.handle));
         }
 
-        A.indent--;
-        A.doIntent();
-        A.strm.put(']');
-
+        yg(yajl_gen_array_close(A.handle));
     }
         return;
     }
     // should not be reached
     if(A.opts.ignoreUnprintable)
-        A.strm<<"// unprintable field type";
+        yg(yajl_gen_null(A.handle));
     else
         throw std::runtime_error("Encountered unprintable field type");
 }
@@ -206,6 +279,7 @@ JSONPrintOptions::JSONPrintOptions()
     :multiLine(true)
     ,ignoreUnprintable(true)
     ,indent(0)
+    ,json5(false)
 {}
 
 void printJSON(std::ostream& strm,

src/json/pv/json.h

@@ -44,6 +44,7 @@ struct epicsShareClass JSONPrintOptions
     bool multiLine;        //!< include new lines
     bool ignoreUnprintable;//!< ignore union/union array when encountered
     unsigned indent;       //!< Initial indentation (# of spaces)
+    bool json5;            //!< Output extended JSON (eg. NaN).  @since 8.1.0
     JSONPrintOptions();
 };
 

src/misc/pv/byteBuffer.h

@@ -494,23 +494,6 @@ public:
     {
         return sizeof(T)>1 && _reverseEndianess;
     }
-    /**
-     * 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, char fill='\0')
-    {
-        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.
      *

src/misc/pv/serialize.h

@@ -16,6 +16,14 @@
 
 #include <shareLib.h>
 
+#if defined(PVD_INTERNAL)
+#  define PVD_DEPRECATED(msg)
+#elif __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 5
+#  define PVD_DEPRECATED(msg) __attribute__((deprecated(msg)))
+#else
+#  define PVD_DEPRECATED(msg) EPICS_DEPRECATED
+#endif
+
 namespace epics { namespace pvData { 
 
     class SerializableControl;
@@ -47,11 +55,7 @@ namespace epics { namespace pvData {
          * @param size The number of bytes.
          */
         virtual void ensureBuffer(std::size_t size) =0;
-        /**
-         * Add pad bytes to buffer.
-         * @param alignment alignment required.
-         */
-        virtual void alignBuffer(std::size_t alignment) =0;
+        virtual void alignBuffer(std::size_t alignment) PVD_DEPRECATED("Deprecated for lack of use") {}
         /**
          * Method for serializing primitive array data.
          * Hook for supplying custom serialization implementation.
@@ -98,14 +102,8 @@ namespace epics { namespace pvData {
          * @param size The number of bytes.
          */
         virtual void ensureData(std::size_t size) =0;
-        /**
-         * Align buffer.
-         * Note that this takes care only current buffer alignment.
-         * If streaming protocol is used,
-         * care must be taken that entire stream is aligned.
-         * @param alignment size in bytes, must be power of two.
-         */
-        virtual void alignData(std::size_t alignment) =0;
+        // Deprecated for lack of use
+        virtual void alignData(std::size_t alignment) PVD_DEPRECATED("Deprecated for lack of use") {};
         /**
          * Method for deserializing array data.
          * Hook for supplying custom deserialization implementation.

src/misc/pv/sharedVector.h

@@ -837,9 +837,13 @@ namespace detail {
             typedef typename meta::strip_const<TO>::type to_t;
             ScalarType stype = src.original_type(),
                        dtype = (ScalarType)ScalarTypeID<TO>::value;
-            if(stype==dtype) {
+            if(src.empty()) {
+                return shared_vector<TO>();
+
+            } else if(stype==dtype) {
                 // no convert needed
                 return shared_vector<TO>(src, detail::_shared_vector_cast_tag());
+
             } else {
                 // alloc and convert
                 shared_vector<to_t> ret(src.size()/ScalarTypeFunc::elementSize(stype));

src/misc/serializeHelper.cpp

@@ -174,14 +174,6 @@ struct ToString : public epics::pvData::SerializableControl
         assert(bufwrap.getRemaining()>0);
     }
 
-    virtual void alignBuffer(std::size_t alignment)
-    {
-        if(bufwrap.getRemaining()<alignment)
-            flushSerializeBuffer();
-        assert(bufwrap.getRemaining()>=alignment);
-        bufwrap.align(alignment);
-    }
-
     virtual bool directSerialize(
         ByteBuffer *existingBuffer,
         const char* toSerialize,
@@ -232,16 +224,6 @@ struct FromString : public epics::pvData::DeserializableControl
             throw std::logic_error("Incomplete buffer");
     }
 
-    virtual void alignData(std::size_t alignment)
-    {
-        size_t pos = buf.getPosition(), k = alignment-1;
-        if(pos&k) {
-            std::size_t npad = alignment-(pos&k);
-            ensureData(npad);
-            buf.align(alignment);
-        }
-    }
-
     virtual bool directDeserialize(
         ByteBuffer *existingBuffer,
         char* deserializeTo,

src/pv/pvIntrospect.h

@@ -24,14 +24,6 @@
 #include <pv/pvdVersion.h>
 
 #include <shareLib.h>
-
-#if defined(PVD_INTERNAL)
-#  define PVD_DEPRECATED(msg)
-#elif __GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ >= 5
-#  define PVD_DEPRECATED(msg) __attribute__((deprecated(msg)))
-#else
-#  define PVD_DEPRECATED(msg) EPICS_DEPRECATED
-#endif
 #define PVD_DEPRECATED_52 PVD_DEPRECATED("See https://github.com/epics-base/pvDataCPP/issues/52")
 
 /* C++11 keywords

testApp/Makefile

@@ -12,6 +12,8 @@ include $(PVDATA_TEST)/pv/Makefile
 include $(PVDATA_TEST)/property/Makefile
 include $(PVDATA_TEST)/copy/Makefile
 
+PROD_SRCS_RTEMS += rtemsTestData.c
+
 # pvDataAllTests runs all the test programs in a known working order.
 testHarness_SRCS += pvDataAllTests.c
 
@@ -30,6 +32,11 @@ TESTSPEC_RTEMS = pvdTestHarness.$(MUNCH_SUFFIX); pvDataAllTests
 # Build test scripts for hosts
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
 
+ifneq ($(filter $(T_A),$(CROSS_COMPILER_RUNTEST_ARCHS)),)
+TESTPROD = $(TESTPROD_HOST)
+TESTSCRIPTS += $(TESTS:%=%.t)
+endif
+
 include $(TOP)/configure/RULES
 
 

testApp/misc/testByteBuffer.cpp

@@ -217,38 +217,6 @@ void testUnaligned()
 {
     testDiag("test correctness of unaligned access");
 
-    ByteBuffer buf(32, EPICS_ENDIAN_BIG);
-
-    // malloc() should give us a buffer aligned to at least native integer size
-    buf.align(sizeof(int));
-    testOk1(buf.getPosition()==0);
-
-    buf.clear();
-    buf.put<uint8>(0x42);
-    buf.put<uint16>(0x1020);
-    buf.align(2, '\x41');
-    testOk1(buf.getPosition()==4);
-
-    testOk1(memcmp(buf.getBuffer(), "\x42\x10\x20\x41", 4)==0);
-
-    buf.clear();
-    buf.put<uint8>(0x42);
-    buf.put<uint32>(0x12345678);
-    buf.align(4, '\x41');
-    testOk1(buf.getPosition()==8);
-
-    testOk1(memcmp(buf.getBuffer(), "\x42\x12\x34\x56\x78\x41\x41\x41", 8)==0);
-
-    buf.clear();
-    buf.put<uint8>(0x42);
-    uint64 val = 0x12345678;
-    val<<=32;
-    val |= 0x90abcdef;
-    buf.put<uint64>(val);
-    buf.align(8, '\x41');
-    testOk1(buf.getPosition()==16);
-
-    testOk1(memcmp(buf.getBuffer(), "\x42\x12\x34\x56\x78\x90\xab\xcd\xef\x41\x41\x41", 8)==0);
 }
 
 static
@@ -305,7 +273,7 @@ void testArrayBE()
 
 MAIN(testByteBuffer)
 {
-    testPlan(104);
+    testPlan(97);
     testDiag("Tests byteBuffer");
     testBasicOperations();
     testInverseEndianness(EPICS_ENDIAN_BIG, expect_be);

testApp/misc/testSerialization.cpp

@@ -67,10 +67,6 @@ public:
     virtual void ensureBuffer(std::size_t /*size*/) {
     }
 
-    virtual void alignBuffer(std::size_t alignment) {
-        buffer->align(alignment);
-    }
-
     virtual bool directSerialize(ByteBuffer* /*existingBuffer*/, const char* /*toSerialize*/,
                                  std::size_t /*elementCount*/, std::size_t /*elementSize*/)
     {
@@ -95,10 +91,6 @@ public:
     virtual void ensureData(size_t /*size*/) {
     }
 
-    virtual void alignData(size_t alignment) {
-        buffer->align(alignment);
-    }
-
     virtual bool directDeserialize(ByteBuffer* /*existingBuffer*/, char* /*deserializeTo*/,
                                    std::size_t /*elementCount*/, std::size_t /*elementSize*/)
     {

testApp/misc/testSharedVector.cpp

@@ -474,6 +474,9 @@ void testVectorConvert()
     testOk1(ints.unique());
     testOk1(strings.size()==ints.size());
     testOk1(strings.at(0)=="42");
+
+    testDiag("convert empty array");
+    testOk1(pvd::shared_vector_convert<double>(pvd::shared_vector<pvd::int32>()).empty());
 }
 
 void testWeak()
@@ -695,7 +698,7 @@ void testCXX11Init()
 
 MAIN(testSharedVector)
 {
-    testPlan(191);
+    testPlan(192);
     testDiag("Tests for shared_vector");
 
     testDiag("sizeof(shared_vector<pvd::int32>)=%lu",

testApp/misc/testjson.cpp

@@ -123,7 +123,7 @@ const char bigtest[] =
         "  ,{\"a\":9, \"b\":10}\n"
         "  ],\n"
         " \"any\": \"4.2\",\n"
-        " \"almost\": \"hello\"\n"
+        " \"almost\": \"long string /with\\\\ several \\\" and ' characters\\u001f\\u2705\"\n"
         "}";
 // intentionally not setting "extra"
 
@@ -204,7 +204,7 @@ void testInto()
     }
 
     testFieldEqual<pvd::PVString>(val, "any", "4.2");
-    testFieldEqual<pvd::PVString>(val, "almost", "hello");
+    testFieldEqual<pvd::PVString>(val, "almost", "long string /with\\ several \" and ' characters\x1f\xe2\x9c\x85");
 }
 
 void testroundtrip()
@@ -255,19 +255,19 @@ void testroundtrip()
         round2 = strm.str();
     }
 
-    testEqual(round2, "{\"scalar\": 42,"
-                       "\"ivec\": [1,2,3],"
-                       "\"svec\": [\"one\",\"two\"],"
-                       "\"sub\": {"
-                         "\"x\": {"
-                          "\"y\": 43"
+    testEqual(round2, "{\"scalar\":42,"
+                       "\"ivec\":[1,2,3],"
+                       "\"svec\":[\"one\",\"two\"],"
+                       "\"sub\":{"
+                         "\"x\":{"
+                          "\"y\":43"
                        "}},"
-                       "\"extra\": 0,"
-                       "\"sarr\": [{\"a\": 5,\"b\": 6},"
-                                  "{\"a\": 7,\"b\": 8},"
-                                  "{\"a\": 9,\"b\": 10}],"
-                      "\"any\": \"4.2\","
-                      "\"almost\": \"hello\""
+                       "\"extra\":0,"
+                       "\"sarr\":[{\"a\":5,\"b\":6},"
+                                  "{\"a\":7,\"b\":8},"
+                                  "{\"a\":9,\"b\":10}],"
+                      "\"any\":\"4.2\","
+                      "\"almost\":\"long string /with\\\\ several \\\" and ' characters\\u001F\xe2\x9c\x85\""
                       "}");
 }
 

testApp/misc/testprinter.cpp

@@ -134,12 +134,12 @@ void showNTScalarNumeric()
 {
     testDiag("%s", CURRENT_FUNCTION);
     pvd::PVStructurePtr input(pvd::getPVDataCreate()->createPVStructure(scalarNumeric));
-    input->getSubFieldT<pvd::PVScalar>("value")->putFrom(-42);
+    input->getSubFieldT<pvd::PVScalar>("value")->putFrom(pvd::int32(-42));
 
     testDiff("<undefined>              -42 \n", print(input->stream()));
 
-    input->getSubFieldT<pvd::PVScalar>("alarm.severity")->putFrom(1);
-    input->getSubFieldT<pvd::PVScalar>("alarm.status")->putFrom(1);
+    input->getSubFieldT<pvd::PVScalar>("alarm.severity")->putFrom(pvd::int32(1));
+    input->getSubFieldT<pvd::PVScalar>("alarm.status")->putFrom(pvd::int32(1));
     input->getSubFieldT<pvd::PVString>("alarm.message")->put("FOO");
 
     testDiff("<undefined>              -42 MINOR DEVICE FOO \n", print(input->stream()));
@@ -162,8 +162,8 @@ void showNTScalarString()
 
     testDiff("<undefined>              bar \n", print(input->stream()));
 
-    input->getSubFieldT<pvd::PVScalar>("alarm.severity")->putFrom(1);
-    input->getSubFieldT<pvd::PVScalar>("alarm.status")->putFrom(1);
+    input->getSubFieldT<pvd::PVScalar>("alarm.severity")->putFrom(pvd::int32(1));
+    input->getSubFieldT<pvd::PVScalar>("alarm.status")->putFrom(pvd::int32(1));
     input->getSubFieldT<pvd::PVString>("alarm.message")->put("FOO");
 
     testDiff("<undefined>              bar MINOR DEVICE FOO \n", print(input->stream()));

testApp/rtemsTestData.c

@@ -0,0 +1,2 @@
+/* no test data */
+const void* epicsRtemsFSImage = 0;