zeroc-ice 3.7.9.1 → 3.7.10

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

@@ -24,13 +24,7 @@ struct timespec zeroTimeout = { 0, 0 };
 }
 #endif
 
-#if defined(ICE_OS_UWP)
-using namespace Windows::Storage::Streams;
-using namespace Windows::Networking;
-using namespace Windows::Networking::Sockets;
-#endif
-
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 
 Selector::Selector(const InstancePtr& instance) : _instance(instance)
 {
@@ -116,12 +110,6 @@ Selector::update(EventHandler* handler, SocketOperation remove, SocketOperation
 void
 Selector::finish(IceInternal::EventHandler* handler)
 {
-#ifdef ICE_OS_UWP
-    // If async operations are no longer pending, clear the completion handler to break
-    // the cyclic reference count.
-    assert(!handler->_started && !handler->_pending);
-    handler->getNativeInfo()->setCompletedHandler(nullptr);
-#endif
     handler->_registered = SocketOperationNone;
     handler->_finish = false; // Ensures that finished() is only called once on the event handler.
 }

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

@@ -39,10 +39,6 @@ struct __CFSocket;
 typedef struct __CFSocket * CFSocketRef;
 #endif
 
-#if defined(ICE_OS_UWP)
-#    include <deque>
-#endif
-
 namespace IceInternal
 {
 
@@ -53,22 +49,10 @@ class SelectorTimeoutException
 {
 };
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 
 class Selector
 {
-#if defined(ICE_OS_UWP)
-    struct SelectEvent
-    {
-        SelectEvent(const EventHandlerPtr& handler, SocketOperation status) : handler(handler), status(status)
-        {
-        }
-
-        EventHandlerPtr handler;
-        SocketOperation status;
-    };
-#endif
-
 public:
 
     Selector(const InstancePtr&);

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       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.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       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.9
+// Ice version 3.7.10
 //
 // <auto-generated>
 //
@@ -37,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 9
+#   if ICE_INT_VERSION % 100 < 10
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -8,13 +8,6 @@
 
 using namespace IceInternal;
 
-#if defined(ICE_OS_UWP)
-
-#include <Ice/Properties.h>
-using namespace Platform;
-using namespace Windows::Foundation;
-#endif
-
 StreamSocket::StreamSocket(const ProtocolInstancePtr& instance,
                            const NetworkProxyPtr& proxy,
                            const Address& addr,
@@ -30,7 +23,7 @@ StreamSocket::StreamSocket(const ProtocolInstancePtr& instance,
 #endif
 {
     init();
-#if !defined(ICE_USE_IOCP) && !defined(ICE_OS_UWP)
+#if !defined(ICE_USE_IOCP)
     if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr))
     {
         _state = _proxy ? StateProxyWrite : StateConnected;
@@ -86,24 +79,6 @@ StreamSocket::connect(Buffer& readBuffer, Buffer& writeBuffer)
     {
 #if defined(ICE_USE_IOCP)
         doFinishConnectAsync(_fd, _write);
-#elif defined(ICE_OS_UWP)
-        if(_write.error != ERROR_SUCCESS)
-        {
-            try
-            {
-                checkConnectErrorCode(__FILE__, __LINE__, _write.error);
-            }
-            catch(Ice::DNSException& ex)
-            {
-                //
-                // Don't need to pass a wide string converter as the wide string come from
-                // Windows API.
-                //
-                const Address& addr = _proxy ? _proxy->getAddress() : _addr;
-                ex.host = wstringToString(addr.host->RawName->Data(), Ice::getProcessStringConverter());
-                throw;
-            }
-        }
 #else
         doFinishConnect(_fd);
 #endif
@@ -147,7 +122,7 @@ StreamSocket::isConnected()
 size_t
 StreamSocket::getSendPacketSize(size_t length)
 {
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     return _maxSendPacketSize > 0 ? std::min(length, _maxSendPacketSize) : length;
 #else
     return length;
@@ -157,7 +132,7 @@ StreamSocket::getSendPacketSize(size_t length)
 size_t
 StreamSocket::getRecvPacketSize(size_t length)
 {
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     return _maxRecvPacketSize > 0 ? std::min(length, _maxRecvPacketSize) : length;
 #else
     return length;
@@ -173,7 +148,6 @@ StreamSocket::setBufferSize(int rcvSize, int sndSize)
 SocketOperation
 StreamSocket::read(Buffer& buf)
 {
-#if !defined(ICE_OS_UWP)
     if(_state == StateProxyRead)
     {
         while(true)
@@ -192,14 +166,12 @@ StreamSocket::read(Buffer& buf)
         }
     }
     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;
 }
 
 SocketOperation
 StreamSocket::write(Buffer& buf)
 {
-#if !defined(ICE_OS_UWP)
     if(_state == StateProxyWrite)
     {
         while(true)
@@ -218,11 +190,9 @@ StreamSocket::write(Buffer& buf)
         }
     }
     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;
 }
 
-#if !defined(ICE_OS_UWP)
 ssize_t
 StreamSocket::read(char* buf, size_t length)
 {
@@ -348,9 +318,8 @@ StreamSocket::write(const char* buf, size_t length)
     }
     return sent;
 }
-#endif
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 AsyncInfo*
 StreamSocket::getAsyncInfo(SocketOperation op)
 {
@@ -492,120 +461,6 @@ StreamSocket::finishRead(Buffer& buf)
 
 }
 
-#elif defined(ICE_OS_UWP)
-
-bool
-StreamSocket::startWrite(Buffer& buf)
-{
-    if(_state == StateConnectPending)
-    {
-        const Address& addr = _proxy ? _proxy->getAddress() : _addr;
-        try
-        {
-            try
-            {
-                queueAction(SocketOperationConnect,
-                            safe_cast<Windows::Networking::Sockets::StreamSocket^>(_fd)->ConnectAsync(
-                                  addr.host, addr.port,
-                                  Windows::Networking::Sockets::SocketProtectionLevel::PlainSocket), true);
-            }
-            catch(Platform::Exception^ ex)
-            {
-                checkConnectErrorCode(__FILE__, __LINE__, ex->HResult);
-            }
-        }
-        catch(Ice::DNSException& ex)
-        {
-            //
-            // Don't need to pass a wide string converter as the wide string come from
-            // Windows API.
-            //
-            ex.host = wstringToString(addr.host->RawName->Data(), Ice::getProcessStringConverter());
-            throw;
-        }
-        return false;
-    }
-
-    assert(!buf.b.empty());
-    assert(buf.i != buf.b.end());
-
-    size_t packetSize = getSendPacketSize(buf.b.end() - buf.i);
-    _writer->WriteBytes(ref new Array<unsigned char>(&*buf.i, static_cast<unsigned int>(packetSize)));
-    try
-    {
-        queueOperation(SocketOperationWrite, _writer->StoreAsync());
-    }
-    catch(Platform::Exception^ ex)
-    {
-        checkErrorCode(__FILE__, __LINE__, ex->HResult);
-    }
-    return packetSize == static_cast<size_t>(buf.b.end() - buf.i);
-}
-
-void
-StreamSocket::finishWrite(Buffer& buf)
-{
-    _write.operation = nullptr; // Must be cleared with the connection lock held
-    if(_fd == INVALID_SOCKET || (_state < StateConnected && _state != StateProxyWrite))
-    {
-        return;
-    }
-
-    if(_write.error != ERROR_SUCCESS)
-    {
-        checkErrorCode(__FILE__, __LINE__, _write.error);
-    }
-
-    buf.i += _write.count;
-}
-
-void
-StreamSocket::startRead(Buffer& buf)
-{
-    assert(!buf.b.empty() && buf.i != buf.b.end());
-    size_t packetSize = getRecvPacketSize(buf.b.end() - buf.i);
-    try
-    {
-        queueOperation(SocketOperationRead, _reader->LoadAsync(static_cast<unsigned int>(packetSize)));
-    }
-    catch(Platform::Exception^ ex)
-    {
-        checkErrorCode(__FILE__, __LINE__, ex->HResult);
-    }
-}
-
-void
-StreamSocket::finishRead(Buffer& buf)
-{
-    _read.operation = nullptr; // Must be cleared with the connection lock held
-    if(_fd == INVALID_SOCKET)
-    {
-        return;
-    }
-
-    if(_read.error != ERROR_SUCCESS)
-    {
-        checkErrorCode(__FILE__, __LINE__, _read.error);
-    }
-    else if(_read.count == 0)
-    {
-        throw Ice::ConnectionLostException(__FILE__, __LINE__, 0);
-    }
-
-    try
-    {
-        auto data = ref new Platform::Array<unsigned char>(_read.count);
-        _reader->ReadBytes(data);
-        memcpy(&*buf.i, data->Data, _read.count);
-    }
-    catch(Platform::Exception^ ex)
-    {
-        checkErrorCode(__FILE__, __LINE__, ex->HResult);
-    }
-
-    buf.i += _read.count;
-}
-
 #endif
 
 void
@@ -614,16 +469,6 @@ StreamSocket::close()
     assert(_fd != INVALID_SOCKET);
     try
     {
-#if defined(ICE_OS_UWP)
-        if(_read.operation)
-        {
-            _read.operation->Cancel();
-        }
-        if(_write.operation)
-        {
-            _write.operation->Cancel();
-        }
-#endif
         closeSocket(_fd);
         _fd = INVALID_SOCKET;
     }
@@ -656,14 +501,6 @@ StreamSocket::init()
     //
     _maxSendPacketSize = std::max(512, IceInternal::getSendBufferSize(_fd));
     _maxRecvPacketSize = std::max(512, IceInternal::getRecvBufferSize(_fd));
-#elif defined(ICE_OS_UWP)
-    Windows::Networking::Sockets::StreamSocket^ s = safe_cast<Windows::Networking::Sockets::StreamSocket^>(_fd);
-    _writer = ref new Windows::Storage::Streams::DataWriter(s->OutputStream);
-    _reader = ref new Windows::Storage::Streams::DataReader(s->InputStream);
-    _reader->InputStreamOptions = Windows::Storage::Streams::InputStreamOptions::Partial;
-
-    _maxSendPacketSize = std::max(static_cast<unsigned int>(512), s->Control->OutboundBufferSizeInBytes / 2);
-    _maxRecvPacketSize = _instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.RcvSize", 128 * 1024);
 #endif
 }
 

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

@@ -31,16 +31,14 @@ public:
     SocketOperation read(Buffer&);
     SocketOperation write(Buffer&);
 
-#if !defined(ICE_OS_UWP)
     ssize_t read(char*, size_t);
     ssize_t write(const char*, size_t);
-#endif
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     AsyncInfo* getAsyncInfo(SocketOperation);
 #endif
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     bool startWrite(Buffer&);
     void finishWrite(Buffer&);
     void startRead(Buffer&);
@@ -73,17 +71,12 @@ private:
     State _state;
     std::string _desc;
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     size_t _maxSendPacketSize;
     size_t _maxRecvPacketSize;
     AsyncInfo _read;
     AsyncInfo _write;
 #endif
-
-#if defined(ICE_OS_UWP)
-    Windows::Storage::Streams::DataReader^ _reader;
-    Windows::Storage::Streams::DataWriter^ _writer;
-#endif
 };
 typedef IceUtil::Handle<StreamSocket> StreamSocketPtr;
 

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

@@ -18,12 +18,6 @@
 
 #if defined(ICE_USE_IOCP)
 #  include <Mswsock.h>
-#elif defined(ICE_OS_UWP)
-using namespace Platform;
-using namespace Windows::Foundation;
-using namespace Windows::Storage::Streams;
-using namespace Windows::Networking;
-using namespace Windows::Networking::Sockets;
 #endif
 
 //
@@ -48,25 +42,6 @@ IceInternal::TcpAcceptor::getNativeInfo()
 void
 IceInternal::TcpAcceptor::close()
 {
-#if defined(ICE_OS_UWP)
-    IceUtil::Mutex::Lock lock(_mutex);
-    if(_acceptPending)
-    {
-        assert(_accepted.empty());
-        completed(SocketOperationRead);
-        _acceptPending = false;
-    }
-    else if(!_accepted.empty())
-    {
-        for(deque<Windows::Networking::Sockets::StreamSocket^>::const_iterator p = _accepted.begin();
-            p != _accepted.end(); ++p)
-        {
-            closeSocket(*p);
-        }
-        _accepted.clear();
-    }
-#endif
-
 #if defined(ICE_USE_IOCP)
     if(_acceptFd != INVALID_SOCKET)
     {
@@ -87,9 +62,7 @@ IceInternal::TcpAcceptor::listen()
     try
     {
         const_cast<Address&>(_addr) = doBind(_fd, _addr);
-#if !defined(ICE_OS_UWP)
         doListen(_fd, _backlog);
-#endif
     }
     catch(...)
     {
@@ -170,70 +143,6 @@ IceInternal::TcpAcceptor::accept()
     _acceptFd = INVALID_SOCKET;
     return new TcpTransceiver(_instance, new StreamSocket(_instance, fd));
 }
-
-#elif defined(ICE_OS_UWP)
-
-AsyncInfo*
-IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
-{
-    return 0; // Not used
-}
-
-void
-IceInternal::TcpAcceptor::startAccept()
-{
-    assert(_fd != INVALID_SOCKET);
-
-    //
-    // If there are already sockets waiting to be accepted, we just
-    // notify the selector that the acceptor is ready for acceting the
-    // new socket. Otherwise, we set the _acceptPending flag, when a
-    // new socket connection event is received, the message handler
-    // will notify the selector.
-    //
-    IceUtil::Mutex::Lock lock(_mutex);
-    assert(!_acceptPending);
-    if(!_accepted.empty())
-    {
-        completed(SocketOperationRead);
-    }
-    else
-    {
-        _acceptPending = true;
-    }
-}
-
-void
-IceInternal::TcpAcceptor::finishAccept()
-{
-    //
-    // Nothing to do, we just check there's at least one accepted
-    // socket or the acceptor was closed.
-    //
-    IceUtil::Mutex::Lock lock(_mutex);
-    assert(!_acceptPending && (!_accepted.empty() || _fd == INVALID_SOCKET));
-}
-
-TransceiverPtr
-IceInternal::TcpAcceptor::accept()
-{
-    if(_fd == INVALID_SOCKET) // Acceptor closed.
-    {
-        assert(_accepted.empty());
-        throw SocketException(__FILE__, __LINE__);
-    }
-
-    Windows::Networking::Sockets::StreamSocket^ fd;
-    {
-        IceUtil::Mutex::Lock lock(_mutex);
-        assert(!_accepted.empty());
-        fd = _accepted.front();
-        _accepted.pop_front();
-    }
-
-    return new TcpTransceiver(_instance, new StreamSocket(_instance, fd));
-}
-
 #else
 
 TransceiverPtr
@@ -288,37 +197,7 @@ IceInternal::TcpAcceptor::TcpAcceptor(const TcpEndpointIPtr& endpoint,
 #endif
 {
     _backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", SOMAXCONN);
-
-#if defined(ICE_OS_UWP)
-    _fd = ref new StreamSocketListener();
-    safe_cast<StreamSocketListener^>(_fd)->ConnectionReceived +=
-        ref new TypedEventHandler<StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^>(
-            [=](StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^ args)
-                {
-                    IceUtil::Mutex::Lock lock(_mutex);
-                    if(_fd == INVALID_SOCKET) // Acceptor was closed.
-                    {
-                        closeSocket(args->Socket);
-                        return;
-                    }
-                    _accepted.push_back(args->Socket);
-
-                    //
-                    // If the acceptor is waiting for a socket to be accepted, notify
-                    // the selector that the acceptor is ready for "read". This will
-                    // in turn caused finishAccept() and accept() to be called by the
-                    // thread pool. If the acceptor isn't ready to accept the socket,
-                    // it is just queued, when startAccept is called it will be dequed.
-                    //
-                    if(_acceptPending)
-                    {
-                        completed(SocketOperationRead);
-                        _acceptPending = false;
-                    }
-                });
-#else
     _fd = createServerSocket(false, _addr, instance->protocolSupport());
-#endif
 
 #ifdef ICE_USE_IOCP
     _acceptBuf.resize((sizeof(sockaddr_storage) + 16) * 2);

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

@@ -10,10 +10,6 @@
 #include <Ice/Acceptor.h>
 #include <Ice/Network.h>
 
-#if defined(ICE_OS_UWP)
-#include <deque>
-#endif
-
 namespace IceInternal
 {
 
@@ -24,13 +20,13 @@ class TcpAcceptor : public Acceptor, public NativeInfo
 public:
 
     virtual NativeInfoPtr getNativeInfo();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual AsyncInfo* getAsyncInfo(SocketOperation);
 #endif
 
     virtual void close();
     virtual EndpointIPtr listen();
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual void startAccept();
     virtual void finishAccept();
 #endif
@@ -58,10 +54,6 @@ private:
     int _acceptError;
     std::vector<char> _acceptBuf;
     AsyncInfo _info;
-#elif defined(ICE_OS_UWP)
-    IceUtil::Mutex _mutex;
-    bool _acceptPending;
-    std::deque<Windows::Networking::Sockets::StreamSocket^> _accepted;
 #endif
 };
 

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

@@ -55,7 +55,7 @@ IceInternal::TcpTransceiver::read(Buffer& buf)
     return _stream->read(buf);
 }
 
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
 bool
 IceInternal::TcpTransceiver::startWrite(Buffer& buf)
 {

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

@@ -28,7 +28,7 @@ public:
     virtual void close();
     virtual SocketOperation write(Buffer&);
     virtual SocketOperation read(Buffer&);
-#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
+#if defined(ICE_USE_IOCP)
     virtual bool startWrite(Buffer&);
     virtual void finishWrite(Buffer&);
     virtual void startRead(Buffer&);