zeroc-ice 3.6b1 → 3.6.0

data/ext/Endpoint.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ImplicitContext.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ImplicitContext.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Init.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -26,14 +26,21 @@ static VALUE iceModule;
 extern "C"
 {
 
+#ifdef ICE_STATIC_LIBS
 Ice::Plugin* createIceSSL(const Ice::CommunicatorPtr&, const std::string&, const Ice::StringSeq&);
 Ice::Plugin* createIceDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&);
+Ice::Plugin* createIceLocatorDiscovery(const Ice::CommunicatorPtr&, const string&, const Ice::StringSeq&);
+#endif
 
 void
 ICE_DECLSPEC_EXPORT Init_IceRuby()
 {
+#ifdef ICE_STATIC_LIBS
+    // Register the plugins manually if we're building with static libraries.
     Ice::registerPluginFactory("IceSSL", createIceSSL, false);
     Ice::registerPluginFactory("IceDiscovery", createIceDiscovery, false);
+    Ice::registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, false);
+#endif
 
     iceModule = rb_define_module("Ice");
     initCommunicator(iceModule);

data/ext/Logger.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Logger.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ObjectFactory.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/ObjectFactory.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Operation.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Operation.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Properties.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Properties.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Proxy.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Proxy.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Slice.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Slice.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.

data/ext/Types.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -16,6 +16,7 @@
 #include <Ice/LocalException.h>
 #include <Ice/SlicedData.h>
 #include <list>
+#include <limits>
 
 //
 // Required for RHASH_SIZE to work properly with Ruby 1.8.x.
@@ -594,7 +595,12 @@ IceRuby::PrimitiveInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectM
             throw RubyException(rb_eTypeError, "unable to convert value to a float");
         }
         assert(TYPE(val) == T_FLOAT);
-        os->write(static_cast<float>(RFLOAT_VALUE(val)));
+        double d = static_cast<double>(RFLOAT_VALUE(val));
+        if(d > numeric_limits<float>::max() || d < -numeric_limits<float>::max())
+        {
+            throw RubyException(rb_eTypeError, "value is out of range for a float");
+        }
+        os->write(static_cast<float>(d));
         break;
     }
     case PrimitiveInfo::KindDouble:
@@ -923,7 +929,7 @@ convertDataMembers(VALUE members, DataMemberList& reqMembers, DataMemberList& op
 // StructInfo implementation.
 //
 IceRuby::StructInfo::StructInfo(VALUE ident, VALUE t, VALUE m) :
-    rubyClass(t)
+    rubyClass(t), _nullMarshalValue(Qnil)
 {
     const_cast<string&>(id) = getString(ident);
 
@@ -952,7 +958,7 @@ IceRuby::StructInfo::getId() const
 bool
 IceRuby::StructInfo::validate(VALUE val)
 {
-    return callRuby(rb_obj_is_kind_of, val, rubyClass) == Qtrue;
+    return NIL_P(val) || callRuby(rb_obj_is_kind_of, val, rubyClass) == Qtrue;
 }
 
 bool
@@ -990,7 +996,17 @@ IceRuby::StructInfo::usesClasses() const
 void
 IceRuby::StructInfo::marshal(VALUE p, const Ice::OutputStreamPtr& os, ObjectMap* objectMap, bool optional)
 {
-    assert(callRuby(rb_obj_is_kind_of, p, rubyClass) == Qtrue); // validate() should have caught this.
+    assert(NIL_P(p) || callRuby(rb_obj_is_kind_of, p, rubyClass) == Qtrue); // validate() should have caught this.
+
+    if(NIL_P(p))
+    {
+        if(NIL_P(_nullMarshalValue))
+        {
+            _nullMarshalValue = callRuby(rb_class_new_instance, 0, static_cast<VALUE*>(0), rubyClass);
+            rb_gc_register_address(&_nullMarshalValue); // Prevent garbage collection
+        }
+        p = _nullMarshalValue;
+    }
 
     Ice::OutputStream::size_type sizePos = -1;
     if(optional)
@@ -1058,22 +1074,30 @@ IceRuby::StructInfo::print(VALUE value, IceUtilInternal::Output& out, PrintObjec
         out << "<invalid value - expected " << id << ">";
         return;
     }
-    out.sb();
-    for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q)
+
+    if(NIL_P(value))
     {
-        DataMemberPtr member = *q;
-        out << nl << member->name << " = ";
-        if(callRuby(rb_ivar_defined, value, member->rubyID) == Qfalse)
-        {
-            out << "<not defined>";
-        }
-        else
+        out << "<nil>";
+    }
+    else
+    {
+        out.sb();
+        for(DataMemberList::const_iterator q = members.begin(); q != members.end(); ++q)
         {
-            volatile VALUE val = callRuby(rb_ivar_get, value, member->rubyID);
-            member->type->print(val, out, history);
+            DataMemberPtr member = *q;
+            out << nl << member->name << " = ";
+            if(callRuby(rb_ivar_defined, value, member->rubyID) == Qfalse)
+            {
+                out << "<not defined>";
+            }
+            else
+            {
+                volatile VALUE val = callRuby(rb_ivar_get, value, member->rubyID);
+                member->type->print(val, out, history);
+            }
         }
+        out.eb();
     }
-    out.eb();
 }
 
 void
@@ -1084,6 +1108,11 @@ IceRuby::StructInfo::destroy()
         (*p)->type->destroy();
     }
     const_cast<DataMemberList&>(members).clear();
+    if(!NIL_P(_nullMarshalValue))
+    {
+        rb_gc_unregister_address(&_nullMarshalValue); // Prevent garbage collection
+        _nullMarshalValue = Qnil;
+    }
 }
 
 //
@@ -2388,6 +2417,11 @@ IceRuby::ProxyInfo::destroy()
 IceRuby::ObjectWriter::ObjectWriter(VALUE object, ObjectMap* objectMap) :
     _object(object), _map(objectMap)
 {
+    //
+    // Mark the object as in use for the lifetime of this wrapper.
+    //
+    rb_gc_register_address(&_object);
+
     volatile VALUE cls = CLASS_OF(object);
     volatile VALUE type = callRuby(rb_const_get, cls, rb_intern("ICE_TYPE"));
     assert(!NIL_P(type));
@@ -2395,6 +2429,11 @@ IceRuby::ObjectWriter::ObjectWriter(VALUE object, ObjectMap* objectMap) :
     assert(_info);
 }
 
+IceRuby::ObjectWriter::~ObjectWriter()
+{
+    rb_gc_unregister_address(&_object);
+}
+
 void
 IceRuby::ObjectWriter::ice_preMarshal()
 {
@@ -2469,6 +2508,15 @@ IceRuby::ObjectWriter::writeMembers(const Ice::OutputStreamPtr& os, const DataMe
 IceRuby::ObjectReader::ObjectReader(VALUE object, const ClassInfoPtr& info) :
     _object(object), _info(info)
 {
+    //
+    // Mark the object as in use for the lifetime of this wrapper.
+    //
+    rb_gc_register_address(&_object);
+}
+
+IceRuby::ObjectReader::~ObjectReader()
+{
+    rb_gc_unregister_address(&_object);
 }
 
 void

data/ext/Types.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -253,6 +253,7 @@ private:
 
     bool _variableLength;
     int _wireSize;
+    VALUE _nullMarshalValue;
 };
 typedef IceUtil::Handle<StructInfo> StructInfoPtr;
 
@@ -452,6 +453,7 @@ class ObjectWriter : public Ice::ObjectWriter
 public:
 
     ObjectWriter(VALUE, ObjectMap*);
+    virtual ~ObjectWriter();
 
     virtual void ice_preMarshal();
 
@@ -474,6 +476,7 @@ class ObjectReader : public Ice::ObjectReader
 public:
 
     ObjectReader(VALUE, const ClassInfoPtr&);
+    virtual ~ObjectReader();
 
     virtual void ice_postUnmarshal();
 

data/ext/Util.cpp

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -38,8 +38,8 @@ setVersion(VALUE p, const T& version, const char* type)
 {
     assert(checkIsInstance(p, type));
 
-    VALUE major = callRuby(rb_int2inum, version.major);
-    VALUE minor = callRuby(rb_int2inum, version.minor);
+    volatile VALUE major = callRuby(rb_int2inum, version.major);
+    volatile VALUE minor = callRuby(rb_int2inum, version.minor);
     rb_ivar_set(p, rb_intern("@major"), major);
     rb_ivar_set(p, rb_intern("@minor"), minor);
 
@@ -308,73 +308,64 @@ IceRuby::createString(const string& str)
 #endif
 }
 
+namespace
+{
+
+template <typename T> 
+struct RubyCallArgs
+{
+    volatile VALUE val;
+    T ret;
+};
+
+//
+// Wrapper function to call rb_num2long with rb_protect
+//
+VALUE
+rb_num2long_wrapper(VALUE val)
+{
+    RubyCallArgs<long>* data = (RubyCallArgs<long>*)val;
+    data->ret = rb_num2long(data->val);
+    return val;
+}
+
+//
+// Wrapper function to call rb_num2ll with rb_protect
+//
+VALUE
+rb_num2ll_wrapper(VALUE val)
+{
+    RubyCallArgs<Ice::Long>* data = (RubyCallArgs<Ice::Long>*)val;
+    data->ret = rb_num2ll(data->val);
+    return val;
+}
+
+}
+
 long
 IceRuby::getInteger(VALUE val)
 {
-    if(!FIXNUM_P(val) && TYPE(val) != T_BIGNUM)
-    {
-        val = callRuby(rb_Integer, val);
-    }
-    if(FIXNUM_P(val))
-    {
-        return FIX2LONG(val);
-    }
-    else if(TYPE(val) == T_BIGNUM)
+    RubyCallArgs<long> arg= {val, -1};
+    int error = 0;
+    rb_protect(rb_num2long_wrapper, (VALUE)&arg, &error);
+    if(error)
     {
-        Ice::Long l = getLong(val);
-        if(l >= static_cast<Ice::Long>(INT_MIN) && l <= static_cast<Ice::Long>(INT_MAX))
-        {
-            return static_cast<long>(l);
-        }
+        throw RubyException(rb_eTypeError, "unable to convert value to an int");
     }
-    throw RubyException(rb_eTypeError, "unable to convert value to an integer");
+    return arg.ret;
 }
 
-#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
-#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
-
 Ice::Long
 IceRuby::getLong(VALUE val)
 {
-    //
-    // The rb_num2ll function raises exceptions, but we can't call it using callProtected
-    // because its return type is long long and not VALUE.
-    //
-    volatile VALUE v = callRuby(rb_Integer, val);
-    if(NIL_P(v))
+    RubyCallArgs<Ice::Long> arg= {val, -1};
+    int error = 0;
+    rb_protect(rb_num2ll_wrapper, (VALUE)&arg, &error);
+    if(error)
     {
         throw RubyException(rb_eTypeError, "unable to convert value to a long");
     }
-    if(FIXNUM_P(v))
-    {
-        return FIX2LONG(v);
-    }
-    else
-    {
-        assert(TYPE(v) == T_BIGNUM);
-        long len = RBIGNUM_LEN(v);
-        if(len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
-        {
-            throw RubyException(rb_eRangeError, "bignum too big to convert into long");
-        }
-        BDIGIT *ds = RBIGNUM_DIGITS(v);
-        BDIGIT_DBL num = 0;
-        while(len--)
-        {
-            num = BIGUP(num);
-            num += ds[len];
-        }
-        Ice::Long l = static_cast<Ice::Long>(num);
-        if(l < 0 && (RBIGNUM_SIGN(v) || l != LLONG_MIN))
-        {
-            throw RubyException(rb_eRangeError, "bignum too big to convert into long");
-        }
-        if (!RBIGNUM_SIGN(v))
-        {
-            return -l;
-        }
-        return l;
-    }
+    return arg.ret;
 }
 
 bool
@@ -752,7 +743,7 @@ setExceptionMembers(const Ice::LocalException& ex, VALUE p)
 VALUE
 IceRuby::createArrayHelper(long sz)
 {
-    VALUE arr = callRuby(rb_ary_new2, sz);
+    volatile VALUE arr = callRuby(rb_ary_new2, sz);
     if(sz > 0)
     {
         callRubyVoid(rb_ary_store, arr, sz - 1, Qnil);