msgpack 0.5.2 → 0.5.3

data/ChangeLog

@@ -1,4 +1,10 @@
 
+2012-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:
 
 * Fixed invalid pack/unpack on 32bit architecture such as Win32

data/ext/msgpack/buffer.c

@@ -72,7 +72,8 @@ static void _msgpack_buffer_chunk_destroy(msgpack_buffer_chunk_t* c)
             free(c->mem);
         }
         /* no needs to update rmem_owner because chunks will not be
-         * free()ed and thus *rmem_owner = NULL is always valid. */
+         * free()ed (left in free_list) and thus *rmem_owner is
+         * always valid. */
 #else
         free(c->mem);
 #endif
@@ -282,8 +283,8 @@ static inline void _msgpack_buffer_add_new_chunk(msgpack_buffer_t* b)
 
 #ifndef DISABLE_RMEM
 #ifndef DISABLE_RMEM_REUSE_INTERNAL_FRAGMENT
-        if(b->rmem_owner == &b->tail.mem) {
-            /* reuse unused rmem */
+        if(b->rmem_last == b->tail_buffer_end) {
+            /* reuse unused rmem space */
             size_t unused = b->tail_buffer_end - b->tail.last;
             b->rmem_last -= unused;
         }

data/ext/msgpack/rmem.c

@@ -76,7 +76,7 @@ void* _msgpack_rmem_alloc2(msgpack_rmem_t* pm)
     return pm->head.pages;
 }
 
-static inline void handle_empty_chunk(msgpack_rmem_t* pm, msgpack_rmem_chunk_t* c)
+void _msgpack_rmem_chunk_free(msgpack_rmem_t* pm, msgpack_rmem_chunk_t* c)
 {
     if(pm->array_first->mask == 0xffffffff) {
         /* free and move to last */
@@ -92,19 +92,3 @@ static inline void handle_empty_chunk(msgpack_rmem_t* pm, msgpack_rmem_chunk_t*
     *c = tmp;
 }
 
-bool _msgpack_rmem_free2(msgpack_rmem_t* pm, void* mem)
-{
-    /* search from last */
-    msgpack_rmem_chunk_t* c = pm->array_last - 1;
-    msgpack_rmem_chunk_t* before_first = pm->array_first - 1;
-    for(; c != before_first; c--) {
-        if(_msgpack_rmem_chunk_try_free(c, mem)) {
-            if(c != pm->array_first && c->mask == 0xffffffff) {
-                handle_empty_chunk(pm, c);
-            }
-            return true;
-        }
-    }
-    return false;
-}
-

data/ext/msgpack/rmem.h

@@ -82,17 +82,26 @@ static inline void* msgpack_rmem_alloc(msgpack_rmem_t* pm)
     return _msgpack_rmem_alloc2(pm);
 }
 
-bool _msgpack_rmem_free2(msgpack_rmem_t* pm, void* mem);
+void _msgpack_rmem_chunk_free(msgpack_rmem_t* pm, msgpack_rmem_chunk_t* c);
 
 static inline bool msgpack_rmem_free(msgpack_rmem_t* pm, void* mem)
 {
     if(_msgpack_rmem_chunk_try_free(&pm->head, mem)) {
         return true;
     }
-    if(pm->array_last == pm->array_end) {
-        return false;
+
+    /* search from last */
+    msgpack_rmem_chunk_t* c = pm->array_last - 1;
+    msgpack_rmem_chunk_t* before_first = pm->array_first - 1;
+    for(; c != before_first; c--) {
+        if(_msgpack_rmem_chunk_try_free(c, mem)) {
+            if(c != pm->array_first && c->mask == 0xffffffff) {
+                _msgpack_rmem_chunk_free(pm, c);
+            }
+            return true;
+        }
     }
-    return _msgpack_rmem_free2(pm, mem);
+    return false;
 }
 
 

data/lib/msgpack/version.rb

@@ -1,3 +1,3 @@
 module MessagePack
-	VERSION = "0.5.2"
+	VERSION = "0.5.3"
 end

data/spec/buffer_io_spec.rb

@@ -210,7 +210,7 @@ describe Buffer do
     }
   end
 
-  it 'random write' do
+  it 'random write and flush' do
     r = Random.new(random_seed)
 
     50.times {
@@ -233,5 +233,24 @@ describe Buffer do
       io.string.should == s
     }
   end
+
+  it 'random write and clear' do
+    r = Random.new(random_seed)
+    b = Buffer.new
+
+    50.times {
+      s = r.bytes(0)
+
+      r.rand(4).times do
+        n = r.rand(1024*1400)
+        x = r.bytes(n)
+        s << x
+        b.write(x)
+      end
+
+      b.size.should == s.size
+      b.clear
+    }
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msgpack
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler