zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/Ice/Network.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_NETWORK_H
 #define ICE_NETWORK_H
@@ -43,7 +38,7 @@ typedef int ssize_t;
 #   include <netdb.h>
 #endif
 
-#if defined(__linux) && !defined(ICE_NO_EPOLL)
+#if defined(__linux__) && !defined(ICE_NO_EPOLL)
 #   define ICE_USE_EPOLL 1
 #elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && TARGET_OS_IPHONE == 0 && !defined(ICE_NO_KQUEUE)
 #   define ICE_USE_KQUEUE 1
@@ -151,16 +146,6 @@ enum SocketOperation
 #endif
 };
 
-//
-// On UWP, wait only for read to return, on IOCP/Win32 wait for
-// both pending read and write operations to complete (#ICE-6695).
-//
-#if defined(ICE_OS_UWP)
-const int SocketOperationWaitForClose = 1;
-#elif defined(ICE_USE_IOCP)
-const int SocketOperationWaitForClose = 3;
-#endif
-
 //
 // AsyncInfo struct for Windows IOCP or UWP holds the result of
 // asynchronous operations after it completed.
@@ -174,12 +159,13 @@ struct ICE_API AsyncInfo : WSAOVERLAPPED
     WSABUF buf;
     DWORD flags;
     DWORD count;
-    int error;
+    DWORD error;
 };
 #elif defined(ICE_OS_UWP)
 struct ICE_API AsyncInfo
 {
     Windows::Foundation::AsyncOperationCompletedHandler<unsigned int>^ completedHandler;
+    Windows::Foundation::IAsyncInfo^ operation;
     int count;
     int error;
 };
@@ -250,7 +236,7 @@ protected:
     HANDLE _handle;
     ULONG_PTR _key;
 #elif defined(ICE_OS_UWP)
-    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^, bool = false);
+    bool checkIfErrorOrCompleted(SocketOperation, Windows::Foundation::IAsyncInfo^, Windows::Foundation::AsyncStatus, bool = false);
     SocketOperationCompletedHandler^ _completedHandler;
 #else
     SOCKET _newFd;
@@ -345,7 +331,7 @@ ICE_API void checkErrorCode(const char*, int, HRESULT);
 //
 // UWP impose some restriction on operations that block when run from
 // STA thread and throws concurrency::invalid_operation. We cannot
-// directly call task::get or task::way, this helper method is used to
+// directly call task::get or task::wait, this helper method is used to
 // workaround this limitation.
 //
 template<typename T>

data/ext/ice/cpp/src/Ice/NetworkF.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_NETWORK_F_H
 #define ICE_NETWORK_F_H

data/ext/ice/cpp/src/Ice/NetworkProxy.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/NetworkProxy.h>
 #include <Ice/HttpParser.h>
@@ -81,7 +76,6 @@ private:
 SOCKSNetworkProxy::SOCKSNetworkProxy(const string& host, int port) : _host(host), _port(port)
 {
     assert(!host.empty());
-    memset(&_address, 0, sizeof(_address));
 }
 
 SOCKSNetworkProxy::SOCKSNetworkProxy(const Address& addr) : _port(0), _address(addr)
@@ -194,7 +188,6 @@ HTTPNetworkProxy::HTTPNetworkProxy(const string& host, int port) :
     _host(host), _port(port), _protocol(EnableBoth)
 {
     assert(!host.empty());
-    memset(&_address, 0, sizeof(_address));
 }
 
 HTTPNetworkProxy::HTTPNetworkProxy(const Address& addr, ProtocolSupport protocol) :
@@ -305,6 +298,7 @@ IceInternal::createNetworkProxy(const Ice::PropertiesPtr& properties, ProtocolSu
     if(!proxyHost.empty())
     {
 #ifdef ICE_OS_UWP
+        UNREFERENCED_PARAMETER(protocolSupport);
         throw Ice::InitializationException(__FILE__, __LINE__, "SOCKS proxy not supported with UWP");
 #else
         if(protocolSupport == EnableIPv6)

data/ext/ice/cpp/src/Ice/NetworkProxy.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_NETWORK_PROXY_H
 #define ICE_NETWORK_PROXY_H

data/ext/ice/cpp/src/Ice/NetworkProxyF.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_NETWORK_PROXY_F_H
 #define ICE_NETWORK_PROXY_F_H

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

@@ -0,0 +1,57 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifdef ICE_SWIFT
+
+#include <Ice/OSLogLoggerI.h>
+#include <os/log.h>
+
+using namespace std;
+using namespace Ice;
+
+Ice::OSLogLoggerI::OSLogLoggerI(const std::string& prefix) : _prefix(prefix)
+{
+    const string subsystem = prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + prefix;
+    _log.reset(os_log_create(subsystem.c_str(), ""));
+}
+
+void
+Ice::OSLogLoggerI::print(const std::string& message)
+{
+    os_log_with_type(_log.get(), OS_LOG_TYPE_DEFAULT, "%{public}s.", message.c_str());
+}
+
+void
+Ice::OSLogLoggerI::trace(const std::string& category, const std::string& message)
+{
+    const string subsystem = _prefix.empty() ? "com.zeroc.ice" : "com.zeroc.ice." + _prefix;
+    IceInternal::UniqueRef<os_log_t> log(os_log_create(subsystem.c_str(), category.c_str()));
+    os_log_with_type(log.get(), OS_LOG_TYPE_INFO, "%{public}s.", message.c_str());
+}
+
+void
+Ice::OSLogLoggerI::warning(const std::string& message)
+{
+    os_log_with_type(_log.get(), OS_LOG_TYPE_ERROR, "%{public}s.", message.c_str());
+}
+
+void
+Ice::OSLogLoggerI::error(const std::string& message)
+{
+    os_log_with_type(_log.get(), OS_LOG_TYPE_FAULT, "%{public}s.", message.c_str());
+}
+
+std::string
+Ice::OSLogLoggerI::getPrefix()
+{
+    return _prefix;
+}
+
+LoggerPtr
+Ice::OSLogLoggerI::cloneWithPrefix(const std::string& prefix)
+{
+    return ICE_MAKE_SHARED(OSLogLoggerI, prefix);
+}
+
+#endif

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

@@ -0,0 +1,40 @@
+//
+// Copyright (c) ZeroC, Inc. All rights reserved.
+//
+
+#ifndef ICE_OSLOG_LOGGER_I_H
+#define ICE_OSLOG_LOGGER_I_H
+
+#ifdef ICE_SWIFT
+
+#include <Ice/Logger.h>
+#include <Ice/UniqueRef.h>
+#include <os/log.h>
+
+namespace Ice
+{
+
+class OSLogLoggerI : public Logger
+{
+public:
+
+    OSLogLoggerI(const std::string&);
+
+    virtual void print(const std::string&);
+    virtual void trace(const std::string&, const std::string&);
+    virtual void warning(const std::string&);
+    virtual void error(const std::string&);
+    virtual std::string getPrefix();
+    virtual LoggerPtr cloneWithPrefix(const std::string&);
+
+private:
+
+    const std::string _prefix;
+    IceInternal::UniqueRef<os_log_t> _log;
+};
+
+}
+
+#endif
+
+#endif

data/ext/ice/cpp/src/Ice/Object.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/Object.h>
 #include <Ice/Incoming.h>
@@ -118,7 +113,6 @@ Ice::ObjectPtr
 Ice::Object::ice_clone() const
 {
     throw CloneNotImplementedException(__FILE__, __LINE__);
-    return 0; // avoid warning with some compilers
 }
 
 Ice::SlicedDataPtr
@@ -161,7 +155,14 @@ Ice::Object::_iceD_ice_ids(Incoming& inS, const Current& current)
     inS.readEmptyParams();
     vector<string> ret = ice_ids(current);
     OutputStream* ostr = inS.startWriteParams();
-    ostr->write(&ret[0], &ret[0] + ret.size(), false);
+    if(ret.empty())
+    {
+        ostr->write(ret);
+    }
+    else
+    {
+        ostr->write(&ret[0], &ret[0] + ret.size(), false);
+    }
     inS.endWriteParams();
     return true;
 }
@@ -250,6 +251,11 @@ Ice::Object::_iceDispatch(Incoming& in, const Current& current)
 }
 
 #ifndef ICE_CPP11_MAPPING
+void
+Ice::Object::ice_collectable(bool)
+{
+}
+
 void
 Ice::Object::ice_preMarshal()
 {
@@ -320,28 +326,21 @@ Ice::Object::_iceCheckMode(OperationMode expected, OperationMode received)
 {
     if(expected != received)
     {
+        assert(expected != ICE_ENUM(OperationMode, Nonmutating)); // We never expect Nonmutating
         if(expected == ICE_ENUM(OperationMode, Idempotent) && received == ICE_ENUM(OperationMode, Nonmutating))
         {
             //
             // Fine: typically an old client still using the deprecated nonmutating keyword
             //
-
-            //
-            // Note that expected == Nonmutating and received == Idempotent is not ok:
-            // the server may still use the deprecated nonmutating keyword to detect updates
-            // and the client should not break this (deprecated) feature.
-            //
         }
         else
         {
-            Ice::MarshalException ex(__FILE__, __LINE__);
             std::ostringstream reason;
             reason << "unexpected operation mode. expected = "
                    << operationModeToString(expected)
                    << " received = "
                    << operationModeToString(received);
-            ex.reason = reason.str();
-            throw ex;
+            throw Ice::MarshalException(__FILE__, __LINE__, reason.str());
         }
     }
 }

data/ext/ice/cpp/src/Ice/ObjectAdapter.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>
 //
@@ -43,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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -73,7 +68,9 @@ Ice::ObjectAdapter::~ObjectAdapter()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ObjectAdapter* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(ObjectAdapter* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

data/ext/ice/cpp/src/Ice/ObjectAdapterF.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>
 //
@@ -37,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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.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/ObjectAdapterFactory.h>
 #include <Ice/ObjectAdapterI.h>
@@ -41,8 +36,8 @@ IceInternal::ObjectAdapterFactory::shutdown()
 
         adapters = _adapters;
 
-        _instance = 0;
-        _communicator = 0;
+        _instance = ICE_NULLPTR;
+        _communicator = ICE_NULLPTR;
 
         notifyAll();
     }
@@ -147,32 +142,66 @@ IceInternal::ObjectAdapterFactory::updateObservers(void (ObjectAdapterI::*fn)())
 ObjectAdapterPtr
 IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrxPtr& router)
 {
-    IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
-
-    if(!_instance)
+    ObjectAdapterIPtr adapter;
     {
-        throw CommunicatorDestroyedException(__FILE__, __LINE__);
+        IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+
+        if(!_instance)
+        {
+            throw CommunicatorDestroyedException(__FILE__, __LINE__);
+        }
+
+        if(name.empty())
+        {
+            string uuid = Ice::generateUUID();
+            adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true);
+        }
+        else
+        {
+            if(_adapterNamesInUse.find(name) != _adapterNamesInUse.end())
+            {
+                throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
+            }
+            adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, name, false);
+            _adapterNamesInUse.insert(name);
+        }
     }
 
-    ObjectAdapterIPtr adapter;
-    if(name.empty())
+    //
+    // Must be called outside the synchronization since initialize can make client invocations
+    // on the router if it's set.
+    //
+    bool initialized = false;
+    try
     {
-        string uuid = Ice::generateUUID();
-        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true);
-        adapter->initialize(ICE_NULLPTR);
+        adapter->initialize(router);
+        initialized = true;
+
+        IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+        if(!_instance)
+        {
+            throw CommunicatorDestroyedException(__FILE__, __LINE__);
+        }
+        _adapters.push_back(adapter);
     }
-    else
+    catch(const Ice::CommunicatorDestroyedException&)
     {
-        if(_adapterNamesInUse.find(name) != _adapterNamesInUse.end())
+        if(initialized)
         {
-            throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
+            adapter->destroy();
         }
-        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, name, false);
-        adapter->initialize(router);
-        _adapterNamesInUse.insert(name);
+        throw;
+    }
+    catch(const std::exception&)
+    {
+        if(!name.empty())
+        {
+            IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
+            _adapterNamesInUse.erase(name);
+        }
+        throw;
     }
 
-    _adapters.push_back(adapter);
     return adapter;
 }