Merge branch 'master' into PSI

ci: consistent AppVeyor job config for pvData/pvAccess

.appveyor.yml

@@ -1,18 +1,11 @@
 # .appveyor.yml for use with EPICS Base ci-scripts
 # (see: https://github.com/epics-base/ci-scripts)
 
+# This is YAML - indentation levels are crucial
+
 cache:
   - C:\Users\appveyor\.tools
 
-#---------------------------------#
-#       additional packages       #
-#---------------------------------#
-
-install:
-# for the sequencer
-  - cinst re2c
-  - cmd: git submodule update --init --recursive
-
 #---------------------------------#
 #       repository cloning        #
 #---------------------------------#
@@ -21,13 +14,15 @@ init:
   # Set autocrlf to make batch files work
   - git config --global core.autocrlf true
 
-clone_depth: 50
+clone_depth: 5
 
 # Skipping commits affecting only specific files
 skip_commits:
   files:
-    - 'documentation/*'
-    - '**/*.md'
+  - 'documentation/*'
+  - '.github/*'
+  - '**/*.md'
+  - '.readthedocs.yml'
 
 # Build Configurations: dll/static, regular/debug
 configuration:
@@ -40,39 +35,58 @@ configuration:
 environment:
   # common / default variables for all jobs
   SETUP_PATH: .ci-local
+  BASE: 7.0
 
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    CMP: vs2019
-    BASE: 7.0
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-    CMP: gcc
-    BASE: 7.0
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    CMP: vs2017
-    BASE: 7.0
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    CMP: vs2019
+  - CMP: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     BASE: 3.15
+  - CMP: vs2017
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  - CMP: vs2015
+  - CMP: vs2013
+  - CMP: gcc
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    # TODO: static linking w/ readline isn't working.  Bypass auto-detect
+    COMMANDLINE_LIBRARY: EPICS
 
 # Platform: processor architecture
 platform:
   - x64
 
+# Matrix configuration: exclude sets of jobs
+matrix:
+  exclude:
+  # MinGW debug builds use the same libraries, unlike VS
+  - configuration: dynamic-debug
+    CMP: gcc
+  - configuration: static-debug
+    CMP: gcc
+
 #---------------------------------#
 #     building & testing          #
 #---------------------------------#
 
-build_script:
+install:
+  - cmd: git submodule update --init --recursive
+  - cmd: pip install git+https://github.com/mdavidsaver/ci-core-dumper#egg=ci-core-dumper
   - cmd: python .ci/cue.py prepare
+
+build_script:
   - cmd: python .ci/cue.py build
 
 test_script:
-  - cmd: python .ci/cue.py test
+  - cmd: python -m ci_core_dumper install
+  - cmd: python .ci/cue.py -T 20M test
 
 on_finish:
   - ps: Get-ChildItem *.tap -Recurse -Force | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-  - cmd: python .ci/cue.py build test-results -s
+  - cmd: python .ci/cue.py -T 5M test-results
+
+on_failure:
+  - cmd: python -m ci_core_dumper report
 
 #---------------------------------#
 #         debugging               #

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

@@ -3,7 +3,7 @@
 
 # This is YAML - indentation levels are crucial
 
-# Set the 'name:' properties to values that work for you (pvxs)
+# Workflow name, shared by all branches
 
 name: pvData
 
@@ -11,143 +11,299 @@ name: pvData
 on:
   push:
     paths-ignore:
-      - .appveyor.yml
+      - '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:
-  build-base:
-    name: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}
+  native:
+    name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     # Set environment variables from matrix parameters
     env:
-      BASE: ${{ matrix.base }}
+      BASE: "7.0"
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
-      WINE: ${{ matrix.wine }}
-      RTEMS: ${{ matrix.rtems }}
+      CI_CROSS_TARGETS: ${{ matrix.cross }}
       EXTRA: ${{ matrix.extra }}
       TEST: ${{ matrix.test }}
     strategy:
       fail-fast: false
       matrix:
+        # Job names also name artifacts, character limitations apply
         include:
+          - os: ubuntu-22.04
+            cmp: gcc-12
+            name: "Ub-22 gcc-12 c++20 Werror"
+            # Turn all warnings into errors,
+            # except for those we could not fix (yet).
+            # Remove respective -Wno-error=... flag once it is fixed.
+            extra: "CMD_CXXFLAGS=-std=c++20
+                    CMD_CPPFLAGS='-fdiagnostics-color
+                                  -fstack-protector-strong
+                                  -Wformat
+                                  -Werror
+                                  -Werror=format-security
+                                  -Wno-error=deprecated-declarations
+                                  -Wno-error=stringop-truncation
+                                  -Wno-error=restrict
+                                  -Wno-error=sizeof-pointer-memaccess
+                                  -Wno-error=nonnull
+                                  -Wno-error=dangling-pointer
+                                  -Wno-error=format-overflow
+                                  -Wno-error=stringop-overread
+                                  -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3'
+                    CMD_LDFLAGS=-Wl,-z,relro"
+
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "7.0"
-            wine: "64"
+            cross: "windows-x64-mingw"
+            name: "Ub-20 gcc + MinGW"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
-            base: "7.0"
-            wine: "64"
-
-          - os: ubuntu-20.04
-            cmp: gcc
-            configuration: default
-            base: "3.15"
-            wine: "64"
+            cross: "windows-x64-mingw"
+            name: "Ub-20 gcc + MinGW, static"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: static
-            base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++11"
+            name: "Ub-20 gcc C++11, static"
 
-          - os: ubuntu-16.04
-            cmp: clang
-            configuration: default
-            base: "7.0"
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: static
+            extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
+            name: "Ub-20 gcc unsigned char"
+
+          - os: ubuntu-20.04
+            cmp: clang
+            configuration: default
+            name: "Ub-20 clang"
 
           - os: ubuntu-20.04
             cmp: clang
             configuration: default
-            base: "7.0"
             extra: "CMD_CXXFLAGS=-std=c++11"
+            name: "Ub-20 clang C++11"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "7.0"
-            rtems: "4.10"
+            cross: "RTEMS-pc686-qemu@5"
+            name: "Ub-20 gcc + RT-5.1 pc686"
 
           - os: ubuntu-20.04
             cmp: gcc
             configuration: default
-            base: "7.0"
-            rtems: "4.9"
-
-          - os: ubuntu-16.04
-            cmp: gcc-4.8
-            utoolchain: true
-            configuration: default
-            base: "7.0"
-
-          - os: ubuntu-16.04
-            cmp: gcc-4.9
-            utoolchain: true
-            configuration: default
-            base: "7.0"
+            cross: "RTEMS-beatnik@5"
+            test: NO
+            name: "Ub-20 gcc + RT-5.1 beatnik"
 
           - os: ubuntu-20.04
-            cmp: gcc-8
-            utoolchain: true
+            cmp: gcc
             configuration: default
-            base: "7.0"
+            cross: "RTEMS-xilinx_zynq_a9_qemu@5"
+            test: NO
+            name: "Ub-20 gcc + RT-5.1 xilinx_zynq_a9_qemu"
 
           - os: ubuntu-20.04
-            cmp: clang
+            cmp: gcc
             configuration: default
-            base: "7.0"
+            cross: "RTEMS-uC5282@5"
+            test: NO
+            name: "Ub-20 gcc + RT-5.1 uC5282"
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            name: "Ub-20 gcc + RT-4.10"
+            cross: "RTEMS-pc386-qemu@4.10"
+            test: NO
+
+          - os: ubuntu-20.04
+            cmp: gcc
+            configuration: default
+            name: "Ub-20 gcc + RT-4.9"
+            cross: "RTEMS-pc386-qemu@4.9"
 
           - os: macos-latest
             cmp: clang
             configuration: default
-            base: "7.0"
+            name: "MacOS clang"
 
           - os: windows-2019
             cmp: vs2019
+            configuration: debug
+            name: "Win2019 MSC-19"
+            extra: "CMD_CXXFLAGS=-analysis"
+
+          - os: windows-2019
+            cmp: vs2019
+            configuration: static-debug
+            name: "Win2019 MSC-19, static"
+            extra: "CMD_CXXFLAGS=-analysis"
+
+          - os: windows-2019
+            cmp: vs2019
+            configuration: debug
+            name: "Win2019 MSC-19, debug"
+
+          - os: windows-2019
+            cmp: gcc
             configuration: default
-            base: "7.0"
+            name: "Win2019 mingw"
 
-          - os: windows-2019
-            cmp: vs2019
-            configuration: static
-            base: "7.0"
+          # Linux cross builds
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-aarch64"
+            cross: linux-aarch64
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-arm gnueabi"
+            cross: linux-arm@arm-linux-gnueabi
+
+          - os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            name: "Cross linux-arm gnueabihf"
+            cross: linux-arm@arm-linux-gnueabihf
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
-    - name: Cache Dependencies
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache
-        key: ${{ matrix.base }}/${{ matrix.os }}/${{ matrix.cmp }}/${{ matrix.configuration }}/${{ matrix.wine }}${{ matrix.rtems }}/${{ matrix.extra }}
-    - name: Automatic core dump analysis
+    - 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: "apt-get install ${{ matrix.cmp }}"
-      run: |
-        sudo apt-get -y install software-properties-common
-        sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-        sudo apt-get update
-        sudo apt-get -y install ${{ matrix.cmp }}
-      if: matrix.utoolchain
     - 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 test
+      run: python .ci/cue.py -T 60M test
+    - name: Upload tapfiles Artifact
+      if: ${{ always() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: tapfiles ${{ matrix.name }}
+        path: '**/O.*/*.tap'
+        if-no-files-found: ignore
     - name: Collect and show test results
-      run: python .ci/cue.py 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:
+      BASE: "7.0"
+      CMP: ${{ matrix.cmp }}
+      BCFG: ${{ matrix.configuration }}
+      EXTRA: ${{ matrix.extra }}
+      TEST: ${{ matrix.test }}
+    strategy:
+      fail-fast: false
+      matrix:
+        # Job names also name artifacts, character limitations apply
+        include:
+          #- name: "CentOS-7"
+          #  image: centos:7
+          #  cmp: gcc
+          #  configuration: default
+
+          - name: "Fedora-33"
+            image: fedora:33
+            cmp: gcc
+            configuration: default
+
+          - name: "Fedora-latest"
+            image: fedora:latest
+            cmp: gcc
+            configuration: default
+
+    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@v4
+      with:
+        submodules: true
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@master
+      if: matrix.image!='centos:7'
+    - name: Automatic core dumper analysis
+      uses: mdavidsaver/ci-core-dumper@node16
+      if: matrix.image=='centos:7'
+    - 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@v4
+      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

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.4
+PROJECT_NUMBER         = 8.0.7-dev
 
 # 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,11 +2,11 @@
 
 EPICS_PVD_MAJOR_VERSION = 8
 EPICS_PVD_MINOR_VERSION = 0
-EPICS_PVD_MAINTENANCE_VERSION = 4
+EPICS_PVD_MAINTENANCE_VERSION = 7
 
 # Development flag, set to zero for release versions
 
-EPICS_PVD_DEVELOPMENT_FLAG = 0
+EPICS_PVD_DEVELOPMENT_FLAG = 1
 
 # Immediately after a release the MAINTENANCE_VERSION
 # will be incremented and the DEVELOPMENT_FLAG set to 1

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.4
+PROJECT_NUMBER         = 8.0.7-dev
 
 # 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,7 +2,20 @@
 
 @page release_notes Release Notes
 
-Release 8.1.0 (Feb 2021)
+Release 8.0.6 (Dec 2023)
+========================
+
+- Compatible changes
+  - Actually enable JSON-5 output in PVStructure::Formatter::JSON when available.
+  - Fix unaligned access issues for some ARM/Linux targets.
+
+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

src/factory/Convert.cpp

@@ -27,7 +27,7 @@ using std::string;
 namespace epics { namespace pvData {
 
 
-static std::vector<string> split(string commaSeparatedList) {
+static std::vector<string> split(const string& commaSeparatedList) {
     string::size_type numValues = 1;
     string::size_type index=0;
     while(true) {

src/factory/FieldCreateFactory.cpp

@@ -1299,6 +1299,17 @@ void validateFieldName(const std::string& n)
         msg<<"Field name \""<<n<<"\" must begin with A-Z, a-z, or '_'";
         throw std::invalid_argument(msg.str());
     }
+/*
+    size_t i = n.find_first_of("\"' ./");
+    if (i != std::string::npos)
+    {
+        std::cerr << "Warning: character '" << n[i] << "' ("
+            << (unsigned int)(unsigned char)n[i]
+            << ") in field name \"" << n
+            << "\" may have undesired side effects." << std::endl;
+    }
+*/
+/*
     for(size_t i=0, N=n.size(); i<N; i++)
     {
         char c = n[i];
@@ -1317,6 +1328,7 @@ void validateFieldName(const std::string& n)
             }
         }
     }
+*/
 }
 
 void validateFieldNames(const StringArray& l)

src/factory/printer.cpp

@@ -404,6 +404,9 @@ std::ostream& operator<<(std::ostream& strm, const PVStructure::Formatter& forma
     if(format.xfmt==PVStructure::Formatter::JSON) {
         JSONPrintOptions opts;
         opts.multiLine = false;
+#if EPICS_VERSION_INT>=VERSION_INT(7,0,6,1)
+        opts.json5 = true;
+#endif
         printJSON(strm, format.xtop, format.xshow ? *format.xshow : BitSet().set(0), opts);
         strm<<'\n';
         return strm;
@@ -497,7 +500,7 @@ std::ostream& operator<<(std::ostream& strm, const escape& Q)
         case '\'': next = '\''; break;
         case '\"': next = '\"'; if(Q.S==escape::CSV) quote = '"'; break;
         default:
-            if(!isprint(C)) {
+            if(!isprint((unsigned char)C)) {
                 // print three charator escape
                 strm<<"\\x"<<hexdigit(C>>4)<<hexdigit(C);
             } else {
@@ -534,7 +537,7 @@ std::ostream& operator<<(std::ostream& strm, const maybeQuote& q)
             esc = true;
             break;
         default:
-            if(!isprint(q.s[i])) {
+            if(!isprint((unsigned char)q.s[i])) {
                 esc = true;
             }
             break;

src/json/Makefile

@@ -7,4 +7,4 @@ INC += pv/json.h
 LIBSRCS += parsehelper.cpp
 LIBSRCS += parseany.cpp
 LIBSRCS += parseinto.cpp
-LIBSRCS += print.cpp
+LIBSRCS += jprint.cpp

src/json/jprint.cpp

@@ -0,0 +1,305 @@
+/*
+ * 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>
+
+#include <errlog.h>
+#include <yajl_gen.h>
+
+#define epicsExportSharedSymbols
+#include <pv/pvdVersion.h>
+#include <pv/pvData.h>
+#include <pv/valueBuilder.h>
+#include <pv/bitSet.h>
+#include "pv/json.h"
+
+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 {
+    yajl_gen handle;
+    const pvd::JSONPrintOptions& opts;
+
+    std::string indent;
+
+    args(std::ostream& strm,
+         const pvd::JSONPrintOptions& opts)
+        :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();
+
+        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)
+{
+    const pvd::StructureConstPtr& type = fld->getStructure();
+    const pvd::PVFieldPtrArray& children = fld->getPVFields();
+
+    const pvd::StringArray& names = type->getFieldNames();
+
+    yg(yajl_gen_map_open(A.handle));
+
+    for(size_t i=0, N=names.size(); i<N; i++)
+    {
+        if(mask && !mask->get(children[i]->getFieldOffset())) continue;
+
+        yg_string(A.handle, names[i]);
+        show_field(A, children[i].get(), mask);
+    }
+
+    yg(yajl_gen_map_close(A.handle));
+}
+
+void show_field(args& A, const pvd::PVField* fld, const pvd::BitSet *mask)
+{
+    switch(fld->getField()->getType())
+    {
+    case pvd::scalar:
+    {
+        const pvd::PVScalar *scalar=static_cast<const pvd::PVScalar*>(fld);
+        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);
+
+        pvd::shared_vector<const void> arr;
+        scalar->getAs<void>(arr);
+
+        yg(yajl_gen_array_open(A.handle));
+
+        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;
+        }
+        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:
+        show_struct(A, static_cast<const pvd::PVStructure*>(fld), mask);
+        return;
+    case pvd::structureArray:
+    {
+        pvd::PVStructureArray::const_svector arr(static_cast<const pvd::PVStructureArray*>(fld)->view());
+        yg(yajl_gen_array_open(A.handle));
+
+        for(size_t i=0, N=arr.size(); i<N; i++) {
+            if(arr[i])
+                show_struct(A, arr[i].get(), 0);
+            else
+                yg(yajl_gen_null(A.handle));
+        }
+
+        yg(yajl_gen_array_close(A.handle));
+    }
+        return;
+    case pvd::union_:
+    {
+        const pvd::PVUnion *U=static_cast<const pvd::PVUnion*>(fld);
+        const pvd::PVField::const_shared_pointer& C(U->get());
+
+        if(!C) {
+            yg(yajl_gen_null(A.handle));
+        } else {
+            show_field(A, C.get(), 0);
+        }
+    }
+        return;
+    case pvd::unionArray: {
+        const pvd::PVUnionArray *U=static_cast<const pvd::PVUnionArray*>(fld);
+        pvd::PVUnionArray::const_svector arr(U->view());
+
+        yg(yajl_gen_array_open(A.handle));
+
+        for(size_t i=0, N=arr.size(); i<N; i++) {
+            if(arr[i])
+                show_field(A, arr[i].get(), 0);
+            else
+                yg(yajl_gen_null(A.handle));
+        }
+
+        yg(yajl_gen_array_close(A.handle));
+    }
+        return;
+    }
+    // should not be reached
+    if(A.opts.ignoreUnprintable)
+        yg(yajl_gen_null(A.handle));
+    else
+        throw std::runtime_error("Encountered unprintable field type");
+}
+
+void expandBS(const pvd::PVStructure& top, pvd::BitSet& mask, bool parents) {
+    if(mask.get(0)) { // special handling because getSubField(0) not allowed
+        // wildcard
+        for(size_t idx=1, N=top.getNumberFields(); idx<N; idx++) {
+            mask.set(idx);
+        }
+
+    } else {
+        for(pvd::int32 idx = mask.nextSetBit(0), N=top.getNumberFields(); idx>=0 && idx<N; idx=mask.nextSetBit(idx+1)) {
+            pvd::PVField::const_shared_pointer fld = top.getSubFieldT(idx);
+
+            // look forward and mark all children
+            for(size_t i=idx+1, N=fld->getNextFieldOffset(); i<N; i++)
+                mask.set(i);
+
+            if(parents) {
+                // look back and mark all parents
+                // we've already stepped past all parents so siblings will not be automatically marked
+                for(const pvd::PVStructure *parent = fld->getParent(); parent; parent = parent->getParent()) {
+                    mask.set(parent->getFieldOffset());
+                }
+            }
+        }
+    }
+}
+
+} // namespace
+
+namespace epics{namespace pvData{
+
+JSONPrintOptions::JSONPrintOptions()
+    :multiLine(true)
+    ,ignoreUnprintable(true)
+    ,indent(0)
+    ,json5(false)
+{}
+
+void printJSON(std::ostream& strm,
+               const PVStructure& val,
+               const BitSet& mask,
+               const JSONPrintOptions& opts)
+{
+    args A(strm, opts);
+    pvd::BitSet emask(mask);
+    expandBS(val, emask, true);
+    if(!emask.get(0)) return;
+    show_struct(A, &val, &emask);
+}
+
+void printJSON(std::ostream& strm,
+               const PVField& val,
+               const JSONPrintOptions& opts)
+{
+    args A(strm, opts);
+    show_field(A, &val, 0);
+}
+
+}} // namespace epics::pvData

src/json/print.cpp

@@ -1,231 +0,0 @@
-/*
- * 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>
-#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, const pvd::BitSet *mask);
-
-void show_struct(args& A, const pvd::PVStructure* fld, const pvd::BitSet *mask)
-{
-    const pvd::StructureConstPtr& type = fld->getStructure();
-    const pvd::PVFieldPtrArray& children = fld->getPVFields();
-
-    const pvd::StringArray& names = type->getFieldNames();
-
-    A.strm.put('{');
-    A.indent++;
-
-    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]<<"\": ";
-        show_field(A, children[i].get(), mask);
-    }
-
-    A.indent--;
-    A.doIntent();
-    A.strm.put('}');
-}
-
-void show_field(args& A, const pvd::PVField* fld, const pvd::BitSet *mask)
-{
-    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>();
-        }
-    }
-        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));
-
-        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(']');
-    }
-        return;
-    case pvd::structure:
-        show_struct(A, static_cast<const pvd::PVStructure*>(fld), mask);
-        return;
-    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(), 0);
-            else
-                A.strm<<"NULL";
-        }
-
-        A.indent--;
-        A.doIntent();
-        A.strm.put(']');
-    }
-        return;
-    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(), 0);
-        }
-    }
-        return;
-    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++;
-
-        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";
-        }
-
-        A.indent--;
-        A.doIntent();
-        A.strm.put(']');
-
-    }
-        return;
-    }
-    // should not be reached
-    if(A.opts.ignoreUnprintable)
-        A.strm<<"// unprintable field type";
-    else
-        throw std::runtime_error("Encountered unprintable field type");
-}
-
-void expandBS(const pvd::PVStructure& top, pvd::BitSet& mask, bool parents) {
-    if(mask.get(0)) { // special handling because getSubField(0) not allowed
-        // wildcard
-        for(size_t idx=1, N=top.getNumberFields(); idx<N; idx++) {
-            mask.set(idx);
-        }
-
-    } else {
-        for(pvd::int32 idx = mask.nextSetBit(0), N=top.getNumberFields(); idx>=0 && idx<N; idx=mask.nextSetBit(idx+1)) {
-            pvd::PVField::const_shared_pointer fld = top.getSubFieldT(idx);
-
-            // look forward and mark all children
-            for(size_t i=idx+1, N=fld->getNextFieldOffset(); i<N; i++)
-                mask.set(i);
-
-            if(parents) {
-                // look back and mark all parents
-                // we've already stepped past all parents so siblings will not be automatically marked
-                for(const pvd::PVStructure *parent = fld->getParent(); parent; parent = parent->getParent()) {
-                    mask.set(parent->getFieldOffset());
-                }
-            }
-        }
-    }
-}
-
-} // namespace
-
-namespace epics{namespace pvData{
-
-JSONPrintOptions::JSONPrintOptions()
-    :multiLine(true)
-    ,ignoreUnprintable(true)
-    ,indent(0)
-{}
-
-void printJSON(std::ostream& strm,
-               const PVStructure& val,
-               const BitSet& mask,
-               const JSONPrintOptions& opts)
-{
-    args A(strm, opts);
-    pvd::BitSet emask(mask);
-    expandBS(val, emask, true);
-    if(!emask.get(0)) return;
-    show_struct(A, &val, &emask);
-}
-
-void printJSON(std::ostream& strm,
-               const PVField& val,
-               const JSONPrintOptions& opts)
-{
-    args A(strm, opts);
-    show_field(A, &val, 0);
-}
-
-}} // namespace epics::pvData

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/anyscalar.cpp

@@ -31,7 +31,7 @@ AnyScalar::AnyScalar(const AnyScalar& o)
 }
 
 #if __cplusplus>=201103L
-AnyScalar::AnyScalar(AnyScalar&& o)
+AnyScalar::AnyScalar(AnyScalar&& o) noexcept
     :_stype(o._stype)
 {
     typedef std::string string;
@@ -136,7 +136,7 @@ void AnyScalar::swap(AnyScalar& o) {
 }
 const void* AnyScalar::bufferUnsafe() const {
     if(_stype==pvString) {
-        return as<std::string>().c_str();
+        return ref<std::string>().c_str();
     } else {
         return _wrap.blob;
     }

src/misc/debugPtr.cpp

@@ -35,7 +35,7 @@ void shared_ptr_base::track_new()
 }
 
 // create new tracker if ptr!=nullptr, otherwise clear
-void shared_ptr_base::track_new(void* ptr)
+void shared_ptr_base::track_new(const void* ptr)
 {
     track_clear();
     if(ptr){

src/misc/pv/anyscalar.h

@@ -123,7 +123,7 @@ public:
     AnyScalar(const AnyScalar& o);
 
 #if __cplusplus>=201103L
-    AnyScalar(AnyScalar&& o);
+    AnyScalar(AnyScalar&& o) noexcept;
 #endif
 
     inline ~AnyScalar() {clear();}
@@ -140,7 +140,7 @@ public:
     }
 
 #if __cplusplus>=201103L
-    inline AnyScalar& operator=(AnyScalar&& o) {
+    inline AnyScalar& operator=(AnyScalar&& o) noexcept {
         clear();
         swap(o);
         return *this;

src/misc/pv/byteBuffer.h

@@ -150,14 +150,17 @@ struct swap<8> {
 #undef _PVA_swap64
 
 /* PVD serialization doesn't pay attention to alignement,
- * which some targets really care about and treat unaligned
+ * which some targets (ARM and powerpc) really care about and treat unaligned
  * access as a fault, or with a heavy penalty (~= to a syscall).
  *
  * For those targets,, we will have to live with the increase
  * in execution time and/or object code size of byte-wise copy.
+ *
+ * Treat x86 32/64 as an outlier, and assume all other targets
+ * need, or greatly benefit, from aligned access.
  */
 
-#ifdef _ARCH_PPC
+#if !(defined(__x86_64__) || defined(_M_AMD64) || defined(__i386__) || defined(_M_IX86))
 
 template<typename T>
 union alignu {

src/misc/pv/debugPtr.h

@@ -78,7 +78,7 @@ protected:
     // add ourselves to tracker
     void track_new();
     // create new tracker if ptr!=nullptr, otherwise clear
-    void track_new(void* ptr);
+    void track_new(const void* ptr);
     // copy tracker and add ourself
     void track_assign(const shared_ptr_base& o);
     void track_clear();
@@ -286,6 +286,7 @@ public:
 
     long use_count() const noexcept { return real.use_count(); }
     bool unique() const noexcept { return real.unique(); }
+    bool expired() const noexcept { return real.expired(); }
 };
 
 template<class Base>
@@ -316,13 +317,12 @@ do_enable_shared_from_this(const shared_ptr<Store>& dest,
     self->xxInternalSelf = actual;
 }
 
-}} // namespace epics::debug
-
 template<typename T>
-inline std::ostream& operator<<(std::ostream& strm, const epics::debug::shared_ptr<T>& ptr)
+inline std::ostream& operator<<(std::ostream& strm, const shared_ptr<T>& ptr)
 {
     strm<<ptr.get();
     return strm;
 }
 
+}} // namespace epics::debug
 #endif // DEBUGPTR_H

src/misc/pv/sharedVector.h

@@ -434,11 +434,11 @@ public:
         _E_non_const* temp=new _E_non_const[i];
         try{
             std::copy(begin(), begin()+new_count, temp);
-            this->m_sdata.reset(temp, detail::default_array_deleter<E*>());
         }catch(...){
             delete[] temp;
             throw;
         }
+        this->m_sdata.reset(temp, detail::default_array_deleter<E*>());
         this->m_offset = 0;
         this->m_count = new_count;
         this->m_total = i;
@@ -481,11 +481,11 @@ public:
             std::copy(begin(),
                       begin()+n,
                       temp);
-            this->m_sdata.reset(temp, detail::default_array_deleter<pointer>());
         }catch(...){
             delete[] temp;
             throw;
         }
+        this->m_sdata.reset(temp, detail::default_array_deleter<pointer>());
         this->m_offset= 0;
         this->m_count = i;
         this->m_total = new_total;

src/misc/reftrack.cpp

@@ -271,10 +271,10 @@ char* epicsRefSnapshotCurrent()
         snap.update();
         std::ostringstream strm;
         strm<<snap;
-        const char *str = strm.str().c_str();
-        char *ret = (char*)malloc(strlen(str)+1);
+        std::string str = strm.str();
+        char *ret = (char*)malloc(str.length()+1);
         if(ret)
-            strcpy(ret, str);
+            strcpy(ret, str.c_str());
         return ret;
     }catch(std::exception& e){
         return epicsStrDup(e.what());

src/property/pv/pvAlarm.h

@@ -44,11 +44,6 @@ public:
     //default constructors and destructor are OK
     //returns (false,true) if pvField(is not, is) a valid alarm structure
     //An automatic detach is issued if already attached.
-    /*
-     * Attach to a field of a PVData object.
-     * @param pvField The pvField.
-     * @return (false,true) if the pvField (is not, is) an alarm structure.
-     */
     /*
      * Attach to a field of a PVData object.
      * @param pvField The pvField.

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

@@ -247,7 +247,7 @@ void showNTTable()
     iarr.push_back(42); // will not be shown
     input->getSubFieldT<pvd::PVIntArray>("value.colA")->replace(pvd::freeze(iarr));
 
-    sarr.push_back("one\x7f");
+    sarr.push_back("one\x7f\x80");
     sarr.push_back("two words");
     sarr.push_back("A '\"'");
     input->getSubFieldT<pvd::PVStringArray>("value.colB")->replace(pvd::freeze(sarr));
@@ -255,7 +255,7 @@ void showNTTable()
 
     testDiff("<undefined>                \n"
              "labelA   \"label B\"\n"
-             "     1     one\\x7F\n"
+             "     1 one\\x7F\\x80\n"
              "     2 \"two words\"\n"
              "     3  \"A \\'\"\"\\'\"\n"
              , print(input->stream()),

testApp/pv/testOperators.cpp

@@ -33,7 +33,7 @@ MAIN(testOperators)
     PVDoublePtr pvValue = pvStructure->getSubField<PVDouble>("value");
     *pvValue <<= testDV;
 
-    double dv;
+    double dv = 0.;
     *pvValue >>= dv;
     testOk1(testDV == dv);
 

testApp/pv/testPVData.cpp

@@ -768,7 +768,7 @@ static void testSubField()
 
 MAIN(testPVData)
 {
-    testPlan(271);
+    testPlan(270);
     try{
         fieldCreate = getFieldCreate();
         pvDataCreate = getPVDataCreate();
@@ -777,7 +777,7 @@ MAIN(testPVData)
         convert = getConvert();
         testSizes();
         testCreatePVStructure();
-        testCreatePVStructureWithInvalidName();
+//        testCreatePVStructureWithInvalidName();
         testPVScalar();
         testScalarArray();
         testRequest();