zeroc-ice 3.6.5 → 3.7.4

data/ext/ice/cpp/src/Ice/RouterInfoF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_ROUTER_INFO_F_H
 #define ICE_ROUTER_INFO_F_H

data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp

@@ -1,15 +1,10 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
-#include <IceUtil/SHA1.h>
+#include <Ice/SHA1.h>
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 #   if defined(_WIN32)
 #      include <Wincrypt.h>
 #      include <IceUtil/Exception.h>
@@ -23,29 +18,29 @@
 using namespace std;
 using namespace IceUtil;
 
-#ifndef ICE_OS_WINRT
+#ifndef ICE_OS_UWP
 
-namespace IceUtilInternal
+namespace IceInternal
 {
 
 class SHA1::Hasher
 {
 public:
-    
+
     Hasher();
 #   ifdef _WIN32
     ~Hasher();
 #endif
-    
+
     void update(const unsigned char*, std::size_t);
     void finalize(std::vector<unsigned char>&);
-    
+
 private:
 
     // noncopyable
     Hasher(const Hasher&);
     Hasher operator=(const Hasher&);
-    
+
 #   if defined (_WIN32)
     HCRYPTPROV _ctx;
     HCRYPTHASH _hash;
@@ -65,7 +60,7 @@ namespace
 const int SHA_DIGEST_LENGTH = 20;
 }
 
-IceUtilInternal::SHA1::Hasher::Hasher() :
+IceInternal::SHA1::Hasher::Hasher() :
     _ctx(0),
     _hash(0)
 {
@@ -80,7 +75,7 @@ IceUtilInternal::SHA1::Hasher::Hasher() :
     }
 }
 
-IceUtilInternal::SHA1::Hasher::~Hasher()
+IceInternal::SHA1::Hasher::~Hasher()
 {
     if(_hash)
     {
@@ -93,19 +88,19 @@ IceUtilInternal::SHA1::Hasher::~Hasher()
     }
 }
 #   elif defined(__APPLE__)
-IceUtilInternal::SHA1::Hasher::Hasher()
+IceInternal::SHA1::Hasher::Hasher()
 {
     CC_SHA1_Init(&_ctx);
 }
 #   else
-IceUtilInternal::SHA1::Hasher::Hasher()
+IceInternal::SHA1::Hasher::Hasher()
 {
     SHA1_Init(&_ctx);
 }
 #   endif
 
 void
-IceUtilInternal::SHA1::Hasher::update(const unsigned char* data, size_t length)
+IceInternal::SHA1::Hasher::update(const unsigned char* data, size_t length)
 {
 #   if defined(_WIN32)
     if(!CryptHashData(_hash, data, static_cast<DWORD>(length), 0))
@@ -113,14 +108,14 @@ IceUtilInternal::SHA1::Hasher::update(const unsigned char* data, size_t length)
         throw IceUtil::SyscallException(__FILE__, __LINE__, GetLastError());
     }
 #   elif defined(__APPLE__)
-    CC_SHA1_Update(&_ctx, reinterpret_cast<const void*>(data), length);
+    CC_SHA1_Update(&_ctx, reinterpret_cast<const void*>(data), static_cast<CC_LONG>(length));
 #   else
     SHA1_Update(&_ctx, reinterpret_cast<const void*>(data), length);
 #   endif
 }
 
 void
-IceUtilInternal::SHA1::Hasher::finalize(vector<unsigned char>& md)
+IceInternal::SHA1::Hasher::finalize(vector<unsigned char>& md)
 {
 #   if defined(_WIN32)
     md.resize(SHA_DIGEST_LENGTH);
@@ -138,32 +133,32 @@ IceUtilInternal::SHA1::Hasher::finalize(vector& md)
 #   endif
 }
 
-IceUtilInternal::SHA1::SHA1() :
+IceInternal::SHA1::SHA1() :
     _hasher(new Hasher())
 {
 }
 
-IceUtilInternal::SHA1::~SHA1()
+IceInternal::SHA1::~SHA1()
 {
 }
 
 void
-IceUtilInternal::SHA1::update(const unsigned char* data, std::size_t length)
+IceInternal::SHA1::update(const unsigned char* data, std::size_t length)
 {
     _hasher->update(data, length);
 }
 
 void
-IceUtilInternal::SHA1::finalize(std::vector<unsigned char>& md)
+IceInternal::SHA1::finalize(std::vector<unsigned char>& md)
 {
     _hasher->finalize(md);
 }
 #endif
 
 void
-IceUtilInternal::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md)
+IceInternal::sha1(const unsigned char* data, size_t length, vector<unsigned char>& md)
 {
-#if defined(ICE_OS_WINRT)
+#if defined(ICE_OS_UWP)
     auto dataA =
         ref new Platform::Array<unsigned char>(const_cast<unsigned char*>(data), static_cast<unsigned int>(length));
     auto hasher = Windows::Security::Cryptography::Core::HashAlgorithmProvider::OpenAlgorithm("SHA1");
@@ -180,7 +175,7 @@ IceUtilInternal::sha1(const unsigned char* data, size_t length, vector
     hasher.finalize(md);
 #elif defined(__APPLE__)
     md.resize(CC_SHA1_DIGEST_LENGTH);
-    CC_SHA1(&data[0], length, &md[0]);
+    CC_SHA1(&data[0], static_cast<CC_LONG>(length), &md[0]);
 #else
     md.resize(SHA_DIGEST_LENGTH);
     ::SHA1(&data[0], length, &md[0]);

data/ext/ice/cpp/src/Ice/Selector.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <Ice/Selector.h>
 #include <Ice/EventHandler.h>
@@ -29,98 +24,13 @@ struct timespec zeroTimeout = { 0, 0 };
 }
 #endif
 
-#ifdef ICE_OS_WINRT
-using namespace Windows::Foundation;
+#if defined(ICE_OS_UWP)
 using namespace Windows::Storage::Streams;
 using namespace Windows::Networking;
 using namespace Windows::Networking::Sockets;
+#endif
 
-Selector::Selector(const InstancePtr& instance) : _instance(instance)
-{
-}
-
-void
-Selector::destroy()
-{
-}
-
-void
-Selector::initialize(IceInternal::EventHandler* handler)
-{
-    EventHandlerPtr h = handler;
-    handler->__incRef();
-    handler->getNativeInfo()->setCompletedHandler(
-        ref new SocketOperationCompletedHandler([=](int operation)
-                                                {
-                                                    //
-                                                    // Use the reference counted handler to ensure it's not
-                                                    // destroyed as long as the callback lambda exists.
-                                                    //
-                                                    completed(h, static_cast<SocketOperation>(operation));
-                                                }));
-}
-
-void
-Selector::update(IceInternal::EventHandler* handler, SocketOperation remove, SocketOperation add)
-{
-    handler->_registered = static_cast<SocketOperation>(handler->_registered & ~remove);
-    handler->_registered = static_cast<SocketOperation>(handler->_registered | add);
-    if(add & SocketOperationRead && !(handler->_pending & SocketOperationRead))
-    {
-        handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationRead);
-        completed(handler, SocketOperationRead); // Start an asynchrnous read
-    }
-    else if(add & SocketOperationWrite && !(handler->_pending & SocketOperationWrite))
-    {
-        handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationWrite);
-        completed(handler, SocketOperationWrite); // Start an asynchrnous write
-    }
-}
-
-void
-Selector::finish(IceInternal::EventHandler* handler)
-{
-    handler->_registered = SocketOperationNone;
-    handler->_finish = false; // Ensures that finished() is only called once on the event handler.
-    handler->__decRef();
-}
-
-IceInternal::EventHandlerPtr
-Selector::getNextHandler(SocketOperation& status, int timeout)
-{
-    Lock lock(*this);
-    while(_events.empty())
-    {
-        if(timeout > 0)
-        {
-            timedWait(IceUtil::Time::seconds(timeout));
-            if(_events.empty())
-            {
-                throw SelectorTimeoutException();
-            }
-        }
-        else
-        {
-            wait();
-        }
-    }
-    assert(!_events.empty());
-    IceInternal::EventHandlerPtr handler = _events.front().handler;
-    const SelectEvent& event = _events.front();
-    status = event.status;
-    _events.pop_front();
-    return handler;
-}
-
-void
-Selector::completed(const IceInternal::EventHandlerPtr& handler, SocketOperation op)
-{
-    Lock lock(*this);
-    _events.push_back(SelectEvent(handler, op));
-    notify();
-}
-
-#elif defined(ICE_USE_IOCP)
+#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
 
 Selector::Selector(const InstancePtr& instance) : _instance(instance)
 {
@@ -130,36 +40,60 @@ Selector::~Selector()
 {
 }
 
+#ifdef ICE_USE_IOCP
 void
 Selector::setup(int sizeIO)
 {
-    _handle = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, sizeIO);
-    if(_handle == NULL)
+    _handle = CreateIoCompletionPort(INVALID_HANDLE_VALUE, ICE_NULLPTR, 0, sizeIO);
+    if(_handle == ICE_NULLPTR)
     {
-        Ice::SocketException ex(__FILE__, __LINE__);
-        ex.error = GetLastError();
-        throw ex;
+        throw Ice::SocketException(__FILE__, __LINE__, GetLastError());
     }
 }
+#endif
 
 void
 Selector::destroy()
 {
+#ifdef ICE_USE_IOCP
     CloseHandle(_handle);
+#endif
 }
 
 void
 Selector::initialize(EventHandler* handler)
 {
-    HANDLE socket = reinterpret_cast<HANDLE>(handler->getNativeInfo()->fd());
-    if(CreateIoCompletionPort(socket, _handle, reinterpret_cast<ULONG_PTR>(handler), 0) == NULL)
+    if(!handler->getNativeInfo())
+    {
+        return;
+    }
+
+#ifdef ICE_USE_IOCP
+    SOCKET socket = handler->getNativeInfo()->fd();
+    if(socket != INVALID_SOCKET)
     {
-        Ice::SocketException ex(__FILE__, __LINE__);
-        ex.error = GetLastError();
-        throw ex;
+        if(CreateIoCompletionPort(reinterpret_cast<HANDLE>(socket),
+                                  _handle,
+                                  reinterpret_cast<ULONG_PTR>(handler),
+                                  0) == ICE_NULLPTR)
+        {
+            throw Ice::SocketException(__FILE__, __LINE__, GetLastError());
+        }
     }
-    handler->__incRef();
     handler->getNativeInfo()->initialize(_handle, reinterpret_cast<ULONG_PTR>(handler));
+#else
+    EventHandlerPtr h = ICE_GET_SHARED_FROM_THIS(handler);
+    handler->getNativeInfo()->setCompletedHandler(
+        ref new SocketOperationCompletedHandler(
+            [=](int operation)
+            {
+                //
+                // Use the reference counted handler to ensure it's not
+                // destroyed as long as the callback lambda exists.
+                //
+                completed(h.get(), static_cast<SocketOperation>(operation));
+            }));
+#endif
 }
 
 void
@@ -167,42 +101,60 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
 {
     handler->_registered = static_cast<SocketOperation>(handler->_registered & ~remove);
     handler->_registered = static_cast<SocketOperation>(handler->_registered | add);
-    AsyncInfo* info = 0;
     if(add & SocketOperationRead && !(handler->_pending & SocketOperationRead))
     {
         handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationRead);
-        info = handler->getNativeInfo()->getAsyncInfo(SocketOperationRead);
+        completed(handler, SocketOperationRead); // Start an asynchrnous read
     }
     else if(add & SocketOperationWrite && !(handler->_pending & SocketOperationWrite))
     {
         handler->_pending = static_cast<SocketOperation>(handler->_pending | SocketOperationWrite);
-        info = handler->getNativeInfo()->getAsyncInfo(SocketOperationWrite);
-    }
-
-    if(info)
-    {
-        if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), info))
-        {
-            Ice::SocketException ex(__FILE__, __LINE__);
-            ex.error = GetLastError();
-            throw ex;
-        }
+        completed(handler, SocketOperationWrite); // Start an asynchrnous write
     }
 }
 
 void
 Selector::finish(IceInternal::EventHandler* handler)
 {
+#ifdef ICE_OS_UWP
+    // If async operations are no longer pending, clear the completion handler to break
+    // the cyclic reference count.
+    assert(!handler->_started && !handler->_pending);
+    handler->getNativeInfo()->setCompletedHandler(nullptr);
+#endif
     handler->_registered = SocketOperationNone;
-    handler->__decRef();
+    handler->_finish = false; // Ensures that finished() is only called once on the event handler.
+}
+
+void
+Selector::ready(EventHandler* handler, SocketOperation status, bool value)
+{
+    if(((handler->_ready & status) != 0) == value)
+    {
+        return; // Nothing to do if ready state already correctly set.
+    }
+
+    if(value)
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready | status);
+    }
+    else
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready & ~status);
+    }
 }
 
 EventHandler*
+#ifdef ICE_USE_IOCP
 Selector::getNextHandler(SocketOperation& status, DWORD& count, int& error, int timeout)
+#else
+Selector::getNextHandler(SocketOperation& status, int timeout)
+#endif
 {
+#ifdef ICE_USE_IOCP
     ULONG_PTR key;
     LPOVERLAPPED ol;
-    error = 0;
+    error = ERROR_SUCCESS;
 
     if(!GetQueuedCompletionStatus(_handle, &count, &key, &ol, timeout > 0 ? timeout * 1000 : INFINITE))
     {
@@ -215,49 +167,132 @@ Selector::getNextHandler(SocketOperation& status, DWORD& count, int& error, int
             }
             else
             {
-                {
-                    Ice::SocketException ex(__FILE__, __LINE__, err);
-                    Ice::Error out(_instance->initializationData().logger);
-                    out << "fatal error: couldn't dequeue packet from completion port:\n" << ex;
-                }
-                abort();
+                Ice::SocketException ex(__FILE__, __LINE__, err);
+                Ice::Error out(_instance->initializationData().logger);
+                out << "couldn't dequeue packet from completion port:\n" << ex;
+                IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(5)); // Sleep 5s to avoid looping
             }
         }
         AsyncInfo* info = static_cast<AsyncInfo*>(ol);
-        status = info->status;
-        count = SOCKET_ERROR;
+        if(info)
+        {
+            status = info->status;
+        }
+        count = 0;
         error = WSAGetLastError();
         return reinterpret_cast<EventHandler*>(key);
     }
 
-    assert(ol);
     AsyncInfo* info = static_cast<AsyncInfo*>(ol);
-    status = info->status;
+    if(info)
+    {
+        status = info->status;
+    }
+    else
+    {
+        status = reinterpret_cast<EventHandler*>(key)->_ready;
+    }
     return reinterpret_cast<EventHandler*>(key);
+#else
+    IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+    while(_events.empty())
+    {
+        if(timeout > 0)
+        {
+            _monitor.timedWait(IceUtil::Time::seconds(timeout));
+            if(_events.empty())
+            {
+                throw SelectorTimeoutException();
+            }
+        }
+        else
+        {
+            _monitor.wait();
+        }
+    }
+    assert(!_events.empty());
+    IceInternal::EventHandlerPtr handler = _events.front().handler;
+    const SelectEvent& event = _events.front();
+    status = event.status;
+    _events.pop_front();
+    return handler.get();
+#endif
+}
+
+void
+Selector::completed(EventHandler* handler, SocketOperation op)
+{
+#ifdef ICE_USE_IOCP
+    AsyncInfo* info = 0;
+    NativeInfoPtr nativeInfo = handler->getNativeInfo();
+    if(nativeInfo)
+    {
+        info = nativeInfo->getAsyncInfo(op);
+    }
+    if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), info))
+    {
+        throw Ice::SocketException(__FILE__, __LINE__, GetLastError());
+    }
+#else
+    IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
+    _events.push_back(SelectEvent(handler->shared_from_this(), op));
+    _monitor.notify();
+#endif
 }
 
-#elif defined(ICE_USE_KQUEUE) || defined(ICE_USE_EPOLL)
+#elif defined(ICE_USE_KQUEUE) || defined(ICE_USE_EPOLL) || defined(ICE_USE_SELECT) || defined(ICE_USE_POLL)
 
-Selector::Selector(const InstancePtr& instance) : _instance(instance)
+Selector::Selector(const InstancePtr& instance) : _instance(instance), _interrupted(false)
 {
-    _events.resize(256);
+    SOCKET fds[2];
+    createPipe(fds);
+    _fdIntrRead = fds[0];
+    _fdIntrWrite = fds[1];
+    _selecting = false;
+
 #if defined(ICE_USE_EPOLL)
+    _events.resize(256);
     _queueFd = epoll_create(1);
     if(_queueFd < 0)
     {
-        Ice::SocketException ex(__FILE__, __LINE__);
-        ex.error = IceInternal::getSocketErrno();
-        throw ex;
+        throw Ice::SocketException(__FILE__, __LINE__, IceInternal::getSocketErrno());
     }
-#else
+
+    epoll_event event;
+    memset(&event, 0, sizeof(epoll_event));
+    event.data.ptr = 0;
+    event.events = EPOLLIN;
+    if(epoll_ctl(_queueFd, EPOLL_CTL_ADD, _fdIntrRead, &event) != 0)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+    }
+#elif defined(ICE_USE_KQUEUE)
+    _events.resize(256);
     _queueFd = kqueue();
     if(_queueFd < 0)
     {
-        Ice::SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
+        throw Ice::SocketException(__FILE__, __LINE__, getSocketErrno());
     }
-    _selecting = false;
+
+    struct kevent ev;
+    EV_SET(&ev, _fdIntrRead, EVFILT_READ, EV_ADD, 0, 0, 0);
+    int rs = kevent(_queueFd, &ev, 1, 0, 0, 0);
+    if(rs < 0)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+    }
+#elif defined(ICE_USE_SELECT)
+    FD_ZERO(&_readFdSet);
+    FD_ZERO(&_writeFdSet);
+    FD_ZERO(&_errorFdSet);
+    FD_SET(_fdIntrRead, &_readFdSet);
+#else
+    struct pollfd pollFd;
+    pollFd.fd = _fdIntrRead;
+    pollFd.events = POLLIN;
+    _pollFdSet.push_back(pollFd);
 #endif
 }
 
@@ -268,6 +303,7 @@ Selector::~Selector()
 void
 Selector::destroy()
 {
+#if defined(ICE_USE_KQUEUE) || defined(ICE_USE_EPOLL)
     try
     {
         closeSocket(_queueFd);
@@ -277,6 +313,27 @@ Selector::destroy()
         Ice::Error out(_instance->initializationData().logger);
         out << "exception in selector while calling closeSocket():\n" << ex;
     }
+#endif
+
+    try
+    {
+        closeSocket(_fdIntrWrite);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "exception in selector while calling closeSocket():\n" << ex;
+    }
+
+    try
+    {
+        closeSocket(_fdIntrRead);
+    }
+    catch(const Ice::LocalException& ex)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "exception in selector while calling closeSocket():\n" << ex;
+    }
 }
 
 void
@@ -289,109 +346,65 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
     {
         return;
     }
+    checkReady(handler);
 
-    SOCKET fd = handler->getNativeInfo()->fd();
-#if defined(ICE_USE_EPOLL)
-    epoll_event event;
-    memset(&event, 0, sizeof(epoll_event));
-    event.data.ptr = handler;
-    SocketOperation status = handler->_registered;
-    if(handler->_disabled)
-    {
-        status = static_cast<SocketOperation>(status & ~handler->_disabled);
-        previous = static_cast<SocketOperation>(previous & ~handler->_disabled);
-    }
-    event.events |= status & SocketOperationRead ? EPOLLIN : 0;
-    event.events |= status & SocketOperationWrite ? EPOLLOUT : 0;
-    int op;
-    if(!previous && status)
+    NativeInfoPtr nativeInfo = handler->getNativeInfo();
+    if(nativeInfo && nativeInfo->fd() != INVALID_SOCKET)
     {
-        op = EPOLL_CTL_ADD;
-    }
-    else if(previous && !status)
-    {
-        op = EPOLL_CTL_DEL;
+        updateSelectorForEventHandler(handler, remove, add);
     }
-    else if(previous == status)
+}
+
+void
+Selector::enable(EventHandler* handler, SocketOperation status)
+{
+    if(!(handler->_disabled & status))
     {
         return;
     }
-    else
-    {
-        op = EPOLL_CTL_MOD;
-    }
-    if(epoll_ctl(_queueFd, op, fd, &event) != 0)
+    handler->_disabled = static_cast<SocketOperation>(handler->_disabled & ~status);
+    checkReady(handler);
+
+    NativeInfoPtr nativeInfo = handler->getNativeInfo();
+    if(!nativeInfo || nativeInfo->fd() == INVALID_SOCKET)
     {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+        return;
     }
-#else // ICE_USE_KQUEUE
-    if(remove & SocketOperationRead)
+
+    if(handler->_registered & status)
     {
+#if defined(ICE_USE_EPOLL)
+        SOCKET fd = nativeInfo->fd();
+        SocketOperation previous = static_cast<SocketOperation>(handler->_registered & ~(handler->_disabled | status));
+        SocketOperation newStatus = static_cast<SocketOperation>(handler->_registered & ~handler->_disabled);
+        epoll_event event;
+        memset(&event, 0, sizeof(epoll_event));
+        event.data.ptr = handler;
+        if(newStatus & SocketOperationRead)
+        {
+            event.events |= EPOLLIN;
+        }
+        if(newStatus & SocketOperationWrite)
+        {
+            event.events |= EPOLLOUT;
+        }
+        if(epoll_ctl(_queueFd, previous ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, fd, &event) != 0)
+        {
+            Ice::Error out(_instance->initializationData().logger);
+            out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+        }
+#elif defined(ICE_USE_KQUEUE)
         struct kevent ev;
-        EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, handler);
-        _changes.push_back(ev);
-    }
-    if(remove & SocketOperationWrite)
-    {
-        struct kevent ev;
-        EV_SET(&ev, fd, EVFILT_WRITE, EV_DELETE, 0, 0, handler);
-        _changes.push_back(ev);
-    }
-    if(add & SocketOperationRead)
-    {
-        struct kevent ev;
-        EV_SET(&ev, fd, EVFILT_READ, EV_ADD | (handler->_disabled & SocketOperationRead ? EV_DISABLE : 0), 0, 0,
-               handler);
-        _changes.push_back(ev);
-    }
-    if(add & SocketOperationWrite)
-    {
-        struct kevent ev;
-        EV_SET(&ev, fd, EVFILT_WRITE, EV_ADD | (handler->_disabled & SocketOperationWrite ? EV_DISABLE : 0), 0, 0,
-               handler);
-        _changes.push_back(ev);
-    }
-    if(_selecting)
-    {
-        updateSelector();
-    }
-#endif
-}
-
-void
-Selector::enable(EventHandler* handler, SocketOperation status)
-{
-    if(!(handler->_disabled & status))
-    {
-        return;
-    }
-    handler->_disabled = static_cast<SocketOperation>(handler->_disabled & ~status);
-
-    if(handler->_registered & status)
-    {
         SOCKET fd = handler->getNativeInfo()->fd();
-#if defined(ICE_USE_EPOLL)
-        SocketOperation previous = static_cast<SocketOperation>(handler->_registered & ~(handler->_disabled | status));
-        SocketOperation newStatus = static_cast<SocketOperation>(handler->_registered & ~handler->_disabled);
-        epoll_event event;
-        memset(&event, 0, sizeof(epoll_event));
-        event.data.ptr = handler;
-        event.events |= newStatus & SocketOperationRead ? EPOLLIN : 0;
-        event.events |= newStatus & SocketOperationWrite ? EPOLLOUT : 0;
-        if(epoll_ctl(_queueFd, previous ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, fd, &event) != 0)
-        {
-            Ice::Error out(_instance->initializationData().logger);
-            out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
-        }
-#else // ICE_USE_KQUEUE
-        struct kevent ev;
         EV_SET(&ev, fd, status == SocketOperationRead ? EVFILT_READ : EVFILT_WRITE, EV_ENABLE, 0, 0, handler);
         _changes.push_back(ev);
         if(_selecting)
         {
             updateSelector();
         }
+#else
+        _changes.push_back(make_pair(handler, static_cast<SocketOperation>(handler->_registered & ~handler->_disabled)));
+        wakeup();
 #endif
     }
 }
@@ -404,23 +417,37 @@ Selector::disable(EventHandler* handler, SocketOperation status)
         return;
     }
     handler->_disabled = static_cast<SocketOperation>(handler->_disabled | status);
+    checkReady(handler);
+
+    NativeInfoPtr nativeInfo = handler->getNativeInfo();
+    if(!nativeInfo || nativeInfo->fd() == INVALID_SOCKET)
+    {
+        return;
+    }
 
     if(handler->_registered & status)
     {
-        SOCKET fd = handler->getNativeInfo()->fd();
 #if defined(ICE_USE_EPOLL)
+        SOCKET fd = nativeInfo->fd();
         SocketOperation newStatus = static_cast<SocketOperation>(handler->_registered & ~handler->_disabled);
         epoll_event event;
         memset(&event, 0, sizeof(epoll_event));
         event.data.ptr = handler;
-        event.events |= newStatus & SocketOperationRead ? EPOLLIN : 0;
-        event.events |= newStatus & SocketOperationWrite ? EPOLLOUT : 0;
+        if(newStatus & SocketOperationRead)
+        {
+            event.events |= EPOLLIN;
+        }
+        if(newStatus & SocketOperationWrite)
+        {
+            event.events |= EPOLLOUT;
+        }
         if(epoll_ctl(_queueFd, newStatus ? EPOLL_CTL_MOD : EPOLL_CTL_DEL, fd, &event) != 0)
         {
             Ice::Error out(_instance->initializationData().logger);
             out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
         }
-#else // ICE_USE_KQUEUE
+#elif defined(ICE_USE_KQUEUE)
+        SOCKET fd = nativeInfo->fd();
         struct kevent ev;
         EV_SET(&ev, fd, status == SocketOperationRead ? EVFILT_READ : EVFILT_WRITE, EV_DISABLE, 0, 0, handler);
         _changes.push_back(ev);
@@ -428,6 +455,9 @@ Selector::disable(EventHandler* handler, SocketOperation status)
         {
             updateSelector();
         }
+#else
+        _changes.push_back(make_pair(handler, static_cast<SocketOperation>(handler->_registered & ~handler->_disabled)));
+        wakeup();
 #endif
     }
 }
@@ -438,7 +468,11 @@ Selector::finish(EventHandler* handler, bool closeNow)
     if(handler->_registered)
     {
         update(handler, handler->_registered, SocketOperationNone);
+#if !defined(ICE_USE_EPOLL) && !defined(ICE_USE_KQUEUE)
+        return false; // Don't close now if selecting
+#endif
     }
+
 #if defined(ICE_USE_KQUEUE)
     if(closeNow && !_changes.empty())
     {
@@ -449,98 +483,127 @@ Selector::finish(EventHandler* handler, bool closeNow)
         //
         updateSelector();
     }
+#elif !defined(ICE_USE_EPOLL)
+    if(!_changes.empty())
+    {
+        return false;
+    }
 #endif
+
     return closeNow;
 }
 
-#if defined(ICE_USE_KQUEUE)
 void
-Selector::updateSelector()
+Selector::ready(EventHandler* handler, SocketOperation status, bool value)
 {
-    int rs = kevent(_queueFd, &_changes[0], _changes.size(), &_changes[0], _changes.size(), &zeroTimeout);
-    if(rs < 0)
+    if(((handler->_ready & status) != 0) == value)
     {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+        return; // Nothing to do if ready state already correctly set.
     }
-    else
+
+    if(status & SocketOperationConnect)
     {
-        for(int i = 0; i < rs; ++i)
+        NativeInfoPtr nativeInfo = handler->getNativeInfo();
+        if(nativeInfo && nativeInfo->newFd() && handler->_registered)
         {
-            //
-            // Check for errors, we ignore EINPROGRESS that started showing up with macOS Sierra
-            // and which occurs when another thread removes the FD from the kqueue (see ICE-7419).
-            //
-            if(_changes[i].flags & EV_ERROR && _changes[i].data != EINPROGRESS)
-            {
-                Ice::Error out(_instance->initializationData().logger);
-                out << "error while updating selector:\n" << IceUtilInternal::errorToString(_changes[i].data);
-            }
+            // If new FD is set after connect, register the FD with the selector.
+            updateSelectorForEventHandler(handler, SocketOperationNone, handler->_registered);
         }
     }
-    _changes.clear();
+
+    if(value)
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready | status);
+    }
+    else
+    {
+        handler->_ready = static_cast<SocketOperation>(handler->_ready & ~status);
+    }
+    checkReady(handler);
 }
-#endif
 
 void
-Selector::select(vector<pair<EventHandler*, SocketOperation> >& handlers, int timeout)
+Selector::wakeup()
 {
-    int ret = 0;
-    int spuriousWakeup = 0;
-    while(true)
+    if(_selecting && !_interrupted)
     {
-#if defined(ICE_USE_EPOLL)
-        ret = epoll_wait(_queueFd, &_events[0], _events.size(), timeout > 0 ? timeout * 1000 : -1);
-#else
-        assert(!_events.empty());
-        if(timeout > 0)
-        {
-            struct timespec ts;
-            ts.tv_sec = timeout;
-            ts.tv_nsec = 0;
-            ret = kevent(_queueFd, 0, 0, &_events[0], _events.size(), &ts);
-        }
-        else
-        {
-            ret = kevent(_queueFd, 0, 0, &_events[0], _events.size(), 0);
-        }
-#endif
-        if(ret == SOCKET_ERROR)
+        char c = 0;
+        while(true)
         {
-            if(interrupted())
+            if(::write(_fdIntrWrite, &c, 1) == SOCKET_ERROR)
             {
-                continue;
-            }
+                if(interrupted())
+                {
+                    continue;
+                }
 
-            {
-                Ice::SocketException ex(__FILE__, __LINE__, IceInternal::getSocketErrno());
-                Ice::Error out(_instance->initializationData().logger);
-                out << "fatal error: selector failed:\n" << ex;
+                throw Ice::SocketException(__FILE__, __LINE__, IceInternal::getSocketErrno());
             }
-            abort();
+            break;
         }
-        else if(ret == 0 && timeout <= 0)
+        _interrupted = true;
+    }
+}
+
+void
+Selector::startSelect()
+{
+    if(_interrupted)
+    {
+        char c;
+        while(true)
         {
-            if(++spuriousWakeup > 100)
+            ssize_t ret = ::read(_fdIntrRead, &c, 1);
+            if(ret == SOCKET_ERROR)
             {
-                spuriousWakeup = 0;
-                _instance->initializationData().logger->warning("spurious selector wakeup");
+                if(interrupted())
+                {
+                    continue;
+                }
+                throw Ice::SocketException(__FILE__, __LINE__, IceInternal::getSocketErrno());
             }
-            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1));
-            continue;
+            break;
         }
-        break;
+        _interrupted = false;
+    }
+
+#if !defined(ICE_USE_EPOLL)
+    if(!_changes.empty())
+    {
+        updateSelector();
     }
+#endif
+    _selecting = true;
+
+    //
+    // If there are ready handlers, don't block in select, just do a non-blocking
+    // select to retrieve new ready handlers from the Java selector.
+    //
+    _selectNow = !_readyHandlers.empty();
+}
+
+void
+Selector::finishSelect(vector<pair<EventHandler*, SocketOperation> >& handlers)
+{
+    _selecting = false;
 
-    if(ret == 0)
+    assert(handlers.empty());
+
+#if defined(ICE_USE_POLL) || defined(ICE_USE_SELECT)
+    if(_interrupted) // Interrupted, we have to process the interrupt before returning any handlers
     {
-        throw SelectorTimeoutException();
+        return;
     }
+#endif
 
-    assert(ret > 0);
-    for(int i = 0; i < ret; ++i)
+#if defined(ICE_USE_POLL)
+    for(vector<struct pollfd>::const_iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
+#else
+    for(int i = 0; i < _count; ++i)
+#endif
     {
         pair<EventHandler*, SocketOperation> p;
+
 #if defined(ICE_USE_EPOLL)
         struct epoll_event& ev = _events[i];
         p.first = reinterpret_cast<EventHandler*>(ev.data.ptr);
@@ -548,67 +611,468 @@ Selector::select(vector >& handlers, int ti
                                                  SocketOperationRead : SocketOperationNone) |
                                                 ((ev.events & (EPOLLOUT | EPOLLERR)) ?
                                                  SocketOperationWrite : SocketOperationNone));
-#else
-        struct kevent& ev = _events[i];
+#elif defined(ICE_USE_KQUEUE)
+        struct kevent& ev = _events[static_cast<size_t>(i)];
         if(ev.flags & EV_ERROR)
         {
             Ice::Error out(_instance->initializationData().logger);
-            out << "selector returned error:\n" << IceUtilInternal::errorToString(ev.data);
+            out << "selector returned error:\n" << IceUtilInternal::errorToString(static_cast<int>(ev.data));
             continue;
         }
         p.first = reinterpret_cast<EventHandler*>(ev.udata);
         p.second = (ev.filter == EVFILT_READ) ? SocketOperationRead : SocketOperationWrite;
-#endif
-        handlers.push_back(p);
-    }
-}
+#elif defined(ICE_USE_SELECT)
+        //
+        // Round robin for the filedescriptors.
+        //
+        SOCKET fd;
+        p.second = SocketOperationNone;
+        if(i < _selectedReadFdSet.fd_count)
+        {
+            fd = _selectedReadFdSet.fd_array[i];
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationRead);
+        }
+        else if(i < _selectedWriteFdSet.fd_count + _selectedReadFdSet.fd_count)
+        {
+            fd = _selectedWriteFdSet.fd_array[i - _selectedReadFdSet.fd_count];
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationWrite);
+        }
+        else
+        {
+            fd = _selectedErrorFdSet.fd_array[i - _selectedReadFdSet.fd_count - _selectedWriteFdSet.fd_count];
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationConnect);
+        }
 
-#elif defined(ICE_USE_CFSTREAM)
+        assert(fd != _fdIntrRead);
+        p.first = _handlers[fd];
+#else
+        if(r->revents == 0)
+        {
+            continue;
+        }
 
-namespace
-{
+        SOCKET fd = r->fd;
+        assert(_handlers.find(fd) != _handlers.end());
+        p.first = _handlers[fd];
+        p.second = SocketOperationNone;
+        if(r->revents & (POLLIN | POLLERR | POLLHUP))
+        {
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationRead);
+        }
+        if(r->revents & (POLLOUT | POLLERR | POLLHUP))
+        {
+            p.second = static_cast<SocketOperation>(p.second | SocketOperationWrite);
+        }
+        assert(p.second);
+#endif
+        if(!p.first)
+        {
+            continue; // Interrupted
+        }
 
-void selectorInterrupt(void* info)
-{
-    reinterpret_cast<Selector*>(info)->processInterrupt();
-}
+        map<EventHandlerPtr, SocketOperation>::iterator q = _readyHandlers.find(ICE_GET_SHARED_FROM_THIS(p.first));
 
-void eventHandlerSocketCallback(CFSocketRef, CFSocketCallBackType callbackType, CFDataRef, const void* d, void* info)
-{
-    if(callbackType == kCFSocketReadCallBack)
-    {
-        reinterpret_cast<EventHandlerWrapper*>(info)->readyCallback(SocketOperationRead);
-    }
-    else if(callbackType == kCFSocketWriteCallBack)
-    {
-        reinterpret_cast<EventHandlerWrapper*>(info)->readyCallback(SocketOperationWrite);
+        if(q != _readyHandlers.end()) // Handler will be added by the loop below
+        {
+            q->second = p.second; // We just remember which operations are ready here.
+        }
+        else
+        {
+            handlers.push_back(p);
+        }
     }
-    else if(callbackType == kCFSocketConnectCallBack)
+
+    for(map<EventHandlerPtr, SocketOperation>::iterator q = _readyHandlers.begin(); q != _readyHandlers.end(); ++q)
     {
-        reinterpret_cast<EventHandlerWrapper*>(info)->readyCallback(SocketOperationConnect,
-                                                                    d ? *reinterpret_cast<const SInt32*>(d) : 0);
+        pair<EventHandler*, SocketOperation> p;
+        p.first = q->first.get();
+        p.second = static_cast<SocketOperation>(p.first->_ready & ~p.first->_disabled & p.first->_registered);
+        p.second = static_cast<SocketOperation>(p.second | q->second);
+        if(p.second)
+        {
+            handlers.push_back(p);
+        }
+
+        //
+        // Reset the operation, it's only used by this method to temporarly store the socket status
+        // return by the select operation above.
+        //
+        q->second = SocketOperationNone;
     }
 }
 
-class SelectorHelperThread : public IceUtil::Thread
+void
+Selector::select(int timeout)
 {
-public:
-
-    SelectorHelperThread(Selector& selector) : _selector(selector)
+    if(_selectNow)
     {
+        timeout = 0;
     }
-
-    virtual void run()
+    else if(timeout > 0)
     {
-        _selector.run();
+        timeout = timeout * 1000;
+    }
+    else
+    {
+        timeout = -1;
     }
 
-private:
-
-    Selector& _selector;
-};
-
-CFOptionFlags
+    int spuriousWakeup = 0;
+    while(true)
+    {
+#if defined(ICE_USE_EPOLL)
+        _count = epoll_wait(_queueFd, &_events[0], _events.size(), timeout);
+#elif defined(ICE_USE_KQUEUE)
+        assert(!_events.empty());
+        if(timeout >= 0)
+        {
+            struct timespec ts;
+            ts.tv_sec = timeout;
+            ts.tv_nsec = 0;
+            _count = kevent(_queueFd, 0, 0, &_events[0], static_cast<int>(_events.size()), &ts);
+        }
+        else
+        {
+            _count = kevent(_queueFd, 0, 0, &_events[0], static_cast<int>(_events.size()), 0);
+        }
+#elif defined(ICE_USE_SELECT)
+        fd_set* rFdSet = fdSetCopy(_selectedReadFdSet, _readFdSet);
+        fd_set* wFdSet = fdSetCopy(_selectedWriteFdSet, _writeFdSet);
+        fd_set* eFdSet = fdSetCopy(_selectedErrorFdSet, _errorFdSet);
+        if(timeout >= 0)
+        {
+            struct timeval tv;
+            tv.tv_sec = timeout;
+            tv.tv_usec = 0;
+            _count = ::select(0, rFdSet, wFdSet, eFdSet, &tv); // The first parameter is ignored on Windows
+        }
+        else
+        {
+            _count = ::select(0, rFdSet, wFdSet, eFdSet, 0); // The first parameter is ignored on Windows
+        }
+#else
+        _count = poll(&_pollFdSet[0], _pollFdSet.size(), timeout);
+#endif
+
+        if(_count == SOCKET_ERROR)
+        {
+            if(interrupted())
+            {
+                continue;
+            }
+
+            Ice::SocketException ex(__FILE__, __LINE__, IceInternal::getSocketErrno());
+            Ice::Error out(_instance->initializationData().logger);
+            out << "selector failed:\n" << ex;
+            IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(5)); // Sleep 5s to avoid looping
+        }
+        else if(_count == 0 && timeout < 0)
+        {
+            if(++spuriousWakeup > 100)
+            {
+                spuriousWakeup = 0;
+                _instance->initializationData().logger->warning("spurious selector wakeup");
+            }
+            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1));
+            continue;
+        }
+        break;
+    }
+
+    if(_count == 0 && !_selectNow)
+    {
+        throw SelectorTimeoutException();
+    }
+}
+
+void
+Selector::checkReady(EventHandler* handler)
+{
+    if(handler->_ready & ~handler->_disabled & handler->_registered)
+    {
+        _readyHandlers.insert(make_pair(ICE_GET_SHARED_FROM_THIS(handler), SocketOperationNone));
+        wakeup();
+    }
+    else
+    {
+        map<EventHandlerPtr, SocketOperation>::iterator p = _readyHandlers.find(ICE_GET_SHARED_FROM_THIS(handler));
+        if(p != _readyHandlers.end())
+        {
+            _readyHandlers.erase(p);
+        }
+    }
+}
+
+void
+Selector::updateSelector()
+{
+#if defined(ICE_USE_KQUEUE)
+    int rs = kevent(_queueFd, &_changes[0], static_cast<int>(_changes.size()),
+                    &_changes[0], static_cast<int>(_changes.size()), &zeroTimeout);
+    if(rs < 0)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+    }
+    else
+    {
+        for(int i = 0; i < rs; ++i)
+        {
+            //
+            // Check for errors, we ignore EINPROGRESS that started showing up with macOS Sierra
+            // and which occurs when another thread removes the FD from the kqueue (see ICE-7419).
+            //
+            if(_changes[static_cast<size_t>(i)].flags & EV_ERROR &&
+               _changes[static_cast<size_t>(i)].data != EINPROGRESS)
+            {
+                Ice::Error out(_instance->initializationData().logger);
+                out << "error while updating selector:\n"
+                    << IceUtilInternal::errorToString(static_cast<int>(_changes[static_cast<size_t>(i)].data));
+            }
+        }
+    }
+    _changes.clear();
+#elif !defined(ICE_USE_EPOLL)
+    assert(!_selecting);
+
+    for(vector<pair<EventHandler*, SocketOperation> >::const_iterator p = _changes.begin(); p != _changes.end(); ++p)
+    {
+        EventHandler* handler = p->first;
+        SocketOperation status = p->second;
+
+        SOCKET fd = handler->getNativeInfo()->fd();
+        if(status)
+        {
+#if defined(ICE_USE_SELECT)
+            if(status & SocketOperationRead)
+            {
+                FD_SET(fd, &_readFdSet);
+            }
+            else
+            {
+                FD_CLR(fd, &_readFdSet);
+            }
+            if(status & SocketOperationWrite)
+            {
+                FD_SET(fd, &_writeFdSet);
+            }
+            else
+            {
+                FD_CLR(fd, &_writeFdSet);
+            }
+            if(status & SocketOperationConnect)
+            {
+                FD_SET(fd, &_writeFdSet);
+                FD_SET(fd, &_errorFdSet);
+            }
+            else
+            {
+                FD_CLR(fd, &_writeFdSet);
+                FD_CLR(fd, &_errorFdSet);
+            }
+            _handlers[fd] = handler;
+#else
+            short events = 0;
+            if(status & SocketOperationRead)
+            {
+                events |= POLLIN;
+            }
+            if(status & SocketOperationWrite)
+            {
+                events |= POLLOUT;
+            }
+            map<SOCKET, EventHandler*>::const_iterator q = _handlers.find(fd);
+            if(q == _handlers.end())
+            {
+                struct pollfd pollFd;
+                pollFd.fd = fd;
+                pollFd.events = events;
+                pollFd.revents = 0;
+                _pollFdSet.push_back(pollFd);
+                _handlers.insert(make_pair(fd, handler));
+            }
+            else
+            {
+                for(vector<struct pollfd>::iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
+                {
+                    if(r->fd == fd)
+                    {
+                        r->events = events;
+                        break;
+                    }
+                }
+            }
+#endif
+        }
+        else
+        {
+#if defined(ICE_USE_SELECT)
+            FD_CLR(fd, &_readFdSet);
+            FD_CLR(fd, &_writeFdSet);
+            FD_CLR(fd, &_errorFdSet);
+#else
+            for(vector<struct pollfd>::iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
+            {
+                if(r->fd == fd)
+                {
+                    _pollFdSet.erase(r);
+                    break;
+                }
+            }
+#endif
+            _handlers.erase(fd);
+        }
+    }
+    _changes.clear();
+#endif
+}
+
+void
+Selector::updateSelectorForEventHandler(EventHandler* handler,
+                                        ICE_MAYBE_UNUSED SocketOperation remove,
+                                        ICE_MAYBE_UNUSED SocketOperation add)
+{
+#if defined(ICE_USE_EPOLL)
+    SocketOperation previous = handler->_registered;
+    previous = static_cast<SocketOperation>(previous & ~add);
+    previous = static_cast<SocketOperation>(previous | remove);
+    SOCKET fd = handler->getNativeInfo()->fd();
+    assert(fd != INVALID_SOCKET);
+    epoll_event event;
+    memset(&event, 0, sizeof(epoll_event));
+    event.data.ptr = handler;
+    SocketOperation status = handler->_registered;
+    if(handler->_disabled)
+    {
+        status = static_cast<SocketOperation>(status & ~handler->_disabled);
+        previous = static_cast<SocketOperation>(previous & ~handler->_disabled);
+    }
+    if(status & SocketOperationRead)
+    {
+        event.events |= EPOLLIN;
+    }
+    if(status & SocketOperationWrite)
+    {
+        event.events |= EPOLLOUT;
+    }
+    int op;
+    if(!previous && status)
+    {
+        op = EPOLL_CTL_ADD;
+    }
+    else if(previous && !status)
+    {
+        op = EPOLL_CTL_DEL;
+    }
+    else if(previous == status)
+    {
+        return;
+    }
+    else
+    {
+        op = EPOLL_CTL_MOD;
+    }
+    if(epoll_ctl(_queueFd, op, fd, &event) != 0)
+    {
+        Ice::Error out(_instance->initializationData().logger);
+        out << "error while updating selector:\n" << IceUtilInternal::errorToString(IceInternal::getSocketErrno());
+    }
+#elif defined(ICE_USE_KQUEUE)
+    SOCKET fd = handler->getNativeInfo()->fd();
+    assert(fd != INVALID_SOCKET);
+    if(remove & SocketOperationRead)
+    {
+        struct kevent ev;
+        EV_SET(&ev, fd, EVFILT_READ, EV_DELETE, 0, 0, handler);
+        _changes.push_back(ev);
+    }
+    if(remove & SocketOperationWrite)
+    {
+        struct kevent ev;
+        EV_SET(&ev, fd, EVFILT_WRITE, EV_DELETE, 0, 0, handler);
+        _changes.push_back(ev);
+    }
+    if(add & SocketOperationRead)
+    {
+        struct kevent ev;
+        EV_SET(&ev, fd, EVFILT_READ, EV_ADD | (handler->_disabled & SocketOperationRead ? EV_DISABLE : 0), 0, 0,
+               handler);
+        _changes.push_back(ev);
+    }
+    if(add & SocketOperationWrite)
+    {
+        struct kevent ev;
+        EV_SET(&ev, fd, EVFILT_WRITE, EV_ADD | (handler->_disabled & SocketOperationWrite ? EV_DISABLE : 0), 0, 0,
+               handler);
+        _changes.push_back(ev);
+    }
+    if(_selecting)
+    {
+        updateSelector();
+    }
+#else
+    _changes.push_back(make_pair(handler, static_cast<SocketOperation>(handler->_registered & ~handler->_disabled)));
+    wakeup();
+#endif
+    checkReady(handler);
+}
+
+#elif defined(ICE_USE_CFSTREAM)
+
+namespace
+{
+
+void selectorInterrupt(void* info)
+{
+    reinterpret_cast<Selector*>(info)->processInterrupt();
+}
+
+void eventHandlerSocketCallback(CFSocketRef, CFSocketCallBackType callbackType, CFDataRef, const void* d, void* info)
+{
+    if(callbackType == kCFSocketReadCallBack)
+    {
+        reinterpret_cast<EventHandlerWrapper*>(info)->readyCallback(SocketOperationRead);
+    }
+    else if(callbackType == kCFSocketWriteCallBack)
+    {
+        reinterpret_cast<EventHandlerWrapper*>(info)->readyCallback(SocketOperationWrite);
+    }
+    else if(callbackType == kCFSocketConnectCallBack)
+    {
+        reinterpret_cast<EventHandlerWrapper*>(info)->readyCallback(SocketOperationConnect,
+                                                                    d ? *reinterpret_cast<const SInt32*>(d) : 0);
+    }
+}
+
+class SelectorHelperThread : public IceUtil::Thread
+{
+public:
+
+    SelectorHelperThread(Selector& selector) : _selector(selector)
+    {
+    }
+
+    virtual void run()
+    {
+        _selector.run();
+
+#if TARGET_IPHONE_SIMULATOR != 0
+        //
+        // Workaround for CFSocket bug where the CFSocketManager thread crashes if an
+        // invalidated socket is being processed for reads/writes. We add this sleep
+        // mostly to prevent spurious crashes with testing. This bug is very unlikely
+        // to be hit otherwise.
+        //
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(100));
+#endif
+    }
+
+private:
+
+    Selector& _selector;
+};
+
+CFOptionFlags
 toCFCallbacks(SocketOperation op)
 {
     CFOptionFlags cbs = 0;
@@ -629,45 +1093,38 @@ toCFCallbacks(SocketOperation op)
 
 }
 
-EventHandlerWrapper::EventHandlerWrapper(const EventHandlerPtr& handler, Selector& selector) :
-    _handler(handler),
-    _nativeInfo(StreamNativeInfoPtr::dynamicCast(handler->getNativeInfo())),
+EventHandlerWrapper::EventHandlerWrapper(EventHandler* handler, Selector& selector) :
+    _handler(ICE_GET_SHARED_FROM_THIS(handler)),
+    _streamNativeInfo(StreamNativeInfoPtr::dynamicCast(handler->getNativeInfo())),
     _selector(selector),
     _ready(SocketOperationNone),
     _finish(false)
 {
-    if(!StreamNativeInfoPtr::dynamicCast(handler->getNativeInfo()))
+    if(_streamNativeInfo)
+    {
+        _streamNativeInfo->initStreams(this);
+    }
+    else if(handler->getNativeInfo())
     {
         SOCKET fd = handler->getNativeInfo()->fd();
         CFSocketContext ctx = { 0, this, 0, 0, 0 };
-        _socket = CFSocketCreateWithNative(kCFAllocatorDefault,
-                                           fd,
-                                           kCFSocketReadCallBack |
-                                           kCFSocketWriteCallBack |
-                                           kCFSocketConnectCallBack,
-                                           eventHandlerSocketCallback,
-                                           &ctx);
+        _socket.reset(CFSocketCreateWithNative(kCFAllocatorDefault,
+                                               fd,
+                                               kCFSocketReadCallBack |
+                                               kCFSocketWriteCallBack |
+                                               kCFSocketConnectCallBack,
+                                               eventHandlerSocketCallback,
+                                               &ctx));
 
         // Disable automatic re-enabling of callbacks and closing of the native socket.
-        CFSocketSetSocketFlags(_socket, 0);
-        CFSocketDisableCallBacks(_socket, kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack);
-        _source = CFSocketCreateRunLoopSource(kCFAllocatorDefault, _socket, 0);
-    }
-    else
-    {
-        _socket = 0;
-        _source = 0;
-        _nativeInfo->initStreams(this);
+        CFSocketSetSocketFlags(_socket.get(), 0);
+        CFSocketDisableCallBacks(_socket.get(), kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack);
+        _source.reset(CFSocketCreateRunLoopSource(kCFAllocatorDefault, _socket.get(), 0));
     }
 }
 
 EventHandlerWrapper::~EventHandlerWrapper()
 {
-    if(_socket)
-    {
-        CFRelease(_socket);
-        CFRelease(_source);
-    }
 }
 
 void
@@ -678,37 +1135,37 @@ EventHandlerWrapper::updateRunLoop()
 
     if(_socket)
     {
-        CFSocketDisableCallBacks(_socket, kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack);
+        CFSocketDisableCallBacks(_socket.get(), kCFSocketReadCallBack | kCFSocketWriteCallBack | kCFSocketConnectCallBack);
         if(op)
         {
-            CFSocketEnableCallBacks(_socket, toCFCallbacks(op));
+            CFSocketEnableCallBacks(_socket.get(), toCFCallbacks(op));
         }
 
-        if(op && !CFRunLoopContainsSource(CFRunLoopGetCurrent(), _source, kCFRunLoopDefaultMode))
+        if(op && !CFRunLoopContainsSource(CFRunLoopGetCurrent(), _source.get(), kCFRunLoopDefaultMode))
         {
-            CFRunLoopAddSource(CFRunLoopGetCurrent(), _source, kCFRunLoopDefaultMode);
+            CFRunLoopAddSource(CFRunLoopGetCurrent(), _source.get(), kCFRunLoopDefaultMode);
         }
-        else if(!op && CFRunLoopContainsSource(CFRunLoopGetCurrent(), _source, kCFRunLoopDefaultMode))
+        else if(!op && CFRunLoopContainsSource(CFRunLoopGetCurrent(), _source.get(), kCFRunLoopDefaultMode))
         {
-            CFRunLoopRemoveSource(CFRunLoopGetCurrent(), _source, kCFRunLoopDefaultMode);
+            CFRunLoopRemoveSource(CFRunLoopGetCurrent(), _source.get(), kCFRunLoopDefaultMode);
         }
 
         if(_finish)
         {
-            CFSocketInvalidate(_socket);
+            CFSocketInvalidate(_socket.get());
         }
     }
     else
     {
-        SocketOperation readyOp = _nativeInfo->registerWithRunLoop(op);
+        SocketOperation readyOp = _streamNativeInfo->registerWithRunLoop(op);
         if(!(op & (SocketOperationWrite | SocketOperationConnect)) || _ready & SocketOperationWrite)
         {
-            _nativeInfo->unregisterFromRunLoop(SocketOperationWrite, false);
+            _streamNativeInfo->unregisterFromRunLoop(SocketOperationWrite, false);
         }
 
         if(!(op & (SocketOperationRead | SocketOperationConnect)) || _ready & SocketOperationRead)
         {
-            _nativeInfo->unregisterFromRunLoop(SocketOperationRead, false);
+            _streamNativeInfo->unregisterFromRunLoop(SocketOperationRead, false);
         }
 
         if(readyOp)
@@ -718,7 +1175,7 @@ EventHandlerWrapper::updateRunLoop()
 
         if(_finish)
         {
-            _nativeInfo->closeStreams();
+            _streamNativeInfo->closeStreams();
         }
     }
 }
@@ -740,7 +1197,7 @@ EventHandlerWrapper::ready(SocketOperation op, int error)
         // stream (which can't be used from another thread than the run loop thread if
         // it's registered with a run loop).
         //
-        op = _nativeInfo->unregisterFromRunLoop(op, error != 0);
+        op = _streamNativeInfo->unregisterFromRunLoop(op, error != 0);
     }
 
     op = static_cast<SocketOperation>(_handler->_registered & op);
@@ -753,23 +1210,25 @@ EventHandlerWrapper::ready(SocketOperation op, int error)
     {
         if(op & SocketOperationConnect)
         {
-            _nativeInfo->setConnectError(error);
+            _streamNativeInfo->setConnectError(error);
         }
     }
 
     _ready = static_cast<SocketOperation>(_ready | op);
-    if(!(_handler->_disabled & op))
-    {
-        _selector.addReadyHandler(this);
-    }
+    checkReady();
 }
 
-void
+bool
 EventHandlerWrapper::checkReady()
 {
-    if(_ready & _handler->_registered)
+    if((_ready | _handler->_ready) & ~_handler->_disabled & _handler->_registered)
     {
         _selector.addReadyHandler(this);
+        return false;
+    }
+    else
+    {
+        return _handler->getNativeInfo() && !_finish;
     }
 }
 
@@ -777,7 +1236,7 @@ SocketOperation
 EventHandlerWrapper::readyOp()
 {
     assert(!(~_handler->_registered & _ready));
-    SocketOperation op = static_cast<SocketOperation>(~_handler->_disabled & _ready);
+    SocketOperation op = static_cast<SocketOperation>(~_handler->_disabled & (_ready | _handler->_ready));
     _ready = static_cast<SocketOperation>(~op & _ready);
     return op;
 }
@@ -795,15 +1254,16 @@ EventHandlerWrapper::update(SocketOperation remove, SocketOperation add)
 
     // Clear ready flags which might not be valid anymore.
     _ready = static_cast<SocketOperation>(_ready & _handler->_registered);
-    return true;
+    return _handler->getNativeInfo();
 }
 
-void
+bool
 EventHandlerWrapper::finish()
 {
     _finish = true;
     _ready = SocketOperationNone;
     _handler->_registered = SocketOperationNone;
+    return _handler->getNativeInfo();
 }
 
 Selector::Selector(const InstancePtr& instance) : _instance(instance), _destroyed(false)
@@ -812,7 +1272,7 @@ Selector::Selector(const InstancePtr& instance) : _instance(instance), _destroye
     memset(&ctx, 0, sizeof(CFRunLoopSourceContext));
     ctx.info = this;
     ctx.perform = selectorInterrupt;
-    _source = CFRunLoopSourceCreate(0, 0, &ctx);
+    _source.reset(CFRunLoopSourceCreate(0, 0, &ctx));
     _runLoop = 0;
 
     _thread = new SelectorHelperThread(*this);
@@ -832,27 +1292,33 @@ Selector::~Selector()
 void
 Selector::destroy()
 {
-    Lock sync(*this);
-
-    //
-    // Make sure any pending changes are processed to ensure remaining
-    // streams/sockets are closed.
-    //
-    _destroyed = true;
-    while(!_changes.empty())
     {
-        CFRunLoopSourceSignal(_source);
+        Lock sync(*this);
+
+        //
+        // Make sure any pending changes are processed to ensure remaining
+        // streams/sockets are closed.
+        //
+        _destroyed = true;
+        CFRunLoopSourceSignal(_source.get());
         CFRunLoopWakeUp(_runLoop);
 
-        wait();
+        while(!_changes.empty())
+        {
+            CFRunLoopSourceSignal(_source.get());
+            CFRunLoopWakeUp(_runLoop);
+
+            wait();
+        }
     }
 
     _thread->getThreadControl().join();
     _thread = 0;
 
-    CFRelease(_source);
+    Lock sync(*this);
+    _source.reset(0);
 
-    assert(_wrappers.empty());
+    //assert(_wrappers.empty());
     _readyHandlers.clear();
     _selectedHandlers.clear();
 }
@@ -869,7 +1335,6 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
 {
     Lock sync(*this);
     const EventHandlerWrapperPtr& wrapper = _wrappers[handler];
-    assert(wrapper);
     if(wrapper->update(remove, add))
     {
         _changes.insert(wrapper);
@@ -911,534 +1376,162 @@ Selector::finish(EventHandler* handler, bool closeNow)
     std::map<EventHandler*, EventHandlerWrapperPtr>::iterator p = _wrappers.find(handler);
     assert(p != _wrappers.end());
     EventHandlerWrapperPtr wrapper = p->second;
-    wrapper->finish();
-    _wrappers.erase(p);
-    _changes.insert(wrapper);
-    notify();
-    return closeNow;
-}
-
-void
-Selector::select(std::vector<std::pair<EventHandler*, SocketOperation> >& handlers, int timeout)
-{
-    Lock sync(*this);
-
-    //
-    // Re-enable callbacks for previously selected handlers.
-    //
-    if(!_selectedHandlers.empty())
-    {
-        vector<pair<EventHandlerWrapperPtr, SocketOperation> >::const_iterator p;
-        for(p = _selectedHandlers.begin(); p != _selectedHandlers.end(); ++p)
-        {
-            if(!p->first->_finish)
-            {
-                _changes.insert(p->first);
-            }
-        }
-        _selectedHandlers.clear();
-    }
-
-    //
-    // Wait for handlers to be ready.
-    //
-    handlers.clear();
-    while(_selectedHandlers.empty())
-    {
-        while(!_changes.empty())
-        {
-            CFRunLoopSourceSignal(_source);
-            CFRunLoopWakeUp(_runLoop);
-
-            wait();
-        }
-
-        if(_readyHandlers.empty())
-        {
-            if(timeout > 0)
-            {
-                if(!timedWait(IceUtil::Time::seconds(timeout)))
-                {
-                    break;
-                }
-            }
-            else
-            {
-                wait();
-            }
-        }
-
-        if(!_changes.empty())
-        {
-            continue; // Make sure to process the changes first.
-        }
-
-        for(vector<EventHandlerWrapperPtr>::const_iterator p = _readyHandlers.begin(); p != _readyHandlers.end(); ++p)
-        {
-            SocketOperation op = (*p)->readyOp();
-            if(op)
-            {
-                _selectedHandlers.push_back(pair<EventHandlerWrapperPtr, SocketOperation>(*p, op));
-                handlers.push_back(pair<EventHandler*, SocketOperation>((*p)->_handler.get(), op));
-            }
-        }
-        _readyHandlers.clear();
-    }
-}
-
-void
-Selector::processInterrupt()
-{
-    Lock sync(*this);
-    if(!_changes.empty())
-    {
-        for(set<EventHandlerWrapperPtr>::const_iterator p = _changes.begin(); p != _changes.end(); ++p)
-        {
-            (*p)->updateRunLoop();
-        }
-        _changes.clear();
-        notify();
-    }
-    if(_destroyed)
-    {
-        CFRunLoopStop(_runLoop);
-    }
-}
-
-void
-Selector::ready(EventHandlerWrapper* wrapper, SocketOperation op, int error)
-{
-    Lock sync(*this);
-    wrapper->ready(op, error);
-}
-
-void
-Selector::addReadyHandler(EventHandlerWrapper* wrapper)
-{
-    // Called from ready()
-    _readyHandlers.push_back(wrapper);
-    if(_readyHandlers.size() == 1)
-    {
-        notify();
-    }
-}
-
-void
-Selector::run()
-{
+    if(wrapper->finish())
     {
-        Lock sync(*this);
-        _runLoop = CFRunLoopGetCurrent();
+        _changes.insert(wrapper);
         notify();
     }
-
-    CFRunLoopAddSource(CFRunLoopGetCurrent(), _source, kCFRunLoopDefaultMode);
-    CFRunLoopRun();
-    CFRunLoopRemoveSource(CFRunLoopGetCurrent(), _source, kCFRunLoopDefaultMode);
-}
-
-#elif defined(ICE_USE_SELECT) || defined(ICE_USE_POLL)
-
-Selector::Selector(const InstancePtr& instance) : _instance(instance), _selecting(false), _interrupted(false)
-{
-    SOCKET fds[2];
-    createPipe(fds);
-    _fdIntrRead = fds[0];
-    _fdIntrWrite = fds[1];
-#if defined(ICE_USE_SELECT)
-    FD_ZERO(&_readFdSet);
-    FD_ZERO(&_writeFdSet);
-    FD_ZERO(&_errorFdSet);
-    FD_SET(_fdIntrRead, &_readFdSet);
-#else
-    struct pollfd pollFd;
-    pollFd.fd = _fdIntrRead;
-    pollFd.events = POLLIN;
-    _pollFdSet.push_back(pollFd);
-#endif
-}
-
-Selector::~Selector()
-{
-    try
-    {
-        closeSocket(_fdIntrWrite);
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "exception in selector while calling closeSocket():\n" << ex;
-    }
-
-    try
-    {
-        closeSocket(_fdIntrRead);
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "exception in selector while calling closeSocket():\n" << ex;
-    }
-}
-
-void
-Selector::destroy()
-{
-#if !defined(ICE_USE_SELECT) && !defined(ICE_USE_POLL)
-    assert(_events.empty());
-#endif
-}
-
-void
-Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation add)
-{
-    SocketOperation previous = handler->_registered;
-    handler->_registered = static_cast<SocketOperation>(handler->_registered & ~remove);
-    handler->_registered = static_cast<SocketOperation>(handler->_registered | add);
-    if(previous == handler->_registered)
-    {
-        return;
-    }
-
-    updateImpl(handler);
+    _wrappers.erase(p);
+    return closeNow;
 }
 
 void
-Selector::enable(EventHandler* handler, SocketOperation status)
+Selector::ready(EventHandler* handler, SocketOperation status, bool value)
 {
-    if(!(handler->_disabled & status))
-    {
-        return;
-    }
-    handler->_disabled = static_cast<SocketOperation>(handler->_disabled & ~status);
-
-    if(handler->_registered & status)
+    if(((handler->_ready & status) != 0) == value)
     {
-        updateImpl(handler);
+        return; // Nothing to do if ready state already correctly set.
     }
-}
 
-void
-Selector::disable(EventHandler* handler, SocketOperation status)
-{
-    if(handler->_disabled & status)
+    if(value)
     {
-        return;
+        handler->_ready = static_cast<SocketOperation>(handler->_ready | status);
     }
-    handler->_disabled = static_cast<SocketOperation>(handler->_disabled | status);
-
-    if(handler->_registered & status)
+    else
     {
-        updateImpl(handler);
+        handler->_ready = static_cast<SocketOperation>(handler->_ready & ~status);
     }
-}
 
-bool
-Selector::finish(EventHandler* handler, bool closeNow)
-{
-    if(handler->_registered)
-    {
-        update(handler, handler->_registered, SocketOperationNone);
-        return false; // Don't close now if selecting.
-    }
-    return closeNow;
+    Lock sync(*this);
+    std::map<EventHandler*, EventHandlerWrapperPtr>::iterator p = _wrappers.find(handler);
+    assert(p != _wrappers.end());
+    p->second->checkReady();
 }
 
 void
 Selector::startSelect()
 {
-    if(_interrupted)
-    {
-        char c;
-        while(true)
-        {
-            ssize_t ret;
-#ifdef _WIN32
-            ret = ::recv(_fdIntrRead, &c, 1, 0);
-#else
-            ret = ::read(_fdIntrRead, &c, 1);
-#endif
-            if(ret == SOCKET_ERROR)
-            {
-                if(interrupted())
-                {
-                    continue;
-                }
-
-                Ice::SocketException ex(__FILE__, __LINE__);
-                ex.error = IceInternal::getSocketErrno();
-                throw ex;
-            }
-            break;
-        }
-        _interrupted = false;
+    Lock sync(*this);
 
-        if(!_changes.empty())
+    //
+    // Re-enable callbacks for previously selected handlers.
+    //
+    vector<pair<EventHandlerWrapperPtr, SocketOperation> >::const_iterator p;
+    for(p = _selectedHandlers.begin(); p != _selectedHandlers.end(); ++p)
+    {
+        if(p->first->checkReady())
         {
-            updateSelector();
+            _changes.insert(p->first);
         }
     }
-    _selecting = true;
+    _selectedHandlers.clear();
 }
 
 void
-Selector::finishSelect()
+Selector::finishSelect(std::vector<std::pair<EventHandler*, SocketOperation> >& handlers)
 {
-    _selecting = false;
+    Lock sync(*this);
+    handlers.clear();
+    for(set<EventHandlerWrapperPtr>::const_iterator p = _readyHandlers.begin(); p != _readyHandlers.end(); ++p)
+    {
+        SocketOperation op = (*p)->readyOp();
+        if(op)
+        {
+            _selectedHandlers.push_back(pair<EventHandlerWrapperPtr, SocketOperation>(*p, op));
+            handlers.push_back(pair<EventHandler*, SocketOperation>((*p)->_handler.get(), op));
+        }
+    }
+    _readyHandlers.clear();
 }
 
 void
-Selector::select(vector<pair<EventHandler*, SocketOperation> >& handlers, int timeout)
+Selector::select(int timeout)
 {
-    int ret = 0;
-    while(true)
+    //
+    // Wait for handlers to be ready.
+    //
+    Lock sync(*this);
+    while(!_destroyed)
     {
-#if defined(ICE_USE_SELECT)
-        fd_set* rFdSet = fdSetCopy(_selectedReadFdSet, _readFdSet);
-        fd_set* wFdSet = fdSetCopy(_selectedWriteFdSet, _writeFdSet);
-        fd_set* eFdSet = fdSetCopy(_selectedErrorFdSet, _errorFdSet);
-        if(timeout > 0)
-        {
-            struct timeval tv;
-            tv.tv_sec = timeout;
-            tv.tv_usec = 0;
-            ret = ::select(0, rFdSet, wFdSet, eFdSet, &tv); // The first parameter is ignored on Windows
-        }
-        else
+        while(!_changes.empty())
         {
-            ret = ::select(0, rFdSet, wFdSet, eFdSet, 0); // The first parameter is ignored on Windows
+            CFRunLoopSourceSignal(_source.get());
+            CFRunLoopWakeUp(_runLoop);
+
+            wait();
         }
-#else
-        ret = poll(&_pollFdSet[0], _pollFdSet.size(), timeout > 0 ? timeout * 1000 : -1);
-#endif
-        if(ret == SOCKET_ERROR)
+
+        if(_readyHandlers.empty())
         {
-            if(interrupted())
+            if(timeout > 0)
             {
-                continue;
+                if(!timedWait(IceUtil::Time::seconds(timeout)))
+                {
+                    break;
+                }
             }
-
+            else
             {
-                Ice::SocketException ex(__FILE__, __LINE__, IceInternal::getSocketErrno());
-                Ice::Error out(_instance->initializationData().logger);
-                out << "fatal error: selector failed:\n" << ex;
+                wait();
             }
-            abort();
         }
-        break;
-    }
-
-    if(ret == 0)
-    {
-        throw SelectorTimeoutException();
-    }
-
-    assert(ret > 0);
-
-#if defined(ICE_USE_SELECT)
-    if(_selectedReadFdSet.fd_count == 0 && _selectedWriteFdSet.fd_count == 0 && _selectedErrorFdSet.fd_count == 0)
-    {
-        Ice::Error out(_instance->initializationData().logger);
-        out << "select() in selector returned " << ret << " but no filedescriptor is ready";
-        return;
-    }
 
-    for(unsigned int i = 0; i < static_cast<unsigned int>(ret); ++i)
-    {
-        pair<EventHandler*, SocketOperation> p;
-
-        //
-        // Round robin for the filedescriptors.
-        //
-        SOCKET fd;
-        p.second = SocketOperationNone;
-        if(i < _selectedReadFdSet.fd_count)
-        {
-            fd = _selectedReadFdSet.fd_array[i];
-            p.second = static_cast<SocketOperation>(p.second | SocketOperationRead);
-        }
-        else if(i < _selectedWriteFdSet.fd_count + _selectedReadFdSet.fd_count)
-        {
-            fd = _selectedWriteFdSet.fd_array[i - _selectedReadFdSet.fd_count];
-            p.second = static_cast<SocketOperation>(p.second | SocketOperationWrite);
-        }
-        else
+        if(_changes.empty())
         {
-            fd = _selectedErrorFdSet.fd_array[i - _selectedReadFdSet.fd_count - _selectedWriteFdSet.fd_count];
-            p.second = static_cast<SocketOperation>(p.second | SocketOperationConnect);
+            break;
         }
+    }
+}
 
-        if(fd == _fdIntrRead) // Interrupted, we have to process the interrupt before returning any handlers
+void
+Selector::processInterrupt()
+{
+    Lock sync(*this);
+    if(!_changes.empty())
+    {
+        for(set<EventHandlerWrapperPtr>::const_iterator p = _changes.begin(); p != _changes.end(); ++p)
         {
-            handlers.clear();
-            return;
+            (*p)->updateRunLoop();
         }
-
-        assert(_handlers.find(fd) != _handlers.end());
-        p.first = _handlers[fd];
-        handlers.push_back(p);
+        _changes.clear();
+        notify();
     }
-#else
-    if(_pollFdSet[0].revents == POLLIN) // Interrupted, we have to process the interrupt before returning any handlers
+    if(_destroyed)
     {
-        return;
+        CFRunLoopStop(_runLoop);
     }
+}
 
-    for(vector<struct pollfd>::const_iterator q = _pollFdSet.begin(); q != _pollFdSet.end(); ++q)
+void
+Selector::run()
+{
     {
-        pair<EventHandler*, SocketOperation> p;
-        if(q->revents != 0)
-        {
-            SOCKET fd = q->fd;
-            assert(fd != _fdIntrRead);
-            assert(_handlers.find(fd) != _handlers.end());
-            p.first = _handlers[fd];
-            p.second = SocketOperationNone;
-            if(q->revents & (POLLIN | POLLERR | POLLHUP))
-            {
-                p.second = static_cast<SocketOperation>(p.second | SocketOperationRead);
-            }
-            if(q->revents & POLLOUT)
-            {
-                p.second = static_cast<SocketOperation>(p.second | SocketOperationWrite);
-            }
-            assert(p.second);
-            handlers.push_back(p);
-        }
+        Lock sync(*this);
+        _runLoop = CFRunLoopGetCurrent();
+        notify();
     }
-#endif
+
+    CFRunLoopAddSource(CFRunLoopGetCurrent(), _source.get(), kCFRunLoopDefaultMode);
+    CFRunLoopRun();
+    CFRunLoopRemoveSource(CFRunLoopGetCurrent(), _source.get(), kCFRunLoopDefaultMode);
 }
 
 void
-Selector::updateImpl(EventHandler* handler)
+Selector::ready(EventHandlerWrapper* wrapper, SocketOperation op, int error)
 {
-    SocketOperation status = static_cast<SocketOperation>(handler->_registered & ~handler->_disabled);
-    _changes.push_back(make_pair(handler, status));
-    if(_selecting)
-    {
-        if(!_interrupted)
-        {
-            char c = 0;
-            while(true)
-            {
-#ifdef _WIN32
-                if(::send(_fdIntrWrite, &c, 1, 0) == SOCKET_ERROR)
-#else
-                if(::write(_fdIntrWrite, &c, 1) == SOCKET_ERROR)
-#endif
-                {
-                    if(interrupted())
-                    {
-                        continue;
-                    }
-
-                    Ice::SocketException ex(__FILE__, __LINE__);
-                    ex.error = IceInternal::getSocketErrno();
-                    throw ex;
-                }
-                break;
-            }
-            _interrupted = true;
-        }
-    }
-    else
-    {
-        updateSelector();
-    }
+    Lock sync(*this);
+    wrapper->ready(op, error);
 }
 
 void
-Selector::updateSelector()
+Selector::addReadyHandler(EventHandlerWrapper* wrapper)
 {
-    for(vector<pair<EventHandler*, SocketOperation> >::const_iterator p = _changes.begin(); p != _changes.end(); ++p)
+    // Called from ready()
+    _readyHandlers.insert(wrapper);
+    if(_readyHandlers.size() == 1)
     {
-        EventHandler* handler = p->first;
-        SocketOperation status = p->second;
-
-        SOCKET fd = handler->getNativeInfo()->fd();
-        if(status)
-        {
-#if defined(ICE_USE_SELECT)
-            if(status & SocketOperationRead)
-            {
-                FD_SET(fd, &_readFdSet);
-            }
-            else
-            {
-                FD_CLR(fd, &_readFdSet);
-            }
-            if(status & SocketOperationWrite)
-            {
-                FD_SET(fd, &_writeFdSet);
-            }
-            else
-            {
-                FD_CLR(fd, &_writeFdSet);
-            }
-            if(status & SocketOperationConnect)
-            {
-                FD_SET(fd, &_writeFdSet);
-                FD_SET(fd, &_errorFdSet);
-            }
-            else
-            {
-                FD_CLR(fd, &_writeFdSet);
-                FD_CLR(fd, &_errorFdSet);
-            }
-            _handlers[fd] = handler;
-#else
-            short events = 0;
-            if(status & SocketOperationRead)
-            {
-                events |= POLLIN;
-            }
-            if(status & SocketOperationWrite)
-            {
-                events |= POLLOUT;
-            }
-            map<SOCKET, EventHandler*>::const_iterator q = _handlers.find(fd);
-            if(q == _handlers.end())
-            {
-                struct pollfd pollFd;
-                pollFd.fd = fd;
-                pollFd.events = events;
-                pollFd.revents = 0;
-                _pollFdSet.push_back(pollFd);
-                _handlers.insert(make_pair(fd, handler));
-            }
-            else
-            {
-                for(vector<struct pollfd>::iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
-                {
-                    if(r->fd == fd)
-                    {
-                        r->events = events;
-                        break;
-                    }
-                }
-            }
-#endif
-        }
-        else
-        {
-#if defined(ICE_USE_SELECT)
-            FD_CLR(fd, &_readFdSet);
-            FD_CLR(fd, &_writeFdSet);
-            FD_CLR(fd, &_errorFdSet);
-#else
-            for(vector<struct pollfd>::iterator r = _pollFdSet.begin(); r != _pollFdSet.end(); ++r)
-            {
-                if(r->fd == fd)
-                {
-                    _pollFdSet.erase(r);
-                    break;
-                }
-            }
-#endif
-            _handlers.erase(fd);
-        }
+        notify();
     }
-    _changes.clear();
 }
 
 #endif