zeroc-ice 3.7.11 → 3.8.1

data/dist/ice/cpp/src/Ice/IncomingAsync.cpp

@@ -1,230 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/IncomingAsync.h>
-#include <Ice/ServantLocator.h>
-#include <Ice/Object.h>
-#include <Ice/ConnectionI.h>
-#include <Ice/LocalException.h>
-#include <Ice/Protocol.h>
-#include <Ice/Instance.h>
-#include <Ice/Properties.h>
-#include <Ice/ReplyStatus.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-#ifndef ICE_CPP11_MAPPING
-IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
-IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; }
-
-Ice::AMDCallback::~AMDCallback()
-{
-    // Out of line to avoid weak vtable
-}
-
-Ice::AMD_Object_ice_invoke::~AMD_Object_ice_invoke()
-{
-    // Out of line to avoid weak vtable
-}
-#endif
-
-namespace
-{
-
-IceUtil::Mutex* globalMutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        globalMutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete globalMutex;
-        globalMutex = 0;
-    }
-};
-
-Init init;
-
-}
-
-IceInternal::IncomingAsync::IncomingAsync(Incoming& in) :
-    IncomingBase(in),
-    _responseSent(false),
-    _responseHandlerCopy(ICE_GET_SHARED_FROM_THIS(_responseHandler))
-{
-#ifndef ICE_CPP11_MAPPING
-    in.setAsync(this);
-#endif
-}
-
-#ifdef ICE_CPP11_MAPPING
-shared_ptr<IncomingAsync>
-IceInternal::IncomingAsync::create(Incoming& in)
-{
-    auto async = make_shared<IncomingAsync>(in);
-    in.setAsync(async);
-    return async;
-}
-#endif
-
-#ifndef ICE_CPP11_MAPPING
-void
-IceInternal::IncomingAsync::ice_exception(const ::std::exception& exc)
-{
-    try
-    {
-        for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p)
-        {
-            if(!(*p)->exception(exc))
-            {
-                return;
-            }
-        }
-    }
-    catch(...)
-    {
-        return;
-    }
-
-    checkResponseSent();
-    IncomingBase::exception(exc, true); // User thread
-}
-
-void
-IceInternal::IncomingAsync::ice_exception()
-{
-    try
-    {
-        for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p)
-        {
-            if(!(*p)->exception())
-            {
-                return;
-            }
-        }
-    }
-    catch(...)
-    {
-        return;
-    }
-
-    checkResponseSent();
-    IncomingBase::exception("unknown c++ exception", true); // User thread
-}
-
-#endif
-
-void
-IceInternal::IncomingAsync::kill(Incoming& in)
-{
-    checkResponseSent();
-    in._observer.adopt(_observer); // Give back the observer to incoming.
-}
-
-void
-IceInternal::IncomingAsync::completed()
-{
-    for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p)
-    {
-        try
-        {
-#ifdef ICE_CPP11_MAPPING
-            if(p->first && !p->first())
-#else
-            if(!(*p)->response())
-#endif
-            {
-                return;
-            }
-        }
-        catch(...)
-        {
-        }
-    }
-
-    checkResponseSent();
-    IncomingBase::response(true); // User thread
-}
-
-#ifdef ICE_CPP11_MAPPING
-void
-IceInternal::IncomingAsync::completed(exception_ptr ex)
-{
-    for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p)
-    {
-        try
-        {
-            if(p->second && !p->second(ex))
-            {
-                return;
-            }
-        }
-        catch(...)
-        {
-        }
-    }
-
-    checkResponseSent();
-    try
-    {
-        rethrow_exception(ex);
-    }
-    catch(const std::exception& exc)
-    {
-        IncomingBase::exception(exc, true); // User thread
-    }
-    catch(...)
-    {
-        IncomingBase::exception("unknown c++ exception", true); // User thread
-    }
-}
-#endif
-
-void
-IceInternal::IncomingAsync::checkResponseSent()
-{
-    IceUtil::Mutex::Lock sync(*globalMutex);
-    if(_responseSent)
-    {
-        throw ResponseSentException(__FILE__, __LINE__);
-    }
-    _responseSent = true;
-}
-
-#ifndef ICE_CPP11_MAPPING
-IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) : IncomingAsync(in)
-{
-}
-
-void
-IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>& outEncaps)
-{
-    if(outEncaps.empty())
-    {
-        writeParamEncaps(0, 0, ok);
-    }
-    else
-    {
-        writeParamEncaps(&outEncaps[0], static_cast<Int>(outEncaps.size()), ok);
-    }
-    completed();
-}
-
-void
-IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair<const Byte*, const Byte*>& outEncaps)
-{
-    writeParamEncaps(outEncaps.first, static_cast<Int>(outEncaps.second - outEncaps.first), ok);
-    completed();
-}
-#endif

data/dist/ice/cpp/src/Ice/IncomingRequest.h

@@ -1,33 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_INCOMING_REQUEST_H
-#define ICE_INCOMING_REQUEST_H
-
-#include <Ice/Incoming.h>
-#include <Ice/Object.h>
-
-namespace IceInternal
-{
-
-//
-// Adapts Incoming to Ice::Request
-// (the goal here is to avoid adding any virtual function to Incoming)
-//
-class ICE_API IncomingRequest : public Ice::Request
-{
-public:
-
-    IncomingRequest(Incoming& in) : _in(in)
-    {
-    }
-
-    virtual const Ice::Current& getCurrent();
-
-    Incoming& _in;
-};
-
-}
-
-#endif

data/dist/ice/cpp/src/Ice/LocalObject.cpp

@@ -1,23 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/LocalObject.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-IceUtil::Shared* Ice::upCast(LocalObject* obj) { return obj; }
-
-bool
-Ice::LocalObject::operator==(const LocalObject& r) const
-{
-    return this == &r;
-}
-
-bool
-Ice::LocalObject::operator<(const LocalObject& r) const
-{
-    return this < &r;
-}

data/dist/ice/cpp/src/Ice/MetricsObserverI.cpp

@@ -1,8 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/MetricsObserverI.h>
-
-#include <Ice/Connection.h>
-#include <Ice/Endpoint.h>

data/dist/ice/cpp/src/Ice/PropertiesAdminI.cpp

@@ -1,265 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/PropertiesAdminI.h>
-#include <Ice/Instance.h>
-#include <Ice/Logger.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/ThreadPool.h>
-
-using namespace std;
-using namespace Ice;
-
-namespace
-{
-
-const char* traceCategory = "Admin.Properties";
-
-}
-
-#ifndef ICE_CPP11_MAPPING
-PropertiesAdminUpdateCallback::~PropertiesAdminUpdateCallback()
-{
-    // Out of line to avoid weak vtable
-}
-#endif
-
-NativePropertiesAdmin::~NativePropertiesAdmin()
-{
-    // Out of line to avoid weak vtable
-}
-
-namespace IceInternal
-{
-
-PropertiesAdminI::PropertiesAdminI(const InstancePtr& instance) :
-    _properties(instance->initializationData().properties),
-    _logger(instance->initializationData().logger)
-{
-}
-
-string
-#ifdef ICE_CPP11_MAPPING
-PropertiesAdminI::getProperty(string name, const Current&)
-#else
-PropertiesAdminI::getProperty(const string& name, const Current&)
-#endif
-{
-    Lock sync(*this);
-    return _properties->getProperty(name);
-}
-
-PropertyDict
-#ifdef ICE_CPP11_MAPPING
-PropertiesAdminI::getPropertiesForPrefix(string prefix, const Current&)
-#else
-PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&)
-#endif
-{
-    Lock sync(*this);
-    return _properties->getPropertiesForPrefix(prefix);
-}
-
-void
-#ifdef ICE_CPP11_MAPPING
-PropertiesAdminI::setProperties(PropertyDict props, const Current&)
-#else
-PropertiesAdminI::setProperties(const PropertyDict& props, const Current&)
-#endif
-{
-    Lock sync(*this);
-
-    PropertyDict old = _properties->getPropertiesForPrefix("");
-    PropertyDict::const_iterator p;
-    const int traceLevel = _properties->getPropertyAsInt("Ice.Trace.Admin.Properties");
-
-    //
-    // Compute the difference between the new property set and the existing property set:
-    //
-    // 1) Any properties in the new set that were not defined in the existing set.
-    //
-    // 2) Any properties that appear in both sets but with different values.
-    //
-    // 3) Any properties not present in the new set but present in the existing set.
-    //    In other words, the property has been removed.
-    //
-    PropertyDict added, changed, removed;
-    for(p = props.begin(); p != props.end(); ++p)
-    {
-        PropertyDict::iterator q = old.find(p->first);
-        if(q == old.end())
-        {
-            if(!p->second.empty())
-            {
-                //
-                // This property is new.
-                //
-                added.insert(*p);
-            }
-        }
-        else
-        {
-            if(p->second != q->second)
-            {
-                if(p->second.empty())
-                {
-                    //
-                    // This property was removed.
-                    //
-                    removed.insert(*p);
-                }
-                else
-                {
-                    //
-                    // This property has changed.
-                    //
-                    changed.insert(*p);
-                }
-            }
-        }
-    }
-
-    if(traceLevel > 0 && (!added.empty() || !changed.empty() || !removed.empty()))
-    {
-        Trace out(_logger, traceCategory);
-
-        out << "Summary of property changes";
-
-        if(!added.empty())
-        {
-            out << "\nNew properties:";
-            for(p = added.begin(); p != added.end(); ++p)
-            {
-                out << "\n  " << p->first;
-                if(traceLevel > 1)
-                {
-                    out << " = " << p->second;
-                }
-            }
-        }
-
-        if(!changed.empty())
-        {
-            out << "\nChanged properties:";
-            for(p = changed.begin(); p != changed.end(); ++p)
-            {
-                out << "\n  " << p->first;
-                if(traceLevel > 1)
-                {
-                    out << " = " << p->second << " (old value = " << _properties->getProperty(p->first) << ")";
-                }
-            }
-        }
-
-        if(!removed.empty())
-        {
-            out << "\nRemoved properties:";
-            for(p = removed.begin(); p != removed.end(); ++p)
-            {
-                out << "\n  " << p->first;
-            }
-        }
-    }
-
-    //
-    // Update the property set.
-    //
-
-    for(p = added.begin(); p != added.end(); ++p)
-    {
-        _properties->setProperty(p->first, p->second);
-    }
-
-    for(p = changed.begin(); p != changed.end(); ++p)
-    {
-        _properties->setProperty(p->first, p->second);
-    }
-
-    for(p = removed.begin(); p != removed.end(); ++p)
-    {
-        _properties->setProperty(p->first, "");
-    }
-
-    if(!_updateCallbacks.empty())
-    {
-        PropertyDict changes = added;
-        changes.insert(changed.begin(), changed.end());
-        changes.insert(removed.begin(), removed.end());
-
-        // Copy callbacks to allow callbacks to update callbacks
-#ifdef ICE_CPP11_MAPPING
-        auto callbacks = _updateCallbacks;
-        for(const auto& cb : callbacks)
-#else
-        vector<PropertiesAdminUpdateCallbackPtr> callbacks = _updateCallbacks;
-        for(vector<PropertiesAdminUpdateCallbackPtr>::const_iterator q = callbacks.begin(); q != callbacks.end(); ++q)
-#endif
-        {
-            try
-            {
-#ifdef ICE_CPP11_MAPPING
-                cb(changes);
-#else
-                (*q)->updated(changes);
-#endif
-            }
-            catch(const std::exception& ex)
-            {
-                if(_properties->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 1)
-                {
-                    Warning out(_logger);
-                    out << "properties admin update callback raised unexpected exception:\n" << ex;
-                }
-            }
-            catch(...)
-            {
-                if(_properties->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 1)
-                {
-                    Warning out(_logger);
-                    out << "properties admin update callback raised unexpected exception:\nunknown c++ exception";
-                }
-            }
-        }
-    }
-}
-
-#ifdef ICE_CPP11_MAPPING
-
-std::function<void()>
-PropertiesAdminI::addUpdateCallback(std::function<void(const Ice::PropertyDict&)> cb)
-{
-    Lock sync(*this);
-
-    auto p = _updateCallbacks.insert(_updateCallbacks.end(), std::move(cb));
-    auto propertiesAdmin = shared_from_this();
-
-    return [p, propertiesAdmin] { propertiesAdmin->removeUpdateCallback(p); };
-}
-
-void
-PropertiesAdminI::removeUpdateCallback(std::list<std::function<void(const Ice::PropertyDict&)>>::iterator p)
-{
-    Lock sync(*this);
-    _updateCallbacks.erase(p);
-}
-
-#else
-
-void
-PropertiesAdminI::addUpdateCallback(const PropertiesAdminUpdateCallbackPtr& cb)
-{
-    Lock sync(*this);
-    _updateCallbacks.push_back(cb);
-}
-
-void
-PropertiesAdminI::removeUpdateCallback(const PropertiesAdminUpdateCallbackPtr& cb)
-{
-    Lock sync(*this);
-    _updateCallbacks.erase(remove(_updateCallbacks.begin(), _updateCallbacks.end(), cb), _updateCallbacks.end());
-}
-
-#endif
-
-}

data/dist/ice/cpp/src/Ice/PropertiesAdminI.h

@@ -1,64 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_PROPERTIES_ADMIN_I_H
-#define ICE_PROPERTIES_ADMIN_I_H
-
-#include <IceUtil/RecMutex.h>
-#include <Ice/Properties.h>
-#include <Ice/PropertiesAdmin.h>
-#include <Ice/NativePropertiesAdmin.h>
-#include <Ice/LoggerF.h>
-
-#ifdef ICE_CPP11_MAPPING
-#include <list>
-#endif
-
-namespace IceInternal
-{
-
-class PropertiesAdminI : public Ice::PropertiesAdmin, public Ice::NativePropertiesAdmin,
-#ifdef ICE_CPP11_MAPPING
-                         public std::enable_shared_from_this<PropertiesAdminI>,
-#endif
-                         private IceUtil::RecMutex
-{
-public:
-
-    PropertiesAdminI(const InstancePtr&);
-
-#ifdef ICE_CPP11_MAPPING
-    virtual std::string getProperty(std::string, const Ice::Current&) override;
-    virtual Ice::PropertyDict getPropertiesForPrefix(std::string, const Ice::Current&) override;
-    virtual void setProperties(::Ice::PropertyDict, const Ice::Current&) override;
-
-    virtual std::function<void()> addUpdateCallback(std::function<void(const Ice::PropertyDict&)>) override;
-    void removeUpdateCallback(std::list<std::function<void(const Ice::PropertyDict&)>>::iterator);
-
-#else
-    virtual std::string getProperty(const std::string&, const Ice::Current&);
-    virtual Ice::PropertyDict getPropertiesForPrefix(const std::string&, const Ice::Current&);
-    virtual void setProperties(const Ice::PropertyDict&, const Ice::Current&);
-
-    virtual void addUpdateCallback(const Ice::PropertiesAdminUpdateCallbackPtr&);
-    virtual void removeUpdateCallback(const Ice::PropertiesAdminUpdateCallbackPtr&);
-#endif
-
-private:
-
-    const Ice::PropertiesPtr _properties;
-    const Ice::LoggerPtr _logger;
-
-#ifdef ICE_CPP11_MAPPING
-    std::list<std::function<void(const Ice::PropertyDict&)>> _updateCallbacks;
-#else
-    std::vector<Ice::PropertiesAdminUpdateCallbackPtr> _updateCallbacks;
-#endif
-
-};
-ICE_DEFINE_PTR(PropertiesAdminIPtr, PropertiesAdminI);
-
-}
-
-#endif