pvxslibs 1.1.4a1__cp36-cp36m-manylinux1_x86_64.whl → 1.2.0a1__cp36-cp36m-manylinux1_x86_64.whl

pvxslibs/include/pvxs/client.h

@@ -1033,6 +1033,7 @@ struct PVXS_API Config {
 
 private:
     bool BE = EPICS_BYTE_ORDER==EPICS_ENDIAN_BIG;
+    bool UDP = true;
 public:
 
     // compat
@@ -1073,6 +1074,8 @@ public:
     // for protocol compatibility testing
     inline Config& overrideSendBE(bool be) { BE = be; return *this; }
     inline bool sendBE() const { return BE; }
+    inline Config& overrideShareUDP(bool share) { UDP = share; return *this; }
+    inline bool shareUDP() const { return UDP; }
 #endif
 };
 

pvxslibs/include/pvxs/iochooks.h

@@ -0,0 +1,94 @@
+/*
+ * 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_IOCHOOKS_H
+#define PVXS_IOCHOOKS_H
+
+#include <pvxs/version.h>
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+
+#  if defined(PVXS_IOC_API_BUILDING) && defined(EPICS_BUILD_DLL)
+/* building library as dll */
+#    define PVXS_IOC_API __declspec(dllexport)
+#  elif !defined(PVXS_IOC_API_BUILDING) && defined(EPICS_CALL_DLL)
+/* calling library in dll form */
+#    define PVXS_IOC_API __declspec(dllimport)
+#  endif
+
+#elif __GNUC__ >= 4
+#  define PVXS_IOC_API __attribute__ ((visibility("default")))
+#endif
+
+#ifndef PVXS_IOC_API
+#  define PVXS_IOC_API
+#endif
+
+namespace pvxs {
+namespace server {
+class Server;
+}
+namespace ioc {
+
+/** Return the singleton Server instance which is setup
+ *  for use in an IOC process.
+ *
+ *  This Server instance is created during a registrar function,
+ *  started by the initHookAfterCaServerRunning phase of iocInit().
+ *  It is stopped and destroyed during an epicsAtExit() hook added
+ *  during an initHookAfterInitDatabase hook..
+ *
+ *  Any configuration changes via. epicsEnvSet() must be made before registrars are run
+ *  by \*_registerRecordDeviceDriver(pdbbase).
+ *
+ *  server::SharedPV and server::Source added before iocInit() will be available immediately.
+ *  Others may be added (or removed) later.
+ *
+ *  @throws std::logic_error if called before instance is created, or after instance is destroyed.
+ *
+ * @code
+ * static void myinitHook(initHookState state) {
+ *     if(state!=initHookAfterIocBuilt)
+ *         return;
+ *
+ *     server::SharedPV mypv(...);
+ *     ioc::server()
+ *           .addPV("my:pv:name", mypv);
+ * }
+ * static void myregistrar() {
+ *     initHookRegister(&myinitHook);
+ * }
+ * extern "C" {
+ *     epicsExportRegistrar(myregistrar); // needs matching entry in .dbd
+ * }
+ * @endcode
+ */
+PVXS_IOC_API
+server::Server server();
+
+/**
+ * Load JSON group definition file.
+ * This function does not actually parse the given file, but adds it to the list of files to be loaded,
+ * at the appropriate time in the startup process.
+ *
+ * @param jsonFilename the json file containing the group definitions
+ * @param macros NULL, or a comma separated list of macro definitions.  eg. "KEY=VAL,OTHER=SECOND"
+ * @return 0 for success, 1 for failure
+ * @since UNRELEASED
+ */
+PVXS_IOC_API
+long dbLoadGroup(const char* jsonFilename, const char* macros=nullptr);
+
+/** Call just before testIocShutdownOk()
+ *
+ *  Shutdown QSRV.  Only needed with Base <= 7.0.4 .
+ *  Since 7.0.4, QSRV shutdown occurs during testIocShutdownOk() .
+ *  @since UNRELEASED
+ */
+PVXS_IOC_API
+void testShutdown();
+
+}} // namespace pvxs::ioc
+#endif // PVXS_IOCHOOKS_H

pvxslibs/include/pvxs/nt.h

@@ -67,13 +67,19 @@ struct NTScalar {
     bool control;
     //! Include alarm (range) meta-data
     bool valueAlarm;
+    /** Include 'display.form' and 'display.precision' when 'value' is a numeric type
+     *  @pre requires display=true
+     *  @since UNRELEASED
+     */
+    bool form;
 
     constexpr
     NTScalar(TypeCode value = TypeCode::Float64,
              bool display = false,
              bool control = false,
-             bool valueAlarm = false)
-        :value(value), display(display), control(control), valueAlarm(valueAlarm)
+             bool valueAlarm = false,
+             bool form = false)
+        :value(value), display(display), control(control), valueAlarm(valueAlarm), form(form)
     {}
 
     //! A TypeDef which can be appended

pvxslibs/include/pvxs/server.h

@@ -176,6 +176,7 @@ struct PVXS_API Config {
 
 private:
     bool BE = EPICS_BYTE_ORDER==EPICS_ENDIAN_BIG;
+    bool UDP = true;
 public:
 
     // compat
@@ -220,6 +221,8 @@ public:
     // for protocol compatibility testing
     inline Config& overrideSendBE(bool be) { BE = be; return *this; }
     inline bool sendBE() const { return BE; }
+    inline Config& overrideShareUDP(bool share) { UDP = share; return *this; }
+    inline bool shareUDP() const { return UDP; }
 #endif
 };
 

pvxslibs/include/pvxs/source.h

@@ -61,6 +61,9 @@ struct MonitorStat {
     size_t maxQueue=0;
     //! Negotiated limit on nQueue
     size_t limitQueue=0;
+    //! Number of updates squashed during post() calss
+    //! @since UNRELEASED
+    size_t nSquash=0;
 
     bool running=false;
     bool finished=false;
@@ -106,7 +109,7 @@ public:
     //! Signal to subscriber that this subscription will not yield any further events.
     //! This is not an error.  Client should not retry.
     void finish() {
-        doPost(Value(), false, false);
+        doPost(Value(), false, true);
     }
 
     //! Poll information and statistics for this subscription.

pvxslibs/include/pvxs/unittest.h

@@ -23,6 +23,8 @@
 namespace pvxs {
 
 /** Prepare for testing.  Call after testPlan()
+ * @since UNRELEASED If linked with pvxsIoc library, PVA server started
+ *                   by ``iocInit()`` will use "isolated" configuration.
  */
 PVXS_API
 void testSetup();

pvxslibs/include/pvxs/versionNum.h

@@ -2,5 +2,5 @@
 #  error Include pvxs/version.h instead of this file
 #endif
 #define PVXS_MAJOR_VERSION 1
-#define PVXS_MINOR_VERSION 1
-#define PVXS_MAINTENANCE_VERSION 4
+#define PVXS_MINOR_VERSION 2
+#define PVXS_MAINTENANCE_VERSION 0

pvxslibs/lib/pvxsIoc_dsoinfo.py

@@ -0,0 +1,14 @@
+
+# generated by setuptools_dso
+import os
+
+dsoname = 'pvxslibs.lib.pvxsIoc'
+libname = 'libpvxsIoc.so'
+soname = 'libpvxsIoc.so.1.2'
+depends = ['pvxslibs.lib.pvxs', 'pvxslibs.lib.event_core', 'epicscorelibs.lib.dbRecStd', 'epicscorelibs.lib.dbCore', 'epicscorelibs.lib.Com']
+dir = os.path.dirname(__file__)
+filename = os.path.join(dir, libname)
+sofilename = os.path.join(dir, soname)
+del dir
+del os
+__all__ = ("dsoname", "libname", "soname", "filename", "sofilename")

pvxslibs/lib/pvxs_dsoinfo.py

@@ -4,7 +4,7 @@ import os
 
 dsoname = 'pvxslibs.lib.pvxs'
 libname = 'libpvxs.so'
-soname = 'libpvxs.so.1.1'
+soname = 'libpvxs.so.1.2'
 depends = ['epicscorelibs.lib.Com', 'pvxslibs.lib.event_core', 'pvxslibs.lib.event_pthread']
 dir = os.path.dirname(__file__)
 filename = os.path.join(dir, libname)

pvxslibs/test/test_load.py

@@ -16,6 +16,11 @@ class TestLoad(unittest.TestCase):
 
         self.assertNotEqual(0, pvxs_version_int())
 
+        libIoc = ctypes.CDLL(find_dso('...lib.pvxsIoc'), ctypes.RTLD_GLOBAL)
+
+        # load original QSRV to ensure no symbol conflicts
+        p2p = ctypes.CDLL(find_dso('epicscorelibs.lib.qsrv'), ctypes.RTLD_GLOBAL)
+
 class TestVersion(unittest.TestCase):
     def test_ver(self):
         from ..version import version_info, abi_requires

{pvxslibs-1.1.4a1.dist-info → pvxslibs-1.2.0a1.dist-info}/METADATA

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

pvxslibs-1.2.0a1.dist-info/RECORD

@@ -0,0 +1,38 @@
+pvxslibs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pvxslibs/path.py,sha256=FbVt5FQgbSMpS4yGGXnXZJ6NI775LbElaJQ95Wn5TIA,199
+pvxslibs/version.py,sha256=vmbnHFP7nheGuX7r7LAKgJ4c2joFyUd4BPqeM4bpUfQ,984
+pvxslibs/include/pvxs/client.h,sha256=xEHumVz1Rb2dt1EAvb-tElNC6os8xK5yzi2kyN84YFU,36817
+pvxslibs/include/pvxs/data.h,sha256=19NwOI51ZHhDpjYRp0ClO9UJd8BJlP9cd7In7fLoXMs,28570
+pvxslibs/include/pvxs/iochooks.h,sha256=iD3QCX6FkS35mIRw9wMgB0Baz8CO3NjA5J-wNz9_5k8,2804
+pvxslibs/include/pvxs/log.h,sha256=2hqmFQ300vhl7mtToc4LBAVJqBgs1QMYz92pmLv1ab4,4959
+pvxslibs/include/pvxs/netcommon.h,sha256=om2fgidy5rOuxPWr98BKqbej22I9IfBnDtMlg8vOFok,1786
+pvxslibs/include/pvxs/nt.h,sha256=ouxryPdYVsuZ1pIbUaKi2VCSK7ZhxkOOvHdVsgzt7wY,3693
+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=oOtCFc8c3ZihKPog1KEml7czpdjtpKQiaTJf4b9Aq0Q,10241
+pvxslibs/include/pvxs/srvcommon.h,sha256=jF_3tG6VzF0UheypRTO1SJO0RXabmdcbPV5FbgRWS8k,4110
+pvxslibs/include/pvxs/unittest.h,sha256=Vmigu2i_GwsCC9kqoaimk5zAf3tyWUsg8FE5v6elDRk,10192
+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=Hyz-13kzJBQNLcnkqY2gLoXq665niO8yJdMmOB4Qn3c,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=F8Na2mFSOQPC7A-kSz-lI8Q08c7IoNqyjGOve8CNnis,979412
+pvxslibs/lib/libevent_core.so.2.2.0,sha256=F8Na2mFSOQPC7A-kSz-lI8Q08c7IoNqyjGOve8CNnis,979412
+pvxslibs/lib/libevent_pthread.so,sha256=af8xqMOIk0rJbmifP-a6fBOrqsnJqbNpRaY3qbH_0os,24252
+pvxslibs/lib/libevent_pthread.so.2.2.0,sha256=af8xqMOIk0rJbmifP-a6fBOrqsnJqbNpRaY3qbH_0os,24252
+pvxslibs/lib/libpvxs.so,sha256=49IH22vWKVRY1AdHxlyJC5Nll1ddOmj1Z2IJcsxf-rY,1753445
+pvxslibs/lib/libpvxs.so.1.2,sha256=49IH22vWKVRY1AdHxlyJC5Nll1ddOmj1Z2IJcsxf-rY,1753445
+pvxslibs/lib/libpvxsIoc.so,sha256=W2zYvHoXP6fYl99zXWhngysbKwVFEdZ6l_gQy7xdbSU,407749
+pvxslibs/lib/libpvxsIoc.so.1.2,sha256=W2zYvHoXP6fYl99zXWhngysbKwVFEdZ6l_gQy7xdbSU,407749
+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.0a1.dist-info/LICENSE,sha256=XViOs7FX1SESr-qTXIin_5793B4tlaQsJdO5atkFUAg,1499
+pvxslibs-1.2.0a1.dist-info/METADATA,sha256=NPajdl3hB1GYhsvQvyShP2c2YNkNXt4rdX6LrCB-14E,1225
+pvxslibs-1.2.0a1.dist-info/WHEEL,sha256=IODkjaibdQL4Y0ih2utemBolHCvYTfxEeli_9oQOqGs,109
+pvxslibs-1.2.0a1.dist-info/top_level.txt,sha256=RixlMjBFoSBZhAgzdvurnG0N681VoNV0ikf00-HgXFM,9
+pvxslibs-1.2.0a1.dist-info/RECORD,,

pvxslibs-1.1.4a1.dist-info/RECORD

@@ -1,34 +0,0 @@
-pvxslibs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/path.py,sha256=FbVt5FQgbSMpS4yGGXnXZJ6NI775LbElaJQ95Wn5TIA,199
-pvxslibs/version.py,sha256=vmbnHFP7nheGuX7r7LAKgJ4c2joFyUd4BPqeM4bpUfQ,984
-pvxslibs/include/pvxs/client.h,sha256=et_np6DmBqutuFJ2xf8eeuLerCXjCyeih_A6Qns2i4Q,36668
-pvxslibs/include/pvxs/data.h,sha256=19NwOI51ZHhDpjYRp0ClO9UJd8BJlP9cd7In7fLoXMs,28570
-pvxslibs/include/pvxs/log.h,sha256=2hqmFQ300vhl7mtToc4LBAVJqBgs1QMYz92pmLv1ab4,4959
-pvxslibs/include/pvxs/netcommon.h,sha256=om2fgidy5rOuxPWr98BKqbej22I9IfBnDtMlg8vOFok,1786
-pvxslibs/include/pvxs/nt.h,sha256=oP-6FIvWvfPt28kggStuNxk0KNPUVDXOtnG9WGLStWM,3479
-pvxslibs/include/pvxs/server.h,sha256=LnDoZBMnP1DE50IYcjnY2B92-ffs0GyuwEPafei6gLU,7689
-pvxslibs/include/pvxs/sharedArray.h,sha256=iRxhRgYbcMg6WWB15KbwML6THyFLqZ0QEvMHLj_wxc0,23748
-pvxslibs/include/pvxs/sharedpv.h,sha256=VPrngwKEOjtGW708clV6rDtn8CarBMSkSM-S6SEmxDM,4143
-pvxslibs/include/pvxs/source.h,sha256=VLKeO-7W4_P5hPjTFkQBIv70mPyL5HXTBybRvhCzUwI,10139
-pvxslibs/include/pvxs/srvcommon.h,sha256=jF_3tG6VzF0UheypRTO1SJO0RXabmdcbPV5FbgRWS8k,4110
-pvxslibs/include/pvxs/unittest.h,sha256=BGWRMNhUU--6jTXfSjaFnQhvsCHRLQCs75fh8iQvDLE,10047
-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=WTwYJf8Nv0navc2ds3XJGQeP9ACqZDGgT5AWijzS2HU,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=OvqgANyMgoZJpk6vTg_vuZgK_DQIOUh9AFqlh6IapP8,962721
-pvxslibs/lib/libevent_core.so.2.2.0,sha256=OvqgANyMgoZJpk6vTg_vuZgK_DQIOUh9AFqlh6IapP8,962721
-pvxslibs/lib/libevent_pthread.so,sha256=Azds_fgXbDOU9Ec0Tf35dlPe8ISl9gqcRJlD4tcLlwY,23707
-pvxslibs/lib/libevent_pthread.so.2.2.0,sha256=Azds_fgXbDOU9Ec0Tf35dlPe8ISl9gqcRJlD4tcLlwY,23707
-pvxslibs/lib/libpvxs.so,sha256=oBFPymlKkCHBvIMZ3GxpRBxQhHa-ynoNO01mXAKytwA,1758702
-pvxslibs/lib/libpvxs.so.1.1,sha256=oBFPymlKkCHBvIMZ3GxpRBxQhHa-ynoNO01mXAKytwA,1758702
-pvxslibs/lib/pvxs_dsoinfo.py,sha256=ueLOB8xtQcG40OqlRIhER0HKIMhBQ6l0XTYiX0C84tg,407
-pvxslibs/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/test/test_load.py,sha256=lxaKPHB3mmziSZy8Odf5_VOgY4_IiUiFXtGr5pRMnMM,775
-pvxslibs-1.1.4a1.dist-info/LICENSE,sha256=XViOs7FX1SESr-qTXIin_5793B4tlaQsJdO5atkFUAg,1499
-pvxslibs-1.1.4a1.dist-info/METADATA,sha256=movAB5T8KhC76ZqDolAJqUUpKyiHN6z4e4b0KwHjYfU,1225
-pvxslibs-1.1.4a1.dist-info/WHEEL,sha256=IODkjaibdQL4Y0ih2utemBolHCvYTfxEeli_9oQOqGs,109
-pvxslibs-1.1.4a1.dist-info/top_level.txt,sha256=RixlMjBFoSBZhAgzdvurnG0N681VoNV0ikf00-HgXFM,9
-pvxslibs-1.1.4a1.dist-info/RECORD,,