pvxslibs 1.1.4a1__cp310-cp310-win_amd64.whl → 1.2.0a1__cp310-cp310-win_amd64.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 = 'pvxsIoc.dll'
+soname = 'pvxsIoc.dll'
+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/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=Dom8mJoqA4iRv1nBiJPptF1bdm5iIGtPpMQsFeBtJNI,209
+pvxslibs/version.py,sha256=idyj3WCiCjGJGRvPqLE_TNfd5Gzxnx4c8pxGO0_AejI,1016
+pvxslibs/include/pvxs/client.h,sha256=qK2jpFuJfa80RCg9-9Y65Y99Ulp-hWmEj9AvoEVdy3o,37905
+pvxslibs/include/pvxs/data.h,sha256=xe38UJCGhrkMd_i2T8G-PTb_cKco-zMFRe1rSh4JKkI,29518
+pvxslibs/include/pvxs/iochooks.h,sha256=2t9wXKmzT-FiLyrCrM3YRXx6YFqMA0qzu-v9Nul96xY,2898
+pvxslibs/include/pvxs/log.h,sha256=rnPEl1vTOBqf6vnYQFBafiPVYx2FlmRSvbDUMYO-0s0,5107
+pvxslibs/include/pvxs/netcommon.h,sha256=a3BTAYYD5nGfqXmZWq0kk91b0SEAhd4jPS2HjFVSDdw,1860
+pvxslibs/include/pvxs/nt.h,sha256=Xa8qU-nYvAubgQ6dgkkA_0liOgbjLwVU12n3GQQ6zdo,3861
+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=0oQ3SsFNgY8ltoyWUz3STcx3S3h1hO3lREXdbmDGVdo,10529
+pvxslibs/include/pvxs/srvcommon.h,sha256=kMNQRiMka-laIyIUPlBWNRDndVyISB3V0ujNrFzMdVQ,4238
+pvxslibs/include/pvxs/unittest.h,sha256=wUImNzwhSEss8pptlQEvdAmQ4l_093CDYUCw1NvvP-w,10519
+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=VX5PQpXUc9nofoT3e8staLDMxtv_4LB2Y698iQrStt8,182
+pvxslibs/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pvxslibs/lib/event_core.dll,sha256=jE4fREKA9lBvja3VUooktSWImyfKDUJAxtNq8Qq-7Pg,199168
+pvxslibs/lib/event_core.exp,sha256=5SGi7xgIw33jeeHk58AVo5-tOFlZdlAAYXnvSvnODy8,52056
+pvxslibs/lib/event_core.lib,sha256=fNJv5-A9qhmUaUNHBft2wvQ8DVO_VO7jkJ3V1ct1NgI,87182
+pvxslibs/lib/event_core_dsoinfo.py,sha256=H0HQPHx7pnRhQ6fkEj-yJEfTEkj9GaA1mx-kW_fOhFk,351
+pvxslibs/lib/pvxs.dll,sha256=sC5dCCGH4Retjk5osB1ByEmsLOWGyeh-CreVfIvMJ5I,897024
+pvxslibs/lib/pvxs.exp,sha256=R_gCz5DwGMqMtRfM24uO8qjqQ4Ywl-28LqLgyf5VFt0,157612
+pvxslibs/lib/pvxs.lib,sha256=knpoVMBcend_62oPbp9MxY_YITtRfGWnkks7D2nzkKM,257360
+pvxslibs/lib/pvxsIoc.dll,sha256=Pb0jipayNIy4cA9FN6ovgSb9HQPWznod4QrNTB2K2_I,226304
+pvxslibs/lib/pvxsIoc.exp,sha256=jMp6Oze2YPojgPBsPtmIeN1PfRgMjJGoW-Hh9aoJOhc,2217
+pvxslibs/lib/pvxsIoc.lib,sha256=NlNtGYLRii-VXO2BBdJCg4W9IjHFmAxXxScQd6DMf30,3798
+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.0a1.dist-info/LICENSE,sha256=-ROhoot-GxWl5VV-rFFE_1K-41MEQzGJQvSSvyf6ntc,1525
+pvxslibs-1.2.0a1.dist-info/METADATA,sha256=TaVjCgBWcXFhndjdgOKLZ1xA8NogVSfdCZCK6GBJ__U,1238
+pvxslibs-1.2.0a1.dist-info/WHEEL,sha256=jrOhEbqKwvzRFSJcbYXlJCyVkgVdHg4_7__YHrdTUfw,102
+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,33 +0,0 @@
-pvxslibs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/path.py,sha256=Dom8mJoqA4iRv1nBiJPptF1bdm5iIGtPpMQsFeBtJNI,209
-pvxslibs/version.py,sha256=idyj3WCiCjGJGRvPqLE_TNfd5Gzxnx4c8pxGO0_AejI,1016
-pvxslibs/include/pvxs/client.h,sha256=V-oXejPnu99DfNHAobH8x1HqnjTi0WWCfJsCij_5PMM,37753
-pvxslibs/include/pvxs/data.h,sha256=xe38UJCGhrkMd_i2T8G-PTb_cKco-zMFRe1rSh4JKkI,29518
-pvxslibs/include/pvxs/log.h,sha256=rnPEl1vTOBqf6vnYQFBafiPVYx2FlmRSvbDUMYO-0s0,5107
-pvxslibs/include/pvxs/netcommon.h,sha256=a3BTAYYD5nGfqXmZWq0kk91b0SEAhd4jPS2HjFVSDdw,1860
-pvxslibs/include/pvxs/nt.h,sha256=q-RM2Fb5zp6aMBrspb9DDrnBNcmVmCKX8wcLLFMrtnQ,3641
-pvxslibs/include/pvxs/server.h,sha256=98M0iH4fzt8X-UMpewKB1I_Mz0qHr7pDM49dxaK79jc,7920
-pvxslibs/include/pvxs/sharedArray.h,sha256=BMW9Ea1YjtpgnXEiQg_3SbL5mAG5On9uLvLLRxpSMlQ,24494
-pvxslibs/include/pvxs/sharedpv.h,sha256=k6LasQsMrpHTPa9DasXKvWTppqwVZJ9vBHj8P5Q-9Cw,4264
-pvxslibs/include/pvxs/source.h,sha256=zMRqvIbOQ_kdHIi1xi5NwLPRabRROjvF-T3RGaBi374,10424
-pvxslibs/include/pvxs/srvcommon.h,sha256=kMNQRiMka-laIyIUPlBWNRDndVyISB3V0ujNrFzMdVQ,4238
-pvxslibs/include/pvxs/unittest.h,sha256=MCBt3J2toaHJoD27keDP1osRS99ZMoeRHKNe0pk_gVg,10372
-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=3BKOUlcr0oeh6Ks8ufkBsXt-VxyDpSPm_SsJVHVFuIg,182
-pvxslibs/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/lib/event_core.dll,sha256=m6L19aL_Mtbg_8_ui3nZb4gi_TkhikNc8E7XvpNXsbE,197632
-pvxslibs/lib/event_core.exp,sha256=QQOXspi12dm2idJnJw-mfmjb_m2ys6k9wYMkXMdkdd8,51896
-pvxslibs/lib/event_core.lib,sha256=clFyM1MJ0jgDPQSn_05tr9-feBkzUWKkd7MvPuLm5uY,86914
-pvxslibs/lib/event_core_dsoinfo.py,sha256=H0HQPHx7pnRhQ6fkEj-yJEfTEkj9GaA1mx-kW_fOhFk,351
-pvxslibs/lib/pvxs.dll,sha256=INYz6qymbhP0jU-LvPZPOhDCCOuS7aa9Ydm97iaYanY,888832
-pvxslibs/lib/pvxs.exp,sha256=JlNVkH4PstVcQuK1H_GWMOHzJLPEytyAEVa1GihtLKI,161564
-pvxslibs/lib/pvxs.lib,sha256=w7wHFE0L0SmoD9l3go5V9_E-0dAuD5Ql2l6juj9Kq7k,261372
-pvxslibs/lib/pvxs_dsoinfo.py,sha256=qmYxkZldQ5Yzw5_PMqlmFpmODXGTKv0ZU8CqFBLpEZI,383
-pvxslibs/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pvxslibs/test/test_load.py,sha256=2ewIzLd2haLXJAMn3xMqJ3fwJd1yFlUQIiKcE6DsE8Y,800
-pvxslibs-1.1.4a1.dist-info/LICENSE,sha256=-ROhoot-GxWl5VV-rFFE_1K-41MEQzGJQvSSvyf6ntc,1525
-pvxslibs-1.1.4a1.dist-info/METADATA,sha256=e1iEklMRQymREggSuhaEMhakX6bUW5EFQHMqUc58TQA,1238
-pvxslibs-1.1.4a1.dist-info/WHEEL,sha256=jrOhEbqKwvzRFSJcbYXlJCyVkgVdHg4_7__YHrdTUfw,102
-pvxslibs-1.1.4a1.dist-info/top_level.txt,sha256=RixlMjBFoSBZhAgzdvurnG0N681VoNV0ikf00-HgXFM,9
-pvxslibs-1.1.4a1.dist-info/RECORD,,