pvxslibs 1.3.0a1__tar.gz → 1.3.2__tar.gz

{pvxslibs-1.3.0a1/python/pvxslibs.egg-info → pvxslibs-1.3.2}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: pvxslibs
-Version: 1.3.0a1
+Version: 1.3.2
 Summary: PVXS libraries packaged for python
-Home-page: https://mdavidsaver.github.io/pvxs
+Home-page: https://epics-base.github.io/pvxs
 Author: Michael Davidsaver
 Author-email: mdavidsaver@gmail.com
 License: BSD
@@ -27,8 +27,8 @@ License-File: LICENSE
 PVXS - PVAccess protocol library
 ================================
 
-VCS - https://github.com/mdavidsaver/pvxs
+VCS - https://github.com/epics-base/pvxs
 
-Documentation - https://mdavidsaver.github.io/pvxs/
+Documentation - https://epics-base.github.io/pvxs/
 
 

pvxslibs-1.3.2/README.md

@@ -0,0 +1,6 @@
+PVXS - PVAccess protocol library
+================================
+
+VCS - https://github.com/epics-base/pvxs
+
+Documentation - https://epics-base.github.io/pvxs/

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/configure/CONFIG_PVXS_VERSION

@@ -1,6 +1,6 @@
 PVXS_MAJOR_VERSION = 1
 PVXS_MINOR_VERSION = 3
-PVXS_MAINTENANCE_VERSION = 0
+PVXS_MAINTENANCE_VERSION = 2
 
 # Version range conditions in Makefiles
 #
@@ -12,7 +12,9 @@ PVXS_MAINTENANCE_VERSION = 0
 #
 # ifneq ($(PVXS_X_Y_Z),YES)   # PVXS != X.Y.Z
 #
-PVXS_1_3_0 = YES
+PVXS_1_3_2 = YES
+PVXS_1_3_1 = NO
+PVXS_1_3_0 = NO
 PVXS_1_2_4 = NO
 PVXS_1_2_3 = NO
 PVXS_1_2_2 = NO

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/ioc/iocsource.cpp

@@ -368,16 +368,7 @@ IOCSource::doPreProcessing(dbChannel* pDbChannel, SecurityLogger& securityLogger
         throw std::runtime_error("Unable to put value: Field Disabled: S_db_putDisabled");
     }
 
-    SecurityLogger asWritePvt(
-            asTrapWriteWithData((securityClient.cli)[0], // The user is the first element
-                    credentials.cred[0].c_str(),         // The user is the first element
-                    credentials.host.c_str(),
-                    pDbChannel,
-                    dbChannelFinalFieldType(pDbChannel),
-                    dbChannelFinalElements(pDbChannel),
-                    nullptr
-            )
-    );
+    SecurityLogger asWritePvt(pDbChannel, credentials, securityClient);
 
     securityLogger.swap(asWritePvt);
 

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/ioc/securityclient.cpp

@@ -40,7 +40,7 @@ SecurityClient::~SecurityClient() {
 }
 
 bool SecurityClient::canWrite() const {
-    return std::all_of(cli.begin(), cli.end(), [](ASCLIENTPVT asc) {
+    return std::any_of(cli.begin(), cli.end(), [](ASCLIENTPVT asc) {
         return asCheckPut(asc);
     });
 }

pvxslibs-1.3.2/ioc/securitylogger.h

@@ -0,0 +1,73 @@
+/*
+ * Copyright - See the COPYRIGHT that is included with this distribution.
+ * pvxs is distributed subject to a Software License Agreement found
+ * in file LICENSE that is included with this distribution.
+ *
+ * Author George S. McIntyre <george@level-n.com>, 2023
+ *
+ */
+
+#ifndef PVXS_SECURITYLOGGER_H
+#define PVXS_SECURITYLOGGER_H
+
+#include <algorithm>
+#include <asLib.h>
+#include <dbChannel.h>
+
+#include "credentials.h"
+#include "securityclient.h"
+
+namespace pvxs {
+namespace ioc {
+
+class SecurityLogger {
+    void* pfieldsave = nullptr;
+    dbChannel *pchan = nullptr;
+    void* pvt;
+public:
+    ~SecurityLogger() {
+        asTrapWriteAfterWrite(pvt);
+        // asTrapWrite callbacks may have clobbered pfield
+        if(pchan)
+            pchan->addr.pfield = pfieldsave;
+    }
+
+    void swap(SecurityLogger& o) {
+        std::swap(pfieldsave, o.pfieldsave);
+        std::swap(pchan, o.pchan);
+        std::swap(pvt, o.pvt);
+    }
+
+    SecurityLogger()
+            :pvt(nullptr) {
+    }
+    SecurityLogger(dbChannel* pDbChannel,
+                   const Credentials& credentials,
+                   const SecurityClient& securityClient)
+        :pfieldsave(pDbChannel->addr.pfield)
+        ,pvt(asTrapWriteWithData((securityClient.cli)[0], // The user is the first element
+                         credentials.cred[0].c_str(),     // The user is the first element
+                         credentials.host.c_str(),
+                         pDbChannel,
+                         dbChannelFinalFieldType(pDbChannel),
+                         dbChannelFinalElements(pDbChannel),
+                         nullptr
+                 ))
+    {
+        /* asTrapWrite callbacks may have called clobbered
+         * see
+         *   https://github.com/epics-modules/caPutLog/pull/23
+         *   https://github.com/epics-base/epics-base/issues/474
+         */
+        if(pchan)
+            pchan->addr.pfield = pfieldsave;
+    }
+
+    SecurityLogger(const SecurityLogger&) = delete;
+    SecurityLogger& operator=(const SecurityLogger&) = delete;
+};
+
+} // pvxs
+} // ioc
+
+#endif //PVXS_SECURITYLOGGER_H

pvxslibs-1.3.2/pyproject.toml

@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel", "setuptools_dso>=2.7a1", "setuptools_dso>=2.11a2; python_version >= '3.12'", "epicscorelibs>=7.0.7.99.1.1a2"]

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2/python/pvxslibs.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: pvxslibs
-Version: 1.3.0a1
+Version: 1.3.2
 Summary: PVXS libraries packaged for python
-Home-page: https://mdavidsaver.github.io/pvxs
+Home-page: https://epics-base.github.io/pvxs
 Author: Michael Davidsaver
 Author-email: mdavidsaver@gmail.com
 License: BSD
@@ -27,8 +27,8 @@ License-File: LICENSE
 PVXS - PVAccess protocol library
 ================================
 
-VCS - https://github.com/mdavidsaver/pvxs
+VCS - https://github.com/epics-base/pvxs
 
-Documentation - https://mdavidsaver.github.io/pvxs/
+Documentation - https://epics-base.github.io/pvxs/
 
 

pvxslibs-1.3.2/python/pvxslibs.egg-info/requires.txt

@@ -0,0 +1,2 @@
+setuptools_dso>=2.7a1
+epicscorelibs<7.0.7.99.2,>=7.0.7.99.1.1

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/setup.py

@@ -462,9 +462,8 @@ class InstallHeaders(Command):
             self.copy_file(header,
                            os.path.join(self.build_lib, 'pvxslibs', 'include', os.path.relpath(header, 'ioc')))
 
-        for dbd in glob('ioc/*.dbd'):
-            self.copy_file(dbd,
-                           os.path.join(self.build_lib, 'pvxslibs', 'dbd', os.path.relpath(dbd, 'ioc')))
+        self.copy_file('ioc/pvxs7x.dbd',
+                       os.path.join(self.build_lib, 'pvxslibs/dbd/pvxsIoc.dbd'))
 
 @logexc
 def define_DSOS(self):
@@ -697,7 +696,7 @@ build_dso.sub_commands.extend([
 
 
 pvxs_ver = '%(PVXS_MAJOR_VERSION)s.%(PVXS_MINOR_VERSION)s.%(PVXS_MAINTENANCE_VERSION)s'%pvxsversion
-pvxs_ver += 'a1'
+#pvxs_ver += 'a2'
 
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as F:
     long_description = F.read()
@@ -708,7 +707,7 @@ setup(
     description="PVXS libraries packaged for python",
     long_description=long_description,
     long_description_content_type='text/markdown',
-    url='https://mdavidsaver.github.io/pvxs',
+    url='https://epics-base.github.io/pvxs',
     author='Michael Davidsaver',
     author_email='mdavidsaver@gmail.com',
     license='BSD',

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/client.cpp

@@ -101,7 +101,7 @@ Interrupted::Interrupted()
 Interrupted::~Interrupted() {}
 
 Timeout::Timeout()
-    :std::runtime_error ("Interrupted")
+    :std::runtime_error ("Timeout")
 {}
 Timeout::~Timeout() {}
 

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/clientconn.cpp

@@ -62,25 +62,19 @@ void Connection::startConnecting()
 {
     assert(!this->bev);
 
-    auto bev(bufferevent_socket_new(context->tcp_loop.base, -1, BEV_OPT_CLOSE_ON_FREE|BEV_OPT_DEFER_CALLBACKS));
+    decltype(this->bev) bev(__FILE__, __LINE__,
+                bufferevent_socket_new(context->tcp_loop.base, -1,
+                                       BEV_OPT_CLOSE_ON_FREE|BEV_OPT_DEFER_CALLBACKS));
 
-    bufferevent_setcb(bev, &bevReadS, nullptr, &bevEventS, this);
+    bufferevent_setcb(bev.get(), &bevReadS, nullptr, &bevEventS, this);
 
     timeval tmo(totv(context->effective.tcpTimeout));
-    bufferevent_set_timeouts(bev, &tmo, &tmo);
+    bufferevent_set_timeouts(bev.get(), &tmo, &tmo);
 
-    if(bufferevent_socket_connect(bev, const_cast<sockaddr*>(&peerAddr->sa), peerAddr.size()))
+    if(bufferevent_socket_connect(bev.get(), const_cast<sockaddr*>(&peerAddr->sa), peerAddr.size()))
         throw std::runtime_error("Unable to begin connecting");
-    {
-        auto fd(bufferevent_getfd(bev));
-        int opt = 1;
-        if(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char*)&opt, sizeof(opt))<0) {
-            auto err(SOCKERRNO);
-            log_warn_printf(io, "Unable to TCP_NODELAY: %d on %d\n", err, fd);
-        }
-    }
 
-    connect(bev);
+    connect(std::move(bev));
 
     log_debug_printf(io, "Connecting to %s, RX readahead %zu\n", peerName.c_str(), readahead);
 }
@@ -142,6 +136,16 @@ void Connection::bevEvent(short events)
     if(bev && (events&BEV_EVENT_CONNECTED)) {
         log_debug_printf(io, "Connected to %s\n", peerName.c_str());
 
+        {
+            // after async connect() to avoid winsock specific race.
+            auto fd(bufferevent_getfd(bev.get()));
+            int opt = 1;
+            if(setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char*)&opt, sizeof(opt))<0) {
+                auto err(SOCKERRNO);
+                log_warn_printf(io, "Unable to TCP_NODELAY: %d on %d\n", err, fd);
+            }
+        }
+
         if(bufferevent_enable(bev.get(), EV_READ|EV_WRITE))
             throw std::logic_error("Unable to enable BEV");
 

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/config.cpp

@@ -141,10 +141,10 @@ bool operator==(const SockEndpoint& lhs, const SockEndpoint& rhs)
 
 namespace {
 
-/* Historically pvAccessCPP used $EPICS_PVA_CONN_TMO as the period
- * between sending CMD_ECHO.  *::Config::tcpTimeout is the actual
- * inactivity timeout period.  Apply a scaling factor to add a
- * go from one to the other.
+/* Historically pvAccessJava used $EPICS_PVA_CONN_TMO as the period
+ * between sending CMD_ECHO.  To avoid meta-stability apply a scaling
+ * factor.
+ * https://github.com/epics-base/pvAccessCPP/issues/171
  */
 constexpr double tmoScale = 4.0/3.0; // 40 second idle timeout / 30 configured
 

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/conn.cpp

@@ -39,8 +39,10 @@ ConnBase::ConnBase(bool isClient, bool sendBE, bufferevent* bev, const SockAddr&
     ,txBody(__FILE__, __LINE__, evbuffer_new())
     ,state(Holdoff)
 {
-    if(bev) // true for server connection.  client will call connect() shortly
-        connect(bev);
+    if(bev) { // true for server connection.  client will call connect() shortly
+        decltype(this->bev) temp(__FILE__, __LINE__, bev);
+        connect(std::move(temp));
+    }
 }
 
 ConnBase::~ConnBase() {}
@@ -50,30 +52,30 @@ const char* ConnBase::peerLabel() const
     return isClient ? "Server" : "Client";
 }
 
-void ConnBase::connect(bufferevent* bev)
+void ConnBase::connect(ev_owned_ptr<bufferevent> &&bev)
 {
     if(!bev)
         throw BAD_ALLOC();
     assert(!this->bev && state==Holdoff);
 
-    this->bev.reset(bev);
-
-    readahead = evsocket::get_buffer_size(bufferevent_getfd(bev), false);
+    readahead = evsocket::get_buffer_size(bufferevent_getfd(bev.get()), false);
 
 #if LIBEVENT_VERSION_NUMBER >= 0x02010000
     // allow to drain OS socket buffer in a single read
-    (void)bufferevent_set_max_single_read(bev, readahead);
+    (void)bufferevent_set_max_single_read(bev.get(), readahead);
 #endif
 
     readahead *= tcp_readahead_mult;
 
 #if LIBEVENT_VERSION_NUMBER >= 0x02010000
     // allow attempt to write as much as is available
-    (void)bufferevent_set_max_single_write(bev, EV_SSIZE_MAX);
+    (void)bufferevent_set_max_single_write(bev.get(), EV_SSIZE_MAX);
 #endif
 
     state = isClient ? Connecting : Connected;
 
+    this->bev = std::move(bev);
+
     // initially wait for at least a header
     bufferevent_setwatermark(this->bev.get(), EV_READ, 8, readahead);
 }

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/conn.h

@@ -61,7 +61,7 @@ public:
 
     bufferevent* connection() { return bev.get(); }
 
-    void connect(bufferevent* bev);
+    void connect(ev_owned_ptr<bufferevent>&& bev);
     void disconnect();
 
 protected:

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/data.cpp

@@ -1231,13 +1231,7 @@ void cache_sync(Value& cache, Value& dlt)
             dst->as<shared_array<const void>>() = src->as<shared_array<const void>>();
             break;
         case StoreType::Compound:
-        {
-            std::shared_ptr<impl::FieldStorage> sstore(Value::Helper::store(dlt),
-                                                      src);
-            auto& dfld(dst->as<Value>());
-            Value::Helper::set_desc(dfld, &desc[i]);
-            Value::Helper::store(dfld) = std::move(sstore);
-        }
+            dst->as<Value>() = src->as<Value>().clone();
             break;
         }
     }
@@ -1264,7 +1258,7 @@ void FieldStorage::init(StoreType code)
         new(&store) std::string();
         return;
     case StoreType::Compound:
-        new(&store) std::shared_ptr<FieldStorage>();
+        new(&store) Value();
         return;
     case StoreType::Array:
         new(&store) shared_array<void>();

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/dataimpl.h

@@ -47,6 +47,7 @@ struct Value::Helper {
  * copy   marked from delta -> cache
  * copy unmarked from cache -> delta
  */
+PVXS_API
 void cache_sync(Value& cache, Value& delta);
 
 namespace impl {

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/pvxs/version.h

@@ -53,9 +53,9 @@
 #  define GCC_VERSION VERSION_INT(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__, 0)
 #endif
 
-// See https://mdavidsaver.github.io/pvxs/details.html#expertapi
+// See https://epics-base.github.io/pvxs/details.html#expertapi
 #if defined(PVXS_EXPERT_API_ENABLED)
-#  error Define PVXS_ENABLE_EXPERT_API to enable usage of Expert API.  See https://mdavidsaver.github.io/pvxs/details.html#expert-apis
+#  error Define PVXS_ENABLE_EXPERT_API to enable usage of Expert API.  See https://epics-base.github.io/pvxs/details.html#expert-apis
 #elif defined(PVXS_ENABLE_EXPERT_API)
 #  define PVXS_EXPERT_API_ENABLED
 #endif

{pvxslibs-1.3.0a1 → pvxslibs-1.3.2}/src/serverconn.cpp

@@ -408,18 +408,40 @@ ServIface::ServIface(const SockAddr &addr, server::Server::Pvt *server, bool fal
     server->acceptor_loop.assertInLoop();
     auto orig_port = bind_addr.port();
 
-    sock = evsocket(bind_addr.family(), SOCK_STREAM, 0);
-
-    if(evutil_make_listen_socket_reuseable(sock.sock))
-        log_warn_printf(connsetup, "Unable to make socket reusable%s", "\n");
-
     // try to bind to requested port, then fallback to a random port
     while(true) {
+
+        sock = evsocket(bind_addr.family(), SOCK_STREAM, 0);
+
+        if(evutil_make_listen_socket_reuseable(sock.sock))
+            log_warn_printf(connsetup, "Unable to make socket reusable%s", "\n");
+
         try {
             sock.bind(bind_addr);
+            // semantics of SO_REUSEADDR on *nix allow multiple bind() to success.
+            // however, only one listen() will succeed
+
+            // added in libevent 2.1.1
+#ifndef LEV_OPT_DISABLED
+#  define LEV_OPT_DISABLED 0
+#endif
+
+            const int backlog = 4;
+            auto list(evconnlistener_new(server->acceptor_loop.base, onConnS, this, LEV_OPT_DISABLED|LEV_OPT_CLOSE_ON_EXEC, backlog, sock.sock));
+            if(!list) {
+                int err = evutil_socket_geterror(sock);
+                throw std::system_error(err, std::system_category());
+            }
+            listener = evlisten(__FILE__, __LINE__, list);
+
+            if(!LEV_OPT_DISABLED)
+                evconnlistener_disable(listener.get());
+
         } catch(std::system_error& e) {
-            if(fallback && e.code().value()==SOCK_EADDRINUSE) {
-                log_debug_printf(connsetup, "Address %s in use\n", bind_addr.tostring().c_str());
+            if(fallback && (e.code().value()==SOCK_EADDRINUSE || e.code().value()==SOCK_EACCES)) {
+                log_debug_printf(connsetup, "Address %s in use or not permitted: %s\n",
+                                 bind_addr.tostring().c_str(),
+                                 e.what());
                 bind_addr.setPort(0);
                 fallback = false;
                 continue;
@@ -438,18 +460,6 @@ ServIface::ServIface(const SockAddr &addr, server::Server::Pvt *server, bool fal
     if(orig_port && bind_addr.port() != orig_port) {
         log_warn_printf(connsetup, "Server unable to bind port %u, falling back to %s\n", orig_port, name.c_str());
     }
-
-    // added in libevent 2.1.1
-#ifndef LEV_OPT_DISABLED
-#  define LEV_OPT_DISABLED 0
-#endif
-
-    const int backlog = 4;
-    listener = evlisten(__FILE__, __LINE__,
-                        evconnlistener_new(server->acceptor_loop.base, onConnS, this, LEV_OPT_DISABLED|LEV_OPT_CLOSE_ON_EXEC, backlog, sock.sock));
-
-    if(!LEV_OPT_DISABLED)
-        evconnlistener_disable(listener.get());
 }
 
 void ServIface::onConnS(struct evconnlistener *listener, evutil_socket_t sock, struct sockaddr *peer, int socklen, void *raw)

pvxslibs-1.3.0a1/README.md

@@ -1,6 +0,0 @@
-PVXS - PVAccess protocol library
-================================
-
-VCS - https://github.com/mdavidsaver/pvxs
-
-Documentation - https://mdavidsaver.github.io/pvxs/

pvxslibs-1.3.0a1/ioc/securitylogger.h

@@ -1,45 +0,0 @@
-/*
- * Copyright - See the COPYRIGHT that is included with this distribution.
- * pvxs is distributed subject to a Software License Agreement found
- * in file LICENSE that is included with this distribution.
- *
- * Author George S. McIntyre <george@level-n.com>, 2023
- *
- */
-
-#ifndef PVXS_SECURITYLOGGER_H
-#define PVXS_SECURITYLOGGER_H
-
-#include <algorithm>
-#include <asLib.h>
-
-namespace pvxs {
-namespace ioc {
-
-class SecurityLogger {
-    void* pvt;
-public:
-    ~SecurityLogger() {
-        asTrapWriteAfterWrite(pvt);
-    }
-
-    void swap(SecurityLogger& o) {
-        std::swap(pvt, o.pvt);
-    }
-
-    explicit SecurityLogger(void* pvt)
-            :pvt(pvt) {
-    }
-
-    SecurityLogger()
-            :pvt(nullptr) {
-    }
-
-    SecurityLogger(const SecurityLogger&) = delete;
-    SecurityLogger& operator=(const SecurityLogger&) = delete;
-};
-
-} // pvxs
-} // ioc
-
-#endif //PVXS_SECURITYLOGGER_H

pvxslibs-1.3.0a1/pyproject.toml

@@ -1,2 +0,0 @@
-[build-system]
-requires = ["setuptools", "wheel", "setuptools_dso>=2.7a1", "epicscorelibs>=7.0.3.99.2.0a1"]

pvxslibs-1.3.0a1/python/pvxslibs.egg-info/requires.txt

@@ -1,2 +0,0 @@
-setuptools_dso>=2.7a1
-epicscorelibs<7.0.7.99.1,>=7.0.7.99.0.2