zeroc-ice 3.7.9.1 → 3.7.11

data/ext/ValueFactoryManager.cpp

@@ -1,441 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#include <ValueFactoryManager.h>
-#include <Types.h>
-#include <Util.h>
-#include <Ice/LocalException.h>
-
-using namespace std;
-using namespace IceRuby;
-
-static VALUE _valueFactoryManagerClass;
-
-namespace
-{
-
-ClassInfoPtr
-getClassInfo(const string& id)
-{
-    ClassInfoPtr info;
-
-    if(id == Ice::Object::ice_staticId())
-    {
-        //
-        // When the ID is that of Ice::Object, it indicates that the stream has not
-        // found a factory and is providing us an opportunity to preserve the object.
-        //
-        info = lookupClassInfo("::Ice::UnknownSlicedValue");
-    }
-    else
-    {
-        info = lookupClassInfo(id);
-    }
-
-    return info;
-}
-
-}
-
-extern "C"
-void
-IceRuby_ValueFactoryManager_mark(ValueFactoryManagerPtr* p)
-{
-    assert(p);
-    (*p)->mark();
-}
-
-extern "C"
-void
-IceRuby_ValueFactoryManager_free(ValueFactoryManagerPtr* p)
-{
-    assert(p);
-    delete p;
-}
-
-IceRuby::ValueFactoryManager::ValueFactoryManager()
-{
-    //
-    // Create a Ruby wrapper around this object. Note that this is a cyclic reference.
-    //
-    _self = Data_Wrap_Struct(_valueFactoryManagerClass, IceRuby_ValueFactoryManager_mark,
-                             IceRuby_ValueFactoryManager_free, new ValueFactoryManagerPtr(this));
-
-    _defaultFactory = new DefaultValueFactory;
-}
-
-IceRuby::ValueFactoryManager::~ValueFactoryManager()
-{
-    assert(_factories.empty());
-}
-
-void
-IceRuby::ValueFactoryManager::add(const Ice::ValueFactoryPtr& f, const string& id)
-{
-    Lock lock(*this);
-
-    if(id.empty())
-    {
-        if(_defaultFactory->getDelegate())
-        {
-            throw Ice::AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id);
-        }
-
-        _defaultFactory->setDelegate(f);
-    }
-    else
-    {
-        FactoryMap::iterator p = _factories.find(id);
-        if(p != _factories.end())
-        {
-            throw Ice::AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id);
-        }
-
-        _factories.insert(FactoryMap::value_type(id, f));
-    }
-}
-
-Ice::ValueFactoryPtr
-IceRuby::ValueFactoryManager::find(const string& id) const ICE_NOEXCEPT
-{
-    Lock lock(*this);
-
-    if(id.empty())
-    {
-        return _defaultFactory;
-    }
-
-    FactoryMap::const_iterator p = _factories.find(id);
-    if(p != _factories.end())
-    {
-        return p->second;
-    }
-
-    return 0;
-}
-
-void
-IceRuby::ValueFactoryManager::addValueFactory(VALUE f, const string& id)
-{
-    ICE_RUBY_TRY
-    {
-        add(new FactoryWrapper(f, false), id);
-    }
-    ICE_RUBY_CATCH
-}
-
-VALUE
-IceRuby::ValueFactoryManager::findValueFactory(const string& id) const
-{
-    Ice::ValueFactoryPtr f = find(id);
-    if(f)
-    {
-        FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(f);
-        if(w)
-        {
-            return w->getObject();
-        }
-    }
-
-    return Qnil;
-}
-
-void
-IceRuby::ValueFactoryManager::addObjectFactory(VALUE f, const string& id)
-{
-    ICE_RUBY_TRY
-    {
-        add(new FactoryWrapper(f, true), id);
-    }
-    ICE_RUBY_CATCH
-}
-
-VALUE
-IceRuby::ValueFactoryManager::findObjectFactory(const string& id) const
-{
-    Ice::ValueFactoryPtr f = find(id);
-    if(f)
-    {
-        FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(f);
-        if(w && w->isObjectFactory())
-        {
-            return w->getObject();
-        }
-    }
-
-    return Qnil;
-}
-
-void
-IceRuby::ValueFactoryManager::mark()
-{
-    Lock lock(*this);
-
-    for(FactoryMap::iterator p = _factories.begin(); p != _factories.end(); ++p)
-    {
-        FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(p->second);
-        if(w)
-        {
-            w->mark();
-        }
-    }
-
-    _defaultFactory->mark();
-}
-
-void
-IceRuby::ValueFactoryManager::markSelf()
-{
-    volatile VALUE self;
-
-    {
-        Lock lock(*this);
-
-        self = _self;
-    }
-
-    if(!NIL_P(self))
-    {
-        rb_gc_mark(self);
-    }
-}
-
-VALUE
-IceRuby::ValueFactoryManager::getObject() const
-{
-    return _self;
-}
-
-void
-IceRuby::ValueFactoryManager::destroy()
-{
-    FactoryMap factories;
-
-    {
-        Lock lock(*this);
-        if(_self == Qnil)
-        {
-            //
-            // Nothing to do if already destroyed (this can occur if communicator destroy is called multiple times)
-            //
-            return;
-        }
-
-        factories.swap(_factories);
-
-        _self = Qnil;
-    }
-
-    for(FactoryMap::iterator p = factories.begin(); p != factories.end(); ++p)
-    {
-        FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(p->second);
-        if(w)
-        {
-            w->destroy();
-        }
-    }
-
-    _defaultFactory->destroy();
-}
-
-IceRuby::FactoryWrapper::FactoryWrapper(VALUE factory, bool isObjectFactory) :
-    _factory(factory),
-    _isObjectFactory(isObjectFactory)
-{
-}
-
-Ice::ValuePtr
-IceRuby::FactoryWrapper::create(const string& id)
-{
-    //
-    // Get the type information.
-    //
-    ClassInfoPtr info = getClassInfo(id);
-
-    if(!info)
-    {
-        return 0;
-    }
-
-    //
-    // Invoke the create method on the Ruby factory object.
-    //
-    volatile VALUE str = createString(id);
-    volatile VALUE obj = callRuby(rb_funcall, _factory, rb_intern("create"), 1, str);
-    if(NIL_P(obj))
-    {
-        return 0;
-    }
-
-    return new ObjectReader(obj, info);
-}
-
-VALUE
-IceRuby::FactoryWrapper::getObject() const
-{
-    return _factory;
-}
-
-bool
-IceRuby::FactoryWrapper::isObjectFactory() const
-{
-    return _isObjectFactory;
-}
-
-void
-IceRuby::FactoryWrapper::mark()
-{
-    rb_gc_mark(_factory);
-}
-
-void
-IceRuby::FactoryWrapper::destroy()
-{
-    if(_isObjectFactory)
-    {
-        callRuby(rb_funcall, _factory, rb_intern("destroy"), 0);
-    }
-}
-
-Ice::ValuePtr
-IceRuby::DefaultValueFactory::create(const string& id)
-{
-    Ice::ValuePtr v;
-
-    //
-    // Give the application-provided default factory a chance to create the object first.
-    //
-    if(_delegate)
-    {
-        v = _delegate->create(id);
-        if(v)
-        {
-            return v;
-        }
-    }
-
-    //
-    // Get the type information.
-    //
-    ClassInfoPtr info = getClassInfo(id);
-
-    if(!info)
-    {
-        return 0;
-    }
-
-    //
-    // NOTE: We don't do this in Ruby because a generated class can be re-opened to define operations.
-    //
-    ////
-    //// If the requested type is an abstract class, then we give up.
-    ////
-    //if(info->isAbstract)
-    //{
-    //    return 0;
-    //}
-
-    //
-    // Instantiate the object.
-    //
-    volatile VALUE obj = callRuby(rb_class_new_instance, 0, reinterpret_cast<VALUE*>(0), info->rubyClass);
-    assert(!NIL_P(obj));
-    return new ObjectReader(obj, info);
-}
-
-void
-IceRuby::DefaultValueFactory::setDelegate(const Ice::ValueFactoryPtr& d)
-{
-    _delegate = d;
-}
-
-VALUE
-IceRuby::DefaultValueFactory::getObject() const
-{
-    if(_delegate)
-    {
-        FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate);
-        if(w)
-        {
-            return w->getObject();
-        }
-    }
-
-    return Qnil;
-}
-
-void
-IceRuby::DefaultValueFactory::mark()
-{
-    if(_delegate)
-    {
-        FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate);
-        if(w)
-        {
-            w->mark();
-        }
-    }
-}
-
-void
-IceRuby::DefaultValueFactory::destroy()
-{
-    if(_delegate)
-    {
-        FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate);
-        if(w)
-        {
-            w->destroy();
-        }
-    }
-
-    _delegate = 0;
-}
-
-extern "C"
-VALUE
-IceRuby_ValueFactoryManager_add(VALUE self, VALUE factory, VALUE id)
-{
-    ICE_RUBY_TRY
-    {
-        ValueFactoryManagerPtr* p = reinterpret_cast<ValueFactoryManagerPtr*>(DATA_PTR(self));
-        assert(p);
-
-        string type = getString(id);
-        (*p)->addValueFactory(factory, type);
-    }
-    ICE_RUBY_CATCH
-    return Qnil;
-}
-
-extern "C"
-VALUE
-IceRuby_ValueFactoryManager_find(VALUE self, VALUE id)
-{
-    ICE_RUBY_TRY
-    {
-        ValueFactoryManagerPtr* p = reinterpret_cast<ValueFactoryManagerPtr*>(DATA_PTR(self));
-        assert(p);
-
-        string type = getString(id);
-        return (*p)->findValueFactory(type);
-    }
-    ICE_RUBY_CATCH
-    return Qnil;
-}
-
-bool
-IceRuby::initValueFactoryManager(VALUE iceModule)
-{
-    _valueFactoryManagerClass = rb_define_class_under(iceModule, "ValueFactoryManagerI", rb_cObject);
-    rb_undef_alloc_func(_valueFactoryManagerClass);
-
-    //
-    // Instance methods.
-    //
-    rb_define_method(_valueFactoryManagerClass, "add", CAST_METHOD(IceRuby_ValueFactoryManager_add), 2);
-    rb_define_method(_valueFactoryManagerClass, "find", CAST_METHOD(IceRuby_ValueFactoryManager_find), 1);
-
-    return true;
-}

data/ext/extconf.rb

@@ -1,97 +0,0 @@
-#
-# Copyright (c) ZeroC, Inc. All rights reserved.
-#
-
-require "mkmf"
-require "rbconfig"
-
-if RUBY_PLATFORM =~ /mswin|mingw/
-    puts "MinGW is not supported with Ice for Ruby."
-    exit 1
-end
-
-#
-# On OSX & Linux bzlib.h is required.
-#
-if not have_header("bzlib.h") then
-    puts "Bzip2 header files are missing."
-    exit 1
-end
-
-if RUBY_PLATFORM =~ /linux/
-    #
-    # On Linux openssl is required for IceSSL.
-    #
-    if not have_header("openssl/ssl.h") then
-        puts "OpenSSL header files are missing."
-        exit 1
-    end
-end
-
-$INCFLAGS << ' -Iice/cpp/include'
-$INCFLAGS << ' -Iice/cpp/include/generated'
-$INCFLAGS << ' -Iice/cpp/src'
-
-$CPPFLAGS << ' -DICE_STATIC_LIBS'
-$CPPFLAGS << ' -DICE_GEM'
-
-if RUBY_PLATFORM =~ /darwin/
-    $LOCAL_LIBS << ' -lbz2 -liconv -framework Security -framework CoreFoundation'
-elsif RUBY_PLATFORM =~ /linux/
-    $LOCAL_LIBS << ' -lssl -lcrypto -lbz2 -lrt'
-        if RUBY_VERSION =~ /1.8/
-            # With 1.8 we need to link with C++ runtime, as gcc is used to link the extension
-            $LOCAL_LIBS << ' -lstdc++'
-            # With 1.8 we need to fix the objects output directory
-            $CPPFLAGS << ' -o$@'
-            # With 1.8 /usr/lib/ruby/1.8/regex.h conflicts with /usr/include/regex.h
-            # we add a symbolic link to workaround the problem
-            if File.exist?('/usr/include/regex.h') && !File.exist?('regex.h')
-                FileUtils.ln_s '/usr/include/regex.h', 'regex.h'
-            end
-        end
-end
-$CPPFLAGS << ' -w'
-
-# Setup the object and source files.
-$objs = []
-$srcs = []
-
-# Add the plugin source.
-Dir["*.cpp"].each do |f|
-    $objs << File.basename(f, ".*") + ".o"
-    $srcs << f
-end
-
-def filter(f)
-    #
-    # Filter IceSSL sources that doesn't match current OS default
-    # implementation
-    #
-    if f.start_with?("SChannel") or f.start_with?("UWP")
-        return false
-    end
-    if RUBY_PLATFORM =~ /darwin/ and f.start_with?("OpenSSL")
-        return false
-    end
-    if !(RUBY_PLATFORM =~ /darwin/) and f.start_with?("SecureTransport")
-         return false
-    end
-    return true
-end
-
-Dir["ice/**/*.cpp"].each do |f|
-    if filter File.basename(f)
-        $objs << File.dirname(f) + "/" + File.basename(f, ".*") + ".o"
-        $srcs << f
-    end
-end
-
-# The mcpp source.
-Dir["ice/mcpp/*.c"].each do |f|
-    dir = "ice/mcpp"
-    $objs << File.join(dir, File.basename(f, ".*") + ".o")
-    $srcs << File.join(dir, f)
-end
-
-create_makefile "IceRuby"

data/ext/ice/cpp/include/Ice/Config.h

@@ -1,78 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_CONFIG_H
-#define ICE_CONFIG_H
-
-#include <IceUtil/Config.h>
-
-//
-// Some include files we need almost everywhere
-//
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-#include <string>
-#include <vector>
-#include <map>
-
-#ifndef ICE_OS_UWP
-#   if defined(_WIN32)
-#      include <process.h>
-#   else
-#      include <sys/types.h>
-#      include <cstddef>
-#   endif
-#endif
-
-#ifdef ICE_SWIFT
-#   include <dispatch/dispatch.h>
-#endif
-
-//
-// Define the Ice and IceInternal namespace, so that we can use the following
-// everywhere in our code:
-//
-// using namespace Ice;
-// using namespace IceInternal;
-//
-namespace Ice
-{
-}
-
-namespace IceInternal
-{
-}
-
-namespace Ice
-{
-
-/** The mapping for the Slice byte type. */
-typedef unsigned char Byte;
-/** The mapping for the Slice short type. */
-typedef short Short;
-/** The mapping for the Slice int type. */
-typedef int Int;
-#ifdef ICE_CPP11_MAPPING
-/** The mapping for the Slice long type. */
-typedef long long int Long;
-#else
-/** The mapping for the Slice long type. */
-typedef IceUtil::Int64 Long;
-#endif
-/** The mapping for the Slice float type. */
-typedef float Float;
-/** The mapping for the Slice double type. */
-typedef double Double;
-
-}
-
-namespace IceInternal
-{
-
-ICE_API int getSystemErrno();
-
-}
-
-#endif

data/ext/ice/cpp/include/Ice/ConsoleUtil.h

@@ -1,23 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_CONSOLE_UTIL_H
-#define ICE_CONSOLE_UTIL_H
-
-#include <IceUtil/ConsoleUtil.h>
-
-namespace IceInternal
-{
-
-using IceUtilInternal::consoleOut;
-using IceUtilInternal::consoleErr;
-
-#if defined(_WIN32) && !defined(ICE_OS_UWP)
-using IceUtilInternal::endl;
-using IceUtilInternal::flush;
-#endif
-
-}
-
-#endif

data/ext/ice/cpp/include/Ice/ExceptionHelpers.h

@@ -1,74 +0,0 @@
-//
-// Copyright (c) ZeroC, Inc. All rights reserved.
-//
-
-#ifndef ICE_EXCEPTION_HELPERS_H
-#define ICE_EXCEPTION_HELPERS_H
-
-#ifdef ICE_CPP11_MAPPING // C++11 mapping
-
-#include <Ice/InputStream.h>
-#include <Ice/OutputStream.h>
-
-namespace Ice
-{
-
-class LocalException;
-
-/**
- * Helper template for the implementation of Ice::LocalException. It implements ice_id.
- * \headerfile Ice/Ice.h
- */
-template<typename T, typename B> class LocalExceptionHelper : public IceUtil::ExceptionHelper<T, B>
-{
-public:
-
-    using IceUtil::ExceptionHelper<T, B>::ExceptionHelper;
-
-    virtual std::string ice_id() const override
-    {
-        return T::ice_staticId();
-    }
-};
-
-/**
- * Helper template for the implementation of Ice::UserException. It implements ice_id.
- * \headerfile Ice/Ice.h
- */
-template<typename T, typename B> class UserExceptionHelper : public IceUtil::ExceptionHelper<T, B>
-{
-public:
-
-    using IceUtil::ExceptionHelper<T, B>::ExceptionHelper;
-
-    virtual std::string ice_id() const override
-    {
-        return T::ice_staticId();
-    }
-
-protected:
-
-    /// \cond STREAM
-    virtual void _writeImpl(Ice::OutputStream* os) const override
-    {
-        os->startSlice(T::ice_staticId(), -1, std::is_same<B, Ice::LocalException>::value ? true : false);
-        Ice::StreamWriter<T, Ice::OutputStream>::write(os, static_cast<const T&>(*this));
-        os->endSlice();
-        B::_writeImpl(os);
-    }
-
-    virtual void _readImpl(Ice::InputStream* is) override
-    {
-        is->startSlice();
-        Ice::StreamReader<T, ::Ice::InputStream>::read(is, static_cast<T&>(*this));
-        is->endSlice();
-        B::_readImpl(is);
-    }
-    /// \endcond
-};
-
-}
-
-#endif // C++11 mapping end
-
-#endif