zeroc-ice 3.7.10 → 3.8.0

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

@@ -1,480 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/ServantManager.h>
-#include <Ice/ServantLocator.h>
-#include <Ice/LocalException.h>
-#include <Ice/LoggerUtil.h>
-#include <Ice/Instance.h>
-#include <Ice/StringUtil.h>
-
-using namespace std;
-using namespace Ice;
-using namespace IceInternal;
-
-ICE_API IceUtil::Shared* IceInternal::upCast(ServantManager* p) { return p; }
-
-void
-IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity& ident, const string& facet)
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    assert(_instance); // Must not be called after destruction.
-
-    ServantMapMap::iterator p = _servantMapMapHint;
-
-    if(p == _servantMapMap.end() || p->first != ident)
-    {
-        p = _servantMapMap.find(ident);
-    }
-
-    if(p == _servantMapMap.end())
-    {
-        p = _servantMapMap.insert(_servantMapMapHint, pair<const Identity, FacetMap>(ident, FacetMap()));
-    }
-    else
-    {
-        if(p->second.find(facet) != p->second.end())
-        {
-            ToStringMode toStringMode = _instance->toStringMode();
-            ostringstream os;
-            os << Ice::identityToString(ident, toStringMode);
-            if(!facet.empty())
-            {
-                os << " -f " << escapeString(facet, "", toStringMode);
-            }
-            throw AlreadyRegisteredException(__FILE__, __LINE__, "servant", os.str());
-        }
-    }
-
-    _servantMapMapHint = p;
-
-    p->second.insert(pair<const string, ObjectPtr>(facet, object));
-}
-
-void
-IceInternal::ServantManager::addDefaultServant(const ObjectPtr& object, const string& category)
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    assert(_instance); // Must not be called after destruction.
-
-    DefaultServantMap::iterator p = _defaultServantMap.find(category);
-    if(p != _defaultServantMap.end())
-    {
-        throw AlreadyRegisteredException(__FILE__, __LINE__, "default servant", category);
-    }
-
-    _defaultServantMap.insert(pair<const string, ObjectPtr>(category, object));
-}
-
-ObjectPtr
-IceInternal::ServantManager::removeServant(const Identity& ident, const string& facet)
-{
-    //
-    // We return the removed servant to avoid releasing the last reference count
-    // with *this locked. We don't want to run user code, such as the servant
-    // destructor, with an internal Ice mutex locked.
-    //
-    ObjectPtr servant = 0;
-
-    IceUtil::Mutex::Lock sync(*this);
-
-    assert(_instance); // Must not be called after destruction.
-
-    ServantMapMap::iterator p = _servantMapMapHint;
-    FacetMap::iterator q;
-
-    if(p == _servantMapMap.end() || p->first != ident)
-    {
-        p = _servantMapMap.find(ident);
-    }
-
-    if(p == _servantMapMap.end() || (q = p->second.find(facet)) == p->second.end())
-    {
-        ToStringMode toStringMode = _instance->toStringMode();
-        ostringstream os;
-        os << Ice::identityToString(ident, toStringMode);
-        if(!facet.empty())
-        {
-            os << " -f " + escapeString(facet, "", toStringMode);
-        }
-        throw NotRegisteredException(__FILE__, __LINE__, "servant", os.str());
-    }
-
-    servant = q->second;
-    p->second.erase(q);
-
-    if(p->second.empty())
-    {
-        if(p == _servantMapMapHint)
-        {
-            _servantMapMap.erase(p++);
-            _servantMapMapHint = p;
-        }
-        else
-        {
-            _servantMapMap.erase(p);
-        }
-    }
-    return servant;
-}
-
-ObjectPtr
-IceInternal::ServantManager::removeDefaultServant(const string& category)
-{
-    //
-    // We return the removed servant to avoid releasing the last reference count
-    // with *this locked. We don't want to run user code, such as the servant
-    // destructor, with an internal Ice mutex locked.
-    //
-    ObjectPtr servant = 0;
-
-    IceUtil::Mutex::Lock sync(*this);
-
-    assert(_instance); // Must not be called after destruction.
-
-    DefaultServantMap::iterator p = _defaultServantMap.find(category);
-    if(p == _defaultServantMap.end())
-    {
-        throw NotRegisteredException(__FILE__, __LINE__, "default servant", category);
-    }
-
-    servant = p->second;
-    _defaultServantMap.erase(p);
-
-    return servant;
-}
-
-FacetMap
-IceInternal::ServantManager::removeAllFacets(const Identity& ident)
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    assert(_instance); // Must not be called after destruction.
-
-    ServantMapMap::iterator p = _servantMapMapHint;
-
-    if(p == _servantMapMap.end() || p->first != ident)
-    {
-        p = _servantMapMap.find(ident);
-    }
-
-    if(p == _servantMapMap.end())
-    {
-        throw NotRegisteredException(__FILE__, __LINE__, "servant",
-                                     Ice::identityToString(ident, _instance->toStringMode()));
-    }
-
-    FacetMap result = p->second;
-
-    if(p == _servantMapMapHint)
-    {
-        _servantMapMap.erase(p++);
-        _servantMapMapHint = p;
-    }
-    else
-    {
-        _servantMapMap.erase(p);
-    }
-
-    return result;
-}
-
-ObjectPtr
-IceInternal::ServantManager::findServant(const Identity& ident, const string& facet) const
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    //
-    // This assert is not valid if the adapter dispatch incoming
-    // requests from bidir connections. This method might be called if
-    // requests are received over the bidir connection after the
-    // adapter was deactivated.
-    //
-    //assert(_instance); // Must not be called after destruction.
-
-    ServantMapMap::iterator p = _servantMapMapHint;
-    FacetMap::iterator q;
-
-    ServantMapMap& servantMapMap = const_cast<ServantMapMap&>(_servantMapMap);
-
-    if(p == servantMapMap.end() || p->first != ident)
-    {
-        p = servantMapMap.find(ident);
-    }
-
-    if(p == servantMapMap.end() || (q = p->second.find(facet)) == p->second.end())
-    {
-        DefaultServantMap::const_iterator d = _defaultServantMap.find(ident.category);
-        if(d == _defaultServantMap.end())
-        {
-            d = _defaultServantMap.find("");
-            if(d == _defaultServantMap.end())
-            {
-                return 0;
-            }
-            else
-            {
-                return d->second;
-            }
-        }
-        else
-        {
-            return d->second;
-        }
-    }
-    else
-    {
-        _servantMapMapHint = p;
-        return q->second;
-    }
-}
-
-ObjectPtr
-IceInternal::ServantManager::findDefaultServant(const string& category) const
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    DefaultServantMap::const_iterator p = _defaultServantMap.find(category);
-    if(p == _defaultServantMap.end())
-    {
-        return 0;
-    }
-    else
-    {
-        return p->second;
-    }
-}
-
-FacetMap
-IceInternal::ServantManager::findAllFacets(const Identity& ident) const
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    assert(_instance); // Must not be called after destruction.
-
-    ServantMapMap::iterator p = _servantMapMapHint;
-
-    ServantMapMap& servantMapMap = const_cast<ServantMapMap&>(_servantMapMap);
-
-    if(p == servantMapMap.end() || p->first != ident)
-    {
-        p = servantMapMap.find(ident);
-    }
-
-    if(p == servantMapMap.end())
-    {
-        return FacetMap();
-    }
-    else
-    {
-        _servantMapMapHint = p;
-        return p->second;
-    }
-}
-
-bool
-IceInternal::ServantManager::hasServant(const Identity& ident) const
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    //
-    // This assert is not valid if the adapter dispatch incoming
-    // requests from bidir connections. This method might be called if
-    // requests are received over the bidir connection after the
-    // adapter was deactivated.
-    //
-    //assert(_instance); // Must not be called after destruction.
-
-    ServantMapMap::iterator p = _servantMapMapHint;
-    ServantMapMap& servantMapMap = const_cast<ServantMapMap&>(_servantMapMap);
-
-    if(p == servantMapMap.end() || p->first != ident)
-    {
-        p = servantMapMap.find(ident);
-    }
-
-    if(p == servantMapMap.end())
-    {
-        return false;
-    }
-    else
-    {
-        _servantMapMapHint = p;
-        assert(!p->second.empty());
-        return true;
-    }
-}
-
-void
-IceInternal::ServantManager::addServantLocator(const ServantLocatorPtr& locator, const string& category)
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    assert(_instance); // Must not be called after destruction.
-
-    if((_locatorMapHint != _locatorMap.end() && _locatorMapHint->first == category)
-       || _locatorMap.find(category) != _locatorMap.end())
-    {
-        throw AlreadyRegisteredException(__FILE__, __LINE__, "servant locator", category);
-    }
-
-    _locatorMapHint = _locatorMap.insert(_locatorMapHint, pair<const string, ServantLocatorPtr>(category, locator));
-}
-
-ServantLocatorPtr
-IceInternal::ServantManager::removeServantLocator(const string& category)
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    assert(_instance); // Must not be called after destruction.
-
-    map<string, ServantLocatorPtr>::iterator p = _locatorMap.end();
-    if(_locatorMapHint != p)
-    {
-        if(_locatorMapHint->first == category)
-        {
-            p = _locatorMapHint;
-        }
-    }
-
-    if(p == _locatorMap.end())
-    {
-        p = _locatorMap.find(category);
-    }
-
-    if(p == _locatorMap.end())
-    {
-        throw NotRegisteredException(__FILE__, __LINE__, "servant locator", category);
-    }
-
-    ServantLocatorPtr locator = p->second;
-    _locatorMap.erase(p);
-    _locatorMapHint = _locatorMap.begin();
-    return locator;
-}
-
-ServantLocatorPtr
-IceInternal::ServantManager::findServantLocator(const string& category) const
-{
-    IceUtil::Mutex::Lock sync(*this);
-
-    //
-    // This assert is not valid if the adapter dispatch incoming
-    // requests from bidir connections. This method might be called if
-    // requests are received over the bidir connection after the
-    // adapter was deactivated.
-    //
-    //assert(_instance); // Must not be called after destruction.
-
-    map<string, ServantLocatorPtr>& locatorMap =
-        const_cast<map<string, ServantLocatorPtr>&>(_locatorMap);
-
-    map<string, ServantLocatorPtr>::iterator p = locatorMap.end();
-    if(_locatorMapHint != locatorMap.end())
-    {
-        if(_locatorMapHint->first == category)
-        {
-            p = _locatorMapHint;
-        }
-    }
-
-    if(p == locatorMap.end())
-    {
-        p = locatorMap.find(category);
-    }
-
-    if(p != locatorMap.end())
-    {
-        _locatorMapHint = p;
-        return p->second;
-    }
-    else
-    {
-        return 0;
-    }
-}
-
-IceInternal::ServantManager::ServantManager(const InstancePtr& instance, const string& adapterName)
-    : _instance(instance),
-      _adapterName(adapterName),
-      _servantMapMapHint(_servantMapMap.end()),
-      _locatorMapHint(_locatorMap.end())
-{
-}
-
-IceInternal::ServantManager::~ServantManager()
-{
-    //
-    // Don't check whether destroy() has been called. It might have
-    // not been called if the associated object adapter was not
-    // properly deactivated.
-    //
-    //assert(!_instance);
-}
-
-void
-IceInternal::ServantManager::destroy()
-{
-    ServantMapMap servantMapMap;
-    DefaultServantMap defaultServantMap;
-    map<string, ServantLocatorPtr> locatorMap;
-    Ice::LoggerPtr logger;
-
-    {
-        IceUtil::Mutex::Lock sync(*this);
-        //
-        // If the ServantManager has already been destroyed, we're done.
-        //
-        if(!_instance)
-        {
-            return;
-        }
-
-        logger = _instance->initializationData().logger;
-
-        servantMapMap.swap(_servantMapMap);
-        _servantMapMapHint = _servantMapMap.end();
-
-        defaultServantMap.swap(_defaultServantMap);
-
-        locatorMap.swap(_locatorMap);
-        _locatorMapHint = _locatorMap.end();
-
-        _instance = 0;
-    }
-
-    for(map<string, ServantLocatorPtr>::const_iterator p = locatorMap.begin(); p != locatorMap.end(); ++p)
-    {
-        try
-        {
-            p->second->deactivate(p->first);
-        }
-        catch(const Exception& ex)
-        {
-            Error out(logger);
-            out << "exception during locator deactivation:\n"
-                << "object adapter: `" << _adapterName << "'\n"
-                << "locator category: `" << p->first << "'\n"
-                << ex;
-        }
-        catch(...)
-        {
-            Error out(logger);
-            out << "unknown exception during locator deactivation:\n"
-                << "object adapter: `" << _adapterName << "'\n"
-                << "locator category: `" << p->first << "'";
-        }
-    }
-
-    //
-    // We clear the maps outside the synchronization as we don't want to
-    // hold any internal Ice mutex while running user code (such as servant
-    // or servant locator destructors).
-    //
-    servantMapMap.clear();
-    locatorMap.clear();
-    defaultServantMap.clear();
-}

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

@@ -1,69 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_SERVANT_MANAGER_H
-#define ICE_SERVANT_MANAGER_H
-
-#include <IceUtil/Shared.h>
-#include <IceUtil/Mutex.h>
-#include <Ice/ServantManagerF.h>
-#include <Ice/InstanceF.h>
-#include <Ice/ServantLocatorF.h>
-#include <Ice/Identity.h>
-#include <Ice/FacetMap.h>
-
-namespace Ice
-{
-
-class ObjectAdapterI;
-
-}
-
-namespace IceInternal
-{
-
-class ServantManager : public IceUtil::Shared, public IceUtil::Mutex
-{
-public:
-
-    void addServant(const Ice::ObjectPtr&, const Ice::Identity&, const std::string&);
-    void addDefaultServant(const Ice::ObjectPtr&, const std::string&);
-    Ice::ObjectPtr removeServant(const Ice::Identity&, const std::string&);
-    Ice::ObjectPtr removeDefaultServant(const std::string&);
-    Ice::FacetMap removeAllFacets(const Ice::Identity&);
-    Ice::ObjectPtr findServant(const Ice::Identity&, const std::string&) const;
-    Ice::ObjectPtr findDefaultServant(const std::string&) const;
-    Ice::FacetMap findAllFacets(const Ice::Identity&) const;
-    bool hasServant(const Ice::Identity&) const;
-
-    void addServantLocator(const Ice::ServantLocatorPtr& locator, const std::string&);
-    Ice::ServantLocatorPtr removeServantLocator(const std::string&);
-    Ice::ServantLocatorPtr findServantLocator(const std::string&) const;
-
-private:
-
-    ServantManager(const InstancePtr&, const std::string&);
-    ~ServantManager();
-    void destroy();
-    friend class Ice::ObjectAdapterI;
-
-    InstancePtr _instance;
-
-    const std::string _adapterName;
-
-    typedef std::map<Ice::Identity, Ice::FacetMap> ServantMapMap;
-    typedef std::map<std::string, Ice::ObjectPtr> DefaultServantMap;
-
-    ServantMapMap _servantMapMap;
-    mutable ServantMapMap::iterator _servantMapMapHint;
-
-    DefaultServantMap _defaultServantMap;
-
-    std::map<std::string, Ice::ServantLocatorPtr> _locatorMap;
-    mutable std::map<std::string, Ice::ServantLocatorPtr>::iterator _locatorMapHint;
-};
-
-}
-
-#endif

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

@@ -1,46 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_SHARED_CONTEXT_H
-#define ICE_SHARED_CONTEXT_H
-
-#include <IceUtil/Shared.h>
-#include <IceUtil/Handle.h>
-#include <string>
-#include <map>
-
-namespace Ice
-{
-typedef ::std::map< ::std::string, ::std::string> Context;
-}
-
-namespace IceInternal
-{
-
-class SharedContext : public IceUtil::Shared
-{
-public:
-
-    SharedContext()
-    {
-    }
-
-    SharedContext(const Ice::Context& val) :
-        _val(val)
-    {
-    }
-
-    inline const Ice::Context& getValue()
-    {
-        return _val;
-    }
-
-private:
-
-    Ice::Context _val;
-};
-typedef IceUtil::Handle<SharedContext> SharedContextPtr;
-}
-
-#endif

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

@@ -1,49 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-//
-// Ice version 3.7.10
-//
-// <auto-generated>
-//
-// Generated from file `SliceChecksumDict.ice'
-//
-// Warning: do not edit this file.
-//
-// </auto-generated>
-//
-
-#ifndef ICE_API_EXPORTS
-#   define ICE_API_EXPORTS
-#endif
-#include <Ice/SliceChecksumDict.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 < 10
-#       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/SliceChecksums.cpp

@@ -1,75 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <Ice/SliceChecksums.h>
-#include <IceUtil/Mutex.h>
-#include <IceUtil/MutexPtrLock.h>
-
-using namespace std;
-using namespace Ice;
-
-namespace
-{
-
-SliceChecksumDict* _sliceChecksums = 0;
-
-IceUtil::Mutex* _mutex = 0;
-
-class Init
-{
-public:
-
-    Init()
-    {
-        _mutex = new IceUtil::Mutex;
-    }
-
-    ~Init()
-    {
-        delete _mutex;
-        _mutex = 0;
-    }
-};
-
-Init init;
-
-class SliceChecksumDictDestroyer
-{
-public:
-
-    ~SliceChecksumDictDestroyer()
-    {
-        delete _sliceChecksums;
-        _sliceChecksums = 0;
-    }
-};
-
-SliceChecksumDictDestroyer destroyer;
-
-}
-
-SliceChecksumDict
-Ice::sliceChecksums()
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex);
-    if(_sliceChecksums == 0)
-    {
-        _sliceChecksums = new SliceChecksumDict();
-    }
-    return *_sliceChecksums;
-}
-
-IceInternal::SliceChecksumInit::SliceChecksumInit(const char* checksums[])
-{
-    IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_mutex);
-    if(_sliceChecksums == 0)
-    {
-        _sliceChecksums = new SliceChecksumDict();
-    }
-
-    for(int i = 0; checksums[i] != 0; i += 2)
-    {
-        _sliceChecksums->insert(SliceChecksumDict::value_type(checksums[i], checksums[i + 1]));
-    }
-}