oj 1.4.0 → 1.4.1

data/README.md

@@ -32,9 +32,9 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.4.0
+### Release 1.4.1
 
- - Parse errors now raise an Exception that inherites form Oj::Error which inherits from StandardError. Some other Exceptions were changed as well to make it easier to rescue errors.
+ - Windows RubyInstaller and TCS-Ruby now supported thanks to Jarmo Pertman. Thanks Jarmo.
 
 ## <a name="description">Description</a>
 

data/ext/oj/cache.c

@@ -51,7 +51,8 @@ oj_cache_new(Cache *cache) {
     }
     (*cache)->key = 0;
     (*cache)->value = Qundef;
-    bzero((*cache)->slots, sizeof((*cache)->slots));
+    //bzero((*cache)->slots, sizeof((*cache)->slots));
+    memset((*cache)->slots, 0, sizeof((*cache)->slots));
 }
 
 VALUE

data/ext/oj/dump.c

@@ -30,7 +30,9 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#if !IS_WINDOWS
 #include <sys/time.h>
+#endif
 #include <time.h>
 #include <stdio.h>
 #include <string.h>

data/ext/oj/extconf.rb

@@ -6,8 +6,9 @@ dir_config(extension_name)
 parts = RUBY_DESCRIPTION.split(' ')
 type = parts[0]
 type = 'ree' if 'ruby' == type && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
+platform = RUBY_PLATFORM
 version = RUBY_VERSION.split('.')
-puts ">>>>> Creating Makefile for #{type} version #{RUBY_VERSION} <<<<<"
+puts ">>>>> Creating Makefile for #{type} version #{RUBY_VERSION} on #{platform} <<<<<"
 
 dflags = {
   'RUBY_TYPE' => type,
@@ -20,12 +21,13 @@ dflags = {
   'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) &&
                              (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
   'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
-  'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
+  'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type || 'tcs-ruby' == type) ? 1 : 0,
   'HAS_IVAR_HELPERS' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_EXCEPTION_MAGIC' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 0 : 1,
   'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
-  'SAFE_CACHE' => nil,
+  'IS_WINDOWS' => ('i386-mingw32' == platform || 'tcs-ruby' == type) ? 1 : 0,
+  'SAFE_CACHE' => ('i386-mingw32' == platform || 'tcs-ruby' == type) ? 0 : 1,
 }
 # 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
@@ -35,6 +37,8 @@ if 'x86_64-linux' == RUBY_PLATFORM && '1.9.3' == RUBY_VERSION && '2011-10-30' ==
     dflags['NEEDS_STPCPY'] = nil if File.read('/etc/redhat-release').include?('CentOS release 5.4')
   rescue Exception => e
   end
+else
+  dflags['NEEDS_STPCPY'] = nil if 'i386-mingw32' == platform || 'tcs-ruby' == type
 end
 
 dflags.each do |k,v|

data/ext/oj/fast.c

@@ -28,7 +28,9 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/resource.h>
+#if !IS_WINDOWS
+#include <sys/resource.h>  // for getrlimit() on linux
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -479,7 +481,11 @@ static Leaf
 read_next(ParseInfo pi) {
     Leaf	leaf = 0;
 
+#if IS_WINDOWS
+    if ((uint64_t)(uint32_t)&leaf < pi->stack_min) {
+#else
     if ((uint64_t)&leaf < pi->stack_min) {
+#endif
 	rb_raise(rb_eSysStackError, "JSON is too deeply nested");
     }
     next_non_white(pi);	// skip white space
@@ -832,7 +838,6 @@ parse_json(VALUE clas, char *json, int given, int allocated) {
     VALUE		result = Qnil;
     Doc			doc;
     int			ex = 0;
-    struct rlimit	lim;
 
     if (given) {
 	doc = ALLOCA_N(struct _Doc, 1);
@@ -843,11 +848,19 @@ parse_json(VALUE clas, char *json, int given, int allocated) {
     pi.s = pi.str;
     doc_init(doc);
     pi.doc = doc;
-    if (0 == getrlimit(RLIMIT_STACK, &lim)) {
-	pi.stack_min = (uint64_t)&lim - (lim.rlim_cur / 4 * 3); // let 3/4ths of the stack be used only
-    } else {
-	pi.stack_min = 0; // indicates not to check stack limit
+#if IS_WINDOWS
+    pi.stack_min = (uint64_t)(uint32_t)&pi - (512 * 1024); // assume a 1M stack and give half to ruby
+#else
+    {
+	struct rlimit	lim;
+
+	if (0 == getrlimit(RLIMIT_STACK, &lim)) {
+	    pi.stack_min = (uint64_t)&pi - (lim.rlim_cur / 4 * 3); // let 3/4ths of the stack be used only
+	} else {
+	    pi.stack_min = 0; // indicates not to check stack limit
+	}
     }
+#endif
     // last arg is free func void* func(void*)
     doc->self = rb_data_object_alloc(clas, doc, 0, free_doc_cb);
     rb_gc_register_address(&doc->self);

data/ext/oj/load.c

@@ -28,10 +28,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
 #include <pthread.h>
 #endif
-#include <sys/resource.h>
+#if !IS_WINDOWS
+#include <sys/resource.h>  // for getrlimit() on linux
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -162,7 +164,7 @@ classname2class(const char *name, ParseInfo pi) {
     VALUE	*slot;
     int		auto_define = (Yes == pi->options->auto_define);
 
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
     pthread_mutex_lock(&oj_cache_mutex);
 #endif
     if (Qundef == (clas = oj_cache_get(oj_class_cache, name, &slot))) {
@@ -191,7 +193,7 @@ classname2class(const char *name, ParseInfo pi) {
 	    *slot = clas;
 	}
     }
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
     pthread_mutex_unlock(&oj_cache_mutex);
 #endif
     return clas;
@@ -321,7 +323,11 @@ static VALUE
 read_next(ParseInfo pi, int hint) {
     VALUE	obj;
 
+#if IS_WINDOWS
+    if ((uint64_t)(uint32_t)&obj < pi->stack_min) {
+#else
     if ((uint64_t)&obj < pi->stack_min) {
+#endif
 	rb_raise(rb_eSysStackError, "JSON is too deeply nested");
     }
     next_non_white(pi);	// skip white space
@@ -498,7 +504,7 @@ read_obj(ParseInfo pi) {
 		    VALUE	*slot;
 		    ID		var_id;
 
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
 		    pthread_mutex_lock(&oj_cache_mutex);
 #endif
 		    if (Qundef == (var_id = oj_cache_get(oj_attr_cache, ks, &slot))) {
@@ -514,7 +520,7 @@ read_obj(ParseInfo pi) {
 			var_id = rb_intern(attr);
 			*slot = var_id;
 		    }
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
 		    pthread_mutex_unlock(&oj_cache_mutex);
 #endif
 #if HAS_EXCEPTION_MAGIC
@@ -1003,7 +1009,6 @@ VALUE
 oj_parse(char *json, Options options) {
     VALUE		obj;
     struct _ParseInfo	pi;
-    struct rlimit	lim;
 
     if (0 == json) {
 	raise_error("Invalid arg, xml string can not be null", json, 0);
@@ -1016,11 +1021,19 @@ oj_parse(char *json, Options options) {
 	pi.circ_array = circ_array_new();
     }
     pi.options = options;
-    if (0 == getrlimit(RLIMIT_STACK, &lim)) {
-	pi.stack_min = (uint64_t)&lim - (lim.rlim_cur / 4 * 3); // let 3/4ths of the stack be used only
-    } else {
-	pi.stack_min = 0; // indicates not to check stack limit
+#if IS_WINDOWS
+    pi.stack_min = (uint64_t)(uint32_t)&obj - (512 * 1024); // assume a 1M stack and give half to ruby
+#else
+    {
+	struct rlimit	lim;
+
+	if (0 == getrlimit(RLIMIT_STACK, &lim)) {
+	    pi.stack_min = (uint64_t)&obj - (lim.rlim_cur / 4 * 3); // let 3/4ths of the stack be used only
+	} else {
+	    pi.stack_min = 0; // indicates not to check stack limit
+	}
     }
+#endif
     obj = read_next(&pi, 0);
     if (Yes == options->circular) {
 	circ_array_free(pi.circ_array);

data/ext/oj/oj.c

@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/uio.h>
 #include <unistd.h>
 
 #include "oj.h"
@@ -108,7 +107,7 @@ Cache	oj_attr_cache = 0;
 rb_encoding	*oj_utf8_encoding = 0;
 #endif
 
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
 pthread_mutex_t	oj_cache_mutex; // only used if SAFE_CACHE defined
 #endif
 static const char	json_class[] = "json_class";
@@ -386,6 +385,7 @@ load_with_opts(VALUE input, Options copts) {
 	    }
 	    strcpy(json, StringValuePtr(s));
 #ifndef JRUBY_RUBY
+#if !IS_WINDOWS
 	    // JRuby gets confused with what is the real fileno.
 	} else if (rb_respond_to(input, oj_fileno_id) && Qnil != (s = rb_funcall(input, oj_fileno_id, 0))) {
 	    int		fd = FIX2INT(s);
@@ -402,6 +402,7 @@ load_with_opts(VALUE input, Options copts) {
 		rb_raise(rb_eIOError, "failed to read from IO Object.");
 	    }
 	    json[len] = '\0';
+#endif
 #endif
 	} else if (rb_respond_to(input, oj_read_id)) {
 	    s = rb_funcall2(input, oj_read_id, 0, 0);
@@ -961,7 +962,7 @@ void Init_oj() {
     // The end. bump up the size of odds if a new class is added.
     odd->clas = Qundef;
 
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
     pthread_mutex_init(&oj_cache_mutex, 0);
 #endif
     oj_init_doc();

data/ext/oj/oj.h

@@ -46,7 +46,7 @@ extern "C" {
 #endif
 
 #include "stdint.h"
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
 #include <pthread.h>
 #endif
 #include "cache.h"
@@ -188,7 +188,7 @@ extern ID	oj_utc_offset_id;
 extern Cache	oj_class_cache;
 extern Cache	oj_attr_cache;
 
-#ifdef SAFE_CACHE
+#if SAFE_CACHE
 extern pthread_mutex_t	oj_cache_mutex;
 #endif
 #if defined(__cplusplus)

data/lib/oj/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com