Final commit for 8.0.7

- Jeremy Lorelli
- Andrew Johnson
- Dirk Zimoch
- Chris Johns
- Michael Davidsaver

.appveyor.yml

@@ -1,33 +1,30 @@
 # .appveyor.yml for use with EPICS Base ci-scripts
 # (see: https://github.com/epics-base/ci-scripts)
 
+# This is YAML - indentation levels are crucial
+
+#---------------------------------#
+#       build cache               #
+#---------------------------------#
+# The AppVeyor cache allowance is way too small (1GB per account across all
+# projects, branches and jobs) to be used for the dependency builds.
+
 cache:
   - C:\Users\appveyor\.tools
 
-#---------------------------------#
-#       additional packages       #
-#---------------------------------#
-
-install:
-# for the sequencer
-  - cinst re2c
-  - cmd: git submodule update --init --recursive
-
 #---------------------------------#
 #       repository cloning        #
 #---------------------------------#
 
 init:
   # Set autocrlf to make batch files work
-  - git config --global core.autocrlf true
+  - cmd: git config --global core.autocrlf true
 
-clone_depth: 50
+clone_depth: 5
 
-# Skipping commits affecting only specific files
-skip_commits:
-  files:
-    - 'documentation/*'
-    - '**/*.md'
+#---------------------------------#
+#   build matrix configuration    #
+#---------------------------------#
 
 # Build Configurations: dll/static, regular/debug
 configuration:
@@ -40,47 +37,65 @@ configuration:
 environment:
   # common / default variables for all jobs
   SETUP_PATH: .ci-local
+  EPICS_TEST_IMPRECISE_TIMING: YES
+  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
     BASE: 3.15
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2019
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+  - CMP: vs2017
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  - CMP: vs2015
+  - 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
+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               #
 #---------------------------------#
 
-## if you want to connect by remote desktop to a failed build, uncomment these lines
-## note that you will need to connect within the usual build timeout limit (60 minutes)
-## so you may want to adjust the build matrix above to just build the one of interest
+## To connect by remote desktop to a failed build, uncomment the lines below.
+## You must connect within the usual build timeout limit (60 minutes),
+## so adjust the build matrix above to just build the config of interest.
 
 #on_failure:
 #  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
@@ -91,4 +106,8 @@ on_finish:
 #---------------------------------#
 
 notifications:
+  - provider: Email
+    to:
+      - core-talk@aps.anl.gov
+    on_build_success: false
   - provider: GitHubPullRequest

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

@@ -11,27 +11,13 @@ name: pvData
 on:
   push:
     paths-ignore:
-      - 'documentation/*'
-      - 'startup/*'
-      - '.appveyor/*'
-      - '.tools/*'
-      - '.gitattributes'
-      - '**/*.html'
-      - '**/*.md'
+      - .appveyor.yml
   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)
+    EPICS_TEST_TIMEOUT: 300 # 5 min
 
 jobs:
   native:
@@ -39,12 +25,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     # Set environment variables from matrix parameters
     env:
+      # NB: PVA modules build against both BASE 7.0 and 3.15
+      BASE: ${{ matrix.base }}
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
-      BASE: ${{ matrix.base }}
-      WINE: ${{ matrix.wine }}
-      RTEMS: ${{ matrix.rtems }}
-      RTEMS_TARGET: ${{ matrix.rtems_target }}
+      CI_CROSS_TARGETS: ${{ matrix.cross }}
       EXTRA: ${{ matrix.extra }}
       TEST: ${{ matrix.test }}
     strategy:
@@ -52,130 +37,167 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - os: ubuntu-20.04
+          - name: "7.0 Ub gcc c++20 Werror"
+            base: "7.0"
+            os: ubuntu-latest
             cmp: gcc
             configuration: default
-            base: "7.0"
-            wine: "64"
-            name: "Ub-20 gcc-9 + MinGW"
+            # 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
+          - name: "7.0 Ub gcc C++11, static"
+            base: "7.0"
+            os: ubuntu-latest
             cmp: gcc
             configuration: static
-            base: "7.0"
-            wine: "64"
-            name: "Ub-20 gcc-9 + MinGW, static"
+            extra: "CMD_CXXFLAGS=-std=c++11"
 
-          - os: ubuntu-20.04
+          - name: "7.0 Ub gcc u-char"
+            base: "7.0"
+            os: ubuntu-latest
             cmp: gcc
             configuration: static
-            base: "7.0"
-            extra: "CMD_CXXFLAGS=-std=c++11"
-            name: "Ub-20 gcc-9 C++11, static"
+            extra: "CMD_CFLAGS=-funsigned-char CMD_CXXFLAGS=-funsigned-char"
 
-          - os: ubuntu-20.04
+          - name: "7.0 Ub clang"
+            base: "7.0"
+            os: ubuntu-latest
             cmp: clang
             configuration: default
-            base: "7.0"
-            name: "Ub-20 clang-10"
 
-          - os: ubuntu-20.04
+          - name: "7.0 Ub clang C++11"
+            base: "7.0"
+            os: ubuntu-latest
             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
+          - name: "7.0 MacOS clang"
             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
+            os: macos-latest
+            cmp: clang
             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"
+          # Cross builds
 
-          - 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
+          - name: "3.15 Ub-22 gcc + MinGW"
             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
+            os: ubuntu-22.04
             cmp: gcc
             configuration: default
+            cross: "windows-x64-mingw"
+
+          - name: "7.0 Ub gcc + linux-aarch64"
             base: "7.0"
-            name: "Win2019 mingw"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-aarch64"
+
+          - name: "7.0 Ub gcc + linux-arm gnueabi"
+            base: "7.0"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-arm@arm-linux-gnueabi"
+
+          - name: "7.0 Ub gcc + linux-arm gnueabihf"
+            base: "7.0"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "linux-arm@arm-linux-gnueabihf"
+
+          - name: "7.0 Ub gcc + MinGW"
+            base: "7.0"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: default
+            cross: "windows-x64-mingw"
+
+          - name: "7.0 Ub gcc + MinGW, static"
+            base: "7.0"
+            os: ubuntu-latest
+            cmp: gcc
+            configuration: static
+            cross: "windows-x64-mingw"
+
+          - name: "7.0 Ub-22 gcc + RT-4.9 pc386"
+            base: "7.0"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-pc386-qemu@4.9"
+
+          - name: "7.0 Ub-22 gcc + RT-4.10 pc386"
+            base: "7.0"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-pc386-qemu@4.10"
+            test: NO
+
+          - name: "7.0 Ub-22 gcc + RT-5.1 pc686"
+            base: "7.0"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-pc686-qemu@5"
+
+          - name: "7.0 Ub-22 gcc + RT-5.1 beatnik,zynq_a9,uC5282"
+            base: "7.0"
+            os: ubuntu-22.04
+            cmp: gcc
+            configuration: default
+            cross: "RTEMS-beatnik@5:RTEMS-xilinx_zynq_a9_qemu@5:RTEMS-uC5282@5"
+            test: NO
+
+          # Windows builds
+
+          - name: "7.0 Win-22 MSC-22"
+            base: "7.0"
+            os: windows-2022
+            cmp: vs2022
+            configuration: default
+
+          - name: "7.0 Win-22 MSC-22 static"
+            base: "7.0"
+            os: windows-2022
+            cmp: vs2022
+            configuration: static
+
+          - name: "7.0 Win-22 MSC-22 debug"
+            base: "7.0"
+            os: windows-2022
+            cmp: vs2022
+            configuration: debug
+            extra: "CMD_CXXFLAGS=-analyze"
+
+          - name: "7.0 Win-22 MinGW"
+            base: "7.0"
+            os: windows-2022
+            cmp: gcc
+            configuration: default
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -193,7 +215,7 @@ jobs:
       run: python .ci/cue.py -T 60M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
@@ -209,9 +231,9 @@ jobs:
       image: ${{ matrix.image }}
     # Set environment variables from matrix parameters
     env:
+      BASE: ${{ matrix.base }}
       CMP: ${{ matrix.cmp }}
       BCFG: ${{ matrix.configuration }}
-      BASE: ${{ matrix.base }}
       EXTRA: ${{ matrix.extra }}
       TEST: ${{ matrix.test }}
     strategy:
@@ -219,87 +241,61 @@ jobs:
       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
+          - name: "7.0 CentOS-8 gcc"
             base: "7.0"
-
-          - name: "CentOS-8"
             image: centos:8
             cmp: gcc
             configuration: default
-            base: "7.0"
 
-          - name: "Fedora-33"
+          - name: "7.0 Rocky-9 gcc"
+            base: "7.0"
+            image: rockylinux:9
+            cmp: gcc
+            configuration: default
+
+          - name: "7.0 Fedora-33 gcc"
+            base: "7.0"
             image: fedora:33
             cmp: gcc
             configuration: default
-            base: "7.0"
 
-          - name: "Fedora-latest"
+          - name: "7.0 Fedora gcc"
+            base: "7.0"
             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'
+    - name: "Fix repo URLs on CentOS-8"
+      # centos:8 is frozen, repos are in the vault
+      if: matrix.image=='centos:8'
       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
+        sed -i -e "s|mirrorlist=|#mirrorlist=|" \
+        -e "s|#baseurl=http://mirror|baseurl=http://vault|" \
+        /etc/yum.repos.d/CentOS-Linux-{BaseOS,AppStream,Extras,Plus}.repo
     - 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
+        dnf -y install python3 gdb make perl gcc-c++ glibc-devel readline-devel ncurses-devel perl-devel perl-Test-Simple
+        git --version || dnf -y install git
+        python3 --version
+    - uses: actions/checkout@v4
       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
+      run: python3 .ci/cue.py prepare
     - name: Build main module
-      run: python .ci/cue.py build
+      run: python3 .ci/cue.py build
     - name: Run main module tests
-      run: python .ci/cue.py -T 20M test
+      run: python3 .ci/cue.py -T 20M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      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
+      run: python3 .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.5
+PROJECT_NUMBER         = 8.0.7
 
 # 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 = 5
+EPICS_PVD_MAINTENANCE_VERSION = 7
 
 # 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.5
+PROJECT_NUMBER         = 8.0.7
 
 # 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.7 (Dec 2025)
+========================
+
+- Compatible changes
+  - Allow epics::pvData::Timer to be cancelled during callback execution.
+  - Clang compiler warnings cleaned up.
+  - Limit periodic timers to one catch-up after missing many events.
+
+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)
 ========================
 

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

@@ -15,6 +15,7 @@
 #include <sstream>
 
 #include <epicsString.h>
+#include <epicsStdio.h>
 #include <epicsMutex.h>
 #include <epicsThread.h>
 
@@ -378,7 +379,8 @@ BoundedScalarArray::BoundedScalarArray(ScalarType elementType, size_t size)
 string BoundedScalarArray::getID() const
 {
     char buffer[32];
-    sprintf(buffer, "%s<%zu>", ScalarTypeFunc::name(getElementType()), size);
+    epicsSnprintf(buffer, sizeof(buffer), "%s<%lu>",
+        ScalarTypeFunc::name(getElementType()), (unsigned long) size);
     return string(buffer);
 }
 
@@ -403,7 +405,8 @@ FixedScalarArray::FixedScalarArray(ScalarType elementType, size_t size)
 string FixedScalarArray::getID() const
 {
     char buffer[32];
-    sprintf(buffer, "%s[%zu]", ScalarTypeFunc::name(getElementType()), size);
+    epicsSnprintf(buffer, sizeof(buffer), "%s[%lu]",
+        ScalarTypeFunc::name(getElementType()), (unsigned long) size);
     return string(buffer);
 }
 

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/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/pv/timer.h

@@ -60,6 +60,8 @@ private:
     epicsTime timeToRun;
     double period;
     bool onList;
+    bool cancelled;
+    bool processing;
     friend class Timer;
     struct IncreasingTime;
 };

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/misc/timer.cpp

@@ -23,7 +23,9 @@ namespace epics { namespace pvData {
 
 TimerCallback::TimerCallback()
 : period(0.0),
-  onList(false)
+  onList(false),
+  cancelled(false),
+  processing(false)
 {
 }
 
@@ -50,6 +52,7 @@ void Timer::addElement(TimerCallbackPtr const & timerCallback)
     temp.push_back(timerCallback);
 
     timerCallback->onList = true;
+    timerCallback->cancelled = false;
 
     // merge sorted lists.
     // for us effectively insertion sort.
@@ -60,6 +63,11 @@ void Timer::addElement(TimerCallbackPtr const & timerCallback)
 bool Timer::cancel(TimerCallbackPtr const &timerCallback)
 {
     Lock xx(mutex);
+    /* If we're processing, just set the cancel flag */
+    if (timerCallback->processing) {
+        timerCallback->cancelled = true;
+        return true;
+    }
     if(!timerCallback->onList) return false;
     if(!alive) {
         timerCallback->onList = false;
@@ -107,6 +115,7 @@ void Timer::run()
             TimerCallbackPtr work;
             work.swap(queue.front());
             work->onList = false;
+            work->processing = true;
             queue.pop_front();
 
             {
@@ -115,7 +124,15 @@ void Timer::run()
                 work->callback();
             }
 
-            if(work->period > 0.0 && alive) {
+            work->processing = false;
+
+            if(work->period > 0.0 && alive && !work->cancelled) {
+                if(waitfor <= -work->period) {
+                    // Periodic timer phase has fallen behind by at least one full period.
+                    // Could be due to previous slow jobs, or a system time jump forward.
+                    // Reset the phase.
+                    work->timeToRun = now = epicsTime::getCurrent();
+                }
                 work->timeToRun += work->period;
                 addElement(work);
             }

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

@@ -14,6 +14,11 @@
 #include <cstring>
 #include <memory>
 
+// allow to test deprecated functions without causing compiler warnings
+#include <compilerDependencies.h>
+#undef EPICS_DEPRECATED
+#define EPICS_DEPRECATED
+
 #include <testMain.h>
 
 #include <pv/pvUnitTest.h>

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

@@ -6,6 +6,7 @@
 
 #include <testMain.h>
 #include <epicsUnitTest.h>
+#include <epicsStdio.h>
 
 #include <pv/current_function.h>
 #include <pv/pvData.h>
@@ -54,7 +55,7 @@ void buildMiss()
     for(size_t i=0; i<1000; i++) {
         // unique name each time to (partially) defeat caching
         char buf[10];
-        sprintf(buf, "field%zu", i);
+        epicsSnprintf(buf, sizeof(buf), "field%lu", (unsigned long) i);
 
         record.start();
 

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);