oj 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 964ef71e46a6e9c4fb8c734c520e81030a2c76e8
-  data.tar.gz: 31d2779214092e6b11ccdbfa5047abdb96dd0b31
+  metadata.gz: 01dd99731dba1d9feeffe3135e41b282718c6342
+  data.tar.gz: 0c635bcad7be8c0a8b86a074dc2cc42946a4938a
 SHA512:
-  metadata.gz: aa82d27d48917343e1d1737804a84bcf578a47f2b1eef6f05fe59e2a68a1c95ebddf7307fc52dd59224f650c04245cbf98df9ab132d7562506bcc563a06becc0
-  data.tar.gz: dd0354a15f36b3f9337376832df8f051addfa1240eaaeba452c9d0a99a81f77c415e89ef4a1e6e677edde321384b1bd68127fa964e846f07b2e76ff7e185547c
+  metadata.gz: 9cabf96957642d870530a33ed6b4236505d6e67e06d6cddbb7f2b29e2dcc567a12b844a5fe7abe317bb0f3a65cccadf81240c8af23aa4ff7c45363c744bfc045
+  data.tar.gz: 2e2b979fbe2a517b04bca9eb3144b9c3edfeccfd33a3849b4d175a882036b3dff2631de3c888fa608fdbc13a1f3e3b97cbd71fef3f5b87d3ac27074d70606109

data/README.md

@@ -20,6 +20,12 @@ 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.2
+
+ - Added mutex support for Windows.
+
+ - Protected SCP parser for GC.
+
 ### Current Release 2.2.1
 
  - Made all VALUEs in parse volatile to avoid garbage collection while in use.

data/ext/oj/extconf.rb

@@ -31,7 +31,8 @@ dflags = {
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
   'NEEDS_RATIONAL' => ('1' == version[0] && '8' == version[1]) ? 1 : 0,
   'IS_WINDOWS' => is_windows ? 1 : 0,
-  'SAFE_CACHE' => is_windows ? 0 : 1,
+  'USE_PTHREAD_MUTEX' => is_windows ? 0 : 1,
+  'USE_RB_MUTEX' => (is_windows && !('1' == version[0] && '8' == version[1])) ? 1 : 0,
 }
 # This is a monster hack to get around issues with 1.9.3-p0 on CentOS 5.4. SO
 # some reason math.h and string.h contents are not processed. Might be a

data/ext/oj/object.c

@@ -263,8 +263,10 @@ set_obj_ivar(Val parent, const char *key, size_t klen, VALUE value) {
 	    rb_funcall(parent->val, rb_intern("set_backtrace"), 1, value);
 	}
     }
-#if SAFE_CACHE
+#if USE_PTHREAD_MUTEX
     pthread_mutex_lock(&oj_cache_mutex);
+#elif USE_RB_MUTEX
+    rb_mutex_lock(oj_cache_mutex);
 #endif
     if (0 == (var_id = oj_attr_hash_get(key, klen, &slot))) {
 	char	attr[256];
@@ -295,8 +297,10 @@ set_obj_ivar(Val parent, const char *key, size_t klen, VALUE value) {
 	}
 	*slot = var_id;
     }
-#if SAFE_CACHE
+#if USE_PTHREAD_MUTEX
     pthread_mutex_unlock(&oj_cache_mutex);
+#elif USE_RB_MUTEX
+    rb_mutex_unlock(oj_cache_mutex);
 #endif
     rb_ivar_set(parent->val, var_id, value);
 }

data/ext/oj/oj.c

@@ -129,8 +129,10 @@ rb_encoding	*oj_utf8_encoding = 0;
 VALUE		oj_utf8_encoding = Qnil;
 #endif
 
-#if SAFE_CACHE
-pthread_mutex_t	oj_cache_mutex; // only used if SAFE_CACHE defined
+#if USE_PTHREAD_MUTEX
+pthread_mutex_t	oj_cache_mutex;
+#elif USE_RB_MUTEX
+VALUE oj_cache_mutex = Qnil;
 #endif
 static const char	json_class[] = "json_class";
 
@@ -1269,8 +1271,11 @@ void Init_oj() {
     oj_hash_init();
     oj_odd_init();
 
-#if SAFE_CACHE
+#if USE_PTHREAD_MUTEX
     pthread_mutex_init(&oj_cache_mutex, 0);
+#elif USE_RB_MUTEX
+    oj_cache_mutex = rb_mutex_new();
+    rb_gc_register_address(&oj_cache_mutex);
 #endif
     oj_init_doc();
 }

data/ext/oj/oj.h

@@ -46,7 +46,8 @@ extern "C" {
 #endif
 
 #include "stdint.h"
-#if SAFE_CACHE
+
+#if USE_PTHREAD_MUTEX
 #include <pthread.h>
 #endif
 #include "cache8.h"
@@ -224,9 +225,12 @@ extern ID	oj_tv_usec_id;
 extern ID	oj_utc_offset_id;
 extern ID	oj_write_id;
 
-#if SAFE_CACHE
+#if USE_PTHREAD_MUTEX
 extern pthread_mutex_t	oj_cache_mutex;
+#elif USE_RB_MUTEX
+extern VALUE	oj_cache_mutex;
 #endif
+
 #if defined(__cplusplus)
 #if 0
 { /* satisfy cc-mode */

data/ext/oj/parse.c

@@ -569,11 +569,8 @@ colon(ParseInfo pi) {
 
 void
 oj_parse2(ParseInfo pi) {
-    volatile VALUE	rstack = Qnil;
-
     pi->cur = pi->json;
     err_init(&pi->err);
-    rstack = oj_stack_init(&pi->stack);
     while (1) {
 	next_non_white(pi);
 	switch (*pi->cur++) {
@@ -647,7 +644,7 @@ oj_parse2(ParseInfo pi) {
 
 VALUE
 oj_num_as_value(NumInfo ni) {
-    volatile VALUE	rnum = Qnil;
+    VALUE	rnum = Qnil;
 
     if (ni->infinity) {
 	if (ni->neg) {
@@ -721,7 +718,8 @@ VALUE
 oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
     char		*buf = 0;
     volatile VALUE	input;
-    volatile VALUE	result = Qnil;
+    volatile VALUE	wrapped_stack;
+    VALUE		result = Qnil;
     int			line = 0;
     int			free_json = 0;
 
@@ -782,10 +780,14 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json) {
 	pi->circ_array = 0;
     }
     // GC can run at any time. When it runs any Object created by C will be
-    // freed. This usually only happens with large files but it does happen and
-    // it happens more frequently on Ruby 1.8.7.
+    // freed. We protect against this by wrapping the value stack in a ruby
+    // data object and poviding a mark function for ruby objects on the
+    // value stack (while it is in scope).
+    wrapped_stack = oj_stack_init(&pi->stack);
     rb_protect(protect_parse, (VALUE)pi, &line);
     result = stack_head_val(&pi->stack);
+    DATA_PTR(wrapped_stack) = 0;
+
     // proceed with cleanup
     if (0 != pi->circ_array) {
 	oj_circ_array_free(pi->circ_array);

data/ext/oj/resolve.c

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#if SAFE_CACHE
+#if USE_PTHREAD_MUTEX
 #include <pthread.h>
 #endif
 
@@ -102,16 +102,20 @@ oj_name2class(ParseInfo pi, const char *name, size_t len, int auto_define) {
     if (No == pi->options.class_cache) {
 	return resolve_classpath(pi, name, len, auto_define);
     }
-#if SAFE_CACHE
+#if USE_PTHREAD_MUTEX
     pthread_mutex_lock(&oj_cache_mutex);
+#elif USE_RB_MUTEX
+    rb_mutex_lock(oj_cache_mutex);
 #endif
     if (Qnil == (clas = oj_class_hash_get(name, len, &slot))) {
 	if (Qundef != (clas = resolve_classpath(pi, name, len, auto_define))) {
 	    *slot = clas;
 	}
     }
-#if SAFE_CACHE
+#if USE_PTHREAD_MUTEX
     pthread_mutex_unlock(&oj_cache_mutex);
+#elif USE_RB_MUTEX
+    rb_mutex_unlock(oj_cache_mutex);
 #endif
     return clas;
 }

data/ext/oj/scp.c

@@ -198,6 +198,7 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
     char		*buf = 0;
     VALUE		input;
     VALUE		handler;
+    volatile VALUE	wrapped_stack;
     int			line = 0;
 
     if (argc < 2) {
@@ -252,8 +253,8 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
     if (rb_type(input) == T_STRING) {
 	pi.json = StringValuePtr(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);
@@ -285,8 +286,9 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 	    rb_raise(rb_eArgError, "saj_parse() expected a String or IO Object.");
 	}
     }
+    wrapped_stack = oj_stack_init(&pi.stack);
     rb_protect(protect_parse, (VALUE)&pi, &line);
-    //oj_parse2(&pi);
+    DATA_PTR(wrapped_stack) = NULL;
     if (0 != buf) {
 	xfree(buf);
     }

data/ext/oj/val_stack.c

@@ -36,18 +36,33 @@ mark(void *ptr) {
     ValStack	stack = (ValStack)ptr;
     Val		v;
 
+    if (ptr == NULL) return;
+
+#if USE_PTHREAD_MUTEX
     pthread_mutex_lock(&stack->mutex);
+#elif USE_RB_MUTEX
+    rb_mutex_lock(stack->mutex);
+    rb_gc_mark(stack->mutex);
+#endif
     for (v = stack->head; v < stack->tail; v++) {
 	if (Qnil != v->val && Qundef != v->val) {
 	    rb_gc_mark(v->val);
 	}
     }
+#if USE_PTHREAD_MUTEX
     pthread_mutex_unlock(&stack->mutex);
+#elif USE_RB_MUTEX
+    rb_mutex_unlock(stack->mutex);
+#endif
 }
 
 VALUE
 oj_stack_init(ValStack stack) {
+#if USE_PTHREAD_MUTEX
     pthread_mutex_init(&stack->mutex, 0);
+#elif USE_RB_MUTEX
+    stack->mutex = rb_mutex_new();
+#endif
     stack->head = stack->base;
     stack->end = stack->base + sizeof(stack->base) / sizeof(struct _Val);
     stack->tail = stack->head;

data/ext/oj/val_stack.h

@@ -68,7 +68,13 @@ typedef struct _ValStack {
     Val			head;	// current stack
     Val			end;	// stack end
     Val			tail;	// pointer to one past last element name on stack
+
+#if USE_PTHREAD_MUTEX
     pthread_mutex_t	mutex;
+#elif USE_RB_MUTEX
+    VALUE		mutex;
+#endif
+
 } *ValStack;
 
 extern VALUE	oj_stack_init(ValStack stack);
@@ -100,11 +106,19 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	} else {
 	    REALLOC_N(head, struct _Val, len + STACK_INC);
 	}
+#if USE_PTHREAD_MUTEX
 	pthread_mutex_lock(&stack->mutex);
+#elif USE_RB_MUTEX
+	rb_mutex_lock(stack->mutex);
+#endif
 	stack->head = head;
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;
+#if USE_PTHREAD_MUTEX
 	pthread_mutex_unlock(&stack->mutex);
+#elif USE_RB_MUTEX
+	rb_mutex_unlock(stack->mutex);
+#endif
     }
     stack->tail->val = val;
     stack->tail->next = next;

data/lib/oj/version.rb

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

data/test/lots.rb

@@ -53,13 +53,16 @@ $obj = {
   'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
 }
 
+$obj = [$obj]*10000
+
 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)
+$result = nil
+100.times { |i|
+  print(".") if (0 == i % 10)
+  $result = Oj.compat_load($json)
 }
 
 

data/test/test_scp.rb

@@ -217,7 +217,7 @@ class ScpTest < ::Test::Unit::TestCase
     begin
       Oj.sc_parse(handler, json)
     rescue Exception => e
-      assert_equal("unexpected character at line 1, column 6 [parse.c:639]", e.message)
+      assert_equal("unexpected character at line 1, column 6 [parse.c:636]", e.message)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com