pvxslibs 1.4.0a3__tar.gz → 1.4.1__tar.gz

{pvxslibs-1.4.0a3/python/pvxslibs.egg-info → pvxslibs-1.4.1}/PKG-INFO

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

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/configure/CONFIG_PVXS_VERSION

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

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/ioc/pvalink.cpp

@@ -59,7 +59,7 @@ void linkGlobal_t::alloc()
     if (inUnitTest()) {
         linkGlobal->provider_remote = ioc::server().clientConfig().build();
     } else {
-        linkGlobal->provider_remote = client::Config().build();
+        linkGlobal->provider_remote = client::Config::from_env().build();
     }
 }
 

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/pyproject.toml

@@ -4,5 +4,5 @@ requires = [
 	"wheel",
 	"setuptools_dso>=2.7a1",
 	"setuptools_dso>=2.11a2; python_version >= '3.12'",
-	"epicscorelibs>=7.0.7.99.1.2a3",
+	"epicscorelibs>=7.0.7.99.1.2",
 ]

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1/python/pvxslibs.egg-info}/PKG-INFO

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

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

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/setup.py

@@ -696,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 += 'a3'
+# pvxs_ver += 'a3'
 
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as F:
     long_description = F.read()

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/client.cpp

@@ -310,16 +310,17 @@ void ResultWaiter::complete(Result&& result, bool interrupt)
     notify.signal();
 }
 
-OperationBase::OperationBase(operation_t op, const evbase& loop)
+OperationBase::OperationBase(operation_t op, const evbase& loop, const std::string &name)
     :Operation(op)
     ,loop(loop)
+    ,channelName(name)
 {}
 
 OperationBase::~OperationBase() {}
 
 const std::string& OperationBase::name()
 {
-    return chan->name;
+    return channelName;
 }
 
 Value OperationBase::wait(double timeout)
@@ -606,6 +607,9 @@ ContextImpl::ContextImpl(const Config& conf, const evbase& tcp_loop)
         nameServers.emplace_back(saddr, nullptr);
     }
 
+    if(searchDest.empty() && nameServers.empty())
+        log_err_printf(setup, "Client context created with no search destinations.  Nothing much will happen now%s", "\n");
+
     const auto cb([this](const UDPManager::Beacon& msg) {
         onBeacon(msg);
     });

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/clientdiscover.cpp

@@ -15,8 +15,8 @@ DEFINE_LOGGER(io, "pvxs.client.io");
 namespace pvxs {
 namespace client {
 
-Discovery::Discovery(const std::shared_ptr<ContextImpl> &context)
-    :OperationBase (Operation::Discover, context->tcp_loop)
+Discovery::Discovery(const std::shared_ptr<ContextImpl> &context, const std::string& name)
+    :OperationBase (Operation::Discover, context->tcp_loop, name)
     ,context(context)
 {}
 
@@ -63,7 +63,7 @@ std::shared_ptr<Operation> DiscoverBuilder::exec()
     auto context(ctx->impl->shared_from_this());
     auto ping(_ping);
 
-    auto op(std::make_shared<Discovery>(context));
+    auto op(std::make_shared<Discovery>(context, std::string()));
     op->notify = std::move(_fn);
 
     auto syncCancel(_syncCancel);

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/clientget.cpp

@@ -134,8 +134,8 @@ struct GPROp : public OperationBase
 
     INST_COUNTER(GPROp);
 
-    GPROp(operation_t op, const evbase& loop)
-        :OperationBase (op, loop)
+    GPROp(operation_t op, const evbase& loop, const std::string& name)
+        :OperationBase (op, loop, name)
     {}
     ~GPROp() {
         if(loop.assertInRunningLoop())
@@ -582,6 +582,9 @@ std::shared_ptr<Operation> gpr_setup(const std::shared_ptr<ContextImpl>& context
                                      std::shared_ptr<GPROp>&& op,
                                      bool syncCancel)
 {
+    if(name.empty())
+        throw std::logic_error("Empty channel name");
+
     auto internal(std::move(op));
     internal->internal_self = internal;
 
@@ -625,7 +628,7 @@ std::shared_ptr<Operation> GetBuilder::_exec_get()
 
     auto context(ctx->impl->shared_from_this());
 
-    auto op(std::make_shared<GPROp>(Operation::Get, context->tcp_loop));
+    auto op(std::make_shared<GPROp>(Operation::Get, context->tcp_loop, _name));
     op->setDone(std::move(_result), std::move(_onInit));
     op->autoExec = _autoexec;
     op->pvRequest = _buildReq();
@@ -640,7 +643,7 @@ std::shared_ptr<Operation> PutBuilder::exec()
 
     auto context(ctx->impl->shared_from_this());
 
-    auto op(std::make_shared<GPROp>(Operation::Put, context->tcp_loop));
+    auto op(std::make_shared<GPROp>(Operation::Put, context->tcp_loop, _name));
     op->setDone(std::move(_result), std::move(_onInit));
 
     if(_builder) {
@@ -672,7 +675,7 @@ std::shared_ptr<Operation> RPCBuilder::exec()
 
     auto context(ctx->impl->shared_from_this());
 
-    auto op(std::make_shared<GPROp>(Operation::RPC, context->tcp_loop));
+    auto op(std::make_shared<GPROp>(Operation::RPC, context->tcp_loop, _name));
     op->setDone(std::move(_result), nullptr);
     if(_argument) {
         if(!_autoexec)

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/clientimpl.h

@@ -44,6 +44,7 @@ struct ResultWaiter {
 struct OperationBase : public Operation
 {
     const evbase loop;
+    const std::string channelName;
     // remaining members only accessibly from loop worker
     std::shared_ptr<Channel> chan;
     uint32_t ioid = 0;
@@ -51,7 +52,7 @@ struct OperationBase : public Operation
     bool done = false;
     std::shared_ptr<ResultWaiter> waiter;
 
-    OperationBase(operation_t op, const evbase& loop);
+    OperationBase(operation_t op, const evbase& loop, const std::string& name);
     virtual ~OperationBase();
 
     virtual void createOp() =0;
@@ -230,7 +231,7 @@ struct Discovery final : public OperationBase
     std::function<void(const Discovered &)> notify;
     bool running = false;
 
-    Discovery(const std::shared_ptr<ContextImpl>& context);
+    Discovery(const std::shared_ptr<ContextImpl>& context, const std::string& name);
     ~Discovery();
 
     virtual bool cancel() override final;

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/clientintrospect.cpp

@@ -30,8 +30,8 @@ struct InfoOp : public OperationBase
 
     INST_COUNTER(InfoOp);
 
-    explicit InfoOp(const evbase& loop)
-        :OperationBase(Info, loop)
+    explicit InfoOp(const evbase& loop, const std::string& name)
+        :OperationBase(Info, loop, name)
     {}
 
     virtual ~InfoOp()
@@ -184,10 +184,12 @@ std::shared_ptr<Operation> GetBuilder::_exec_info()
         throw std::logic_error("NULL Builder");
     if(!_autoexec)
         throw std::logic_error("autoExec(false) not possible for info()");
+    if(_name.empty())
+        throw std::logic_error("Empty channel name");
 
     auto context(ctx->impl->shared_from_this());
 
-    auto op(std::make_shared<InfoOp>(context->tcp_loop));
+    auto op(std::make_shared<InfoOp>(context->tcp_loop, _name));
     if(_result) {
         op->done = std::move(_result);
     } else {

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/clientmon.cpp

@@ -33,9 +33,6 @@ struct Entry {
 
 struct SubscriptionImpl final : public OperationBase, public Subscription
 {
-    // for use in log messages, even after cancel()
-    std::string channelName;
-
     evevent ackTick;
 
     // const after exec()
@@ -75,8 +72,8 @@ struct SubscriptionImpl final : public OperationBase, public Subscription
 
     INST_COUNTER(SubscriptionImpl);
 
-    explicit SubscriptionImpl(const evbase& loop)
-        :OperationBase (Operation::Monitor, loop)
+    explicit SubscriptionImpl(const evbase& loop, const std::string& name)
+        :OperationBase (Operation::Monitor, loop, name)
         ,ackTick(__FILE__, __LINE__,
                  event_new(loop.base, -1, EV_TIMEOUT, &tickAckS, this))
     {}
@@ -742,12 +739,13 @@ std::shared_ptr<Subscription> MonitorBuilder::exec()
 {
     if(!ctx)
         throw std::logic_error("NULL Builder");
+    if(_name.empty())
+        throw std::logic_error("Empty channel name");
 
     auto context(ctx->impl->shared_from_this());
 
-    auto op(std::make_shared<SubscriptionImpl>(context->tcp_loop));
+    auto op(std::make_shared<SubscriptionImpl>(context->tcp_loop, _name));
     op->self = op;
-    op->channelName = std::move(_name);
     op->event = std::move(_event);
     op->onInit = std::move(_onInit);
     op->pvRequest = _buildReq();

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/evhelper.cpp

@@ -698,6 +698,7 @@ bool evsocket::init_canIPv6() noexcept
 #endif
 
 struct IfMapDaemon : private epicsThreadRunable {
+    SockAttach attach;
     epicsMutex lock;
     epicsEvent wake;
     std::shared_ptr<const IfaceMap::Current> latest;

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/pvxs/client.h

@@ -116,7 +116,10 @@ struct PVXS_API Operation {
     Operation& operator=(const Operation&) = delete;
     virtual ~Operation() =0;
 
-    //! PV name
+    /** PV name
+     *
+     * Returned reference is valid for the lifetime of the Operation
+     */
     virtual const std::string& name() =0;
 
     //! Explicitly cancel a pending operation.

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/pvxs/srvcommon.h

@@ -93,12 +93,12 @@ public:
     virtual ~OpBase() =0;
 };
 //! Log to remote peer
-//! @since UNRELEASED
+//! @since 1.4.0
 struct PVXS_API RemoteLogger {
     virtual ~RemoteLogger() =0;
 
     //! Request log message to peer
-    //! @since UNRELEASED
+    //! @since 1.4.0
     virtual void logRemote(Level lvl, const std::string& msg) =0;
 };
 

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/server.cpp

@@ -165,8 +165,9 @@ client::Config Server::clientConfig() const
     ret.udp_port = pvt->effective.udp_port;
     ret.tcp_port = pvt->effective.tcp_port;
     ret.interfaces = pvt->effective.interfaces;
-    ret.addressList = pvt->effective.interfaces;
-    ret.autoAddrList = false;
+    ret.addressList = pvt->effective.beaconDestinations;
+    ret.autoAddrList = pvt->effective.auto_beacon;
+    // pvt->effective.ignoreAddrs; no equivalent with client config
 
     return ret;
 }

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/serverget.cpp

@@ -88,8 +88,9 @@ struct ServerGPR final : public ServerOp
 
                 if(state==Executing)
                     state = Idle;
+
                 else // Creating
-                    state = Dead;
+                    cleanup();
 
             } else if(state==Creating) {
                 // connect()
@@ -108,7 +109,11 @@ struct ServerGPR final : public ServerOp
                     if(value)
                         to_wire_full(R, value);
                 }
-                state = lastRequest ? Dead : Idle;
+                if(lastRequest) {
+                    cleanup();
+                } else {
+                    state = Idle;
+                }
 
             } else {
                 assert(false);
@@ -117,10 +122,6 @@ struct ServerGPR final : public ServerOp
         }
 
         ch->statTx += conn->enqueueTxBody(cmd);
-
-        if(state == ServerOp::Dead) {
-            cleanup();
-        }
     }
 
     void cleanup() override final

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/servermon.cpp

@@ -59,6 +59,8 @@ struct MonitorOp final : public ServerOp
     // is doReply() scheduled to run
     bool scheduled=false;
     bool pipeline=false; // const after setup
+    // set until first update queued
+    bool first=true;
     // finish() called
     bool finished=false;
     size_t window=0u, limit=4u;
@@ -128,7 +130,11 @@ struct MonitorOp final : public ServerOp
         uint8_t subcmd = 0u;
         if(self->state==Creating) {
             subcmd = 0x08;
-            self->state = self->type ? Idle : Dead;
+            if(self->type) {
+                self->state = Idle;
+            } else {
+                self->cleanup();
+            }
 
         } else if(self->state==Executing) {
             if(self->queue.empty() || (self->pipeline && !self->window && !self->finished)) {
@@ -138,7 +144,7 @@ struct MonitorOp final : public ServerOp
 
             } else if(!self->queue.front()) {
                 subcmd = 0x10;
-                self->state = Dead;
+                self->cleanup();
                 log_debug_printf(connio, "Client %s IOID %u finishes\n",
                                  conn->peerName.c_str(), unsigned(self->ioid));
             }
@@ -177,7 +183,6 @@ struct MonitorOp final : public ServerOp
         ch->statTx += conn->enqueueTxBody(pva_app_msg_t::CMD_MONITOR);
 
         if(self->state == ServerOp::Dead) {
-            self->cleanup();
             return;
         }
 
@@ -250,7 +255,11 @@ struct ServerMonitorControl : public server::MonitorControlOp
             throw std::logic_error("Type change not allowed in post().  Recommend pvxs::Value::cloneEmpty()");
 
         // pvMask is const at this point, so no need to lock
-        bool real = testmask(val, mon->pvMask);
+        bool real = mon->first; // always post through first update
+        if(real)
+            mon->first = false;
+        else
+            real = testmask(val, mon->pvMask); // consider mask for subsequent updates
 
         Guard G(mon->lock);
         if(mon->finished)
@@ -533,7 +542,7 @@ void ServerConn::handle_MONITOR()
 
         if(op->pipeline) {
             if(!nack) {
-                // before UNRELEASED initial nack=0 clamped the window size to zero!
+                // before 1.4.0 initial nack=0 clamped the window size to zero!
                 log_err_printf(connsetup,
                                "Client %s \"%s\" pipeline monitor w/o initial nack incompatible\n",
                                peerName.c_str(), chan->name.c_str());

{pvxslibs-1.4.0a3 → pvxslibs-1.4.1}/src/util.cpp

@@ -716,9 +716,10 @@ std::ostream& operator<<(std::ostream& strm, const SockAddr& addr)
 
 GetAddrInfo::GetAddrInfo(const char *name)
 {
-    evutil_addrinfo hints = {};
-    hints.ai_flags = EVUTIL_AI_NUMERICHOST;
-    if(auto err = evutil_getaddrinfo(name, nullptr, &hints, &info)) {
+    // evutil_getaddrinfo() wrapper implicitly expects result pointer to be zerod
+    // when applying various compatibility "hacks" on some targets.
+    info = nullptr;
+    if(auto err = evutil_getaddrinfo(name, nullptr, nullptr, &info)) {
         throw std::runtime_error(SB()<<"Error resolving \""<<escape(name)<<"\" : "<<evutil_gai_strerror(err));
     }
 }

pvxslibs-1.4.0a3/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.2a3