pvxslibs 1.2.2__tar.gz → 1.2.3__tar.gz

{pvxslibs-1.2.2/python/pvxslibs.egg-info → pvxslibs-1.2.3}/PKG-INFO

@@ -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

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/configure/CONFIG_PVXS_VERSION

@@ -1,6 +1,6 @@
 PVXS_MAJOR_VERSION = 1
 PVXS_MINOR_VERSION = 2
-PVXS_MAINTENANCE_VERSION = 2
+PVXS_MAINTENANCE_VERSION = 3
 
 # Version range conditions in Makefiles
 #
@@ -12,7 +12,8 @@ PVXS_MAINTENANCE_VERSION = 2
 #
 # ifneq ($(PVXS_X_Y_Z),YES)   # PVXS != X.Y.Z
 #
-PVXS_1_2_2 = YES
+PVXS_1_2_3 = YES
+PVXS_1_2_2 = NO
 PVXS_1_2_1 = NO
 PVXS_1_2_0 = NO
 PVXS_1_1_4 = NO

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/fieldnamecomponent.h

@@ -13,6 +13,7 @@
 #include <string>
 #include <vector>
 #include <utility>
+#include <cstdint>
 
 namespace pvxs {
 namespace ioc {

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/group.cpp

@@ -23,7 +23,7 @@ static
 IOCGroupConfig* configInstance;
 
 static
-void onceConfigInstance(void*)
+void onceConfigInstance()
 {
     try {
         configInstance = new IOCGroupConfig;
@@ -32,12 +32,9 @@ void onceConfigInstance(void*)
     }
 }
 
-static
-epicsThreadOnceId onceConfig = EPICS_THREAD_ONCE_INIT;
-
 IOCGroupConfig& IOCGroupConfig::instance()
 {
-    epicsThreadOnce(&onceConfig, &onceConfigInstance, nullptr);
+    threadOnce<&onceConfigInstance>();
     return *configInstance;
 }
 

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/groupconfigprocessor.cpp

@@ -322,22 +322,15 @@ void GroupConfigProcessor::resolveTriggerReferences() {
             resolveGroupTriggerReferences(groupDefinition, groupName);
         } else {
             // If no trigger specified for this group then set all fields to trigger themselves
-            log_debug_printf(_logname, "  pvxs default triggers for '%s'\n", groupName.c_str());
-            resolveSelfTriggerReferences(groupDefinition);
-        }
-    }
-}
+            log_warn_printf(_logname, "Group %s defines no +trigger mappings."
+                            "  Default to individual/split monitor updates.\n",
+                            groupName.c_str());
 
-/**
- * When triggers are unspecified for a group, call this function to configure all its fields to
- * trigger themselves
- *
- * @param groupDefinition the group to define triggers for
- */
-void GroupConfigProcessor::resolveSelfTriggerReferences(GroupDefinition& groupDefinition) {
-    for (auto&& field: groupDefinition.fields) {
-        if (!field.channel.empty()) {
-            field.triggerNames.insert(field.name);  // default is self trigger
+            for (auto&& field: groupDefinition.fields) {
+                if (!field.channel.empty()) {
+                    field.triggerNames.insert(field.name);  // default is self trigger
+                }
+            }
         }
     }
 }

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/groupconfigprocessor.h

@@ -77,7 +77,6 @@ private:
     static void defineAtomicity(GroupDefinition& groupDefinition, const GroupConfig& groupConfig,
                                 const std::string& groupName);
     void defineFieldSortOrder();
-    static void resolveSelfTriggerReferences(GroupDefinition& groupDefinition);
     void parseConfigString(const char* jsonGroupDefinition, const char* dbRecordName = nullptr);
     static void defineTriggers(GroupDefinition& groupDefinition, const FieldConfig& fieldConfig,
                                const std::string& fieldName);

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/iochooks.cpp

@@ -39,6 +39,9 @@
 namespace pvxs {
 namespace ioc {
 
+typedef epicsGuard<epicsMutex> Guard;
+typedef epicsGuardRelease<epicsMutex> UnGuard;
+
 DEFINE_LOGGER(_logname, "pvxs.ioc");
 
 void printIOCShError(const std::exception& e)
@@ -46,8 +49,17 @@ void printIOCShError(const std::exception& e)
     fprintf(stderr, "Error: %s\n", e.what());
 }
 
+namespace {
 // The pvxs server singleton
-std::atomic<server::Server*> pvxsServer{};
+struct pvxServer_t {
+    epicsMutex lock;
+    server::Server srv;
+} *pvxServer;
+
+void pvxServerInit() {
+    pvxServer = new pvxServer_t();
+}
+} // namespace
 
 /**
  * Get the plain pvxs server instance
@@ -55,11 +67,27 @@ std::atomic<server::Server*> pvxsServer{};
  * @return the pvxs server instance
  */
 server::Server server() {
-    if (auto pPvxsServer = pvxsServer.load()) {
-        return *pPvxsServer;
-    } else {
+    threadOnce<&pvxServerInit>();
+    Guard (pvxServer->lock);
+    if(pvxServer->srv)
+        return pvxServer->srv;
+    else
         throw std::logic_error("No Instance");
-    }
+}
+
+static
+void initialisePvxsServer() {
+    using namespace pvxs::server;
+
+    Config conf = ::pvxs::impl::inUnitTest() ? Config::isolated() : Config::from_env();
+    Server newsrv(conf);
+
+    threadOnce<&pvxServerInit>();
+    Guard G(pvxServer->lock);
+    if(pvxServer->srv)
+        throw std::logic_error(SB()<<__func__<<" found existing server?!?");
+
+    pvxServer->srv = std::move(newsrv);
 }
 
 /**
@@ -72,20 +100,24 @@ server::Server server() {
 static
 void pvxsAtExit(void*) noexcept {
     try {
-        if (auto pPvxsServer = pvxsServer.load()) {
-            if (pvxsServer.compare_exchange_strong(pPvxsServer, nullptr)) {
-                // take ownership
-                std::unique_ptr<server::Server> serverInstance(pPvxsServer);
-                serverInstance->stop();
-                IOCGroupConfigCleanup();
-                log_debug_printf(_logname, "Stopped Server%s", "\n");
-            }
+        Guard (pvxServer->lock);
+        if(auto srv = std::move(pvxServer->srv)) {
+            pvxServer->srv = server::Server();
+            srv.stop();
+            IOCGroupConfigCleanup();
+            log_debug_printf(_logname, "Stopped Server%s", "\n");
         }
     } catch(std::exception& e) {
         fprintf(stderr, "Error in %s : %s\n", __func__, e.what());
     }
 }
 
+void testPrepare()
+{
+    if(pvxServer)
+        initialisePvxsServer(); // re-create server for next test cycle
+}
+
 void testShutdown()
 {
 #ifndef USE_DEINIT_HOOKS
@@ -106,10 +138,10 @@ void testShutdown()
  */
 static
 void pvxsr(int detail) {
-    if (auto pPvxsServer = pvxsServer.load()) {
+    if (auto srv = server()) {
         std::ostringstream strm;
         Detailed D(strm, detail);
-        strm << *pPvxsServer;
+        strm << srv;
         printf("%s", strm.str().c_str());
     }
 }
@@ -148,14 +180,12 @@ struct RefTrack {
     std::map<std::string, size_t> refs;
 } *refTrack;
 
-epicsThreadOnceId refSavedOnce = EPICS_THREAD_ONCE_INIT;
-
-void refSavedInit(void *) {
+void refSavedInit() {
     refTrack = new RefTrack();
 }
 
 void pvxrefsave() {
-    epicsThreadOnce(&refSavedOnce, &refSavedInit, nullptr);
+    threadOnce<&refSavedInit>();
     epicsGuard<epicsMutex> G(refTrack->lock);
     refTrack->refs = instanceSnapshot();
 }
@@ -164,7 +194,7 @@ void pvxrefdiff() {
     auto cur(instanceSnapshot());
     std::map<std::string, int64_t> diff;
 
-    epicsThreadOnce(&refSavedOnce, &refSavedInit, nullptr);
+    threadOnce<&refSavedInit>();
     {
         epicsGuard<epicsMutex> G(refTrack->lock);
 
@@ -217,7 +247,6 @@ void pvxrefdiff() {
  */
 static
 void pvxsInitHook(initHookState theInitHookState) {
-    auto pPvxsServer = pvxsServer.load();
     switch(theInitHookState) {
     case initHookAfterInitDatabase:
         // when de-init hooks not available, register for later cleanup via atexit()
@@ -228,15 +257,15 @@ void pvxsInitHook(initHookState theInitHookState) {
         break;
     case initHookAfterCaServerRunning:
     case initHookAfterIocRunning:
-        if(pPvxsServer) {
-            pPvxsServer->start();
-            log_debug_printf(_logname, "Started Server %p", pPvxsServer);
+        if(auto srv = server()) {
+            srv.start();
+            log_debug_printf(_logname, "Started Server%s", "\n");
         }
         break;
     case initHookAfterCaServerPaused:
-        if(pPvxsServer) {
-            pPvxsServer->stop();
-            log_debug_printf(_logname, "Stopped Server %p", pPvxsServer);
+        if(auto srv = server()) {
+            srv.stop();
+            log_debug_printf(_logname, "Stopped Server%s", "\n");
         }
         break;
 #ifdef USE_DEINIT_HOOKS
@@ -257,27 +286,6 @@ using namespace pvxs::ioc;
 
 namespace {
 
-/**
- * Create the pvxs server instance.  We use the global pvxsServer atomic
- */
-void initialisePvxsServer() {
-    using namespace pvxs::server;
-    auto serv = pvxsServer.load();
-    if (!serv) {
-        Config conf = ::pvxs::impl::inUnitTest() ? Config::isolated() : Config::from_env();
-        std::unique_ptr<Server> temp(new Server(conf));
-
-        if (pvxsServer.compare_exchange_strong(serv, temp.get())) {
-            log_debug_printf(_logname, "Installing Server %p\n", temp.get());
-            (void)temp.release();
-        } else {
-            log_crit_printf(_logname, "Race installing Server? %p\n", serv);
-        }
-    } else {
-        log_err_printf(_logname, "Stale Server? %p\n", serv);
-    }
-}
-
 /**
  * IOC pvxs base registrar.  This implements the required registrar function that is called by xxxx_registerRecordDeviceDriver,
  * the auto-generated stub created for all IOC implementations.
@@ -292,6 +300,8 @@ void pvxsBaseRegistrar() {
     try {
         pvxs::logger_config_env();
 
+        pvxServer = new pvxServer_t();
+
         IOCShCommand<int>("pvxsr", "[show_detailed_information?]", "PVXS Server Report.  "
                                                                    "Shows information about server config (level==0)\n"
                                                                    "or about connected clients (level>0).\n")

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/iocshcommand.h

@@ -102,8 +102,6 @@ public:
     }
 };
 
-extern std::atomic<server::Server*> pvxsServer;
-
 } // pvxs
 } // ioc
 

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/iocsource.cpp

@@ -327,6 +327,7 @@ void getProperties(dbChannel* pChannel, db_field_log *pfl, Value& node)
         if(options & DBR_GR_DOUBLE) {
             dlL = meta.lower_disp_limit;
             node["display.limitHigh"] = meta.upper_disp_limit;
+            node["display.precision"] = meta.precision.dp;
         }
         if(options & DBR_CTRL_DOUBLE) {
             node["control.limitLow"] = meta.lower_ctrl_limit;

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/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-1.2.2 → pvxslibs-1.2.3}/ioc/singlesourcehooks.cpp

@@ -30,13 +30,13 @@
 namespace pvxs {
 namespace ioc {
 void pvxsl(int detail) {
-    if (auto pPvxsServer = pvxsServer.load()) {
+    if (auto srv = ioc::server()) {
         // For each registered source/IOID pair print a line of either detailed or regular information
-        for (auto& pair: pPvxsServer->listSource()) {
+        for (auto& pair: srv.listSource()) {
             auto& record = pair.first;
             auto& ioId = pair.second;
 
-            auto source = pPvxsServer->getSource(record, ioId);
+            auto source = srv.getSource(record, ioId);
             if (!source) {
                 // if the source is not yet available in the server then we're in a race condition
                 // silently skip source
@@ -73,10 +73,10 @@ namespace {
 
 void qReport(unsigned level) noexcept {
     try{
-        if (auto pPvxsServer = pvxsServer.load()) {
+        if (auto srv = ioc::server()) {
             std::ostringstream strm;
             Detailed D(strm, (int)level);
-            strm << *pPvxsServer;
+            strm << srv;
             printf("%s", strm.str().c_str());
         }
     }catch(std::exception& e){
@@ -86,8 +86,8 @@ void qReport(unsigned level) noexcept {
 
 void qStats(unsigned *channels, unsigned *clients) noexcept {
     try{
-        if (auto pPvxsServer = pvxsServer.load()) {
-            auto report(pPvxsServer->report(false));
+        if (auto srv = ioc::server()) {
+            auto report(srv.report(false));
             if(clients) {
                 *clients = report.connections.size();
             }

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/ioc/subscriptionctx.h

@@ -12,6 +12,7 @@
 
 #include <memory>
 #include <stdexcept>
+#include <type_traits>
 
 #include <dbEvent.h>
 
@@ -22,21 +23,21 @@ namespace pvxs {
 namespace ioc {
 
 class Subscription {
-    std::shared_ptr<void> sub; // holds void* returned by db_add_event()
+    std::shared_ptr<std::remove_pointer<dbEventSubscription>::type> sub; // holds void* returned by db_add_event()
 public:
     /* 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.
      * Adds a deleter to clean up the subscription by calling db_cancel_event.
      */
-    void subscribe(void* context,
+    void subscribe(dbEventCtx context,
                    const Channel& pChan,
                    EVENTFUNC *user_sub, void *user_arg, unsigned select)
     {
         auto chan(pChan); // bind by value
         sub.reset(db_add_event(context, chan,
                                user_sub, user_arg, select),
-                  [chan](void* sub) mutable
+                  [chan](dbEventSubscription sub) mutable
         {
             db_cancel_event(sub);
             chan = Channel(); // dbChannel* must outlive subscription

{pvxslibs-1.2.2 → pvxslibs-1.2.3/python/pvxslibs.egg-info}/PKG-INFO

@@ -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

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/src/client.cpp

@@ -152,9 +152,15 @@ void Channel::disconnect(const std::shared_ptr<Channel>& self)
     assert(!self || this==self.get());
     auto current(std::move(conn));
 
+    size_t holdoff = 0u;
     switch(state) {
     case Channel::Connecting:
         current->pending.erase(cid);
+        /* disconnect/timeout while before CREATE_CHANNEL sent,
+         * likely lower level networking issue.  Try to slow
+         * down reconnect loop.
+         */
+        holdoff = 10u; // arbitrary
         break;
     case Channel::Creating:
         current->creatingByCID.erase(cid);
@@ -201,7 +207,9 @@ void Channel::disconnect(const std::shared_ptr<Channel>& self)
 
     } else if(forcedServer.family()==AF_UNSPEC) { // begin search
 
-        context->searchBuckets[context->currentBucket].push_back(self);
+        auto next = (context->currentBucket + holdoff) % nBuckets;
+
+        context->searchBuckets[next].push_back(self);
 
         log_debug_printf(io, "Server %s detach channel '%s' to re-search\n",
                          current ? current->peerName.c_str() : "<disconnected>",

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/src/clientget.cpp

@@ -220,7 +220,7 @@ struct GPROp : public OperationBase
                 self->arg = std::move(a);
 
             } else if(put && self->op==Put) {
-                self->builder = [a](Value&&) -> Value {
+                self->builder = [a](Value&&) noexcept -> Value {
                     // caller should be passing a Value of the correct prototype
                     // given through onInit().
                     return a;

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/src/data.cpp

@@ -829,8 +829,13 @@ void Value::traverse(const std::string &expr, bool modify, bool dothrow)
                 // no such member
                 store.reset();
                 desc = nullptr;
-                if(dothrow)
-                    throw LookupError(SB()<<"no such member '"<<name<<"' in '"<<expr<<"'");
+                if(dothrow) {
+                    SB msg;
+                    msg<<"no such member field '"<<name<<"'";
+                    if(name!=expr)
+                        msg<<" in expression '"<<expr<<"'";
+                    throw LookupError(msg);
+                }
             }
 
         } else if(desc->code.code==TypeCode::Union || desc->code.code==TypeCode::Any) {

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/src/describe.cpp

@@ -132,4 +132,12 @@ std::ostream& target_information(std::ostream& strm)
     return strm;
 }
 
+std::ostream& version_information(std::ostream& strm)
+{
+    strm<<version_str()<<"\n";
+    strm<<EPICS_VERSION_STRING<<"\n";
+    strm<<"libevent "<<event_get_version()<<"\n";
+    return strm;
+}
+
 } // namespace pvxs

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/src/evhelper.cpp

@@ -21,6 +21,7 @@
 
 #include <errlog.h>
 #include <epicsEvent.h>
+#include <epicsString.h>
 #include <epicsThread.h>
 #include <epicsExit.h>
 #include <epicsMutex.h>
@@ -51,10 +52,7 @@ VFunctor0::~VFunctor0() {}
 }
 
 static
-epicsThreadOnceId evthread_once = EPICS_THREAD_ONCE_INIT;
-
-static
-void evthread_init(void* unused)
+void evthread_init()
 {
 #if defined(EVTHREAD_USE_WINDOWS_THREADS_IMPLEMENTED)
     evthread_use_windows_threads();
@@ -130,7 +128,7 @@ struct evbase::Pvt final : public epicsThreadRunable
     };
     std::deque<Work> actions;
 
-    owned_ptr<event_base> base;
+    evbaseptr base;
     evevent keepalive;
     evevent dowork;
     epicsEvent start_sync;
@@ -146,7 +144,7 @@ struct evbase::Pvt final : public epicsThreadRunable
                 epicsThreadGetStackSize(epicsThreadStackBig),
                 prio)
     {
-        threadOnce(&evthread_once, &evthread_init, nullptr);
+        threadOnce<&evthread_init>();
 
         worker.start();
         start_sync.wait();
@@ -661,9 +659,19 @@ size_t evsocket::get_buffer_size(evutil_socket_t sock, bool tx)
 #  define EAFNOSUPPORT WSAESOCKTNOSUPPORT
 #endif
 
-bool evsocket::init_canIPv6()
+bool evsocket::init_canIPv6() noexcept
 {
     try {
+        if(auto ena6 = getenv("PVXS_ENABLE_IPV6")) {
+            if(epicsStrCaseCmp(ena6, "NO")==0) {
+                log_info_printf(logsock, "IPv6 support disabled%s", "\n");
+                return false;
+            } else if(epicsStrCaseCmp(ena6, "YES")!=0) {
+                log_warn_printf(logsock, "PVXS_ENABLE_IPV6=%s ignoring unrecognized\n",
+                                ena6);
+            }
+        }
+
         evsocket sock(AF_INET6, SOCK_DGRAM, 0);
         auto addr(SockAddr::loopback(AF_INET6));
         sock.bind(addr);
@@ -688,19 +696,17 @@ bool evsocket::init_canIPv6()
 #  define getMonotonic getCurrent
 #endif
 
-static epicsThreadOnceId mapOnce = EPICS_THREAD_ONCE_INIT;
-
 static IfaceMap* theinstance;
 
 static
-void mapInit(void*)
+void mapInit()
 {
     theinstance = new IfaceMap();
 }
 
 IfaceMap& IfaceMap::instance()
 {
-    threadOnce(&mapOnce, &mapInit);
+    threadOnce<&mapInit>();
     assert(theinstance);
     return *theinstance;
 }

{pvxslibs-1.2.2 → pvxslibs-1.2.3}/src/evhelper.h

@@ -56,15 +56,47 @@ struct default_delete<evbuffer> {
 
 namespace pvxs {namespace impl {
 
-//! unique_ptr which is never constructed with NULL
 template<typename T>
-struct owned_ptr : public std::unique_ptr<T>
+struct ev_delete;
+#define DEFINE_DELETE(TYPE) \
+template<> struct ev_delete<TYPE> { \
+    inline void operator()(TYPE* ev) { TYPE ## _free(ev); } \
+}
+DEFINE_DELETE(event_config);
+DEFINE_DELETE(event_base);
+DEFINE_DELETE(event);
+DEFINE_DELETE(evconnlistener);
+DEFINE_DELETE(bufferevent);
+DEFINE_DELETE(evbuffer);
+#undef DEFINE_DELETE
+
+//! unique_ptr which is never constructed with NULL
+template<typename T, typename D>
+struct owned_ptr : public std::unique_ptr<T, D>
 {
+    typedef std::unique_ptr<T, D> base_t;
     constexpr owned_ptr() {}
-    explicit owned_ptr(const char* file, int line, T* ptr) : std::unique_ptr<T>(ptr) {
+    constexpr owned_ptr(std::nullptr_t np) : base_t(np) {}
+    explicit owned_ptr(const char* file, int line, T* ptr) : base_t(ptr) {
         if(!*this)
             throw loc_bad_alloc(file, line);
     }
+
+    // for functions which return a pointer in an argument
+    //   int some(T** presult); // store *presult = output
+    // use like
+    //   owned_ptr<T> x;
+    //   some(x.acquire());
+    struct acquisition {
+        base_t* o;
+        T* ptr = nullptr;
+        operator T** () { return &ptr; }
+        constexpr acquisition(base_t* o) :o(o) {}
+        ~acquisition() {
+            o->reset(ptr);
+        }
+    };
+    acquisition acquire() { return acquisition{this}; }
 };
 
 /* It seems that std::function<void()>(Fn&&) from gcc (circa 8.3) and clang (circa 7.0)
@@ -96,7 +128,7 @@ struct PVXS_API VFunctor0 {
     virtual void invoke() =0;
 };
 template<typename Fn>
-struct Functor0 : public VFunctor0 {
+struct Functor0 final : public VFunctor0 {
     Functor0() = default;
     Functor0(Fn&& fn) : fn(std::move(fn)) {}
     virtual ~Functor0() {}
@@ -180,11 +212,14 @@ public:
     event_base* base = nullptr;
 };
 
-typedef owned_ptr<event_config> evconfig;
-typedef owned_ptr<event> evevent;
-typedef owned_ptr<evconnlistener> evlisten;
-typedef owned_ptr<bufferevent> evbufferevent;
-typedef owned_ptr<evbuffer> evbuf;
+template<typename T>
+using ev_owned_ptr = owned_ptr<T, ev_delete<T>>;
+typedef ev_owned_ptr<event_config> evconfig;
+typedef ev_owned_ptr<event_base> evbaseptr;
+typedef ev_owned_ptr<event> evevent;
+typedef ev_owned_ptr<evconnlistener> evlisten;
+typedef ev_owned_ptr<bufferevent> evbufferevent;
+typedef ev_owned_ptr<evbuffer> evbuf;
 
 PVXS_API
 void to_wire(Buffer& buf, const SockAddr& val);
@@ -255,7 +290,7 @@ struct PVXS_API evsocket
     static
     bool canIPv6;
 
-    static bool init_canIPv6();
+    static bool init_canIPv6() noexcept;
 
     enum ipstack_t {
         Linsock,
@@ -302,6 +337,7 @@ struct PVXS_API IfaceMap {
         Iface(const std::string& name, uint64_t index, bool isLO) :name(name), index(index), isLO(isLO) {}
     };
 
+    SockAttach attach;
     epicsMutex lock;
     std::map<uint64_t, Iface> byIndex;
     std::map<std::string, Iface*> byName;