pvxslibs 1.3.3a1__tar.gz → 1.3.3a2__tar.gz

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

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

{pvxslibs-1.3.3a1 → pvxslibs-1.3.3a2}/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.3.3a2}/ioc/pvalink_lset.cpp

@@ -252,7 +252,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) {

{pvxslibs-1.3.3a1 → pvxslibs-1.3.3a2}/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,

{pvxslibs-1.3.3a1 → pvxslibs-1.3.3a2}/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.3.3a2/python/pvxslibs.egg-info}/PKG-INFO

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

{pvxslibs-1.3.3a1 → pvxslibs-1.3.3a2}/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 += 'a1'
+pvxs_ver += 'a2'
 
 with open(os.path.join(os.path.dirname(__file__), 'README.md')) as F:
     long_description = F.read()

{pvxslibs-1.3.3a1 → pvxslibs-1.3.3a2}/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;

{pvxslibs-1.3.3a1 → pvxslibs-1.3.3a2}/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.3.3a2}/src/nt.cpp

@@ -215,8 +215,8 @@ TypeDef NTNDArray::build() const
                         UInt16A("ushortValue"),
                         UInt32A("uintValue"),
                         UInt64A("ulongValue"),
-                        Float32("floatValue"),
-                        Float64("doubleValue"),
+                        Float32A("floatValue"),
+                        Float64A("doubleValue"),
                     }),
                     Struct("codec", "codec_t", {
                         String("name"),

{pvxslibs-1.3.3a1 → pvxslibs-1.3.3a2}/src/server.cpp

@@ -788,7 +788,8 @@ void Server::Pvt::doBeacons(short evt)
             auto lvl = Level::Warn;
             if(err==EINTR || err==EPERM)
                 lvl = Level::Debug;
-            log_printf(serverio, lvl, "Beacon tx error (%d) %s\n",
+            log_printf(serverio, lvl, "Beacon tx %s error (%d) %s\n",
+                       (SB()<<dest).str().c_str(),
                        err, evutil_socket_error_to_string(err));
 
         } else if(unsigned(ntx)<pktlen) {