msgpack 0.5.4 → 0.5.5

data/ChangeLog

@@ -1,16 +1,23 @@
 
-2012-03-15 version 0.5.4:
+2013-05-12 version 0.5.5:
+
+* Fixed SEGV problem in to_msgpack
+* Fixed a possible race condition in MessagePack.load when it loads data from IO
+* mingw32 package includes binary for ruby-2.0.0
+
+
+2013-03-15 version 0.5.4:
 
 * Added missing MessagePack::Unpacker#reset method
 
 
-2012-02-14 version 0.5.3:
+2013-02-14 version 0.5.3:
 
 * Fixed segfault problem on Buffer#clear (reuse rmem internal fragment optimization)
 * Fixed segfault problem on Buffer (rmem free code)
 
 
-2012-02-07 version 0.5.2:
+2013-02-07 version 0.5.2:
 
 * Fixed invalid pack/unpack on 32bit architecture such as Win32
 * Disable rmem on Rubinius because rmem is not thread safe

data/Rakefile

@@ -70,6 +70,11 @@ task :default => :build
 # echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
 # exec $SHELL -l
 #
+### install cross-compiled ruby 2.0.0
+# rbenv install 2.0.0-p0
+# gem install rake-compiler
+# rake-compiler cross-ruby VERSION=2.0.0-p0
+#
 ### install cross-compiled ruby 1.9.3
 # rbenv install 1.9.3-p327
 # gem install rake-compiler
@@ -83,6 +88,6 @@ task :default => :build
 ### build gem
 # rbenv shell 1.8.7-p371
 # gem install bundler && bundle
-# rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3
+# rake cross native gem RUBY_CC_VERSION=1.8.7:1.9.3:2.0.0
 #
 

data/doclib/msgpack/packer.rb

@@ -24,7 +24,7 @@ module MessagePack
     #
     # Internal buffer
     #
-    # @return MessagePack::Unpacker
+    # @return MessagePack::Buffer
     #
     attr_reader :buffer
 
@@ -54,7 +54,7 @@ module MessagePack
     #
     # @return [Packer] self
     #
-    def write_array_header(size)
+    def write_array_header(n)
     end
 
     #
@@ -63,12 +63,12 @@ module MessagePack
     #
     # @return [Packer] self
     #
-    def write_map_header(size)
+    def write_map_header(n)
     end
 
     #
     # Flushes data in the internal buffer to the internal IO. Same as _buffer.flush.
-    # If internal IO is not set, it doesn nothing.
+    # If internal IO is not set, it does nothing.
     #
     # @return [Packer] self
     #
@@ -108,6 +108,8 @@ module MessagePack
     def to_str
     end
 
+    alias to_s to_str
+
     #
     # Returns content of the internal buffer as an array of strings. Same as buffer.to_a.
     # This method is faster than _to_str_.

data/doclib/msgpack/unpacker.rb

@@ -25,7 +25,7 @@ module MessagePack
     #
     # Internal buffer
     #
-    # @return [MessagePack::Unpacker]
+    # @return [MessagePack::Buffer]
     #
     attr_reader :buffer
 

data/ext/msgpack/packer_class.c

@@ -230,6 +230,13 @@ VALUE MessagePack_pack(int argc, VALUE* argv)
     }
 
     msgpack_buffer_clear(PACKER_BUFFER_(pk)); /* to free rmem before GC */
+
+#ifdef RB_GC_GUARD
+    /* This prevents compilers from optimizing out the `self` variable
+     * from stack. Otherwise GC free()s it. */
+    RB_GC_GUARD(self);
+#endif
+
     return retval;
 }
 

data/ext/msgpack/unpacker.c

@@ -17,6 +17,16 @@
  */
 
 #include "unpacker.h"
+#include "rmem.h"
+
+#if !defined(DISABLE_RMEM) && !defined(DISABLE_UNPACKER_STACK_RMEM) && \
+        MSGPACK_UNPACKER_STACK_CAPACITY * MSGPACK_UNPACKER_STACK_SIZE <= MSGPACK_RMEM_PAGE_SIZE
+#define UNPACKER_STACK_RMEM
+#endif
+
+#ifdef UNPACKER_STACK_RMEM
+static msgpack_rmem_t s_stack_rmem;
+#endif
 
 #ifdef COMPAT_HAVE_ENCODING  /* see compat.h*/
 static int s_enc_utf8;
@@ -24,13 +34,21 @@ static int s_enc_utf8;
 
 void msgpack_unpacker_static_init()
 {
+#ifdef UNPACKER_STACK_RMEM
+    msgpack_rmem_init(&s_stack_rmem);
+#endif
+
 #ifdef COMPAT_HAVE_ENCODING
     s_enc_utf8 = rb_utf8_encindex();
 #endif
 }
 
 void msgpack_unpacker_static_destroy()
-{ }
+{
+#ifdef UNPACKER_STACK_RMEM
+    msgpack_rmem_destroy(&s_stack_rmem);
+#endif
+}
 
 #define HEAD_BYTE_REQUIRED 0xc6
 
@@ -45,13 +63,24 @@ void msgpack_unpacker_init(msgpack_unpacker_t* uk)
     uk->last_object = Qnil;
     uk->reading_raw = Qnil;
 
-    uk->stack = calloc(MSGPACK_UNPACKER_STACK_CAPACITY, sizeof(msgpack_unpacker_stack_t));
+#ifdef UNPACKER_STACK_RMEM
+    uk->stack = msgpack_rmem_alloc(&s_stack_rmem);
+    /*memset(uk->stack, 0, MSGPACK_UNPACKER_STACK_CAPACITY);*/
+#else
+    /*uk->stack = calloc(MSGPACK_UNPACKER_STACK_CAPACITY, sizeof(msgpack_unpacker_stack_t));*/
+    uk->stack = malloc(MSGPACK_UNPACKER_STACK_CAPACITY * sizeof(msgpack_unpacker_stack_t));
+#endif
     uk->stack_capacity = MSGPACK_UNPACKER_STACK_CAPACITY;
 }
 
 void msgpack_unpacker_destroy(msgpack_unpacker_t* uk)
 {
+#ifdef UNPACKER_STACK_RMEM
+    msgpack_rmem_free(&s_stack_rmem, uk->stack);
+#else
     free(uk->stack);
+#endif
+
     msgpack_buffer_destroy(UNPACKER_BUFFER_(uk));
 }
 
@@ -78,7 +107,7 @@ void msgpack_unpacker_reset(msgpack_unpacker_t* uk)
 
     uk->head_byte = HEAD_BYTE_REQUIRED;
 
-    memset(uk->stack, 0, sizeof(msgpack_unpacker_t) * uk->stack_depth);
+    /*memset(uk->stack, 0, sizeof(msgpack_unpacker_t) * uk->stack_depth);*/
     uk->stack_depth = 0;
 
     uk->last_object = Qnil;

data/ext/msgpack/unpacker.h

@@ -40,6 +40,8 @@ typedef struct {
     VALUE key;
 } msgpack_unpacker_stack_t;
 
+#define MSGPACK_UNPACKER_STACK_SIZE (8+4+8+8)  /* assumes size_t <= 64bit, enum <= 32bit, VALUE <= 64bit */
+
 struct msgpack_unpacker_t {
     msgpack_buffer_t buffer;
 

data/ext/msgpack/unpacker_class.c

@@ -22,8 +22,8 @@
 
 VALUE cMessagePack_Unpacker;
 
-static VALUE s_unpacker_value;
-static msgpack_unpacker_t* s_unpacker;
+//static VALUE s_unpacker_value;
+//static msgpack_unpacker_t* s_unpacker;
 
 static VALUE eUnpackError;
 static VALUE eMalformedFormatError;
@@ -303,32 +303,40 @@ VALUE MessagePack_unpack(int argc, VALUE* argv)
         src = Qnil;
     }
 
-    // TODO create an instance if io is set for thread safety?
-    //VALUE self = Unpacker_alloc(cMessagePack_Unpacker);
-    //UNPACKER(self, uk);
-    msgpack_unpacker_reset(s_unpacker);
-    msgpack_buffer_reset_io(UNPACKER_BUFFER_(s_unpacker));
+    VALUE self = Unpacker_alloc(cMessagePack_Unpacker);
+    UNPACKER(self, uk);
+    //msgpack_unpacker_reset(s_unpacker);
+    //msgpack_buffer_reset_io(UNPACKER_BUFFER_(s_unpacker));
+
+    /* prefer reference than copying */
+    msgpack_buffer_set_write_reference_threshold(UNPACKER_BUFFER_(uk), 0);
 
     if(io != Qnil) {
-        MessagePack_Buffer_initialize(UNPACKER_BUFFER_(s_unpacker), io, Qnil);
+        MessagePack_Buffer_initialize(UNPACKER_BUFFER_(uk), io, Qnil);
     }
 
     if(src != Qnil) {
         /* prefer reference than copying; see MessagePack_Unpacker_module_init */
-        msgpack_buffer_append_string(UNPACKER_BUFFER_(s_unpacker), src);
+        msgpack_buffer_append_string(UNPACKER_BUFFER_(uk), src);
     }
 
-    int r = msgpack_unpacker_read(s_unpacker, 0);
+    int r = msgpack_unpacker_read(uk, 0);
     if(r < 0) {
         raise_unpacker_error(r);
     }
 
     /* raise if extra bytes follow */
-    if(msgpack_buffer_top_readable_size(UNPACKER_BUFFER_(s_unpacker)) > 0) {
+    if(msgpack_buffer_top_readable_size(UNPACKER_BUFFER_(uk)) > 0) {
         rb_raise(eMalformedFormatError, "extra bytes follow after a deserialized object");
     }
 
-    return msgpack_unpacker_get_last_object(s_unpacker);
+#ifdef RB_GC_GUARD
+    /* This prevents compilers from optimizing out the `self` variable
+     * from stack. Otherwise GC free()s it. */
+    RB_GC_GUARD(self);
+#endif
+
+    return msgpack_unpacker_get_last_object(uk);
 }
 
 static VALUE MessagePack_load_module_method(int argc, VALUE* argv, VALUE mod)
@@ -373,11 +381,11 @@ void MessagePack_Unpacker_module_init(VALUE mMessagePack)
     rb_define_method(cMessagePack_Unpacker, "feed_each", Unpacker_feed_each, 1);
     rb_define_method(cMessagePack_Unpacker, "reset", Unpacker_reset, 0);
 
-    s_unpacker_value = Unpacker_alloc(cMessagePack_Unpacker);
-    rb_gc_register_address(&s_unpacker_value);
-    Data_Get_Struct(s_unpacker_value, msgpack_unpacker_t, s_unpacker);
+    //s_unpacker_value = Unpacker_alloc(cMessagePack_Unpacker);
+    //rb_gc_register_address(&s_unpacker_value);
+    //Data_Get_Struct(s_unpacker_value, msgpack_unpacker_t, s_unpacker);
     /* prefer reference than copying */
-    msgpack_buffer_set_write_reference_threshold(UNPACKER_BUFFER_(s_unpacker), 0);
+    //msgpack_buffer_set_write_reference_threshold(UNPACKER_BUFFER_(s_unpacker), 0);
 
     /* MessagePack.unpack(x) */
     rb_define_module_function(mMessagePack, "load", MessagePack_load_module_method, -1);

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.5.4"
+	VERSION = "0.5.5"
 end

data/msgpack.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler', ['~> 1.0']
   s.add_development_dependency 'rake', ['~> 0.9.2']
-  s.add_development_dependency 'rake-compiler', ['~> 0.8.1']
+  s.add_development_dependency 'rake-compiler', ['~> 0.8.3']
   s.add_development_dependency 'rspec', ['~> 2.11']
   s.add_development_dependency 'json', ['~> 1.7']
   s.add_development_dependency 'yard', ['~> 0.8.2']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement