zeroc-ice 3.7.1 → 3.7.2

data/ext/ice/cpp/src/Ice/ReplyStatus.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_REPLY_STATUS_H
 #define ICE_REPLY_STATUS_H

data/ext/ice/cpp/src/Ice/RequestHandler.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/RequestHandler.h>
 #include <Ice/Reference.h>

data/ext/ice/cpp/src/Ice/RequestHandler.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_REQUEST_HANDLER_H
 #define ICE_REQUEST_HANDLER_H

data/ext/ice/cpp/src/Ice/RequestHandlerFactory.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/RequestHandlerFactory.h>
 #include <Ice/CollocatedRequestHandler.h>

data/ext/ice/cpp/src/Ice/RequestHandlerFactory.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_REQUEST_HANDLER_FACTORY_H
 #define ICE_REQUEST_HANDLER_FACTORY_H

data/ext/ice/cpp/src/Ice/ResponseHandler.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/ResponseHandler.h>
 

data/ext/ice/cpp/src/Ice/ResponseHandler.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_RESPONSE_HANDLER_H
 #define ICE_RESPONSE_HANDLER_H

data/ext/ice/cpp/src/Ice/RetryQueue.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/RetryQueue.h>
 #include <Ice/OutgoingAsync.h>
@@ -44,7 +39,7 @@ IceInternal::RetryTask::runTimerTask()
 }
 
 void
-IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const Ice::LocalException& ex)
+IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& /*outAsync*/, const Ice::LocalException& ex)
 {
     if(_queue->cancel(ICE_SHARED_FROM_THIS))
     {

data/ext/ice/cpp/src/Ice/RetryQueue.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_RETRY_QUEUE_H
 #define ICE_RETRY_QUEUE_H

data/ext/ice/cpp/src/Ice/RetryQueueF.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_RETRY_QUEUE_F_H
 #define ICE_RETRY_QUEUE_F_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -45,7 +40,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -120,7 +115,7 @@ Ice::Router::ice_staticId()
 bool
 Ice::Router::_iceD_getClientProxy(::IceInternal::Incoming& inS, const Current& current) const
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     inS.readEmptyParams();
     Ice::optional<bool> iceP_hasRoutingTable;
     ::std::shared_ptr<ObjectPrx> ret = this->getClientProxy(iceP_hasRoutingTable, current);
@@ -136,7 +131,7 @@ Ice::Router::_iceD_getClientProxy(::IceInternal::Incoming& inS, const Current& c
 bool
 Ice::Router::_iceD_getServerProxy(::IceInternal::Incoming& inS, const Current& current) const
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     inS.readEmptyParams();
     ::std::shared_ptr<ObjectPrx> ret = this->getServerProxy(current);
     auto ostr = inS.startWriteParams();
@@ -150,7 +145,7 @@ Ice::Router::_iceD_getServerProxy(::IceInternal::Incoming& inS, const Current& c
 bool
 Ice::Router::_iceD_addProxies(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     auto istr = inS.startReadParams();
     ObjectProxySeq iceP_proxies;
     istr->readAll(iceP_proxies);
@@ -241,7 +236,7 @@ Ice::RouterFinder::ice_staticId()
 bool
 Ice::RouterFinder::_iceD_getRouter(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(OperationMode::Normal, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     inS.readEmptyParams();
     ::std::shared_ptr<RouterPrx> ret = this->getRouter(current);
     auto ostr = inS.startWriteParams();
@@ -297,7 +292,7 @@ void
 Ice::RouterPrx::_iceI_getClientProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<Router::GetClientProxyResult>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Router_getClientProxy_name);
-    outAsync->invoke(iceC_Ice_Router_getClientProxy_name, OperationMode::Nonmutating, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_Router_getClientProxy_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr,
         [](InputStream* istr)
@@ -315,7 +310,7 @@ void
 Ice::RouterPrx::_iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<ObjectPrx>>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Router_getServerProxy_name);
-    outAsync->invoke(iceC_Ice_Router_getServerProxy_name, OperationMode::Nonmutating, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_Router_getServerProxy_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr);
 }
@@ -326,7 +321,7 @@ void
 Ice::RouterPrx::_iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<ObjectProxySeq>>& outAsync, const ObjectProxySeq& iceP_proxies, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Router_addProxies_name);
-    outAsync->invoke(iceC_Ice_Router_addProxies_name, OperationMode::Idempotent, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_Router_addProxies_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
         [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_proxies);
@@ -354,7 +349,7 @@ void
 Ice::RouterFinderPrx::_iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<RouterPrx>>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_RouterFinder_getRouter_name);
-    outAsync->invoke(iceC_Ice_RouterFinder_getRouter_name, OperationMode::Normal, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_RouterFinder_getRouter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr);
 }

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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.
 //
-// **********************************************************************
-//
-// Ice version 3.7.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -42,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/RouterInfo.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/RouterInfo.h>
 #include <Ice/Router.h>
@@ -259,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)
         {

data/ext/ice/cpp/src/Ice/RouterInfo.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_H
 #define ICE_ROUTER_INFO_H

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/Ice/SHA1.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/SHA1.h>
 

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>
@@ -74,10 +69,16 @@ Selector::initialize(EventHandler* handler)
     }
 
 #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)
     {
-        throw Ice::SocketException(__FILE__, __LINE__, GetLastError());
+        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
@@ -153,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))
     {
@@ -177,7 +178,7 @@ Selector::getNextHandler(SocketOperation& status, int timeout)
         {
             status = info->status;
         }
-        count = SOCKET_ERROR;
+        count = 0;
         error = WSAGetLastError();
         return reinterpret_cast<EventHandler*>(key);
     }
@@ -379,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);
@@ -426,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);
@@ -929,8 +942,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)
     {
@@ -1031,6 +1050,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: