zeroc-ice 3.6b1 → 3.6.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -12,15 +12,15 @@
 
 #include <IceUtil/Monitor.h>
 #include <IceUtil/Mutex.h>
+#include <IceUtil/UniquePtr.h>
 
+#include <Ice/ConnectRequestHandlerF.h>
 #include <Ice/RequestHandler.h>
 #include <Ice/Reference.h>
 #include <Ice/RouterInfo.h>
 #include <Ice/ProxyF.h>
 #include <Ice/BasicStream.h>
 
-#include <IceUtil/UniquePtr.h>
-
 #include <deque>
 #include <set>
 
@@ -37,15 +37,11 @@ public:
     ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&);
     virtual ~ConnectRequestHandler();
 
-    virtual RequestHandlerPtr connect(const Ice::ObjectPrx&);
+    RequestHandlerPtr connect(const Ice::ObjectPrx&);
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
 
-    virtual void prepareBatchRequest(BasicStream*);
-    virtual void finishBatchRequest(BasicStream*);
-    virtual void abortBatchRequest();
-
-    virtual bool sendRequest(OutgoingBase*);
-    virtual AsyncStatus sendAsyncRequest(const OutgoingAsyncBasePtr&);
+    virtual bool sendRequest(ProxyOutgoingBase*);
+    virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&);
 
     virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
     virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
@@ -65,16 +61,14 @@ private:
 
     struct Request
     {
-        Request() : out(0), os(0)
+        Request() : out(0)
         {
         }
 
-        OutgoingBase* out;
-        OutgoingAsyncBasePtr outAsync;
-        BasicStream* os;
+        ProxyOutgoingBase* out;
+        ProxyOutgoingAsyncBasePtr outAsync;
     };
 
-    bool _connect;
     Ice::ObjectPrx _proxy;
     std::set<Ice::ObjectPrx> _proxies;
 
@@ -85,12 +79,9 @@ private:
     bool _flushing;
 
     std::deque<Request> _requests;
-    bool _batchRequestInProgress;
-    BasicStream _batchStream;
 
-    RequestHandlerPtr _connectionRequestHandler;
+    RequestHandlerPtr _requestHandler;
 };
-typedef IceUtil::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr;
 
 }
 

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

@@ -0,0 +1,25 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 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_CONNECT_REQUEST_HANDLER_F_H
+#define ICE_CONNECT_REQUEST_HANDLER_F_H
+
+#include <IceUtil/Shared.h>
+#include <Ice/Handle.h>
+
+namespace IceInternal
+{
+
+class ConnectRequestHandler;
+ICE_API IceUtil::Shared* upCast(ConnectRequestHandler*);
+typedef IceInternal::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr;
+
+}
+
+#endif

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -29,8 +29,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 
@@ -43,16 +49,16 @@ namespace Ice
 {
 }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::ConnectionInfo* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ConnectionInfo* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::ConnectionCallback* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::ConnectionCallback* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::Connection* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Connection* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::IPConnectionInfo* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::IPConnectionInfo* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::TCPConnectionInfo* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::TCPConnectionInfo* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::UDPConnectionInfo* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::UDPConnectionInfo* p) { return p; }
 
-ICE_DECLSPEC_EXPORT ::Ice::LocalObject* Ice::upCast(::Ice::WSConnectionInfo* p) { return p; }
+ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::WSConnectionInfo* p) { return p; }

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

@@ -1,13 +1,13 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.6b
+// Ice version 3.6.0
 //
 // <auto-generated>
 //
@@ -27,8 +27,14 @@
 #include <IceUtil/PopDisableWarnings.h>
 
 #ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION  != 30651
-#       error Ice version mismatch: an exact match is required for beta generated code
+#   if ICE_INT_VERSION / 100 != 306
+#       error Ice version mismatch!
+#   endif
+#   if ICE_INT_VERSION % 100 > 50
+#       error Beta header file detected
+#   endif
+#   if ICE_INT_VERSION % 100 < 0
+#       error Ice patch level mismatch!
 #   endif
 #endif
 

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 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.
@@ -28,6 +28,16 @@
 #include <IceUtil/Random.h>
 #include <iterator>
 
+#if TARGET_OS_IPHONE != 0
+namespace IceInternal
+{
+
+bool registerForBackgroundNotification(IceInternal::IncomingConnectionFactory*);
+void unregisterForBackgroundNotification(IceInternal::IncomingConnectionFactory*);
+
+}
+#endif
+
 using namespace std;
 using namespace Ice;
 using namespace Ice::Instrumentation;
@@ -266,7 +276,7 @@ IceInternal::OutgoingConnectionFactory::removeAdapter(const ObjectAdapterPtr& ad
 }
 
 void
-IceInternal::OutgoingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync)
+IceInternal::OutgoingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync)
 {
     list<ConnectionIPtr> c;
 
@@ -1191,7 +1201,7 @@ IceInternal::IncomingConnectionFactory::connections() const
 }
 
 void
-IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchPtr& outAsync)
+IceInternal::IncomingConnectionFactory::flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr& outAsync)
 {
     list<ConnectionIPtr> c = connections(); // connections() is synchronized, so no need to synchronize here.
 
@@ -1235,7 +1245,6 @@ IceInternal::IncomingConnectionFactory::startAsync(SocketOperation)
 bool
 IceInternal::IncomingConnectionFactory::finishAsync(SocketOperation)
 {
-    assert(_acceptor);
     try
     {
         _acceptor->finishAccept();
@@ -1362,15 +1371,35 @@ void
 IceInternal::IncomingConnectionFactory::finished(ThreadPoolCurrent&, bool close)
 {
     IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+
+#if TARGET_OS_IPHONE != 0
+    if(_state < StateClosed)
+    {
+        //
+        // Finished has been called by stopAcceptor if the state isn't
+        // closed.
+        //
+        if(_acceptorStarted && close)
+        {
+            _acceptorStarted = false;
+            closeAcceptor();
+        }
+        return;
+    }
+#endif
+
     assert(_state == StateClosed);
     setState(StateFinished);
 
-    assert(_acceptor);
-
     if(close)
     {
-        closeAcceptor(true);
+        closeAcceptor();
     }
+
+#if TARGET_OS_IPHONE != 0
+    sync.release();
+    unregisterForBackgroundNotification(this);
+#endif
 }
 
 string
@@ -1382,8 +1411,6 @@ IceInternal::IncomingConnectionFactory::toString() const
     {
         return _transceiver->toString();
     }
-
-    assert(_acceptor);
     return _acceptor->toString();
 }
 
@@ -1446,19 +1473,59 @@ IceInternal::IncomingConnectionFactory::IncomingConnectionFactory(const Instance
 {
 }
 
+#if TARGET_OS_IPHONE != 0
+void
+IceInternal::IncomingConnectionFactory::startAcceptor()
+{
+    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+    if(_state >= StateClosed || _acceptorStarted)
+    {
+        return;
+    }
+
+    try
+    {
+        createAcceptor();
+        _acceptorStarted = true;
+    }
+    catch(const Ice::Exception& ex)
+    {
+        if(_warn)
+        {
+            Warning out(_instance->initializationData().logger);
+            out << "unable to create acceptor:\n" << ex;
+        }
+    }
+}
+
 void
-IceInternal::IncomingConnectionFactory::initialize(const string& oaName)
+IceInternal::IncomingConnectionFactory::stopAcceptor()
+{
+    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
+    if(_state >= StateClosed || !_acceptorStarted)
+    {
+        return;
+    }
+
+    if(_adapter->getThreadPool()->finish(this, true))
+    {
+        _acceptorStarted = false;
+        closeAcceptor();
+    }
+}
+#endif
+
+void
+IceInternal::IncomingConnectionFactory::initialize()
 {
     if(_instance->defaultsAndOverrides()->overrideTimeout)
     {
-        const_cast<EndpointIPtr&>(_endpoint) =
-            _endpoint->timeout(_instance->defaultsAndOverrides()->overrideTimeoutValue);
+        _endpoint = _endpoint->timeout(_instance->defaultsAndOverrides()->overrideTimeoutValue);
     }
 
     if(_instance->defaultsAndOverrides()->overrideCompress)
     {
-        const_cast<EndpointIPtr&>(_endpoint) =
-            _endpoint->compress(_instance->defaultsAndOverrides()->overrideCompressValue);
+        _endpoint = _endpoint->compress(_instance->defaultsAndOverrides()->overrideCompressValue);
     }
 
     try
@@ -1480,24 +1547,16 @@ IceInternal::IncomingConnectionFactory::initialize(const string& oaName)
         }
         else
         {
-            const_cast<AcceptorPtr&>(_acceptor) = _endpoint->acceptor(oaName);
-            assert(_acceptor);
-
-            if(_instance->traceLevels()->network >= 2)
-            {
-                Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
-                out << "attempting to bind to " << _endpoint->protocol() << " socket " << _acceptor->toString();
-            }
-
-            const_cast<EndpointIPtr&>(_endpoint) = _acceptor->listen();
-
-            if(_instance->traceLevels()->network >= 1)
-            {
-                Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
-                out << "listening for " << _endpoint->protocol() << " connections\n" << _acceptor->toDetailedString();
-            }
-
-            _adapter->getThreadPool()->initialize(this);
+#if TARGET_OS_IPHONE != 0
+            //
+            // The notification center will call back on the factory to
+            // start the acceptor if necessary.
+            //
+            _acceptorStarted = false;
+            registerForBackgroundNotification(this);
+#else
+            createAcceptor();
+#endif
         }
     }
     catch(const Ice::Exception&)
@@ -1514,19 +1573,6 @@ IceInternal::IncomingConnectionFactory::initialize(const string& oaName)
             }
         }
 
-
-        if(_acceptor)
-        {
-            try
-            {
-                closeAcceptor(false);
-            }
-            catch(const Ice::LocalException&)
-            {
-                // Ignore
-            }
-        }
-
         _state = StateFinished;
         _monitor->destroy();
         _connections.clear();
@@ -1593,15 +1639,15 @@ IceInternal::IncomingConnectionFactory::setState(State state)
             if(_acceptor)
             {
                 //
-                // If possible, close the acceptor now to prevent new connections from 
+                // If possible, close the acceptor now to prevent new connections from
                 // being accepted while we are deactivating. This is especially useful
                 // if there are no more threads in the thread pool available to dispatch
-                // the finish() call. Not all selector implementations do support this 
+                // the finish() call. Not all selector implementations do support this
                 // however.
                 //
                 if(_adapter->getThreadPool()->finish(this, true))
                 {
-                    closeAcceptor(true);
+                    closeAcceptor();
                 }
             }
             else
@@ -1626,9 +1672,50 @@ IceInternal::IncomingConnectionFactory::setState(State state)
 }
 
 void
-IceInternal::IncomingConnectionFactory::closeAcceptor(bool trace)
+IceInternal::IncomingConnectionFactory::createAcceptor()
+{
+    try
+    {
+        _acceptor = _endpoint->acceptor(_adapter->getName());
+        assert(_acceptor);
+
+        if(_instance->traceLevels()->network >= 2)
+        {
+            Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
+            out << "attempting to bind to " << _endpoint->protocol() << " socket " << _acceptor->toString();
+        }
+
+        _endpoint = _acceptor->listen();
+
+        if(_instance->traceLevels()->network >= 1)
+        {
+            Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
+            out << "listening for " << _endpoint->protocol() << " connections\n" << _acceptor->toDetailedString();
+        }
+
+        _adapter->getThreadPool()->initialize(this);
+
+        if(_state == StateActive)
+        {
+            _adapter->getThreadPool()->_register(this, SocketOperationRead);
+        }
+    }
+    catch(const Ice::Exception&)
+    {
+        if(_acceptor)
+        {
+            _acceptor->close();
+        }
+        throw;
+    }
+}
+
+void
+IceInternal::IncomingConnectionFactory::closeAcceptor()
 {
-    if(trace && _instance->traceLevels()->network >= 1)
+    assert(_acceptor);
+
+    if(_instance->traceLevels()->network >= 1)
     {
         Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
         out << "stopping to accept " << _endpoint->protocol() << " connections at " << _acceptor->toString();
@@ -1636,4 +1723,3 @@ IceInternal::IncomingConnectionFactory::closeAcceptor(bool trace)
 
     _acceptor->close();
 }
-