pvxslibs 1.2.2a1__cp37-cp37m-manylinux1_x86_64.whl → 1.2.3__cp37-cp37m-manylinux1_x86_64.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.2a1.dist-info → pvxslibs-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pvxslibs
-Version: 1.2.2a1
+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.2a1)
+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=nWn5TT5xkbHakc0UwiET3_NbOZg-jr4yibrGKYZ7IoU,258
+pvxslibs/version.py,sha256=vmbnHFP7nheGuX7r7LAKgJ4c2joFyUd4BPqeM4bpUfQ,984
+pvxslibs/dbd/pvxsIoc.dbd,sha256=qQkW_9r54zXgXpDIcpihHQN9wcmZ9mTn61fatDe-v18,281
+pvxslibs/include/pvxs/client.h,sha256=S-5NKislCENkrypDalm4T3ZG9Kn486w-lUQEscj-z6c,36954
+pvxslibs/include/pvxs/data.h,sha256=19NwOI51ZHhDpjYRp0ClO9UJd8BJlP9cd7In7fLoXMs,28570
+pvxslibs/include/pvxs/iochooks.h,sha256=DmFxY5eI_u2KltNrzP5OVPF50SptJY07Pq3TC36zNvs,3029
+pvxslibs/include/pvxs/log.h,sha256=2hqmFQ300vhl7mtToc4LBAVJqBgs1QMYz92pmLv1ab4,4959
+pvxslibs/include/pvxs/netcommon.h,sha256=yrVn8qVBPCEZoW4eJZjR46axAsQr7pQi4L_MdxWByCU,2124
+pvxslibs/include/pvxs/nt.h,sha256=AiiWlkSyfauthaGTefu0cYLr74B7TVW26yEdByeG1Ao,4761
+pvxslibs/include/pvxs/server.h,sha256=RhdfJRZepFO7kwIzAWdTmJITtg3WCBnKumk5BhkL91o,7838
+pvxslibs/include/pvxs/sharedArray.h,sha256=iRxhRgYbcMg6WWB15KbwML6THyFLqZ0QEvMHLj_wxc0,23748
+pvxslibs/include/pvxs/sharedpv.h,sha256=VPrngwKEOjtGW708clV6rDtn8CarBMSkSM-S6SEmxDM,4143
+pvxslibs/include/pvxs/source.h,sha256=-mt7mQ2LiEknkEs0J9hiB8CoJtxIi_XFb5sfsPxH4rQ,10308
+pvxslibs/include/pvxs/srvcommon.h,sha256=ph_7mVX2fe8dd2eBQyaYUvnDMra4SnzUrMZ99jeORGY,4523
+pvxslibs/include/pvxs/unittest.h,sha256=uTteII0JrLhTK6dGjaInZKOwsuJ9-hockFaPwifvdbA,10182
+pvxslibs/include/pvxs/util.h,sha256=-EcvbTWT6B3mlwgSBBmkkbSo5q7RJYZDw1aoqqN-U_E,8968
+pvxslibs/include/pvxs/version.h,sha256=vJiv3HIHEag2bkTHm-XOThc_KqWV0xWQpWOzFnAbD1g,2721
+pvxslibs/include/pvxs/versionNum.h,sha256=O0SfAariLpb4uGoPolIYQ6DtooKQkengBct1UoWnvUY,176
+pvxslibs/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pvxslibs/lib/event_core_dsoinfo.py,sha256=ODB3bm08Mq3SrxP8VInAOHWaowhpz0lfoJZNNo1_dtw,347
+pvxslibs/lib/event_pthread_dsoinfo.py,sha256=dgNHgYcTQgKyTvMR09zYPK3XkS4Id29u3kYC919dIUk,356
+pvxslibs/lib/libevent_core.so,sha256=copUri61fQ-BbgQ1TV_cD1azDYUbGVAEGCg1j54iw24,979412
+pvxslibs/lib/libevent_core.so.2.2.0,sha256=copUri61fQ-BbgQ1TV_cD1azDYUbGVAEGCg1j54iw24,979412
+pvxslibs/lib/libevent_pthread.so,sha256=PwUZ0FN2_5gJgzuScx_fUNSz0Idso9q4Jj7iXpfCwf4,24252
+pvxslibs/lib/libevent_pthread.so.2.2.0,sha256=PwUZ0FN2_5gJgzuScx_fUNSz0Idso9q4Jj7iXpfCwf4,24252
+pvxslibs/lib/libpvxs.so,sha256=QYaA-Qa6KAx2eq5SPeo4OFwAxSrn8dALJTE9Na180IY,1773940
+pvxslibs/lib/libpvxs.so.1.2,sha256=QYaA-Qa6KAx2eq5SPeo4OFwAxSrn8dALJTE9Na180IY,1773940
+pvxslibs/lib/libpvxsIoc.so,sha256=YqeLhBXFWREbQvmu4suSscjA5W8RQmzu54uV6-cH98Q,412732
+pvxslibs/lib/libpvxsIoc.so.1.2,sha256=YqeLhBXFWREbQvmu4suSscjA5W8RQmzu54uV6-cH98Q,412732
+pvxslibs/lib/pvxsIoc_dsoinfo.py,sha256=6u2ah5JWP8WAL_rS80sRU6MMzIUGZMlWRKlBa-Tj0LE,465
+pvxslibs/lib/pvxs_dsoinfo.py,sha256=IsPWloTmzQ7jo22BhEfZd4R9snpNNOtpQ1gScn9N4OE,407
+pvxslibs/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pvxslibs/test/test_load.py,sha256=mueD9wz4IBkCRS0TY76spkOS_nw4IBdkofl_fA9hIfg,995
+pvxslibs-1.2.3.dist-info/LICENSE,sha256=XViOs7FX1SESr-qTXIin_5793B4tlaQsJdO5atkFUAg,1499
+pvxslibs-1.2.3.dist-info/METADATA,sha256=zYnYqWYik0kjAGRnohXJYoim3aJJ2MXLASfctngwfeY,1199
+pvxslibs-1.2.3.dist-info/WHEEL,sha256=xd96zpH7kRPY3eMZU7f0QAtsCPJoVsXqYtPBM9HNtrE,109
+pvxslibs-1.2.3.dist-info/top_level.txt,sha256=RixlMjBFoSBZhAgzdvurnG0N681VoNV0ikf00-HgXFM,9
+pvxslibs-1.2.3.dist-info/RECORD,,

{pvxslibs-1.2.2a1.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: cp37-cp37m-manylinux1_x86_64
 

pvxslibs-1.2.2a1.dist-info/RECORD

@@ -1,39 +0,0 @@
-pvxslibs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/path.py,sha256=nWn5TT5xkbHakc0UwiET3_NbOZg-jr4yibrGKYZ7IoU,258
-pvxslibs/version.py,sha256=vmbnHFP7nheGuX7r7LAKgJ4c2joFyUd4BPqeM4bpUfQ,984
-pvxslibs/dbd/pvxsIoc.dbd,sha256=qQkW_9r54zXgXpDIcpihHQN9wcmZ9mTn61fatDe-v18,281
-pvxslibs/include/pvxs/client.h,sha256=S-5NKislCENkrypDalm4T3ZG9Kn486w-lUQEscj-z6c,36954
-pvxslibs/include/pvxs/data.h,sha256=19NwOI51ZHhDpjYRp0ClO9UJd8BJlP9cd7In7fLoXMs,28570
-pvxslibs/include/pvxs/iochooks.h,sha256=J_seOuc9_iMqb6dasrvjVUNQbOnEuaU8Nk76XBpUp3g,2794
-pvxslibs/include/pvxs/log.h,sha256=2hqmFQ300vhl7mtToc4LBAVJqBgs1QMYz92pmLv1ab4,4959
-pvxslibs/include/pvxs/netcommon.h,sha256=__fSN5tbu_3HzXtkej5ulgJ8EyyGIskRUVcXHzNhu8A,1913
-pvxslibs/include/pvxs/nt.h,sha256=14a7b6HGmemS2h6LVs60STAjza2E87i6sjqPsfjLzLw,3688
-pvxslibs/include/pvxs/server.h,sha256=RhdfJRZepFO7kwIzAWdTmJITtg3WCBnKumk5BhkL91o,7838
-pvxslibs/include/pvxs/sharedArray.h,sha256=iRxhRgYbcMg6WWB15KbwML6THyFLqZ0QEvMHLj_wxc0,23748
-pvxslibs/include/pvxs/sharedpv.h,sha256=VPrngwKEOjtGW708clV6rDtn8CarBMSkSM-S6SEmxDM,4143
-pvxslibs/include/pvxs/source.h,sha256=XosjhVQwFoZKZ2YG6Egv5HmupwRIbtSaL4b1XHPPe4Q,10236
-pvxslibs/include/pvxs/srvcommon.h,sha256=-afwMkx5dqCYbznbMSXuXg2HN4DGstUhwCExH1VqGQE,4276
-pvxslibs/include/pvxs/unittest.h,sha256=uTteII0JrLhTK6dGjaInZKOwsuJ9-hockFaPwifvdbA,10182
-pvxslibs/include/pvxs/util.h,sha256=5L1pkyt8_XzLox9yp7vedvIDEzOd6stu3kAN1gBOJnE,8562
-pvxslibs/include/pvxs/version.h,sha256=vJiv3HIHEag2bkTHm-XOThc_KqWV0xWQpWOzFnAbD1g,2721
-pvxslibs/include/pvxs/versionNum.h,sha256=44GAm5VmqDTTtOV4DRpv2Zmg1OsxD68iIN7bx1aRqR4,176
-pvxslibs/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/lib/event_core_dsoinfo.py,sha256=ODB3bm08Mq3SrxP8VInAOHWaowhpz0lfoJZNNo1_dtw,347
-pvxslibs/lib/event_pthread_dsoinfo.py,sha256=dgNHgYcTQgKyTvMR09zYPK3XkS4Id29u3kYC919dIUk,356
-pvxslibs/lib/libevent_core.so,sha256=t3svrU8oNdVvLsdltEQ4MwIe8i2KfCgUPsI7XWTRi-M,979412
-pvxslibs/lib/libevent_core.so.2.2.0,sha256=t3svrU8oNdVvLsdltEQ4MwIe8i2KfCgUPsI7XWTRi-M,979412
-pvxslibs/lib/libevent_pthread.so,sha256=01_dOMKzOIKzCXhIo6izo0qMeAbRBsqVxPR5FNsYXP4,24252
-pvxslibs/lib/libevent_pthread.so.2.2.0,sha256=01_dOMKzOIKzCXhIo6izo0qMeAbRBsqVxPR5FNsYXP4,24252
-pvxslibs/lib/libpvxs.so,sha256=h8lhyXGzVXqZ_dT5YOntB1H4ptIkMv2X7mAdMOOFfL8,1758226
-pvxslibs/lib/libpvxs.so.1.2,sha256=h8lhyXGzVXqZ_dT5YOntB1H4ptIkMv2X7mAdMOOFfL8,1758226
-pvxslibs/lib/libpvxsIoc.so,sha256=WiWO552VvV-0z8e5eoLeL4MUNEOOvACPLh2Hxm6yVaU,408173
-pvxslibs/lib/libpvxsIoc.so.1.2,sha256=WiWO552VvV-0z8e5eoLeL4MUNEOOvACPLh2Hxm6yVaU,408173
-pvxslibs/lib/pvxsIoc_dsoinfo.py,sha256=6u2ah5JWP8WAL_rS80sRU6MMzIUGZMlWRKlBa-Tj0LE,465
-pvxslibs/lib/pvxs_dsoinfo.py,sha256=IsPWloTmzQ7jo22BhEfZd4R9snpNNOtpQ1gScn9N4OE,407
-pvxslibs/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/test/test_load.py,sha256=mueD9wz4IBkCRS0TY76spkOS_nw4IBdkofl_fA9hIfg,995
-pvxslibs-1.2.2a1.dist-info/LICENSE,sha256=XViOs7FX1SESr-qTXIin_5793B4tlaQsJdO5atkFUAg,1499
-pvxslibs-1.2.2a1.dist-info/METADATA,sha256=bzNAAR9gR4j0Tzc_Cn9i4v86yGUi_KQcD8xs6jZae58,1207
-pvxslibs-1.2.2a1.dist-info/WHEEL,sha256=y0fMgdo5SB7yPjxBJvI27L0HkDqOecmyKKwtZtA_KG4,109
-pvxslibs-1.2.2a1.dist-info/top_level.txt,sha256=RixlMjBFoSBZhAgzdvurnG0N681VoNV0ikf00-HgXFM,9
-pvxslibs-1.2.2a1.dist-info/RECORD,,