zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.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 LOCATOR_DISCOVERY_PLUGIN_I_H
 #define LOCATOR_DISCOVERY_PLUGIN_I_H

data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.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 <IceUtil/IceUtil.h>
 #include <Ice/Ice.h>
@@ -111,10 +106,11 @@ 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;
 
     string _instanceName;
     bool _warned;
@@ -123,6 +119,7 @@ private:
     Ice::LocatorPrxPtr _voidLocator;
 
     IceUtil::Time _nextRetry;
+    bool _pending;
     int _pendingRetryCount;
     size_t _failureCount;
     bool _warnOnce;
@@ -145,13 +142,6 @@ private:
     const LocatorIPtr _locator;
 };
 
-const ::std::string IceGrid_Locator_ids[3] =
-{
-    "::Ice::Locator",
-    "::Ice::Object",
-    "::IceGrid::Locator"
-};
-
 //
 // The void locator implementation below is used when no locator is found.
 //
@@ -580,23 +570,38 @@ LocatorI::LocatorI(const string& name,
     _retryCount(p->getPropertyAsIntWithDefault(name + ".RetryCount", 3)),
     _retryDelay(IceUtil::Time::milliSeconds(p->getPropertyAsIntWithDefault(name + ".RetryDelay", 2000))),
     _timer(IceInternal::getInstanceTimer(lookup->ice_getCommunicator())),
+    _traceLevel(p->getPropertyAsInt(name + ".Trace.Lookup")),
     _instanceName(instanceName),
     _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.
     //
     Ice::EndpointSeq endpoints = lookup->ice_getEndpoints();
-    for(vector<Ice::EndpointPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
+    for(vector<Ice::EndpointPtr>::const_iterator q = endpoints.begin(); q != endpoints.end(); ++q)
     {
         Ice::EndpointSeq single;
-        single.push_back(*p);
+        single.push_back(*q);
         _lookups.push_back(make_pair(lookup->ice_endpoints(single), LookupReplyPrxPtr()));
     }
     assert(!_lookups.empty());
@@ -679,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);
         }
@@ -701,8 +706,26 @@ void
 LocatorI::foundLocator(const Ice::LocatorPrxPtr& locator)
 {
     Lock sync(*this);
-    if(!locator || (!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName))
+
+    if(!locator)
     {
+        if(_traceLevel > 2)
+        {
+            Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+            out << "ignoring locator reply: (null locator)";
+        }
+        return;
+    }
+
+    if(!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName)
+    {
+        if(_traceLevel > 2)
+        {
+            Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+            out << "ignoring locator reply: instance name doesn't match\n";
+            out << "expected = " << _instanceName;
+            out << "received = " << locator->ice_getIdentity().category;
+        }
         return;
     }
 
@@ -728,10 +751,21 @@ 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)
+    {
+        Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+        out << "locator lookup succeeded:\nlocator = " << locator;
+        if(!_instanceName.empty())
+        {
+            out << "\ninstance name = " << _instanceName;
+        }
     }
 
     Ice::LocatorPrxPtr l = _pendingRequests.empty() ? _locators[locator->ice_getIdentity().category] : _locator;
@@ -814,12 +848,22 @@ 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
             {
+                if(_traceLevel > 1)
+                {
+                    Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+                    out << "looking up locator:\nlookup = " << _lookup;
+                    if(!_instanceName.empty())
+                    {
+                        out << "\ninstance name = " << _instanceName;
+                    }
+                }
                 for(vector<pair<LookupPrxPtr, LookupReplyPrxPtr> >::const_iterator l = _lookups.begin();
                     l != _lookups.end(); ++l)
                 {
@@ -843,13 +887,25 @@ LocatorI::invoke(const Ice::LocatorPrxPtr& locator, const RequestPtr& request)
                 }
                 _timer->schedule(ICE_SHARED_FROM_THIS, _timeout);
             }
-            catch(const Ice::LocalException&)
+            catch(const Ice::LocalException& ex)
             {
+                if(_traceLevel > 0)
+                {
+                    Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+                    out << "locator lookup failed:\nlookup = " << _lookup;
+                    if(!_instanceName.empty())
+                    {
+                        out << "\ninstance name = " << _instanceName;
+                    }
+                    out << "\n" << ex;
+                }
+
                 for(vector<RequestPtr>::const_iterator p = _pendingRequests.begin(); p != _pendingRequests.end(); ++p)
                 {
                     (*p)->invoke(_voidLocator);
                 }
                 _pendingRequests.clear();
+                _pending = false;
                 _pendingRetryCount = 0;
             }
         }
@@ -860,13 +916,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)
         {
@@ -875,6 +932,17 @@ LocatorI::exception(const Ice::LocalException& ex)
             _warnOnce = false;
         }
 
+        if(_traceLevel > 0)
+        {
+            Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+            out << "locator lookup failed:\nlookup = " << _lookup;
+            if(!_instanceName.empty())
+            {
+                out << "\ninstance name = " << _instanceName;
+            }
+            out << "\n" << ex;
+        }
+
         if(_pendingRequests.empty())
         {
             notify();
@@ -894,10 +962,26 @@ 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)
+            {
+                Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+                out << "retrying locator lookup:\nlookup = " << _lookup << "\nretry count = " << _pendingRetryCount;
+                if(!_instanceName.empty())
+                {
+                    out << "\ninstance name = " << _instanceName;
+                }
+            }
             _failureCount = 0;
             for(vector<pair<LookupPrxPtr, LookupReplyPrxPtr> >::const_iterator l = _lookups.begin();
                 l != _lookups.end(); ++l)
@@ -929,6 +1013,19 @@ LocatorI::runTimerTask()
         _pendingRetryCount = 0;
     }
 
+    assert(_pendingRetryCount == 0);
+    _pending = false;
+
+    if(_traceLevel > 0)
+    {
+        Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
+        out << "locator lookup timed out:\nlookup = " << _lookup;
+        if(!_instanceName.empty())
+        {
+            out << "\ninstance name = " << _instanceName;
+        }
+    }
+
     if(_pendingRequests.empty())
     {
         notify();

data/ext/ice/cpp/src/IceSSL/AcceptorI.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 <IceSSL/AcceptorI.h>
 #include <IceSSL/EndpointI.h>
@@ -72,9 +67,7 @@ IceSSL::AcceptorI::accept()
     //
     if(!_instance->initialized())
     {
-        PluginInitializationException ex(__FILE__, __LINE__);
-        ex.reason = "IceSSL: plug-in is not initialized";
-        throw ex;
+        throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: plug-in is not initialized");
     }
 
     return _instance->engine()->createTransceiver(_instance, _delegate->accept(), _adapterName, true);

data/ext/ice/cpp/src/IceSSL/AcceptorI.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 ICESSL_ACCEPTOR_I_H
 #define ICESSL_ACCEPTOR_I_H

data/ext/ice/cpp/src/IceSSL/CertificateI.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 <IceUtil/DisableWarnings.h>
 #include <IceUtil/Mutex.h>
@@ -51,7 +46,7 @@ const CertificateOID IceSSL::certificateOIDS[] =
 const int IceSSL::certificateOIDSSize = sizeof(IceSSL::certificateOIDS) / sizeof(CertificateOID);
 
 CertificateReadException::CertificateReadException(const char* file, int line, const string& r) :
-    ExceptionHelper<CertificateReadException>(file, line),
+    IceUtil::ExceptionHelper<CertificateReadException>(file, line),
     reason(r)
 {
 }
@@ -77,7 +72,7 @@ CertificateReadException::ice_clone() const
 #endif
 
 CertificateEncodingException::CertificateEncodingException(const char* file, int line, const string& r) :
-    ExceptionHelper<CertificateEncodingException>(file, line),
+    IceUtil::ExceptionHelper<CertificateEncodingException>(file, line),
     reason(r)
 {
 }
@@ -103,7 +98,7 @@ CertificateEncodingException::ice_clone() const
 #endif
 
 ParseException::ParseException(const char* file, int line, const string& r) :
-    ExceptionHelper<ParseException>(file, line),
+    IceUtil::ExceptionHelper<ParseException>(file, line),
     reason(r)
 {
 }

data/ext/ice/cpp/src/IceSSL/CertificateI.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 ICESSL_CERTIFICATE_I_H
 #define ICESSL_CERTIFICATE_I_H

data/ext/ice/cpp/src/IceSSL/ConnectionInfo.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
@@ -69,7 +64,9 @@ IceSSL::ConnectionInfo::~ConnectionInfo()
 {
 }
 
-ICESSL_API ::Ice::LocalObject* IceSSL::upCast(::IceSSL::ConnectionInfo* p) { return p; }
+/// \cond INTERNAL
+ICESSL_API ::Ice::LocalObject* IceSSL::upCast(ConnectionInfo* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.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