zeroc-ice 3.7.0 → 3.7.5

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.0
+// Ice version 3.7.5
 //
 // <auto-generated>
 //
@@ -39,10 +34,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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/RouterInfo.h>
 #include <Ice/Router.h>
@@ -120,7 +115,6 @@ IceInternal::RouterInfo::destroy()
     IceUtil::Mutex::Lock sync(*this);
 
     _clientEndpoints.clear();
-    _serverEndpoints.clear();
     _adapter = 0;
     _identities.clear();
 }
@@ -212,15 +206,13 @@ IceInternal::RouterInfo::getClientEndpoints(const GetClientEndpointsCallbackPtr&
 vector<EndpointIPtr>
 IceInternal::RouterInfo::getServerEndpoints()
 {
+    Ice::ObjectPrxPtr serverProxy = _router->getServerProxy();
+    if(!serverProxy)
     {
-        IceUtil::Mutex::Lock sync(*this);
-        if(!_serverEndpoints.empty())
-        {
-            return _serverEndpoints;
-        }
+        throw NoEndpointException(__FILE__, __LINE__);
     }
-
-    return setServerEndpoints(_router->getServerProxy());
+    serverProxy = serverProxy->ice_router(0); // The server proxy cannot be routed.
+    return serverProxy->_getReference()->getEndpoints();
 }
 
 void
@@ -262,9 +254,9 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxy
 #ifdef ICE_CPP11_MAPPING
     RouterInfoPtr self = this;
     _router->addProxiesAsync(proxies,
-        [self, cookie](const Ice::ObjectProxySeq& proxies)
+        [self, cookie](const Ice::ObjectProxySeq& p)
         {
-            self->addProxyResponse(proxies, cookie);
+            self->addProxyResponse(p, cookie);
         },
         [self, cookie](exception_ptr e)
         {
@@ -342,25 +334,6 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrxPtr& proxy, bool
     return _clientEndpoints;
 }
 
-vector<EndpointIPtr>
-IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrxPtr& /*serverProxy*/)
-{
-    IceUtil::Mutex::Lock sync(*this);
-    if(_serverEndpoints.empty()) // Lazy initialization.
-    {
-        ObjectPrxPtr serverProxy = _router->getServerProxy();
-        if(!serverProxy)
-        {
-            throw NoEndpointException(__FILE__, __LINE__);
-        }
-
-        serverProxy = serverProxy->ice_router(0); // The server proxy cannot be routed.
-
-        _serverEndpoints = serverProxy->_getReference()->getEndpoints();
-    }
-    return _serverEndpoints;
-}
-
 void
 IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrxPtr& proxy, const Ice::ObjectProxySeq& evictedProxies)
 {

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_H
 #define ICE_ROUTER_INFO_H
@@ -140,14 +135,12 @@ public:
     // The following methods need to be public for access by AMI callbacks.
     //
     std::vector<EndpointIPtr> setClientEndpoints(const Ice::ObjectPrxPtr&, bool);
-    std::vector<EndpointIPtr> setServerEndpoints(const Ice::ObjectPrxPtr&);
     void addAndEvictProxies(const Ice::ObjectPrxPtr&, const Ice::ObjectProxySeq&);
 
 private:
 
     const Ice::RouterPrxPtr _router;
     std::vector<EndpointIPtr> _clientEndpoints;
-    std::vector<EndpointIPtr> _serverEndpoints;
     bool _hasRoutingTable;
     Ice::ObjectAdapterPtr _adapter;
     std::set<Ice::Identity> _identities;

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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/Ice/SHA1.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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/SHA1.h>
 
@@ -113,7 +108,7 @@ IceInternal::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
@@ -180,7 +175,7 @@ IceInternal::sha1(const unsigned char* data, size_t length, vector<unsigned char
     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-2017 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>
@@ -52,9 +47,7 @@ Selector::setup(int sizeIO)
     _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
@@ -74,13 +67,18 @@ Selector::initialize(EventHandler* handler)
     {
         return;
     }
+
 #ifdef ICE_USE_IOCP
-    HANDLE socket = reinterpret_cast<HANDLE>(handler->getNativeInfo()->fd());
-    if(CreateIoCompletionPort(socket, _handle, reinterpret_cast<ULONG_PTR>(handler), 0) == ICE_NULLPTR)
+    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->getNativeInfo()->initialize(_handle, reinterpret_cast<ULONG_PTR>(handler));
 #else
@@ -118,6 +116,12 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
 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->_finish = false; // Ensures that finished() is only called once on the event handler.
 }
@@ -150,7 +154,7 @@ Selector::getNextHandler(SocketOperation& status, int timeout)
 #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))
     {
@@ -174,7 +178,7 @@ Selector::getNextHandler(SocketOperation& status, int timeout)
         {
             status = info->status;
         }
-        count = SOCKET_ERROR;
+        count = 0;
         error = WSAGetLastError();
         return reinterpret_cast<EventHandler*>(key);
     }
@@ -227,9 +231,7 @@ Selector::completed(EventHandler* handler, SocketOperation op)
     }
     if(!PostQueuedCompletionStatus(_handle, 0, reinterpret_cast<ULONG_PTR>(handler), info))
     {
-        Ice::SocketException ex(__FILE__, __LINE__);
-        ex.error = GetLastError();
-        throw ex;
+        throw Ice::SocketException(__FILE__, __LINE__, GetLastError());
     }
 #else
     IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
@@ -253,9 +255,7 @@ Selector::Selector(const InstancePtr& instance) : _instance(instance), _interrup
     _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());
     }
 
     epoll_event event;
@@ -272,9 +272,7 @@ Selector::Selector(const InstancePtr& instance) : _instance(instance), _interrup
     _queueFd = kqueue();
     if(_queueFd < 0)
     {
-        Ice::SocketException ex(__FILE__, __LINE__);
-        ex.error = getSocketErrno();
-        throw ex;
+        throw Ice::SocketException(__FILE__, __LINE__, getSocketErrno());
     }
 
     struct kevent ev;
@@ -382,8 +380,14 @@ Selector::enable(EventHandler* handler, SocketOperation status)
         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, previous ? EPOLL_CTL_MOD : EPOLL_CTL_ADD, fd, &event) != 0)
         {
             Ice::Error out(_instance->initializationData().logger);
@@ -429,8 +433,14 @@ Selector::disable(EventHandler* handler, SocketOperation status)
         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);
@@ -527,9 +537,7 @@ Selector::wakeup()
                     continue;
                 }
 
-                Ice::SocketException ex(__FILE__, __LINE__);
-                ex.error = IceInternal::getSocketErrno();
-                throw ex;
+                throw Ice::SocketException(__FILE__, __LINE__, IceInternal::getSocketErrno());
             }
             break;
         }
@@ -552,9 +560,7 @@ Selector::startSelect()
                 {
                     continue;
                 }
-                Ice::SocketException ex(__FILE__, __LINE__);
-                ex.error = IceInternal::getSocketErrno();
-                throw ex;
+                throw Ice::SocketException(__FILE__, __LINE__, IceInternal::getSocketErrno());
             }
             break;
         }
@@ -606,11 +612,11 @@ Selector::finishSelect(vector<pair<EventHandler*, SocketOperation> >& handlers)
                                                 ((ev.events & (EPOLLOUT | EPOLLERR)) ?
                                                  SocketOperationWrite : SocketOperationNone));
 #elif defined(ICE_USE_KQUEUE)
-        struct kevent& ev = _events[i];
+        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);
@@ -723,11 +729,11 @@ Selector::select(int timeout)
             struct timespec ts;
             ts.tv_sec = timeout;
             ts.tv_nsec = 0;
-            _count = kevent(_queueFd, 0, 0, &_events[0], _events.size(), &ts);
+            _count = kevent(_queueFd, 0, 0, &_events[0], static_cast<int>(_events.size()), &ts);
         }
         else
         {
-            _count = kevent(_queueFd, 0, 0, &_events[0], _events.size(), 0);
+            _count = kevent(_queueFd, 0, 0, &_events[0], static_cast<int>(_events.size()), 0);
         }
 #elif defined(ICE_USE_SELECT)
         fd_set* rFdSet = fdSetCopy(_selectedReadFdSet, _readFdSet);
@@ -760,12 +766,12 @@ Selector::select(int timeout)
             out << "selector failed:\n" << ex;
             IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(5)); // Sleep 5s to avoid looping
         }
-        else if(_count == 0 && timeout < 0 && ++spuriousWakeup < 100)
+        else if(_count == 0 && timeout < 0)
         {
-            if(spuriousWakeup == 1)
+            if(++spuriousWakeup > 100)
             {
-                Ice::Warning out(_instance->initializationData().logger);
-                out << "spurious selector wakeup";
+                spuriousWakeup = 0;
+                _instance->initializationData().logger->warning("spurious selector wakeup");
             }
             IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1));
             continue;
@@ -801,7 +807,8 @@ void
 Selector::updateSelector()
 {
 #if defined(ICE_USE_KQUEUE)
-    int rs = kevent(_queueFd, &_changes[0], _changes.size(), &_changes[0], _changes.size(), &zeroTimeout);
+    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);
@@ -815,10 +822,12 @@ Selector::updateSelector()
             // 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)
+            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(_changes[i].data);
+                out << "error while updating selector:\n"
+                    << IceUtilInternal::errorToString(static_cast<int>(_changes[static_cast<size_t>(i)].data));
             }
         }
     }
@@ -919,7 +928,9 @@ Selector::updateSelector()
 }
 
 void
-Selector::updateSelectorForEventHandler(EventHandler* handler, SocketOperation remove, SocketOperation add)
+Selector::updateSelectorForEventHandler(EventHandler* handler,
+                                        ICE_MAYBE_UNUSED SocketOperation remove,
+                                        ICE_MAYBE_UNUSED SocketOperation add)
 {
 #if defined(ICE_USE_EPOLL)
     SocketOperation previous = handler->_registered;
@@ -936,8 +947,14 @@ Selector::updateSelectorForEventHandler(EventHandler* handler, SocketOperation r
         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;
+    if(status & SocketOperationRead)
+    {
+        event.events |= EPOLLIN;
+    }
+    if(status & SocketOperationWrite)
+    {
+        event.events |= EPOLLOUT;
+    }
     int op;
     if(!previous && status)
     {
@@ -1038,6 +1055,16 @@ public:
     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: