zeroc-ice 3.7.9.1 → 3.8.0

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

@@ -1,155 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/Buffer.h>
-#include <Ice/LocalException.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-void
-IceInternal::Buffer::swapBuffer(Buffer& other)
-{
-    b.swap(other.b);
-    std::swap(i, other.i);
-}
-
-IceInternal::Buffer::Container::Container() :
-    _buf(0),
-    _size(0),
-    _capacity(0),
-    _shrinkCounter(0),
-    _owned(true)
-{
-}
-
-IceInternal::Buffer::Container::Container(const_iterator beg, const_iterator end) :
-    _buf(const_cast<iterator>(beg)),
-    _size(static_cast<size_t>(end - beg)),
-    _capacity(static_cast<size_t>(end - beg)),
-    _shrinkCounter(0),
-    _owned(false)
-{
-}
-
-IceInternal::Buffer::Container::Container(const vector<value_type>& v) :
-    _shrinkCounter(0)
-{
-    if(v.empty())
-    {
-        _buf = 0;
-        _size = 0;
-        _capacity = 0;
-        _owned = true;
-    }
-    else
-    {
-        _buf = const_cast<value_type*>(&v[0]);
-        _size = v.size();
-        _capacity = _size;
-        _owned = false;
-    }
-}
-
-IceInternal::Buffer::Container::Container(Container& other, bool adopt)
-{
-    if(adopt)
-    {
-        _buf = other._buf;
-        _size = other._size;
-        _capacity = other._capacity;
-        _shrinkCounter = other._shrinkCounter;
-        _owned = other._owned;
-
-        other._buf = 0;
-        other._size = 0;
-        other._capacity = 0;
-        other._shrinkCounter = 0;
-        other._owned = true;
-    }
-    else
-    {
-        _buf = other._buf;
-        _size = other._size;
-        _capacity = other._capacity;
-        _shrinkCounter = 0;
-        _owned = false;
-    }
-}
-
-IceInternal::Buffer::Container::~Container()
-{
-    if(_buf && _owned)
-    {
-        ::free(_buf);
-    }
-}
-
-void
-IceInternal::Buffer::Container::swap(Container& other)
-{
-    std::swap(_buf, other._buf);
-    std::swap(_size, other._size);
-    std::swap(_capacity, other._capacity);
-    std::swap(_shrinkCounter, other._shrinkCounter);
-    std::swap(_owned, other._owned);
-}
-
-void
-IceInternal::Buffer::Container::clear()
-{
-    if(_buf && _owned)
-    {
-        ::free(_buf);
-    }
-
-    _buf = 0;
-    _size = 0;
-    _capacity = 0;
-    _shrinkCounter = 0;
-    _owned = true;
-}
-
-void
-IceInternal::Buffer::Container::reserve(size_type n)
-{
-    size_type c = _capacity;
-    if(n > _capacity)
-    {
-        _capacity = std::max<size_type>(n, 2 * _capacity);
-        _capacity = std::max<size_type>(static_cast<size_type>(240), _capacity);
-    }
-    else if(n < _capacity)
-    {
-        _capacity = n;
-    }
-    else
-    {
-        return;
-    }
-
-    pointer p;
-    if(_owned)
-    {
-        p = reinterpret_cast<pointer>(::realloc(_buf, _capacity));
-    }
-    else
-    {
-        p = reinterpret_cast<pointer>(::malloc(_capacity));
-        if(p)
-        {
-            ::memcpy(p, _buf, _size);
-            _owned = true;
-        }
-    }
-
-    if(!p)
-    {
-        _capacity = c; // Restore the previous capacity.
-        throw std::bad_alloc();
-    }
-
-    _buf = p;
-}

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

@@ -1,49 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.9
-//
-// <auto-generated>
-//
-// Generated from file `BuiltinSequences.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
-
-#ifndef ICE_API_EXPORTS
-#   define ICE_API_EXPORTS
-#endif
-#include <Ice/BuiltinSequences.h>
-#include <IceUtil/PushDisableWarnings.h>
-#include <Ice/InputStream.h>
-#include <Ice/OutputStream.h>
-#include <IceUtil/PopDisableWarnings.h>
-
-#if defined(_MSC_VER)
-#   pragma warning(disable:4458) // declaration of ... hides class member
-#elif defined(__clang__)
-#   pragma clang diagnostic ignored "-Wshadow"
-#elif defined(__GNUC__)
-#   pragma GCC diagnostic ignored "-Wshadow"
-#endif
-
-#ifndef ICE_IGNORE_VERSION
-#   if ICE_INT_VERSION / 100 != 307
-#       error Ice version mismatch!
-#   endif
-#   if ICE_INT_VERSION % 100 >= 50
-#       error Beta header file detected
-#   endif
-#   if ICE_INT_VERSION % 100 < 9
-#       error Ice patch level mismatch!
-#   endif
-#endif
-
-#ifdef ICE_CPP11_MAPPING // C++11 mapping
-
-#else // C++98 mapping
-
-#endif

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

@@ -1,407 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/CollocatedRequestHandler.h>
-#include <Ice/ObjectAdapterI.h>
-#include <Ice/ThreadPool.h>
-#include <Ice/Reference.h>
-#include <Ice/Instance.h>
-#include <Ice/TraceLevels.h>
-#include <Ice/OutgoingAsync.h>
-
-#include <Ice/TraceUtil.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-namespace
-{
-
-class InvokeAllAsync : public DispatchWorkItem
-{
-public:
-
-    InvokeAllAsync(const OutgoingAsyncBasePtr& outAsync,
-                   OutputStream* os,
-                   const CollocatedRequestHandlerPtr& handler,
-                   Int requestId,
-                   Int batchRequestNum) :
-        _outAsync(outAsync), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum)
-    {
-    }
-
-    virtual void
-    run()
-    {
-        if(_handler->sentAsync(_outAsync.get()))
-        {
-            _handler->invokeAll(_os, _requestId, _batchRequestNum);
-        }
-    }
-
-private:
-
-    OutgoingAsyncBasePtr _outAsync;
-    OutputStream* _os;
-    CollocatedRequestHandlerPtr _handler;
-    Int _requestId;
-    Int _batchRequestNum;
-};
-
-void
-fillInValue(OutputStream* os, int pos, Int value)
-{
-    const Byte* p = reinterpret_cast<const Byte*>(&value);
-#ifdef ICE_BIG_ENDIAN
-    reverse_copy(p, p + sizeof(Int), os->b.begin() + pos);
-#else
-    copy(p, p + sizeof(Int), os->b.begin() + pos);
-#endif
-}
-
-}
-
-CollocatedRequestHandler::CollocatedRequestHandler(const ReferencePtr& ref, const ObjectAdapterPtr& adapter) :
-    RequestHandler(ref),
-    _adapter(ICE_DYNAMIC_CAST(ObjectAdapterI, adapter)),
-    _dispatcher(_reference->getInstance()->initializationData().dispatcher),
-    _logger(_reference->getInstance()->initializationData().logger), // Cached for better performance.
-    _traceLevels(_reference->getInstance()->traceLevels()), // Cached for better performance.
-    _requestId(0)
-{
-}
-
-CollocatedRequestHandler::~CollocatedRequestHandler()
-{
-}
-
-RequestHandlerPtr
-CollocatedRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler)
-{
-    return previousHandler.get() == this ? newHandler : ICE_SHARED_FROM_THIS;
-}
-
-AsyncStatus
-CollocatedRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& outAsync)
-{
-    return outAsync->invokeCollocated(this);
-}
-
-void
-CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const LocalException& ex)
-{
-    Lock sync(*this);
-
-    map<OutgoingAsyncBasePtr, Int>::iterator p = _sendAsyncRequests.find(outAsync);
-    if(p != _sendAsyncRequests.end())
-    {
-        if(p->second > 0)
-        {
-            _asyncRequests.erase(p->second);
-        }
-        _sendAsyncRequests.erase(p);
-        if(outAsync->exception(ex))
-        {
-            outAsync->invokeExceptionAsync();
-        }
-        _adapter->decDirectCount(); // invokeAll won't be called, decrease the direct count.
-        return;
-    }
-
-    OutgoingAsyncPtr o = ICE_DYNAMIC_CAST(OutgoingAsync, outAsync);
-    if(o)
-    {
-        for(map<Int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
-        {
-            if(q->second.get() == o.get())
-            {
-                _asyncRequests.erase(q);
-                if(outAsync->exception(ex))
-                {
-                    outAsync->invokeExceptionAsync();
-                }
-                return;
-            }
-        }
-    }
-}
-
-AsyncStatus
-CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int batchRequestNum, bool synchronous)
-{
-    //
-    // Increase the direct count to prevent the thread pool from being destroyed before
-    // invokeAll is called. This will also throw if the object adapter has been deactivated.
-    //
-    _adapter->incDirectCount();
-
-    int requestId = 0;
-    try
-    {
-        Lock sync(*this);
-
-        //
-        // This will throw if the request is canceled
-        //
-        outAsync->cancelable(ICE_SHARED_FROM_THIS);
-
-        if(_response)
-        {
-            requestId = ++_requestId;
-            _asyncRequests.insert(make_pair(requestId, ICE_GET_SHARED_FROM_THIS(outAsync)));
-        }
-
-        _sendAsyncRequests.insert(make_pair(ICE_GET_SHARED_FROM_THIS(outAsync), requestId));
-    }
-    catch(...)
-    {
-         _adapter->decDirectCount();
-         throw;
-    }
-
-    outAsync->attachCollocatedObserver(_adapter, requestId);
-
-    if(!synchronous || !_response || _reference->getInvocationTimeout() > 0)
-    {
-        // Don't invoke from the user thread if async or invocation timeout is set
-        _adapter->getThreadPool()->dispatch(new InvokeAllAsync(ICE_GET_SHARED_FROM_THIS(outAsync),
-                                                               outAsync->getOs(),
-                                                               ICE_SHARED_FROM_THIS,
-                                                               requestId,
-                                                               batchRequestNum));
-    }
-    else if(_dispatcher)
-    {
-        _adapter->getThreadPool()->dispatchFromThisThread(new InvokeAllAsync(ICE_GET_SHARED_FROM_THIS(outAsync),
-                                                                             outAsync->getOs(),
-                                                                             ICE_SHARED_FROM_THIS,
-                                                                             requestId,
-                                                                             batchRequestNum));
-    }
-    else // Optimization: directly call invokeAll if there's no dispatcher.
-    {
-        //
-        // Make sure to hold a reference on this handler while the call is being
-        // dispatched. Otherwise, the handler could be deleted during the dispatch
-        // if a retry occurs.
-        //
-
-        CollocatedRequestHandlerPtr self(ICE_SHARED_FROM_THIS);
-        if(sentAsync(outAsync))
-        {
-            invokeAll(outAsync->getOs(), requestId, batchRequestNum);
-        }
-    }
-    return AsyncStatusQueued;
-}
-
-void
-CollocatedRequestHandler::sendResponse(Int requestId, OutputStream* os, Byte, bool amd)
-{
-    OutgoingAsyncBasePtr outAsync;
-    {
-        Lock sync(*this);
-        assert(_response);
-
-        if(_traceLevels->protocol >= 1)
-        {
-            fillInValue(os, 10, static_cast<Int>(os->b.size()));
-        }
-
-        InputStream is(os->instance(), os->getEncoding(), *os, true); // Adopting the OutputStream's buffer.
-        is.pos(sizeof(replyHdr) + 4);
-
-        if(_traceLevels->protocol >= 1)
-        {
-            traceRecv(is, _logger, _traceLevels);
-        }
-
-        map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId);
-        if(q != _asyncRequests.end())
-        {
-            is.swap(*q->second->getIs());
-            if(q->second->response())
-            {
-                outAsync = q->second;
-            }
-            _asyncRequests.erase(q);
-        }
-    }
-
-    if(outAsync)
-    {
-        //
-        // If called from an AMD dispatch, invoke asynchronously
-        // the completion callback since this might be called from
-        // the user code.
-        //
-        if(amd)
-        {
-            outAsync->invokeResponseAsync();
-        }
-        else
-        {
-            outAsync->invokeResponse();
-        }
-    }
-
-    _adapter->decDirectCount();
-}
-
-void
-CollocatedRequestHandler::sendNoResponse()
-{
-    _adapter->decDirectCount();
-}
-
-bool
-CollocatedRequestHandler::systemException(Int requestId, const SystemException& ex, bool amd)
-{
-    handleException(requestId, ex, amd);
-    _adapter->decDirectCount();
-    return true;
-}
-
-void
-CollocatedRequestHandler::invokeException(Int requestId, const LocalException& ex, int /*invokeNum*/, bool amd)
-{
-    handleException(requestId, ex, amd);
-    _adapter->decDirectCount();
-}
-
-ConnectionIPtr
-CollocatedRequestHandler::getConnection()
-{
-    return 0;
-}
-
-ConnectionIPtr
-CollocatedRequestHandler::waitForConnection()
-{
-    return 0;
-}
-
-bool
-CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync)
-{
-    {
-        Lock sync(*this);
-        if(_sendAsyncRequests.erase(ICE_GET_SHARED_FROM_THIS(outAsync)) == 0)
-        {
-            return false; // The request timed-out.
-        }
-
-        if(!outAsync->sent())
-        {
-            return true;
-        }
-    }
-    outAsync->invokeSent();
-    return true;
-}
-
-void
-CollocatedRequestHandler::invokeAll(OutputStream* os, Int requestId, Int batchRequestNum)
-{
-    if(_traceLevels->protocol >= 1)
-    {
-        fillInValue(os, 10, static_cast<Int>(os->b.size()));
-        if(requestId > 0)
-        {
-            fillInValue(os, headerSize, requestId);
-        }
-        else if(batchRequestNum > 0)
-        {
-            fillInValue(os, headerSize, batchRequestNum);
-        }
-        traceSend(*os, _logger, _traceLevels);
-    }
-
-    InputStream is(os->instance(), os->getEncoding(), *os);
-
-    if(batchRequestNum > 0)
-    {
-        is.pos(sizeof(requestBatchHdr));
-    }
-    else
-    {
-        is.pos(sizeof(requestHdr));
-    }
-
-    int invokeNum = batchRequestNum > 0 ? batchRequestNum : 1;
-    ServantManagerPtr servantManager = _adapter->getServantManager();
-    try
-    {
-        while(invokeNum > 0)
-        {
-            //
-            // Increase the direct count for the dispatch. We increase it again here for
-            // each dispatch. It's important for the direct count to be > 0 until the last
-            // collocated request response is sent to make sure the thread pool isn't
-            // destroyed before.
-            //
-            try
-            {
-                _adapter->incDirectCount();
-            }
-            catch(const ObjectAdapterDeactivatedException& ex)
-            {
-                handleException(requestId, ex, false);
-                break;
-            }
-
-            Incoming in(_reference->getInstance().get(), this, 0, _adapter, _response, 0, requestId);
-            in.invoke(servantManager, &is);
-            --invokeNum;
-        }
-    }
-    catch(const LocalException& ex)
-    {
-        invokeException(requestId, ex, invokeNum, false); // Fatal invocation exception
-    }
-
-    _adapter->decDirectCount();
-}
-
-void
-CollocatedRequestHandler::handleException(int requestId, const Exception& ex, bool amd)
-{
-    if(requestId == 0)
-    {
-        return; // Ignore exception for oneway messages.
-    }
-
-    OutgoingAsyncBasePtr outAsync;
-    {
-        Lock sync(*this);
-
-        map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId);
-        if(q != _asyncRequests.end())
-        {
-            if(q->second->exception(ex))
-            {
-                outAsync = q->second;
-            }
-            _asyncRequests.erase(q);
-        }
-    }
-
-    if(outAsync)
-    {
-        //
-        // If called from an AMD dispatch, invoke asynchronously
-        // the completion callback since this might be called from
-        // the user code.
-        //
-        if(amd)
-        {
-            outAsync->invokeExceptionAsync();
-        }
-        else
-        {
-            outAsync->invokeException();
-        }
-    }
-}

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

@@ -1,87 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_COLLOCATED_REQUEST_HANDLER_H
-#define ICE_COLLOCATED_REQUEST_HANDLER_H
-
-#include <IceUtil/Mutex.h>
-#include <IceUtil/Monitor.h>
-
-#include <Ice/RequestHandler.h>
-#include <Ice/ResponseHandler.h>
-#include <Ice/OutputStream.h>
-#include <Ice/ObjectAdapterF.h>
-#include <Ice/LoggerF.h>
-#include <Ice/TraceLevelsF.h>
-
-namespace Ice
-{
-
-class ObjectAdapterI;
-ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
-
-}
-
-namespace IceInternal
-{
-
-class OutgoingAsyncBase;
-class OutgoingAsync;
-
-class CollocatedRequestHandler : public RequestHandler,
-                                 public ResponseHandler,
-                                 private IceUtil::Monitor<IceUtil::Mutex>
-{
-public:
-
-    CollocatedRequestHandler(const ReferencePtr&, const Ice::ObjectAdapterPtr&);
-    virtual ~CollocatedRequestHandler();
-
-    virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
-
-    virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&);
-
-    virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
-
-    virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool);
-    virtual void sendNoResponse();
-    virtual bool systemException(Ice::Int, const Ice::SystemException&, bool);
-    virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool);
-
-    const ReferencePtr& getReference() const { return _reference; } // Inlined for performances.
-
-    virtual Ice::ConnectionIPtr getConnection();
-    virtual Ice::ConnectionIPtr waitForConnection();
-
-    AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int, bool);
-
-    bool sentAsync(OutgoingAsyncBase*);
-
-    void invokeAll(Ice::OutputStream*, Ice::Int, Ice::Int);
-
-#ifdef ICE_CPP11_MAPPING
-    std::shared_ptr<CollocatedRequestHandler> shared_from_this()
-    {
-        return std::static_pointer_cast<CollocatedRequestHandler>(ResponseHandler::shared_from_this());
-    }
-#endif
-
-private:
-
-    void handleException(Ice::Int, const Ice::Exception&, bool);
-
-    const Ice::ObjectAdapterIPtr _adapter;
-    const bool _dispatcher;
-    const Ice::LoggerPtr _logger;
-    const TraceLevelsPtr _traceLevels;
-
-    int _requestId;
-    std::map<OutgoingAsyncBasePtr, Ice::Int> _sendAsyncRequests;
-    std::map<Ice::Int, OutgoingAsyncBasePtr> _asyncRequests;
-};
-ICE_DEFINE_PTR(CollocatedRequestHandlerPtr, CollocatedRequestHandler);
-
-}
-
-#endif