pvxslibs 1.3.3a1__tar.gz → 1.4.0a1__tar.gz

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

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

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

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

{pvxslibs-1.3.3a1 → pvxslibs-1.4.0a1}/ioc/credentials.cpp

@@ -24,13 +24,13 @@ namespace ioc {
  */
 
 Credentials::Credentials(const server::ClientCredentials& clientCredentials) {
-    // Extract host name part (or whole thing if no colon present)
-    auto pos = clientCredentials.peer.find_first_of(':');
-    host = clientCredentials.peer.substr(0, pos);
+    SockAddr addr(clientCredentials.peer);
+    addr.setPort(0);
+    host = std::string(SB()<<addr.map6to4());
 
     // "ca" style credentials
     if (clientCredentials.method == "ca") {
-        pos = clientCredentials.account.find_last_of('/');
+        auto pos = clientCredentials.account.find_last_of('/');
         if (pos == std::string::npos) {
             cred.emplace_back(clientCredentials.account);
         } else {

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

@@ -179,7 +179,7 @@ void GroupSource::onOp(Group& group,
                         fieldIndex++;
                     }
                     auto& pvRequest = putOperation->pvRequest();
-                    IOCSource::setForceProcessingFlag(pvRequest, securityCache);
+                    IOCSource::setForceProcessingFlag(putOperation.get(), pvRequest, securityCache);
                     securityCache->done = true;
                 }
 

{pvxslibs-1.3.3a1 → pvxslibs-1.4.0a1}/ioc/iocsource.cpp

@@ -426,32 +426,27 @@ void IOCSource::doPostProcessing(dbChannel* pDbChannel, TriState forceProcessing
  * @param pvRequest the request
  * @param securityControlObject the security control object to update
  */
-void IOCSource::setForceProcessingFlag(const Value& pvRequest,
+void IOCSource::setForceProcessingFlag(server::RemoteLogger *op, const Value& pvRequest,
                                        const std::shared_ptr<SecurityControlObject>& securityControlObject)
 {
     auto proc = pvRequest["record._options.process"];
-    switch(proc.type().code) {
-    case TypeCode::String: {
-        auto val(proc.as<std::string>());
-        if (val == "true") {
-            securityControlObject->forceProcessing = True;
-        } else if (val == "false") {
-            securityControlObject->forceProcessing = False;
-        } else if (val == "passive") {
+    bool b;
+    std::string s;
+    if(!proc) {
+        return; // not provided
+
+    } else if(proc.as(b)) { // actual bool, integer, or string parsable to bool
+        securityControlObject->forceProcessing = b ? True : False;
+        return;
+
+    } else if(proc.as(s)) {
+        if(s=="passive") {
             securityControlObject->forceProcessing = Unset;
-        } else {
-            log_warn_printf(_log, "Ignoring unsupported record._options.process='%s'", val.c_str());
+            return;
         }
-        break;
-    }
-    case TypeCode::Bool:
-        securityControlObject->forceProcessing = proc.as<bool>() ? True : False;
-        break;
-    default:
-        log_warn_printf(_log, "Ignoring unsupported record._options.process type %s", proc.type().name());
-    case TypeCode::Null:
-        break;
     }
+    // oops, unsupported type or unexpected value
+    op->logRemote(Level::Warn, SB()<<"Ignoring unsupported "<<pvRequest.nameOf(proc)<<": "<<proc);
 }
 
 static

{pvxslibs-1.3.3a1 → pvxslibs-1.4.0a1}/ioc/iocsource.h

@@ -62,7 +62,9 @@ public:
     // Utility function to get the TypeCode that the given database channel is configured for
     static TypeCode getChannelValueType(const Channel &pDbChannel, bool errOnLinks = false);
     static void
-    setForceProcessingFlag(const Value& pvRequest, const std::shared_ptr<SecurityControlObject>& securityControlObject);
+    setForceProcessingFlag(server::RemoteLogger *op,
+                           const Value& pvRequest,
+                           const std::shared_ptr<SecurityControlObject>& securityControlObject);
 };
 
 struct CurrentOp {

{pvxslibs-1.3.3a1 → pvxslibs-1.4.0a1}/ioc/pvalink.h

@@ -224,6 +224,7 @@ struct pvaLink final : public pvaLinkConfig
     dbfType type = (dbfType)-1;
 
     DBLINK * plink = nullptr;
+    const char *pfieldname = nullptr;
 
     std::shared_ptr<pvaLinkChannel> lchan;
 

{pvxslibs-1.3.3a1 → pvxslibs-1.4.0a1}/ioc/pvalink_jlif.cpp

@@ -6,6 +6,8 @@
 
 #include <sstream>
 
+#include <pvxs/log.h>
+#include "qsrvpvt.h"
 #include "pvalink.h"
 
 #include <epicsStdio.h> // redirects stdout/stderr
@@ -17,6 +19,8 @@ pvaLinkConfig::~pvaLinkConfig() {}
 
 namespace {
 
+DEFINE_LOGGER(logj, "pvxs.ioc.link.parse");
+
 /* link options.
  *
  * "pvname" # short-hand, sets PV name only
@@ -73,8 +77,8 @@ jlif_result pva_parse_null(jlink *pjlink) noexcept
             pvt->sevr = pvaLinkConfig::NMS;
         } else if(pvt->jkey == "local") {
             pvt->local = false; // alias for local:false
-        } else if(pvt->debug) {
-            printf("pva link parsing unknown none depth=%u key=\"%s\"\n",
+        } else {
+            log_warn_printf(logj, "pva link parsing unknown none depth=%u key=\"%s\"\n",
                    pvt->parseDepth, pvt->jkey.c_str());
         }
 
@@ -107,8 +111,8 @@ jlif_result pva_parse_bool(jlink *pjlink, int val) noexcept
             pvt->always = !!val;
         } else if(pvt->jkey == "atomic") {
             pvt->atomic = !!val;
-        } else if(pvt->debug) {
-            printf("pva link parsing unknown integer depth=%u key=\"%s\" value=%s\n",
+        } else {
+            log_warn_printf(logj, "pva link parsing unknown integer depth=%u key=\"%s\" value=%s\n",
                    pvt->parseDepth, pvt->jkey.c_str(), val ? "true" : "false");
         }
 
@@ -126,8 +130,8 @@ jlif_result pva_parse_integer(jlink *pjlink, long long val) noexcept
             pvt->queueSize = val < 1 ? 1 : size_t(val);
         } else if(pvt->jkey == "monorder") {
             pvt->monorder = std::max(-1024, std::min(int(val), 1024));
-        } else if(pvt->debug) {
-            printf("pva link parsing unknown integer depth=%u key=\"%s\" value=%lld\n",
+        } else {
+            log_warn_printf(logj, "pva link parsing unknown integer depth=%u key=\"%s\" value=%lld\n",
                    pvt->parseDepth, pvt->jkey.c_str(), val);
         }
 
@@ -160,8 +164,8 @@ jlif_result pva_parse_string(jlink *pjlink, const char *val, size_t len) noexcep
                 pvt->proc = pvaLinkConfig::PP;
             } else if(sval=="NPP") {
                 pvt->proc = pvaLinkConfig::NPP;
-            } else if(pvt->debug) {
-                printf("pva link parsing unknown proc depth=%u key=\"%s\" value=\"%s\"\n",
+            } else {
+                log_warn_printf(logj, "pva link parsing unknown proc depth=%u key=\"%s\" value=\"%s\"\n",
                        pvt->parseDepth, pvt->jkey.c_str(), sval.c_str());
             }
 
@@ -177,13 +181,13 @@ jlif_result pva_parse_string(jlink *pjlink, const char *val, size_t len) noexcep
                 // leave room for this to happen compatibly later by
                 // handling as alias for MS until then.
                 pvt->sevr = pvaLinkConfig::MS;
-            } else if(pvt->debug) {
-                printf("pva link parsing unknown sevr depth=%u key=\"%s\" value=\"%s\"\n",
+            } else {
+                log_warn_printf(logj, "pva link parsing unknown sevr depth=%u key=\"%s\" value=\"%s\"\n",
                        pvt->parseDepth, pvt->jkey.c_str(), sval.c_str());
             }
 
-        } else if(pvt->debug) {
-            printf("pva link parsing unknown string depth=%u key=\"%s\" value=\"%s\"\n",
+        } else {
+            log_warn_printf(logj, "pva link parsing unknown string depth=%u key=\"%s\" value=\"%s\"\n",
                    pvt->parseDepth, pvt->jkey.c_str(), sval.c_str());
         }
 

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

@@ -7,6 +7,7 @@
 #include <epicsString.h>
 #include <alarm.h>
 #include <recGbl.h>
+#include <dbLink.h>
 
 #include <pvxs/log.h>
 #include "dbentry.h"
@@ -17,6 +18,26 @@
 
 DEFINE_LOGGER(_logger, "pvxs.ioc.link.lset");
 
+#if EPICS_VERSION_INT <= VERSION_INT(3, 16, 1, 0)
+static
+const char * dbLinkFieldName(const struct link *plink)
+{
+    const struct dbCommon *precord = plink->precord;
+    const dbRecordType *pdbRecordType = precord->rdes;
+    dbFldDes * const *papFldDes = pdbRecordType->papFldDes;
+    const short *link_ind = pdbRecordType->link_ind;
+    int i;
+
+    for (i = 0; i < pdbRecordType->no_links; i++) {
+        const dbFldDes *pdbFldDes = papFldDes[link_ind[i]];
+
+        if (plink == (DBLINK *)((char *)precord + pdbFldDes->offset))
+            return pdbFldDes->name;
+    }
+    return "????";
+}
+#endif
+
 namespace pvxs {
 namespace ioc {
 namespace {
@@ -70,6 +91,7 @@ void pvaOpenLink(DBLINK *plink) noexcept
         // also, no pvaLinkChannel::lock yet
 
         self->plink = plink;
+        self->pfieldname = dbLinkFieldName(plink);
 
         if(self->channelName.empty())
             return; // nothing to do...
@@ -241,7 +263,8 @@ long pvaGetValue(DBLINK *plink, short dbrType, void *pbuffer, long *pnRequest) n
 
         if(!self->valid()) {
             // disconnected
-            (void)recGblSetSevr(plink->precord, LINK_ALARM, INVALID_ALARM);
+            (void)recGblSetSevrMsg(plink->precord, LINK_ALARM, INVALID_ALARM, "%s Disconn",
+                                   self->pfieldname);
             if(self->time) {
                 plink->precord->time = self->snap_time;
             }
@@ -252,7 +275,7 @@ long pvaGetValue(DBLINK *plink, short dbrType, void *pbuffer, long *pnRequest) n
         auto nReq(pnRequest ? *pnRequest : 1);
         auto value(self->fld_value);
 
-        if(value.type()==TypeCode::Any)
+        if(value.type()==TypeCode::Any || value.type()==TypeCode::Union)
             value = value.lookup("->");
 
         if(nReq <= 0 || !value) {
@@ -397,15 +420,16 @@ long pvaGetValue(DBLINK *plink, short dbrType, void *pbuffer, long *pnRequest) n
         {
             log_debug_printf(_logger, "%s: %s recGblSetSevr %d\n", __func__, plink->precord->name,
                              self->snap_severity);
-            recGblSetSevr(plink->precord, LINK_ALARM, self->snap_severity);
+            recGblSetSevrMsg(plink->precord, LINK_ALARM, self->snap_severity,
+                             "%s", self->snap_message.c_str());
         }
 
         if(self->time) {
             plink->precord->time = self->snap_time;
         }
 
-        log_debug_printf(_logger, "%s: %s %s snapsevr=%d OK\n", __func__, plink->precord->name,
-                         self->channelName.c_str(), self->snap_severity);
+        log_debug_printf(_logger, "%s: %s %s snapalrm=%d,\"%s\" OK\n", __func__, plink->precord->name,
+                         self->channelName.c_str(), self->snap_severity, self->snap_message.c_str());
         return 0;
     }CATCH()
     return -1;

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

@@ -75,14 +75,18 @@ void subscriptionValueCallback(void* userArg, struct dbChannel* pChannel,
                                int, struct db_field_log* pDbFieldLog) noexcept {
     auto subscriptionContext = (SingleSourceSubscriptionCtx*)userArg;
     subscriptionContext->hadValueEvent = true;
-    auto change = UpdateType::type(UpdateType::Value | UpdateType::Alarm);
+    auto change = subscriptionContext->pValueEventSubscription.mask;
 #if EPICS_VERSION_INT >= VERSION_INT(7, 0, 6, 0)
     if(pDbFieldLog) {
         // when available, use DBE mask from db_field_log
-        change = UpdateType::type(pDbFieldLog->mask & UpdateType::Everything);
+        change = pDbFieldLog->mask;
     }
 #endif
-    subscriptionCallback(subscriptionContext, change, pChannel, pDbFieldLog);
+    // ARCHIVE events will get the same data fields as VALUE
+    if(change & DBE_ARCHIVE)
+        change = (change&~DBE_ARCHIVE)|DBE_VALUE;
+    change &= UpdateType::Everything; // does not include DBE_ARCHIVE
+    subscriptionCallback(subscriptionContext, UpdateType::type(change), pChannel, pDbFieldLog);
 }
 
 void subscriptionPropertiesCallback(void* userArg, struct dbChannel* pChannel, int,
@@ -116,6 +120,10 @@ void onSubscribe(const std::shared_ptr<SingleSourceSubscriptionCtx>& subscriptio
             CASE(ALARM);
 //            CASE(PROPERTY); // handled as special case
 #undef CASE
+            if(!dbe && !mask.empty()) {
+                subscriptionOperation->logRemote(Level::Warn,
+                                                 SB()<<pvReq.nameOf(fld)<<"=\""<<mask<<"\" selects empty mask");
+            }
             break;
         }
         case Kind::Integer:
@@ -325,7 +333,7 @@ void onOp(const std::shared_ptr<SingleInfo>& sInfo, const Value& valuePrototype,
 
                         auto& pvRequest = putOperation->pvRequest();
                         pvRequest["record._options.block"].as<bool>(putOperationCache->doWait);
-                        IOCSource::setForceProcessingFlag(pvRequest, putOperationCache);
+                        IOCSource::setForceProcessingFlag(putOperation.get(), pvRequest, putOperationCache);
                         if (putOperationCache->forceProcessing) {
                             putOperationCache->doWait = false; // no point in waiting
                         }

{pvxslibs-1.3.3a1 → pvxslibs-1.4.0a1}/ioc/subscriptionctx.h

@@ -25,6 +25,7 @@ namespace ioc {
 class Subscription {
     std::shared_ptr<std::remove_pointer<dbEventSubscription>::type> sub; // holds void* returned by db_add_event()
 public:
+    unsigned mask=0;
     /* Add a subscription event by calling db_add_event using the given subscriptionCtx
      * and selecting the correct elements based on the given type of event being added.
      * You need to specify the correct options that correspond to the event type.
@@ -45,6 +46,7 @@ public:
         });
         if(!sub)
             throw std::runtime_error("Failed to create db subscription");
+        mask = select;
     }
     void cancel() {
         sub.reset();

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

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

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

@@ -516,8 +516,7 @@ Value buildCAMethod()
 }
 
 ContextImpl::ContextImpl(const Config& conf, const evbase& tcp_loop)
-    :ifmap(IfaceMap::instance())
-    ,effective([conf]() -> Config{
+    :effective([conf]() -> Config{
         Config eff(conf);
         eff.expand();
         return eff;
@@ -1023,8 +1022,6 @@ void ContextImpl::tickSearch(SearchKind kind, bool poked)
     if(kind == SearchKind::check)
         currentBucket = (currentBucket+1u)%searchBuckets.size();
 
-    log_debug_printf(io, "Search tick %zu\n", idx);
-
     decltype (searchBuckets)::value_type bucket;
     if (kind == SearchKind::initial) {
         initialSearchBucket.swap(bucket);
@@ -1032,6 +1029,11 @@ void ContextImpl::tickSearch(SearchKind kind, bool poked)
         searchBuckets[idx].swap(bucket);
     }
 
+    log_debug_printf(io, "%s tick %zu for %zu\n",
+                     kind == SearchKind::discover ? "Discover" : "Search",
+                     idx,
+                     bucket.size());
+
     while(!bucket.empty() || kind == SearchKind::discover) {
         // when 'discover' we only loop once
 

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

@@ -459,23 +459,18 @@ void Connection::handle_MESSAGE()
     if(!M.good())
         throw std::runtime_error(SB()<<M.file()<<':'<<M.line()<<" Decode error for Message");
 
+    auto lvl(mtype2level(mtype));
+    const char *chan = "<no channel>";
+
     auto it = opByIOID.find(ioid);
-    if(it==opByIOID.end()) {
-        log_debug_printf(connsetup, "Server %s Message on non-existent ioid\n", peerName.c_str());
-        return;
-    }
-    auto op = it->second.handle.lock();
-
-    Level lvl;
-    switch(mtype) {
-    case 0:  lvl = Level::Info; break;
-    case 1:  lvl = Level::Warn; break;
-    case 2:  lvl = Level::Err; break;
-    default: lvl = Level::Crit; break;
+    if(it!=opByIOID.end()) {
+        if(auto op = it->second.handle.lock()) {
+            chan = op->chan->name.c_str();
+        }
     }
 
     log_printf(remote, lvl, "%s : %s\n",
-               op && op->chan ? op->chan->name.c_str() : "<dead>", msg.c_str());
+               chan, msg.c_str());
 }
 
 void Connection::tickEcho()

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

@@ -247,7 +247,6 @@ private:
 struct ContextImpl : public std::enable_shared_from_this<ContextImpl>
 {
     SockAttach attach;
-    IfaceMap& ifmap;
 
     enum state_t {
         Init,

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

@@ -757,10 +757,17 @@ std::shared_ptr<Subscription> MonitorBuilder::exec()
 
     auto options = op->pvRequest["record._options"];
 
-    options["queueSize"].as<uint32_t>([&op](uint32_t Q) {
-        if(Q>1)
+    if(auto queueSize = options["queueSize"]) {
+        uint32_t Q = 0;
+        if(queueSize.as(Q) && Q>1) {
             op->queueSize = Q;
-    });
+        } else {
+            log_warn_printf(monevt, "%s requested invalid %s : %s\n",
+                            op->channelName.c_str(),
+                            op->pvRequest.nameOf(queueSize).c_str(),
+                            std::string(SB()<<queueSize).c_str());
+        }
+    }
 
     (void)options["pipeline"].as(op->pipeline);
 

{pvxslibs-1.3.3a1 → pvxslibs-1.4.0a1}/src/config.cpp

@@ -60,7 +60,7 @@ SockEndpoint::SockEndpoint(const char* ep, uint16_t defport)
             iface = at+1;
     }
 
-    auto& ifmap = IfaceMap::instance();
+    auto ifmap(IfaceMap::instance());
 
     if(addr.family()==AF_INET6) {
         if(iface.empty() && addr->in6.sin6_scope_id) {
@@ -90,7 +90,7 @@ MCastMembership SockEndpoint::resolve() const
     if(!addr.isMCast())
         throw std::logic_error("not mcast");
 
-    auto& ifmap = IfaceMap::instance();
+    auto ifmap(IfaceMap::instance());
 
     MCastMembership m;
     m.af = addr.family();
@@ -282,7 +282,8 @@ void printAddresses(std::vector<std::string>& out, const std::vector<SockEndpoin
 // Fill out address list by appending broadcast addresses
 // of any and all local interface addresses already included
 void expandAddrList(const std::vector<SockEndpoint>& ifaces,
-                    std::vector<SockEndpoint>& addrs)
+                    std::vector<SockEndpoint>& addrs,
+                    const IfaceMap& ifmap)
 {
     SockAttach attach;
     evsocket dummy(AF_INET, SOCK_DGRAM, 0);
@@ -307,9 +308,9 @@ void expandAddrList(const std::vector<SockEndpoint>& ifaces,
 }
 
 void addGroups(std::vector<SockEndpoint>& ifaces,
-               const std::vector<SockEndpoint>& addrs)
+               const std::vector<SockEndpoint>& addrs,
+               const IfaceMap& ifmap)
 {
-    auto& ifmap = IfaceMap::instance();
     std::set<std::string> allifaces;
 
     for(const auto& addr : addrs) {
@@ -492,7 +493,7 @@ void Config::expand()
         ifaces.emplace_back(SockAddr::any(AF_INET));
     }
 
-    auto& ifmap = IfaceMap::instance();
+    auto ifmap(IfaceMap::instance());
 
     for(size_t i=0; i<ifaces.size(); i++) {
         auto& ep = ifaces[i];
@@ -512,8 +513,8 @@ void Config::expand()
         // use interface list add ipv4 broadcast addresses to beaconDestinations.
         // 0.0.0.0 -> adds all bcasts
         // otherwise add bcast for each iface address
-        expandAddrList(ifaces, bdest);
-        addGroups(ifaces, bdest);
+        expandAddrList(ifaces, bdest, ifmap);
+        addGroups(ifaces, bdest, ifmap);
         auto_beacon = false;
     }
 
@@ -622,6 +623,8 @@ void Config::updateDefs(defs_t& defs) const
 
 void Config::expand()
 {
+    auto ifmap(IfaceMap::instance());
+
     if(udp_port==0)
         throw std::runtime_error("Client can't use UDP random port");
 
@@ -635,8 +638,8 @@ void Config::expand()
         ifaces.emplace_back(SockAddr::any(AF_INET));
 
     if(autoAddrList) {
-        expandAddrList(ifaces, addrs);
-        addGroups(ifaces, addrs);
+        expandAddrList(ifaces, addrs, ifmap);
+        addGroups(ifaces, addrs, ifmap);
         autoAddrList = false;
     }