pvxslibs 1.3.2a1__tar.gz → 1.3.3a1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pvxslibs
-Version: 1.3.2a1
+Version: 1.3.3a1
 Summary: PVXS libraries packaged for python
 Home-page: https://epics-base.github.io/pvxs
 Author: Michael Davidsaver

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

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

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/ioc/groupconfigprocessor.cpp

@@ -225,7 +225,7 @@ void GroupConfigProcessor::defineFields(GroupDefinition& groupDefinition, const
         }
 
         if(fieldName.empty() && fieldConfig.info.type!=MappingInfo::Meta) {
-            fprintf(stderr, "%s.%s Error: only +type:\"meta\" map be mapped at struct top\n",
+            fprintf(stderr, "%s.%s Error: only +type:\"meta\" can be mapped at struct top\n",
                     groupName.c_str(), fieldName.c_str());
             continue;
         }

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/ioc/groupprocessorcontext.cpp

@@ -33,8 +33,7 @@ void GroupProcessorContext::assign(const Value& value) {
             groupPvConfig.structureId = value.as<std::string>();
 
         } else {
-            groupConfigProcessor->groupProcessingWarnings += "Unknown group option ";
-            groupConfigProcessor->groupProcessingWarnings += field;
+            groupConfigProcessor->groupProcessingWarnings += SB()<<"Unknown group option: \""<<field<<"\"\n";
         }
         field.clear();
 
@@ -59,7 +58,7 @@ void GroupProcessorContext::assign(const Value& value) {
             } else if(tname == "const") {
                 type = MappingInfo::Const;
             } else {
-                groupConfigProcessor->groupProcessingWarnings += SB()<<"Unknown mapping +type:\""<<tname<<"\" ignored";
+                groupConfigProcessor->groupProcessingWarnings += SB()<<"Unknown mapping +type:\""<<tname<<"\" ignored\n";
             }
             groupField.info.type = type;
 
@@ -82,8 +81,7 @@ void GroupProcessorContext::assign(const Value& value) {
             groupField.info.cval = value;
 
         } else {
-            groupConfigProcessor->groupProcessingWarnings += "Unknown group field option ";
-            groupConfigProcessor->groupProcessingWarnings += field + ":" + key;
+            groupConfigProcessor->groupProcessingWarnings += SB()<<"Unknown group field option: \""<<field<<":"<<key<<"\"\n";
         }
         key.clear();
     }

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/ioc/groupsource.cpp

@@ -159,7 +159,7 @@ void GroupSource::onOp(Group& group,
     });
 
     // Make a security cache for this client's connection to this group
-    // Each time the same client calls put we will re-use the cached security client
+    // Each time the same client calls put we will reuse the cached security client
     // The security cache will be deleted when the client disconnects from this group pv
     auto securityCache = std::make_shared<GroupSecurityCache>();
 

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/ioc/groupsourcehooks.cpp

@@ -16,6 +16,8 @@
 #include <iocsh.h>
 
 #include <initHooks.h>
+#include <iocInit.h>
+#include <dbAccess.h>
 
 #include <pvxs/source.h>
 #include <pvxs/iochooks.h>
@@ -28,6 +30,9 @@
 #if EPICS_VERSION_INT < VERSION_INT(7, 0, 3, 1)
 #  define iocshSetError(ret) do { (void)ret; }while(0)
 #endif
+#ifndef ERL_ERROR
+#  define ERL_ERROR "ERROR"
+#endif
 
 // include last to avoid clash of #define printf with other headers
 #include <epicsStdio.h>
@@ -42,7 +47,6 @@ namespace ioc {
 static
 void dbLoadGroupCmd(const char* jsonFileName, const char *macros) {
     iocshSetError(!!dbLoadGroup(jsonFileName, macros));
-    GroupConfigProcessor().loadConfigFiles();
 }
 
 /**
@@ -96,6 +100,30 @@ const auto dbLoadGroupMsg =
 
 long dbLoadGroup(const char* jsonFilename, const char* macros) {
     try {
+        /* getIocState() introduced to the 3.15 branch in R3.15.8
+         *                                 7.0 branch in R7.0.4
+         */
+#if EPICS_VERSION_INT >= VERSION_INT(7, 0, 4, 0) \
+    || (EPICS_VERSION_INT < VERSION_INT(7, 0, 0, 0) && EPICS_VERSION_INT >= VERSION_INT(3, 15, 8, 0))
+        if(getIocState() != iocVoid)
+        {
+            fprintf(stderr,
+                    ERL_ERROR " dbLoadGroup() not allowed in current IOC state (%d).\n"
+                    "              Hint: Move before iocInit()\n",
+                    getIocState()
+                    );
+            return 1;
+        }
+#else
+        if(interruptAccept)
+        {
+            fprintf(stderr,
+                    ERL_ERROR " dbLoadGroup() not allowed in current IOC state.\n"
+                    "              Hint: Move before iocInit()\n");
+            return 1;
+        }
+#endif
+
         if (!jsonFilename || !jsonFilename[0]) {
             fprintf(stderr, "%s\n"
                             "Error: Missing required JSON filename\n", dbLoadGroupMsg);

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/ioc/pvalink_lset.cpp

@@ -85,7 +85,7 @@ void pvaOpenLink(DBLINK *plink) noexcept
             linkGlobal_t::channels_t::iterator it(linkGlobal->channels.find(key));
 
             if(it!=linkGlobal->channels.end()) {
-                // re-use existing channel
+                // reuse existing channel
                 chan = it->second.lock();
             }
 

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/ioc/qsrvpvt.h

@@ -40,7 +40,7 @@ static inline void resetGroups() {}
 #if EPICS_VERSION_INT >= VERSION_INT(7, 0, 4, 0)
 #  define USE_DEINIT_HOOKS
 #endif
-#if EPICS_VERSION_INT > VERSION_INT(7, 0, 7, 0)
+#if EPICS_VERSION_INT >= VERSION_INT(7, 0, 8, 0)
 #  define USE_PREPARE_CLEANUP_HOOKS
 #endif
 

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/ioc/singlesource.cpp

@@ -304,7 +304,7 @@ void onOp(const std::shared_ptr<SingleInfo>& sInfo, const Value& valuePrototype,
             });
 
     // Make a security cache for this client's connection to this pv
-    // Each time the same client calls put we will re-use the cached security client
+    // Each time the same client calls put we will reuse the cached security client
     // The security cache will be deleted when the client disconnects from this pv
     auto putOperationCache = std::make_shared<PutOperationCache>();
 

pvxslibs-1.3.3a1/pyproject.toml

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

pvxslibs-1.3.3a1/python/pvxslibs/ioc.py

@@ -0,0 +1,10 @@
+import os
+
+from epicscorelibs import ioc
+import pvxslibs.path
+
+if __name__ == "__main__":
+    os.environ.setdefault("PVXS_QSRV_ENABLE", "YES")
+    pvxs_dbd_load = (("pvxsIoc.dbd", pvxslibs.path.dbd_path), )
+    pvxs_dso_load = ("pvxslibs.lib.pvxsIoc", )
+    ioc.main(extra_dbd_load=pvxs_dbd_load, extra_dso_load=pvxs_dso_load)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pvxslibs
-Version: 1.3.2a1
+Version: 1.3.3a1
 Summary: PVXS libraries packaged for python
 Home-page: https://epics-base.github.io/pvxs
 Author: Michael Davidsaver

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/python/pvxslibs.egg-info/SOURCES.txt

@@ -178,6 +178,7 @@ ioc/typeutils.h
 ioc/yajlcallbackhandler.h
 ioc/pvxs/iochooks.h
 python/pvxslibs/__init__.py
+python/pvxslibs/ioc.py
 python/pvxslibs/path.py
 python/pvxslibs/version.py
 python/pvxslibs.egg-info/PKG-INFO

pvxslibs-1.3.3a1/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.2a1

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

@@ -798,7 +798,7 @@ void ContextImpl::onBeacon(const UDPManager::Beacon& msg)
     cur.guid = msg.guid;
     cur.peerVersion = msg.peerVersion;
     cur.time = now;
-    // don't trigger if sender changes as server (mis)configuration
+    // don't trigger if sender changes as server configuration
     // could see beacons reach us from multiple interfaces.
     cur.sender = msg.src;
 
@@ -904,6 +904,7 @@ void procSearchReply(ContextImpl& self, const SockAddr& src, uint8_t peerVersion
             chan->conn = Connection::build(self.shared_from_this(), serv);
 
             chan->conn->pending[chan->cid] = chan;
+            chan->nSearch = 0u;
             chan->state = Channel::Connecting;
 
             chan->conn->createChannels();
@@ -1145,37 +1146,42 @@ void ContextImpl::tickSearch(SearchKind kind, bool poked)
             to_wire(H, Header{CMD_SEARCH, 0, uint32_t(consumed-8u)});
         }
         for(auto& pair : searchDest) {
-            auto& dest = pair.first.addr.family()==AF_INET ? searchTx4 : searchTx6;
+            auto& dest = pair.dest.addr.family()==AF_INET ? searchTx4 : searchTx6;
 
-            if(pair.second) {
+            if(pair.isucast) {
                 *pflags |= pva_search_flags::Unicast;
 
             } else {
                 *pflags &= ~pva_search_flags::Unicast;
 
-                dest.mcast_prep_sendto(pair.first);
+                dest.mcast_prep_sendto(pair.dest);
             }
 
             int ntx = sendto(dest.sock, (char*)searchMsg.data(), consumed, 0,
-                             &pair.first.addr->sa, pair.first.addr.size());
+                             &pair.dest.addr->sa, pair.dest.addr.size());
 
             if(ntx<0) {
                 int err = evutil_socket_geterror(dest.sock);
                 auto lvl = Level::Warn;
-                if(err==EINTR || err==EPERM)
+                if(err==EINTR || err==EPERM || !pair.lastSuccess)
                     lvl = Level::Debug;
                 log_printf(io, lvl, "Search tx %s error (%d) %s\n",
-                           pair.first.addr.tostring().c_str(), err, evutil_socket_error_to_string(err));
+                           pair.dest.addr.tostring().c_str(), err, evutil_socket_error_to_string(err));
+                pair.lastSuccess = false;
 
             } else if(unsigned(ntx)<consumed) {
-                log_warn_printf(io, "Search truncated %u < %u",
+                log_warn_printf(io, "Search tx truncated %u < %u",
                            unsigned(ntx), unsigned(consumed));
 
             } else {
-                log_hex_printf(io, Level::Debug, (char*)searchMsg.data(), consumed,
-                               "Search to %s %s\n",
-                               std::string(SB()<<pair.first).c_str(),
-                               pair.second ? "ucast" : "bcast");
+                auto lvl = Level::Info;
+                if(pair.lastSuccess)
+                    lvl = Level::Debug;
+                log_hex_printf(io, lvl, (char*)searchMsg.data(), consumed,
+                               "Search tx %s %s\n",
+                               std::string(SB()<<pair.dest).c_str(),
+                               pair.isucast ? "ucast" : "bcast");
+                pair.lastSuccess = true;
             }
         }
         *pflags |= 0x80; // TCP search is always "unicast"

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

@@ -71,8 +71,16 @@ void Connection::startConnecting()
     timeval tmo(totv(context->effective.tcpTimeout));
     bufferevent_set_timeouts(bev.get(), &tmo, &tmo);
 
-    if(bufferevent_socket_connect(bev.get(), const_cast<sockaddr*>(&peerAddr->sa), peerAddr.size()))
-        throw std::runtime_error("Unable to begin connecting");
+    if(bufferevent_socket_connect(bev.get(), const_cast<sockaddr*>(&peerAddr->sa), peerAddr.size())) {
+        // non-blocking connect() failed immediately.
+        // try to defer notification.
+        state = Disconnected;
+        constexpr timeval immediate{0, 0};
+        if(event_add(echoTimer.get(), &immediate))
+            throw std::runtime_error(SB()<<"Unable to begin connecting or schedule deferred notification "<<peerName);
+        log_warn_printf(io, "Unable to connect() to %s\n", peerName.c_str());
+        return;
+    }
 
     connect(std::move(bev));
 
@@ -480,6 +488,11 @@ void Connection::tickEcho()
 
         startConnecting();
 
+    }else if(state==Disconnected) {
+        // deferred notification of early connect() failure.
+        // TODO: avoid a misleading "closed by peer" error
+        bevEvent(BEV_EVENT_EOF);
+
     } else {
         log_debug_printf(io, "Server %s ping\n", peerName.c_str());
 

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/src/clientimpl.h

@@ -86,6 +86,7 @@ struct Connection final : public ConnBase, public std::enable_shared_from_this<C
 
     // While HoldOff, the time until re-connection
     // While Connected, periodic Echo
+    // After early connect() failure, deferred notification
     const evevent echoTimer;
 
     bool ready = false;
@@ -288,7 +289,14 @@ struct ContextImpl : public std::enable_shared_from_this<ContextImpl>
     std::vector<uint8_t> searchMsg;
 
     // search destination address and whether to set the unicast flag
-    std::vector<std::pair<SockEndpoint, bool>> searchDest;
+    struct SearchDest {
+        const SockEndpoint dest;
+        const bool isucast;
+        bool lastSuccess = true;
+        SearchDest(SockEndpoint dest, bool isu) :dest(dest), isucast(isu) {}
+    };
+
+    std::vector<SearchDest> searchDest;
 
     size_t currentBucket = 0u;
     // Channels where we have yet to send out an initial search request

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/src/clientmon.cpp

@@ -242,7 +242,7 @@ struct SubscriptionImpl final : public OperationBase, public Subscription
         loop.call([this, &ret](){
             // really on worker
 
-            // try to re-use already wrapped
+            // try to reuse already wrapped
             ret = external_internal.lock();
             if(!ret) {
                 // nope, need to build a fresh one

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/src/datafmt.cpp

@@ -133,19 +133,22 @@ struct FmtTree {
         case TypeCode::Bool:
             strm<<(fld.as<bool>() ? "true" : "false");
             return;
-#define CASE(ENUM, TYPE) \
-        case TypeCode::ENUM : strm<<fld.as<TYPE>(); return
-            CASE(Int8, int8_t);
-            CASE(Int16, int16_t);
-            CASE(Int32, int32_t);
-            CASE(Int64, int64_t);
-            CASE(UInt8, uint8_t);
-            CASE(UInt16, uint16_t);
-            CASE(UInt32, uint32_t);
-            CASE(UInt64, uint64_t);
-            CASE(Float32, float);
-            CASE(Float64, double);
-#undef CASE
+        case TypeCode::Int8:
+        case TypeCode::Int16:
+        case TypeCode::Int32:
+        case TypeCode::Int64:
+            strm<<fld.as<int64_t>();
+            return;
+        case TypeCode::UInt8:
+        case TypeCode::UInt16:
+        case TypeCode::UInt32:
+        case TypeCode::UInt64:
+            strm<<fld.as<uint64_t>();
+            return;
+        case TypeCode::Float32:
+        case TypeCode::Float64:
+            strm<<fld.as<double>();
+            return;
         case TypeCode::String:
             strm<<"\""<<escape(fld.as<std::string>())<<"\"";
             return;

{pvxslibs-1.3.2a1 → pvxslibs-1.3.3a1}/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.2a1/pyproject.toml

@@ -1,2 +0,0 @@
-[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.2a1/python/pvxslibs.egg-info/requires.txt

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