pvxslibs 1.2.2__cp310-cp310-win_amd64.whl → 1.2.3__cp310-cp310-win_amd64.whl

pvxslibs/include/pvxs/iochooks.h

@@ -61,7 +61,8 @@ namespace ioc {
  *     initHookRegister(&myinitHook);
  * }
  * extern "C" {
- *     epicsExportRegistrar(myregistrar); // needs matching entry in .dbd
+ *      // needs matching "registrar(myregistrar)" in .dbd
+ *     epicsExportRegistrar(myregistrar);
  * }
  * @endcode
  */
@@ -81,6 +82,15 @@ server::Server server();
 PVXS_IOC_API
 long dbLoadGroup(const char* jsonFilename, const char* macros=nullptr);
 
+/** Call just after testdbPrepare()
+ *
+ *  Prepare QSRV for re-test.  Optional if testdbPrepare() called only once.
+ *  Required after subsequent calls.
+ *  @since 1.2.3
+ */
+PVXS_IOC_API
+void testPrepare();
+
 /** Call just before testIocShutdownOk()
  *
  *  Shutdown QSRV.  Only needed with Base <= 7.0.4 .

pvxslibs/include/pvxs/netcommon.h

@@ -1,3 +1,8 @@
+/**
+ * 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.
+ */
 #ifndef PVXS_NETCOMMON_H
 #define PVXS_NETCOMMON_H
 

pvxslibs/include/pvxs/nt.h

@@ -6,6 +6,8 @@
 #ifndef PVXS_NT_H
 #define PVXS_NT_H
 
+#include <memory>
+
 #include <pvxs/version.h>
 #include <pvxs/data.h>
 
@@ -105,6 +107,44 @@ struct NTEnum {
     }
 };
 
+/** Columnar data.
+ *
+ *  Unlike other NT* builders.  This create() method returns a Value
+ *  with the labels field set, and marked.  While suitable for an
+ *  initial value, repeated create() could result in re-sending
+ *  the same labels array with every update.  Users should
+ *  create() once, and then Value::cloneEmpty() or Value::unmark() for
+ *  subsequent updates.
+ *
+ *  @since 1.2.3
+ */
+struct PVXS_API NTTable final {
+
+    NTTable();
+    ~NTTable();
+
+    /** Append a column
+     *
+     *  @param code Value type of column
+     *  @param name Field name of column
+     *  @param label Display label of column.  (defaults to field name)
+     *         Only used in create().
+     *  @returns this
+     */
+    NTTable& add_column(TypeCode code,
+                        const char *name,
+                        const char *label=nullptr);
+
+    //! A TypeDef which can be appended
+    TypeDef build() const;
+    //! Instantiate.  Also populates labels list.
+    Value create() const;
+
+    struct Pvt;
+private:
+    std::shared_ptr<Pvt> pvt;
+};
+
 /** The areaDetector inspired N-dimension array/image container.
  *
  * @code

pvxslibs/include/pvxs/source.h

@@ -30,6 +30,7 @@ public:
     //! @throws std::runtime_error if the client pvRequest() field mask does not select any fields of prototype.
     virtual void connect(const Value& prototype) =0;
     //! Indicate that this operation can not be setup
+    //! @since 1.2.3 Does not block
     virtual void error(const std::string& msg) =0;
 
     ConnectOp(const std::string& name,
@@ -145,6 +146,7 @@ public:
     virtual std::unique_ptr<MonitorControlOp> connect(const Value& prototype) =0;
 
     //! Indicate that this operation can not be setup
+    //! @since 1.2.3 Does not block
     virtual void error(const std::string& msg) =0;
 
     MonitorSetupOp(const std::string& name,

pvxslibs/include/pvxs/srvcommon.h

@@ -1,3 +1,8 @@
+/**
+ * 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.
+ */
 #ifndef PVXS_SRVCOMMON_H
 #define PVXS_SRVCOMMON_H
 
@@ -94,6 +99,7 @@ struct PVXS_API ExecOp : public OpBase {
     //! Issue a reply with data.  For a GET or RPC  (or PUT/Get)
     virtual void reply(const Value& val) =0;
     //! Indicate the request has resulted in an error.
+    //! @since 1.2.3 Does not block
     virtual void error(const std::string& msg) =0;
 
     //! Callback invoked if the peer cancels the operation before reply() or error() is called.

pvxslibs/include/pvxs/util.h

@@ -179,6 +179,17 @@ private:
 PVXS_API
 std::ostream& target_information(std::ostream&);
 
+/** Print version information for PVXS library and dependencies
+ *
+ * As shown by eg. ``pvxget -V``
+ *
+ * @returns The same ostream passed as argument.
+ *
+ * @since 1.2.3
+ */
+PVXS_API
+std::ostream& version_information(std::ostream&);
+
 /** Thread-safe, bounded, multi-producer, multi-consumer FIFO queue.
  *
  * Queue value_type must be movable.  If T is also copy constructable,
@@ -235,7 +246,7 @@ public:
      */
     template<typename ...Args>
     void emplace(Args&&... args) {
-        bool wakeup;
+        bool wakeupR, wakeupW;
         {
             Guard G(lock);
             // while full, wait for reader to consume an entry
@@ -248,11 +259,15 @@ public:
                 nwriters--;
             }
             // notify reader when queue becomes not empty
-            wakeup = Q.empty() && nreaders;
+            wakeupR = Q.empty() && nreaders;
             Q.emplace_back(std::forward<Args>(args)...);
+            // wakeup next writer if there is still space
+            wakeupW = nwriters && Q.size()<nlimit;
         }
-        if(wakeup)
+        if(wakeupR)
             notifyR.signal();
+        if(wakeupW)
+            notifyW.signal();
     }
 
     //! Move a new element to the queue

pvxslibs/include/pvxs/versionNum.h

@@ -3,4 +3,4 @@
 #endif
 #define PVXS_MAJOR_VERSION 1
 #define PVXS_MINOR_VERSION 2
-#define PVXS_MAINTENANCE_VERSION 2
+#define PVXS_MAINTENANCE_VERSION 3

{pvxslibs-1.2.2.dist-info → pvxslibs-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pvxslibs
-Version: 1.2.2
+Version: 1.2.3
 Summary: PVXS libraries packaged for python
 Home-page: https://mdavidsaver.github.io/pvxs
 Author: Michael Davidsaver
@@ -22,8 +22,8 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=2.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: setuptools-dso (>=2.7a1)
-Requires-Dist: epicscorelibs (<7.0.7.99.1,>=7.0.7.99.0.2)
+Requires-Dist: setuptools-dso >=2.7a1
+Requires-Dist: epicscorelibs <7.0.7.99.1,>=7.0.7.99.0.2
 
 PVXS - PVAccess protocol library
 ================================

pvxslibs-1.2.3.dist-info/RECORD

@@ -0,0 +1,39 @@
+pvxslibs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pvxslibs/path.py,sha256=Drk6eD5yrFWT1LCY_ggKCdFamWqaq2sa7SwdAisZ4uw,270
+pvxslibs/version.py,sha256=idyj3WCiCjGJGRvPqLE_TNfd5Gzxnx4c8pxGO0_AejI,1016
+pvxslibs/dbd/pvxsIoc.dbd,sha256=C0GNwadEfWI9I2DLJzHHuYxwtuZ1p3UNAuive4PiWmc,290
+pvxslibs/include/pvxs/client.h,sha256=X2EJh06OZyqa87jGnkUDIOt1MSi9BH2Ov7VFkyW7FXg,38045
+pvxslibs/include/pvxs/data.h,sha256=xe38UJCGhrkMd_i2T8G-PTb_cKco-zMFRe1rSh4JKkI,29518
+pvxslibs/include/pvxs/iochooks.h,sha256=xT7ywXD83E4qFlP0PCaITpdbH39Dt7Z657N8Gezulzk,3133
+pvxslibs/include/pvxs/log.h,sha256=rnPEl1vTOBqf6vnYQFBafiPVYx2FlmRSvbDUMYO-0s0,5107
+pvxslibs/include/pvxs/netcommon.h,sha256=ztBSnySq2yLngNn4hbRNQ0CEHsz12gSoCM0sV4buCRY,2206
+pvxslibs/include/pvxs/nt.h,sha256=xBRXzaRImoX2laUq82ub_O-caN0DQQzLzdqSdzukTkU,4969
+pvxslibs/include/pvxs/server.h,sha256=wTPDy464AQAJUDCCqf66uioCl3XJqHRlKN_X5Nk_rLs,8072
+pvxslibs/include/pvxs/sharedArray.h,sha256=BMW9Ea1YjtpgnXEiQg_3SbL5mAG5On9uLvLLRxpSMlQ,24494
+pvxslibs/include/pvxs/sharedpv.h,sha256=k6LasQsMrpHTPa9DasXKvWTppqwVZJ9vBHj8P5Q-9Cw,4264
+pvxslibs/include/pvxs/source.h,sha256=icpS6mlRwOwMLeADXmrBT1PRWNETIA0zvJZ-4QYKGGo,10598
+pvxslibs/include/pvxs/srvcommon.h,sha256=3uZoTUwz6DcHFXkRX3eFIYwKokaJfFxTW4i-TYkJifo,4661
+pvxslibs/include/pvxs/unittest.h,sha256=237VuP0o3lMeRx1-gc8z1EsFzCRVwHSLrW_XUDxwsec,10509
+pvxslibs/include/pvxs/util.h,sha256=5Dy9ySigLFASMY3P-Oikv8nq3XEYo7mcHgyYuPkezT0,9322
+pvxslibs/include/pvxs/version.h,sha256=_vZXcm-UIOqNnqWqR7JW7CFYH2LNL5uY9AJQcUnR1l0,2818
+pvxslibs/include/pvxs/versionNum.h,sha256=aknNQQD-AY8kstk1EIqHEkLghaNsHhJmbvjTClVNQig,182
+pvxslibs/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pvxslibs/lib/event_core.dll,sha256=FTRq5JM_ILlDb7jiw_7HYi88VpcbNfZIId98SSTny-U,199168
+pvxslibs/lib/event_core.exp,sha256=L3Qo8N2QYEfyfSuxd0knC6Pi3BLlzLS3lMzIn7WIfDc,52056
+pvxslibs/lib/event_core.lib,sha256=AEdJJuqeQftaLcxRtiXx4Hx4x0YPL3IWV0FXPp9tQKY,87182
+pvxslibs/lib/event_core_dsoinfo.py,sha256=H0HQPHx7pnRhQ6fkEj-yJEfTEkj9GaA1mx-kW_fOhFk,351
+pvxslibs/lib/pvxs.dll,sha256=G8_M732ClmdIogNUlHHvOt3z8riotrn3UkdgHl7paTY,902656
+pvxslibs/lib/pvxs.exp,sha256=J2xHH39GDtuFJvKBxYomiQm2RTraPoTna-O-b_IyGLQ,154952
+pvxslibs/lib/pvxs.lib,sha256=cjOHPvx64x6SZHtHzHWjc5gYp68Sb54A-S2emz56UAs,253008
+pvxslibs/lib/pvxsIoc.dll,sha256=nLrGG3c3RkluIQBnCfe3SB6ewbkF4bqlQHE0UIoeoxM,230400
+pvxslibs/lib/pvxsIoc.exp,sha256=mOmh8GEnKGD-ADELAhqackYdSNnAajX2Cm_lfsoB3Uc,2575
+pvxslibs/lib/pvxsIoc.lib,sha256=xuym4EecO1qGvKgwzoBM_w8CUTXim-NeVGb8kvcM7XQ,4300
+pvxslibs/lib/pvxsIoc_dsoinfo.py,sha256=4IZCE1G5oVQ5UhQVD42R8aF1r7Etztq851ZWWvEtHpI,471
+pvxslibs/lib/pvxs_dsoinfo.py,sha256=qmYxkZldQ5Yzw5_PMqlmFpmODXGTKv0ZU8CqFBLpEZI,383
+pvxslibs/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pvxslibs/test/test_load.py,sha256=G06DLRJlk_mvGGBnm0kNmAo7HKlRBiuAYPk6rnWhZB4,1025
+pvxslibs-1.2.3.dist-info/LICENSE,sha256=-ROhoot-GxWl5VV-rFFE_1K-41MEQzGJQvSSvyf6ntc,1525
+pvxslibs-1.2.3.dist-info/METADATA,sha256=o-DXTqWBdC5W1t-Ad9rml7y2JZVplNDD5Iyb7PRX3vI,1232
+pvxslibs-1.2.3.dist-info/WHEEL,sha256=yrvteVAZzxQvtDnzdCRh4dP01sPIxYhLXIXplC7o50E,102
+pvxslibs-1.2.3.dist-info/top_level.txt,sha256=RixlMjBFoSBZhAgzdvurnG0N681VoNV0ikf00-HgXFM,9
+pvxslibs-1.2.3.dist-info/RECORD,,

{pvxslibs-1.2.2.dist-info → pvxslibs-1.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: false
 Tag: cp310-cp310-win_amd64
 

pvxslibs-1.2.2.dist-info/RECORD

@@ -1,39 +0,0 @@
-pvxslibs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/path.py,sha256=Drk6eD5yrFWT1LCY_ggKCdFamWqaq2sa7SwdAisZ4uw,270
-pvxslibs/version.py,sha256=idyj3WCiCjGJGRvPqLE_TNfd5Gzxnx4c8pxGO0_AejI,1016
-pvxslibs/dbd/pvxsIoc.dbd,sha256=C0GNwadEfWI9I2DLJzHHuYxwtuZ1p3UNAuive4PiWmc,290
-pvxslibs/include/pvxs/client.h,sha256=X2EJh06OZyqa87jGnkUDIOt1MSi9BH2Ov7VFkyW7FXg,38045
-pvxslibs/include/pvxs/data.h,sha256=xe38UJCGhrkMd_i2T8G-PTb_cKco-zMFRe1rSh4JKkI,29518
-pvxslibs/include/pvxs/iochooks.h,sha256=alEZBz-SQ5_cT_0Li2ZFme-ZmmLOv2lSWbTu95AtF-s,2888
-pvxslibs/include/pvxs/log.h,sha256=rnPEl1vTOBqf6vnYQFBafiPVYx2FlmRSvbDUMYO-0s0,5107
-pvxslibs/include/pvxs/netcommon.h,sha256=-l0rf6ahqqPqsIGLW_C_oW9PxksJs7gWb5x0MHcOtK4,1990
-pvxslibs/include/pvxs/nt.h,sha256=WHCyxMrYLTVCh6fqMOuz62-9az5gAQowxlM5GezjRwo,3856
-pvxslibs/include/pvxs/server.h,sha256=wTPDy464AQAJUDCCqf66uioCl3XJqHRlKN_X5Nk_rLs,8072
-pvxslibs/include/pvxs/sharedArray.h,sha256=BMW9Ea1YjtpgnXEiQg_3SbL5mAG5On9uLvLLRxpSMlQ,24494
-pvxslibs/include/pvxs/sharedpv.h,sha256=k6LasQsMrpHTPa9DasXKvWTppqwVZJ9vBHj8P5Q-9Cw,4264
-pvxslibs/include/pvxs/source.h,sha256=tbQ7COKA16VPv1ag81bdAtHN9jOIm2m_Savj1wiIy3g,10524
-pvxslibs/include/pvxs/srvcommon.h,sha256=zzLoU0of7GFyLbdPBvTthz4in5RkoDaGWpv7nFJrMfQ,4408
-pvxslibs/include/pvxs/unittest.h,sha256=237VuP0o3lMeRx1-gc8z1EsFzCRVwHSLrW_XUDxwsec,10509
-pvxslibs/include/pvxs/util.h,sha256=pDmS-ogaTrRVksjmMSG6hj2hFEUcMKZnCMHgKdM2p-A,8901
-pvxslibs/include/pvxs/version.h,sha256=_vZXcm-UIOqNnqWqR7JW7CFYH2LNL5uY9AJQcUnR1l0,2818
-pvxslibs/include/pvxs/versionNum.h,sha256=Qs7FwAR-cjZZGMJ2yWo6fVNZt2cZtq18ZL-JbYeoPi4,182
-pvxslibs/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/lib/event_core.dll,sha256=oj2FQ6zAc6pr3amfFxb2MZL9iCtlPMxn5_uSIwFQaEc,199168
-pvxslibs/lib/event_core.exp,sha256=X4W-NsNBFW_k5MNjhdYPhPy3CFa0LNjdMYgODsgXFlM,52056
-pvxslibs/lib/event_core.lib,sha256=c5NfdmiyzpMsk5320qNz4dEHdfrDx8ImJ-Xya88Koxw,87182
-pvxslibs/lib/event_core_dsoinfo.py,sha256=H0HQPHx7pnRhQ6fkEj-yJEfTEkj9GaA1mx-kW_fOhFk,351
-pvxslibs/lib/pvxs.dll,sha256=15xAAoxCX2mM8n4rAuo_gLtqaiy4xI_rGgaUhQRfnaU,891392
-pvxslibs/lib/pvxs.exp,sha256=baEvE4TeoBXi3XrfJ90WqC_6bR4WBKerPUB1Cb-vZC4,153016
-pvxslibs/lib/pvxs.lib,sha256=tBznbai7Y9y_vSwYhBk-JanRVcq01YTe0aLlIqQrezc,249834
-pvxslibs/lib/pvxsIoc.dll,sha256=HkgNP4Qu4yNm23V05w2b_lboMa07ucljPip-8fUdZzM,227840
-pvxslibs/lib/pvxsIoc.exp,sha256=kymbwBhsKfdlhmwY3mVTVi7u7FSt0-1m8jZd7sXxG7A,2413
-pvxslibs/lib/pvxsIoc.lib,sha256=Y6115aCnHNLcboM2Qwsm0GNyknEAYkOT6qCPFcHwgfo,4034
-pvxslibs/lib/pvxsIoc_dsoinfo.py,sha256=4IZCE1G5oVQ5UhQVD42R8aF1r7Etztq851ZWWvEtHpI,471
-pvxslibs/lib/pvxs_dsoinfo.py,sha256=qmYxkZldQ5Yzw5_PMqlmFpmODXGTKv0ZU8CqFBLpEZI,383
-pvxslibs/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/test/test_load.py,sha256=G06DLRJlk_mvGGBnm0kNmAo7HKlRBiuAYPk6rnWhZB4,1025
-pvxslibs-1.2.2.dist-info/LICENSE,sha256=-ROhoot-GxWl5VV-rFFE_1K-41MEQzGJQvSSvyf6ntc,1525
-pvxslibs-1.2.2.dist-info/METADATA,sha256=RmEtkjK5ltj-1ALsBSzO2sO9eq6HdCQmeuoQeIWycO8,1236
-pvxslibs-1.2.2.dist-info/WHEEL,sha256=jrOhEbqKwvzRFSJcbYXlJCyVkgVdHg4_7__YHrdTUfw,102
-pvxslibs-1.2.2.dist-info/top_level.txt,sha256=RixlMjBFoSBZhAgzdvurnG0N681VoNV0ikf00-HgXFM,9
-pvxslibs-1.2.2.dist-info/RECORD,,