Set version numbers for release

found by static code analysis (cppcheck @ sonarqube)
(that doesn't realize ">>=" calls an overloaded operator)

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

@@ -52,34 +52,34 @@ jobs:
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             cmp: gcc
             configuration: default
             base: "7.0"
             wine: "64"
             name: "Ub-20 gcc-9 + MinGW"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             cmp: gcc
             configuration: static
             base: "7.0"
             wine: "64"
             name: "Ub-20 gcc-9 + MinGW, static"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             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
+          - os: ubuntu-latest
             cmp: clang
             configuration: default
             base: "7.0"
             name: "Ub-20 clang-10"
 
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             cmp: clang
             configuration: default
             base: "7.0"
@@ -175,7 +175,7 @@ jobs:
             name: "Win2019 mingw"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -193,7 +193,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@v3
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'
@@ -237,12 +237,6 @@ jobs:
             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
@@ -282,7 +276,7 @@ jobs:
         # people would rather just break all existing scripts...
         [ -e /usr/bin/python ] || ln -sf python3 /usr/bin/python
         python --version
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
     - name: Automatic core dumper analysis
@@ -295,7 +289,7 @@ jobs:
       run: python .ci/cue.py -T 20M test
     - name: Upload tapfiles Artifact
       if: ${{ always() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: tapfiles ${{ matrix.name }}
         path: '**/O.*/*.tap'

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.6
 
 # 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 = 6
 
 # 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.6
 
 # 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,13 @@
 
 @page release_notes Release Notes
 
+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/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/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/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);