2 files changed, 10 insertions, 6 deletions

diff --git a/cpp/src/qpid/client/ConnectionImpl.cpp b/cpp/src/qpid/client/ConnectionImpl.cpp
index ccaa8c0b87..2fdf4d1d25 100644
--- a/cpp/src/qpid/client/ConnectionImpl.cpp
+++ b/cpp/src/qpid/client/ConnectionImpl.cpp
@@ -130,7 +130,10 @@ public:
     }
 };
 
-static IOThread io(SystemInfo::concurrency());
+IOThread& theIO() {
+    static IOThread io(SystemInfo::concurrency());
+    return io;
+}
 
 class HeartbeatTask : public TimerTask {
     TimeoutHandler& timeout;
@@ -173,7 +176,7 @@ ConnectionImpl::~ConnectionImpl() {
     // is running.
     failover.reset();
     if (connector) connector->close();
-    io.sub();
+    theIO().sub();
 }
 
 void ConnectionImpl::addSession(const boost::shared_ptr<SessionImpl>& session, uint16_t channel)
@@ -217,8 +220,8 @@ void ConnectionImpl::open()
     int port = handler.port;
     QPID_LOG(info, "Connecting to " << protocol << ":" << host << ":" << port);
 
-    io.add();
-    connector.reset(Connector::create(protocol, io.poller(), version, handler, this)); 
+    theIO().add();
+    connector.reset(Connector::create(protocol, theIO().poller(), version, handler, this));
     connector->setInputHandler(&handler);
     connector->setShutdownHandler(this);
     connector->connect(host, port);
diff --git a/cpp/src/qpid/sys/epoll/EpollPoller.cpp b/cpp/src/qpid/sys/epoll/EpollPoller.cpp
index 42a2b2bbab..5a6b8987ec 100644
--- a/cpp/src/qpid/sys/epoll/EpollPoller.cpp
+++ b/cpp/src/qpid/sys/epoll/EpollPoller.cpp
@@ -258,7 +258,7 @@ class PollerPrivate {
         // Add always readable fd into our set (but not listening to it yet)
         ::epoll_event epe;
         epe.events = 0;
-        epe.data.u64 = 0;
+        epe.data.u64 = 1;
         QPID_POSIX_CHECK(::epoll_ctl(epollFd, EPOLL_CTL_ADD, alwaysReadableFd, &epe));
     }
 
@@ -285,7 +285,7 @@ class PollerPrivate {
         ::epoll_event epe;
         // Not EPOLLONESHOT, so we eventually get all threads
         epe.events = ::EPOLLIN;
-        epe.data.u64 = 0; // Keep valgrind happy
+        epe.data.u64 = 2; // Keep valgrind happy
         QPID_POSIX_CHECK(::epoll_ctl(epollFd, EPOLL_CTL_MOD, alwaysReadableFd, &epe));  
     }
 };
@@ -442,6 +442,7 @@ bool Poller::interrupt(PollerHandle& handle) {
         ::epoll_event epe;
         epe.events = 0;
         epe.data.u64 = 0; // Keep valgrind happy
+        epe.data.ptr = &eh;
         QPID_POSIX_CHECK(::epoll_ctl(impl->epollFd, EPOLL_CTL_MOD, eh.fd, &epe));
 
         if (eh.isInactive()) {