zeroc-ice 3.7.2 → 3.7.3

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

@@ -110,6 +110,10 @@ public:
 
     std::string prefix() const;
 
+#ifdef ICE_SWIFT
+    dispatch_queue_t getDispatchQueue() const ICE_NOEXCEPT;
+#endif
+
 private:
 
     void run(const EventHandlerThreadPtr&);
@@ -127,10 +131,14 @@ private:
     std::string nextThreadId();
 
     const InstancePtr _instance;
-#ifdef ICE_CPP11_MAPPING
+#ifdef ICE_SWIFT
+    const dispatch_queue_t _dispatchQueue;
+#else // Ice for Swift does not support a dispatcher
+#   ifdef ICE_CPP11_MAPPING
     std::function<void(std::function<void()>, const std::shared_ptr<Ice::Connection>&)> _dispatcher;
-#else
+#   else
     const Ice::DispatcherPtr _dispatcher;
+#   endif
 #endif
     ThreadPoolWorkQueuePtr _workQueue;
     bool _destroyed;

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

@@ -242,6 +242,16 @@ Timer::run()
             {
                 consoleErr << "IceUtil::Timer::run(): uncaught exception" << endl;
             }
+
+            if(token.delay == IceUtil::Time())
+            {
+                //
+                // If thisthe task is not a repeated task, clear the task reference now rather than
+                // in the synchronization block above. Clearing the task reference might end up
+                // calling user code which could trigger a deadlock. See also issue #352.
+                //
+                token.task = ICE_NULLPTR;
+            }
         }
     }
 }

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

@@ -214,7 +214,17 @@ IceInternal::UdpEndpointI::options() const
 
     if(_mcastInterface.length() > 0)
     {
-        s << " --interface " << _mcastInterface;
+        s << " --interface ";
+        bool addQuote = _mcastInterface.find(':') != string::npos;
+        if(addQuote)
+        {
+            s << "\"";
+        }
+        s << _mcastInterface;
+        if(addQuote)
+        {
+            s << "\"";
+        }
     }
 
     if(_mcastTtl != -1)

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

@@ -259,13 +259,21 @@ IceInternal::UdpTransceiver::read(Buffer& buf)
     assert(buf.i == buf.b.begin());
     assert(_fd != INVALID_SOCKET);
 
-    const int packetSize = min(_maxPacketSize, _rcvSize - _udpOverhead);
+#ifdef _WIN32
+    int packetSize = min(_maxPacketSize, _rcvSize - _udpOverhead);
+#else
+    const size_t packetSize = static_cast<size_t>(min(_maxPacketSize, _rcvSize - _udpOverhead));
+#endif
     buf.b.resize(packetSize);
     buf.i = buf.b.begin();
 
 repeat:
 
+#ifdef _WIN32
+    int ret;
+#else
     ssize_t ret;
+#endif
     if(_state == StateConnected)
     {
         ret = ::recv(_fd, reinterpret_cast<char*>(&buf.b[0]), packetSize, 0);
@@ -341,7 +349,7 @@ repeat:
         }
     }
 
-    buf.b.resize(ret);
+    buf.b.resize(static_cast<size_t>(ret));
     buf.i = buf.b.end();
     return SocketOperationNone;
 #endif

data/ext/ice/cpp/src/Ice/ValueFactory.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/Version.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/WSTransceiver.cpp

@@ -588,11 +588,11 @@ IceInternal::WSTransceiver::read(Buffer& buf)
                 // no more than the payload length. The remaining of the buffer will be
                 // sent over in another frame.
                 //
-                size_t readSz = _readPayloadLength - (buf.i - _readStart); // Already read
+                size_t readSz = _readPayloadLength - static_cast<size_t>(buf.i - _readStart); // Already read
                 if(static_cast<size_t>(buf.b.end() - buf.i) > readSz)
                 {
                     size_t size = buf.b.size();
-                    buf.b.resize(buf.i - buf.b.begin() + readSz);
+                    buf.b.resize(static_cast<size_t>(buf.i - buf.b.begin()) + readSz);
                     s = _delegate->read(buf);
                     buf.b.resize(size);
                 }
@@ -1394,7 +1394,7 @@ IceInternal::WSTransceiver::preRead(Buffer& buf)
                 return false;
             }
 
-            size_t n = min(_readBuffer.i - _readI, buf.b.end() - buf.i);
+            size_t n = min(static_cast<size_t>(_readBuffer.i - _readI), static_cast<size_t>(buf.b.end() - buf.i));
 
             if(n > _readPayloadLength)
             {
@@ -1435,13 +1435,13 @@ IceInternal::WSTransceiver::postRead(Buffer& buf)
         // Unmask the data we just read.
         //
         IceInternal::Buffer::Container::iterator p = _readStart;
-        for(size_t n = _readStart - _readFrameStart; p < buf.i; ++p, ++n)
+        for(size_t n = static_cast<size_t>(_readStart - _readFrameStart); p < buf.i; ++p, ++n)
         {
             *p ^= _readMask[n % 4];
         }
     }
 
-    _readPayloadLength -= buf.i - _readStart;
+    _readPayloadLength -= static_cast<size_t>(buf.i - _readStart);
     _readStart = buf.i;
     if(_readPayloadLength == 0)
     {
@@ -1474,7 +1474,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
         {
             prepareWriteHeader(OP_PING, 0); // Don't send any payload
 
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeState = WriteStateControlFrame;
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1483,7 +1483,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             prepareWriteHeader(OP_PONG, _pingPayload.size());
             if(_pingPayload.size() > static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i))
             {
-                size_t pos = _writeBuffer.i - _writeBuffer.b.begin();
+                size_t pos = static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin());
                 _writeBuffer.b.resize(pos + _pingPayload.size());
                 _writeBuffer.i = _writeBuffer.b.begin() + pos;
             }
@@ -1491,7 +1491,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             _writeBuffer.i += _pingPayload.size();
             _pingPayload.clear();
 
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeState = WriteStateControlFrame;
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1513,7 +1513,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             }
 
             _writeState = WriteStateControlFrame;
-            _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+            _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             _writeBuffer.i = _writeBuffer.b.begin();
         }
         else
@@ -1543,7 +1543,7 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
                 _writeBuffer.i = _writeBuffer.b.begin();
             }
 
-            size_t n = buf.i - buf.b.begin();
+            size_t n = static_cast<size_t>(buf.i - buf.b.begin());
             for(; n < buf.b.size() && _writeBuffer.i < _writeBuffer.b.end(); ++_writeBuffer.i, ++n)
             {
                 *_writeBuffer.i = buf.b[n] ^ _writeMask[n % 4];
@@ -1551,20 +1551,21 @@ IceInternal::WSTransceiver::preWrite(Buffer& buf)
             _writePayloadLength = n;
             if(_writeBuffer.i < _writeBuffer.b.end())
             {
-                _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+                _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             }
             _writeBuffer.i = _writeBuffer.b.begin();
         }
         else if(_writePayloadLength == 0)
         {
-            size_t n = min(_writeBuffer.b.end() - _writeBuffer.i, buf.b.end() - buf.i);
+            size_t n = min(static_cast<size_t>(_writeBuffer.b.end() - _writeBuffer.i),
+                           static_cast<size_t>(buf.b.end() - buf.i));
             memcpy(_writeBuffer.i, buf.i, n);
             _writeBuffer.i += n;
             buf.i += n;
             _writePayloadLength = n;
             if(_writeBuffer.i < _writeBuffer.b.end())
             {
-                _writeBuffer.b.resize(_writeBuffer.i - _writeBuffer.b.begin());
+                _writeBuffer.b.resize(static_cast<size_t>(_writeBuffer.i - _writeBuffer.b.begin()));
             }
             _writeBuffer.i = _writeBuffer.b.begin();
         }
@@ -1670,7 +1671,7 @@ IceInternal::WSTransceiver::readBuffered(IceInternal::Buffer::Container::size_ty
     }
     else
     {
-        IceInternal::Buffer::Container::size_type available = _readBuffer.i - _readI;
+        size_t available = static_cast<size_t>(_readBuffer.i - _readI);
         if(available < sz)
         {
             if(_readI != &_readBuffer.b[0])
@@ -1728,7 +1729,7 @@ IceInternal::WSTransceiver::prepareWriteHeader(Byte opCode, IceInternal::Buffer:
         // Use an extra 64 bits to encode the payload length.
         //
         *_writeBuffer.i++ = static_cast<Byte>(127);
-        ice_htonll(payloadLength, _writeBuffer.i);
+        ice_htonll(static_cast<Long>(payloadLength), _writeBuffer.i);
         _writeBuffer.i += 8;
     }
 

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -39,10 +39,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/IceLocatorDiscovery/IceLocatorDiscovery.cpp

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -35,10 +35,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/IceLocatorDiscovery/IceLocatorDiscovery.h

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -41,10 +41,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/IceLocatorDiscovery/PluginI.cpp

@@ -106,9 +106,9 @@ private:
 
     LookupPrxPtr _lookup;
     vector<pair<LookupPrxPtr, LookupReplyPrxPtr> > _lookups;
-    const IceUtil::Time _timeout;
-    const int _retryCount;
-    const IceUtil::Time _retryDelay;
+    IceUtil::Time _timeout;
+    int _retryCount;
+    IceUtil::Time _retryDelay;
     const IceUtil::TimerPtr _timer;
     const int _traceLevel;
 
@@ -119,6 +119,7 @@ private:
     Ice::LocatorPrxPtr _voidLocator;
 
     IceUtil::Time _nextRetry;
+    bool _pending;
     int _pendingRetryCount;
     size_t _failureCount;
     bool _warnOnce;
@@ -574,10 +575,24 @@ LocatorI::LocatorI(const string& name,
     _warned(false),
     _locator(lookup->ice_getCommunicator()->getDefaultLocator()),
     _voidLocator(voidLocator),
+    _pending(false),
     _pendingRetryCount(0),
     _failureCount(0),
     _warnOnce(true)
 {
+    if(_timeout < IceUtil::Time::milliSeconds(0))
+    {
+        _timeout = IceUtil::Time::milliSeconds(300);
+    }
+    if(_retryCount < 0)
+    {
+        _retryCount = 0;
+    }
+    if(_retryDelay < IceUtil::Time::milliSeconds(0))
+    {
+        _retryDelay = IceUtil::Time::milliSeconds(0);
+    }
+
     //
     // Create one lookup proxy per endpoint from the given proxy. We want to send a multicast
     // datagram on each endpoint.
@@ -669,7 +684,7 @@ LocatorI::getLocators(const string& instanceName, const IceUtil::Time& waitTime)
     else
     {
         Lock sync(*this);
-        while(_locators.find(instanceName) == _locators.end() && _pendingRetryCount > 0)
+        while(_locators.find(instanceName) == _locators.end() && _pending)
         {
             timedWait(waitTime);
         }
@@ -725,10 +740,11 @@ LocatorI::foundLocator(const Ice::LocatorPrxPtr& locator)
         return;
     }
 
-    if(_pendingRetryCount > 0) // No need to retry, we found a locator.
+    if(_pending) // No need to continue, we found a locator.
     {
         _timer->cancel(ICE_SHARED_FROM_THIS);
         _pendingRetryCount = 0;
+        _pending = false;
     }
 
     if(_traceLevel > 0)
@@ -821,8 +837,9 @@ LocatorI::invoke(const Ice::LocatorPrxPtr& locator, const RequestPtr& request)
             _pendingRequests.push_back(request);
         }
 
-        if(_pendingRetryCount == 0) // No request in progress
+        if(!_pending) // No request in progress
         {
+            _pending = true;
             _failureCount = 0;
             _pendingRetryCount = _retryCount;
             try
@@ -877,6 +894,7 @@ LocatorI::invoke(const Ice::LocatorPrxPtr& locator, const RequestPtr& request)
                     (*p)->invoke(_voidLocator);
                 }
                 _pendingRequests.clear();
+                _pending = false;
                 _pendingRetryCount = 0;
             }
         }
@@ -887,13 +905,14 @@ void
 LocatorI::exception(const Ice::LocalException& ex)
 {
     Lock sync(*this);
-    if(++_failureCount == _lookups.size() && _pendingRetryCount > 0)
+    if(++_failureCount == _lookups.size() && _pending)
     {
         //
         // All the lookup calls failed, cancel the timer and propagate the error to the requests.
         //
         _timer->cancel(ICE_SHARED_FROM_THIS);
         _pendingRetryCount = 0;
+        _pending = false;
 
         if(_warnOnce)
         {
@@ -932,8 +951,15 @@ void
 LocatorI::runTimerTask()
 {
     Lock sync(*this);
-    if(--_pendingRetryCount > 0)
+    if(!_pending)
     {
+        assert(_pendingRequests.empty());
+        return; // The request failed
+    }
+
+    if(_pendingRetryCount > 0)
+    {
+        --_pendingRetryCount;
         try
         {
             if(_traceLevel > 1)
@@ -976,6 +1002,9 @@ LocatorI::runTimerTask()
         _pendingRetryCount = 0;
     }
 
+    assert(_pendingRetryCount == 0);
+    _pending = false;
+
     if(_traceLevel > 0)
     {
         Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");