zeroc-ice 3.7.2 → 3.7.3

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

@@ -597,7 +597,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, InputStream* s)
 
     if(sz > 0)
     {
-        endpoints.reserve(sz);
+        endpoints.reserve(static_cast<size_t>(sz));
         while(sz--)
         {
             EndpointIPtr endpoint = _instance->endpointFactoryManager()->read(s);

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

@@ -21,9 +21,10 @@ IceInternal::RegisterPluginsInit::RegisterPluginsInit()
     Ice::registerPluginFactory("IceTCP", createIceTCP, true);
 
     //
-    // Only include the UDP and WS transport plugins with non-static builds or Gem/PyPI builds.
+    // Only include the UDP and WS transport plugins with non-static builds or Gem/PyPI/Swift
+    // builds.
     //
-#if !defined(ICE_STATIC_LIBS) || defined(ICE_GEM) || defined(ICE_PYPI)
+#if !defined(ICE_STATIC_LIBS) || defined(ICE_GEM) || defined(ICE_PYPI) || defined(ICE_SWIFT)
     Ice::registerPluginFactory("IceUDP", createIceUDP, true);
     Ice::registerPluginFactory("IceWS", createIceWS, true);
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -38,10 +38,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -37,10 +37,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -307,7 +307,7 @@ Ice::RouterPrx::_iceI_getClientProxy(const ::std::shared_ptr<::IceInternal::Outg
 
 /// \cond INTERNAL
 void
-Ice::RouterPrx::_iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<ObjectPrx>>>& outAsync, const Context& context)
+Ice::RouterPrx::_iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Router_getServerProxy_name);
     outAsync->invoke(iceC_Ice_Router_getServerProxy_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
@@ -318,7 +318,7 @@ Ice::RouterPrx::_iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::Outg
 
 /// \cond INTERNAL
 void
-Ice::RouterPrx::_iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<ObjectProxySeq>>& outAsync, const ObjectProxySeq& iceP_proxies, const Context& context)
+Ice::RouterPrx::_iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ObjectProxySeq>>& outAsync, const ObjectProxySeq& iceP_proxies, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Router_addProxies_name);
     outAsync->invoke(iceC_Ice_Router_addProxies_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
@@ -346,7 +346,7 @@ Ice::RouterPrx::ice_staticId()
 
 /// \cond INTERNAL
 void
-Ice::RouterFinderPrx::_iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<RouterPrx>>>& outAsync, const Context& context)
+Ice::RouterFinderPrx::_iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::RouterPrx>>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_RouterFinder_getRouter_name);
     outAsync->invoke(iceC_Ice_RouterFinder_getRouter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -34,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -108,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
@@ -175,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

@@ -70,12 +70,12 @@ Selector::initialize(EventHandler* handler)
 
 #ifdef ICE_USE_IOCP
     SOCKET socket = handler->getNativeInfo()->fd();
-    if (socket != INVALID_SOCKET)
+    if(socket != INVALID_SOCKET)
     {
-        if (CreateIoCompletionPort(reinterpret_cast<HANDLE>(socket),
-                                   _handle,
-                                   reinterpret_cast<ULONG_PTR>(handler),
-                                   0) == ICE_NULLPTR)
+        if(CreateIoCompletionPort(reinterpret_cast<HANDLE>(socket),
+                                  _handle,
+                                  reinterpret_cast<ULONG_PTR>(handler),
+                                  0) == ICE_NULLPTR)
         {
             throw Ice::SocketException(__FILE__, __LINE__, GetLastError());
         }
@@ -612,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);
@@ -729,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);
@@ -807,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);
@@ -821,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));
             }
         }
     }
@@ -925,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;

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -34,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,10 +32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -34,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -178,7 +178,7 @@ StreamSocket::read(Buffer& buf)
     {
         while(true)
         {
-            ssize_t ret = read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i);
+            ssize_t ret = read(reinterpret_cast<char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i));
             if(ret == 0)
             {
                 return SocketOperationRead;
@@ -191,7 +191,7 @@ StreamSocket::read(Buffer& buf)
             }
         }
     }
-    buf.i += read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i);
+    buf.i += read(reinterpret_cast<char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i));
 #endif
     return buf.i != buf.b.end() ? SocketOperationRead : SocketOperationNone;
 }
@@ -204,7 +204,7 @@ StreamSocket::write(Buffer& buf)
     {
         while(true)
         {
-            ssize_t ret = write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i);
+            ssize_t ret = write(reinterpret_cast<const char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i));
             if(ret == 0)
             {
                 return SocketOperationWrite;
@@ -217,7 +217,7 @@ StreamSocket::write(Buffer& buf)
             }
         }
     }
-    buf.i += write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i);
+    buf.i += write(reinterpret_cast<const char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i));
 #endif
     return buf.i != buf.b.end() ? SocketOperationWrite : SocketOperationNone;
 }
@@ -272,7 +272,7 @@ StreamSocket::read(char* buf, size_t length)
 
         buf += ret;
         read += ret;
-        length -= ret;
+        length -= static_cast<size_t>(ret);
 
         if(packetSize > length)
         {
@@ -339,7 +339,7 @@ StreamSocket::write(const char* buf, size_t length)
 
         buf += ret;
         sent += ret;
-        length -= ret;
+        length -= static_cast<size_t>(ret);
 
         if(packetSize > length)
         {

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

@@ -2,6 +2,10 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
+#include <Ice/Config.h>
+
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
+
 #include <Ice/TcpAcceptor.h>
 #include <Ice/TcpTransceiver.h>
 #include <Ice/TcpEndpointI.h>
@@ -347,3 +351,5 @@ IceInternal::TcpAcceptor::~TcpAcceptor()
     assert(_acceptFd == INVALID_SOCKET);
 #endif
 }
+
+#endif

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

@@ -2,6 +2,10 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
+#include <Ice/Config.h>
+
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
+
 #include <Ice/TcpConnector.h>
 #include <Ice/TcpTransceiver.h>
 #include <Ice/TcpEndpointI.h>
@@ -120,3 +124,4 @@ IceInternal::TcpConnector::TcpConnector(const ProtocolInstancePtr& instance, con
 IceInternal::TcpConnector::~TcpConnector()
 {
 }
+#endif

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

@@ -2,6 +2,10 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
+#include <Ice/Config.h>
+
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
+
 #include <Ice/TcpEndpointI.h>
 #include <Ice/Network.h>
 #include <Ice/TcpAcceptor.h>
@@ -378,3 +382,4 @@ IceInternal::TcpEndpointFactory::clone(const ProtocolInstancePtr& instance) cons
 {
     return new TcpEndpointFactory(instance);
 }
+#endif

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

@@ -2,6 +2,10 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
+#include <Ice/Config.h>
+
+#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
+
 #include <Ice/TcpTransceiver.h>
 #include <Ice/Connection.h>
 #include <Ice/ProtocolInstance.h>
@@ -128,3 +132,4 @@ IceInternal::TcpTransceiver::TcpTransceiver(const ProtocolInstancePtr& instance,
 IceInternal::TcpTransceiver::~TcpTransceiver()
 {
 }
+#endif

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

@@ -110,6 +110,29 @@ class ThreadPoolDestroyedException
 {
 };
 
+#ifdef ICE_SWIFT
+string
+prefixToDispatchQueueLabel(const std::string& prefix)
+{
+    if(prefix == "Ice.ThreadPool.Client")
+    {
+        return "com.zeroc.ice.client";
+    }
+
+    if(prefix == "Ice.ThreadPool.Server")
+    {
+        return "com.zeroc.ice.server";
+    }
+
+    string::size_type end = prefix.find_last_of(".ThreadPool");
+    if(end == string::npos)
+    {
+        end = prefix.size();
+    }
+
+    return "com.zeroc.ice.oa." + prefix.substr(0, end);
+}
+#endif
 }
 
 Ice::DispatcherCall::~DispatcherCall()
@@ -245,7 +268,12 @@ IceInternal::ThreadPoolWorkQueue::getNativeInfo()
 
 IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& prefix, int timeout) :
     _instance(instance),
+#ifdef ICE_SWIFT
+    _dispatchQueue(dispatch_queue_create(prefixToDispatchQueueLabel(prefix).c_str(),
+                                         DISPATCH_QUEUE_CONCURRENT_WITH_AUTORELEASE_POOL)),
+#else
     _dispatcher(_instance->initializationData().dispatcher),
+#endif
     _destroyed(false),
     _prefix(prefix),
     _selector(instance),
@@ -273,8 +301,20 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
     SYSTEM_INFO sysInfo;
     GetSystemInfo(&sysInfo);
     int nProcessors = sysInfo.dwNumberOfProcessors;
+#   elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+    static int ncpu[2] = { CTL_HW, HW_NCPU };
+    size_t sz = sizeof(nProcessors);
+    int nProcessors;
+    if(sysctl(ncpu, 2, &nProcessors, &sz, 0, 0) == -1)
+    {
+        nProcessors = 1;
+    }
 #   else
     int nProcessors = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
+    if(nProcessors == -1)
+    {
+        nProcessors = 1;
+    }
 #   endif
 #endif
 
@@ -417,6 +457,9 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
 IceInternal::ThreadPool::~ThreadPool()
 {
     assert(_destroyed);
+#ifdef ICE_SWIFT
+    dispatch_release(_dispatchQueue);
+#endif
 }
 
 void
@@ -531,6 +574,12 @@ IceInternal::ThreadPool::ready(const EventHandlerPtr& handler, SocketOperation o
 void
 IceInternal::ThreadPool::dispatchFromThisThread(const DispatchWorkItemPtr& workItem)
 {
+#ifdef ICE_SWIFT
+    dispatch_sync(_dispatchQueue, ^
+    {
+        workItem->run();
+    });
+#else
     if(_dispatcher)
     {
         try
@@ -566,6 +615,7 @@ IceInternal::ThreadPool::dispatchFromThisThread(const DispatchWorkItemPtr& workI
     {
         workItem->run();
     }
+#endif
 }
 
 void
@@ -603,6 +653,16 @@ IceInternal::ThreadPool::prefix() const
     return _prefix;
 }
 
+#ifdef ICE_SWIFT
+
+dispatch_queue_t
+IceInternal::ThreadPool::getDispatchQueue() const ICE_NOEXCEPT
+{
+    return _dispatchQueue;
+}
+
+#endif
+
 void
 IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
 {
@@ -619,6 +679,9 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
             }
             catch(const ThreadPoolDestroyedException&)
             {
+                Lock sync(*this);
+                --_inUse;
+                thread->setState(ICE_ENUM(ThreadState, ThreadStateIdle));
                 return;
             }
             catch(const exception& ex)