oj 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2acd85015af30a88c50ae38253f4595c701a6e6e
-  data.tar.gz: 226adba1e99b118b6c3fd6e3a1d4663a9168c94c
+  metadata.gz: 964ef71e46a6e9c4fb8c734c520e81030a2c76e8
+  data.tar.gz: 31d2779214092e6b11ccdbfa5047abdb96dd0b31
 SHA512:
-  metadata.gz: d13abbe27c0f818011a68e456d88cedb0b648641f543aa09eab20f9a43fdfd368899b51d99c732eb23ab1b405285a0f68203bd85e705f1fbbbf5d3e2c03e9bac
-  data.tar.gz: 526a83f70809d99e54ce21c0f1905cf0a19ceb35216aad41aa4138071af8e611f2c744ce8b4fbb22f20113b46db90d8bca57ded64a10da0729112c6812fadb22
+  metadata.gz: aa82d27d48917343e1d1737804a84bcf578a47f2b1eef6f05fe59e2a68a1c95ebddf7307fc52dd59224f650c04245cbf98df9ab132d7562506bcc563a06becc0
+  data.tar.gz: dd0354a15f36b3f9337376832df8f051addfa1240eaaeba452c9d0a99a81f77c415e89ef4a1e6e677edde321384b1bd68127fa964e846f07b2e76ff7e185547c

data/README.md

@@ -20,6 +20,10 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
+### Current Release 2.2.1
+
+ - Made all VALUEs in parse volatile to avoid garbage collection while in use.
+
 ### Current Release 2.2.0
 
  - All 1.8.x versions of Ruby now have require 'rational' called.

data/ext/oj/compat.c

@@ -52,8 +52,8 @@ hash_set_cstr(ParseInfo pi, const char *key, size_t klen, const char *str, size_
 	}
 	parent->clen = len;
     } else {
-	VALUE	rstr = rb_str_new(str, len);
-	VALUE	rkey = rb_str_new(key, klen);
+	volatile VALUE	rstr = rb_str_new(str, len);
+	volatile VALUE	rkey = rb_str_new(key, klen);
 
 	rstr = oj_encode(rstr);
 	rkey = oj_encode(rkey);

data/ext/oj/object.c

@@ -180,14 +180,14 @@ hat_num(ParseInfo pi, Val parent, const char *key, size_t klen, NumInfo ni) {
 }
 
 static int
-hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, VALUE value) {
+hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, volatile VALUE value) {
     if (2 == klen && 'u' == key[1] && T_ARRAY == rb_type(value)) {
 #if HAS_RSTRUCT
-	long		len = RARRAY_LEN(value);
-	VALUE		*a = RARRAY_PTR(value);
-	VALUE		sc;
-	volatile VALUE	s;
-	VALUE		*sv;
+	long			len = RARRAY_LEN(value);
+	volatile VALUE		*a = RARRAY_PTR(value);
+	volatile VALUE		sc;
+	volatile VALUE		s;
+	volatile VALUE		*sv;
 
 	if (0 == len) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "Invalid struct data");
@@ -215,8 +215,8 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, VALUE value) {
 #endif
 	return 1;
     } else if (3 <= klen && '#' == key[1] && T_ARRAY == rb_type(value)) {
-	long	len = RARRAY_LEN(value);
-	VALUE	*a = RARRAY_PTR(value);
+	long		len = RARRAY_LEN(value);
+	volatile VALUE	*a = RARRAY_PTR(value);
 	
 	if (2 != len) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "invalid hash pair");
@@ -232,7 +232,7 @@ hat_value(ParseInfo pi, Val parent, const char *key, size_t klen, VALUE value) {
 static void
 copy_ivars(VALUE target, VALUE src) {
     volatile VALUE	vars = rb_funcall(src, oj_instance_variables_id, 0);
-    VALUE		*np = RARRAY_PTR(vars);
+    volatile VALUE	*np = RARRAY_PTR(vars);
     ID			vid;
     int			i, cnt = (int)RARRAY_LEN(vars);
     const char		*attr;

data/ext/oj/parse.c

@@ -520,14 +520,14 @@ array_end(ParseInfo pi) {
 
 static void
 hash_start(ParseInfo pi) {
-    VALUE	v = pi->start_hash(pi);
+    volatile VALUE	v = pi->start_hash(pi);
 
     stack_push(&pi->stack, v, NEXT_HASH_NEW);
 }
 
 static void
 hash_end(ParseInfo pi) {
-    Val	hash = stack_peek(&pi->stack);
+    volatile Val	hash = stack_peek(&pi->stack);
 
     // leave hash on stack until just before 
     if (0 == hash) {
@@ -647,7 +647,7 @@ oj_parse2(ParseInfo pi) {
 
 VALUE
 oj_num_as_value(NumInfo ni) {
-    VALUE	rnum = Qnil;
+    volatile VALUE	rnum = Qnil;
 
     if (ni->infinity) {
 	if (ni->neg) {
@@ -720,7 +720,7 @@ protect_parse(VALUE pip) {
 VALUE
 oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
     char		*buf = 0;
-    VALUE		input;
+    volatile VALUE	input;
     volatile VALUE	result = Qnil;
     int			line = 0;
     int			free_json = 0;
@@ -737,14 +737,14 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
 	pi->json = json;
 	free_json = 1;
     } else if (rb_type(input) == T_STRING) {
-	pi->json = StringValuePtr(input);
+	pi->json = rb_string_value_cstr((VALUE*)&input);
     } else {
-	VALUE	clas = rb_obj_class(input);
-	VALUE	s;
+	VALUE		clas = rb_obj_class(input);
+	volatile VALUE	s;
 
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
-	    pi->json = StringValuePtr(s);
+	    pi->json = rb_string_value_cstr((VALUE*)&s);
 #ifndef JRUBY_RUBY
 #if !IS_WINDOWS
 	    // JRuby gets confused with what is the real fileno.
@@ -771,7 +771,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
 #endif
 	} else if (rb_respond_to(input, oj_read_id)) {
 	    s = rb_funcall2(input, oj_read_id, 0, 0);
-	    pi->json = StringValuePtr(s);
+	    pi->json = rb_string_value_cstr((VALUE*)&s);
 	} else {
 	    rb_raise(rb_eArgError, "strict_parse() expected a String or IO Object.");
 	}

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/test/lots.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
+# required. That can be set in the RUBYOPT environment variable.
+# export RUBYOPT=-w
+
+$VERBOSE = true
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+
+module One
+  module Two
+    module Three
+      class Empty
+
+        def initialize()
+        end
+
+        def eql?(o)
+          self.class == o.class
+        end
+        alias == eql?
+
+        def to_hash()
+          {'json_class' => "#{self.class.name}"}
+        end
+
+        def to_json(*a)
+          %{{"json_class":"#{self.class.name}"}}
+        end
+
+        def self.json_create(h)
+          self.new()
+        end
+      end # Empty
+    end # Three
+  end # Two
+end # One
+
+$obj = {
+  'a' => 'Alpha', # string
+  'b' => true,    # boolean
+  'c' => 12345,   # number
+  'd' => [ true, [false, [-123456789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
+  'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
+  'f' => nil,     # nil
+  'g' => One::Two::Three::Empty.new(),
+  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
+  'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
+}
+
+Oj.default_options = { :indent => 2, :mode => :compat }
+
+$json = Oj.dump($obj, :mode => :compat)
+
+1000000.times { |i|
+  print(".") if (0 == i % 10000)
+  Oj.compat_load($json)
+}
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -59,6 +59,7 @@ files:
 - test/e.rb
 - test/files.rb
 - test/foo.rb
+- test/lots.rb
 - test/mj.rb
 - test/perf.rb
 - test/perf_compat.rb