oj 3.7.4 → 3.11.2

data/ext/oj/encode.h

@@ -1,43 +1,17 @@
-/* encode.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_ENCODE_H__
-#define __OJ_ENCODE_H__
+#ifndef OJ_ENCODE_H
+#define OJ_ENCODE_H
 
 #include "ruby.h"
 #include "ruby/encoding.h"
 
+#include "oj.h"
+
 static inline VALUE
 oj_encode(VALUE rstr) {
     rb_enc_associate(rstr, oj_utf8_encoding);
     return rstr;
 }
 
-#endif /* __OJ_ENCODE_H__ */
+#endif /* OJ_ENCODE_H */

data/ext/oj/err.c

@@ -1,7 +1,4 @@
-/* err.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #include <stdarg.h>
 
@@ -40,7 +37,7 @@ _oj_err_set_with_location(Err err, VALUE eclas, const char *msg, const char *jso
 
 void
 _oj_raise_error(const char *msg, const char *json, const char *current, const char* file, int line) {
-    struct _Err	err;
+    struct _err	err;
     int		n = 1;
     int		col = 1;
 

data/ext/oj/err.h

@@ -1,35 +1,7 @@
-/* err.h
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
-#ifndef __OJ_ERR_H__
-#define __OJ_ERR_H__
+#ifndef OJ_ERR_H
+#define OJ_ERR_H
 
 #include "ruby.h"
 // Needed to silence 2.4.0 warnings.
@@ -37,9 +9,9 @@
 # define NORETURN(x) x
 #endif
 
-#define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, __FILE__, __LINE__)
+#define set_error(err, eclas, msg, json, current) _oj_err_set_with_location(err, eclas, msg, json, current, FILE, LINE)
 
-typedef struct _Err {
+typedef struct _err {
     VALUE	clas;
     char	msg[128];
 } *Err;
@@ -67,4 +39,4 @@ err_has(Err e) {
     return (Qnil != e->clas);
 }
 
-#endif /* __OJ_ERR_H__ */
+#endif /* OJ_ERR_H */

data/ext/oj/extconf.rb

@@ -28,6 +28,7 @@ have_func('rb_ivar_count')
 have_func('rb_ivar_foreach')
 have_func('stpcpy')
 have_func('rb_data_object_wrap')
+have_func('pthread_mutex_init')
 
 dflags['OJ_DEBUG'] = true unless ENV['OJ_DEBUG'].nil?
 
@@ -41,6 +42,11 @@ end
 
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
+# Adding the __attribute__ flag only works with gcc compilers and even then it
+# does not work to check args with varargs so just remove the check.
+CONFIG['warnflags'].slice!(/ -Wsuggest-attribute=format/)
+CONFIG['warnflags'].slice!(/ -Wdeclaration-after-statement/)
+CONFIG['warnflags'].slice!(/ -Wmissing-noreturn/)
 
 create_makefile(File.join(extension_name, extension_name))
 

data/ext/oj/fast.c

@@ -1,32 +1,4 @@
-/* fast.c
- * Copyright (c) 2012, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2012 Peter Ohler. All rights reserved.
 
 #if !IS_WINDOWS
 #include <sys/resource.h>  // for getrlimit() on linux
@@ -43,16 +15,16 @@
 // maximum to allocate on the stack, arbitrary limit
 #define SMALL_XML	65536
 #define MAX_STACK	100
-//#define BATCH_SIZE	(4096 / sizeof(struct _Leaf) - 1)
+//#define BATCH_SIZE	(4096 / sizeof(struct _leaf) - 1)
 #define BATCH_SIZE	100
 
-typedef struct _Batch {
-    struct _Batch	*next;
+typedef struct _batch {
+    struct _batch	*next;
     int			next_avail;
-    struct _Leaf	leaves[BATCH_SIZE];
+    struct _leaf	leaves[BATCH_SIZE];
 } *Batch;
 
-typedef struct _Doc {
+typedef struct _doc {
     Leaf		data;
     Leaf		*where;	     // points to current location
     Leaf		where_path[MAX_STACK]; // points to head of path
@@ -60,10 +32,10 @@ typedef struct _Doc {
     unsigned long	size;	     // number of leaves/branches in the doc
     VALUE		self;
     Batch		batches;
-    struct _Batch	batch0;
+    struct _batch	batch0;
 } *Doc;
 
-typedef struct _ParseInfo {
+typedef struct _parseInfo {
     char	*str;		/* buffer being read from */
     char	*s;		/* current position in buffer */
     Doc		doc;
@@ -121,7 +93,7 @@ VALUE	oj_doc_class = Qundef;
 #ifndef HAVE_STPCPY
 char *stpcpy(char *dest, const char *src) {
     size_t	cnt = strlen(src);
-    
+
     strcpy(dest, src);
 
     return dest + cnt;
@@ -204,10 +176,10 @@ leaf_new(Doc doc, int type) {
     Leaf	leaf;
 
     if (0 == doc->batches || BATCH_SIZE == doc->batches->next_avail) {
-	Batch	b = ALLOC(struct _Batch);
+	Batch	b = ALLOC(struct _batch);
 
 	// Initializes all leaves with a NO_VAL value_type
-	memset(b, 0, sizeof(struct _Batch));
+	memset(b, 0, sizeof(struct _batch));
 	b->next = doc->batches;
 	doc->batches = b;
 	b->next_avail = 0;
@@ -322,7 +294,7 @@ leaf_fixnum_value(Leaf leaf) {
     int64_t	n = 0;
     int		neg = 0;
     int		big = 0;
-    
+
     if ('-' == *s) {
 	s++;
 	neg = 1;
@@ -337,7 +309,7 @@ leaf_fixnum_value(Leaf leaf) {
     }
     if (big) {
 	char	c = *s;
-	
+
 	*s = '\0';
 	leaf->value = rb_cstr_to_inum(leaf->str, 10, 0);
 	*s = c;
@@ -672,7 +644,7 @@ read_quoted_value(ParseInfo pi) {
     char	*value = 0;
     char	*h = pi->s; // head
     char	*t = h;	    // tail
-    
+
     h++;	// skip quote character
     t++;
     value = h;
@@ -734,7 +706,7 @@ read_quoted_value(ParseInfo pi) {
 // doc support functions
 inline static void
 doc_init(Doc doc) {
-    memset(doc, 0, sizeof(struct _Doc));
+    memset(doc, 0, sizeof(struct _doc));
     doc->where = doc->where_path;
     doc->self = Qundef;
     doc->batches = &doc->batch0;
@@ -805,7 +777,7 @@ static void
 mark_doc(void *ptr) {
     if (NULL != ptr) {
 	Doc	doc = (Doc)ptr;
-	
+
 	rb_gc_mark(doc->self);
 	mark_leaf(doc->data);
     }
@@ -813,16 +785,18 @@ mark_doc(void *ptr) {
 
 static VALUE
 parse_json(VALUE clas, char *json, bool given, bool allocated) {
-    struct _ParseInfo	pi;
+    struct _parseInfo	pi;
     volatile VALUE	result = Qnil;
     Doc			doc;
     int			ex = 0;
     volatile VALUE	self;
 
+    // TBD are both needed? is stack allocation ever needed?
+
     if (given) {
-	doc = ALLOCA_N(struct _Doc, 1);
+	doc = ALLOCA_N(struct _doc, 1);
     } else {
-	doc = ALLOC(struct _Doc);
+	doc = ALLOC(struct _doc);
     }
     /* skip UTF-8 BOM if present */
     if (0xEF == (uint8_t)*json && 0xBB == (uint8_t)json[1] && 0xBF == (uint8_t)json[2]) {
@@ -839,7 +813,7 @@ parse_json(VALUE clas, char *json, bool given, bool allocated) {
     {
 	struct rlimit	lim;
 
-	if (0 == getrlimit(RLIMIT_STACK, &lim)) {
+	if (0 == getrlimit(RLIMIT_STACK, &lim) && RLIM_INFINITY != lim.rlim_cur) {
 	    pi.stack_min = (void*)((char*)&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
@@ -862,6 +836,7 @@ parse_json(VALUE clas, char *json, bool given, bool allocated) {
 	if (allocated && 0 != ex) { // will jump so caller will not free
 	    xfree(json);
 	}
+	rb_gc_enable();
     } else {
 	result = doc->self;
     }
@@ -1165,8 +1140,14 @@ doc_open(VALUE clas, VALUE str) {
     } else {
 	json = ALLOCA_N(char, len);
     }
+    // It should not be necessaary to stop GC but if it is not stopped and a
+    // large string is parsed that string is corrupted or freed during
+    // parsing. I'm not sure what is going on exactly but disabling GC avoids
+    // the issue.
+    rb_gc_disable();
     memcpy(json, StringValuePtr(str), len);
     obj = parse_json(clas, json, given, allocate);
+    rb_gc_enable();
     if (given && allocate) {
 	xfree(json);
     }
@@ -1217,12 +1198,14 @@ doc_open_file(VALUE clas, VALUE filename) {
     fseek(f, 0, SEEK_SET);
     if (len != fread(json, 1, len, f)) {
 	fclose(f);
-	rb_raise(rb_const_get_at(Oj, rb_intern("LoadError")), 
+	rb_raise(rb_const_get_at(Oj, rb_intern("LoadError")),
 		 "Failed to read %lu bytes from %s.", (unsigned long)len, path);
     }
     fclose(f);
     json[len] = '\0';
+    rb_gc_disable();
     obj = parse_json(clas, json, given, allocate);
+    rb_gc_enable();
     if (given && allocate) {
 	xfree(json);
     }
@@ -1564,7 +1547,7 @@ doc_each_child(int argc, VALUE *argv, VALUE self) {
  *       result
  *   }
  *   #=> [3, 2, 1]
- *   
+ *
  *   Oj::Doc.open('[3,[2,1]]') { |doc|
  *       result = []
  *       doc.each_value('/2') { |v| result << v }
@@ -1624,7 +1607,7 @@ doc_dump(int argc, VALUE *argv, VALUE self) {
 
 	if (0 == filename) {
 	    char	buf[4096];
-	    struct _Out out;
+	    struct _out out;
 
 	    out.buf = buf;
 	    out.end = buf + sizeof(buf) - 10;
@@ -1697,21 +1680,21 @@ doc_not_implemented(VALUE self) {
  * extracted. Once the document is closed the document can not longer be
  * accessed. This allows the parsing and data extraction to be extremely fast
  * compared to other JSON parses.
- * 
+ *
  * An Oj::Doc class is not created directly but the _open()_ class method is
  * used to open a document and the yield parameter to the block of the #open()
  * call is the Doc instance. The Doc instance can be moved across, up, and
  * down the JSON document. At each element the data associated with the
  * element can be extracted. It is also possible to just provide a path to the
  * data to be extracted and retrieve the data in that manner.
- * 
+ *
  * For many of the methods a path is used to describe the location of an
  * element. Paths follow a subset of the XPath syntax. The slash ('/')
  * character is the separator. Each step in the path identifies the next
  * branch to take through the document. A JSON object will expect a key string
  * while an array will expect a positive index. A .. step indicates a move up
  * the JSON document.
- * 
+ *
  * @example
  *   json = %{[
  *     {
@@ -1725,12 +1708,12 @@ doc_not_implemented(VALUE self) {
  *   ]}
  *   # move and get value
  *   Oj::Doc.open(json) do |doc|
- *     doc.move('/1/two')  
+ *     doc.move('/1/two')
  *     # doc location is now at the 'two' element of the hash that is the first element of the array.
  *     doc.fetch()
  *   end
  *   #=> 2
- *   
+ *
  *   # Now try again using a path to Oj::Doc.fetch() directly and not using a block.
  *   doc = Oj::Doc.open(json)
  *   doc.fetch('/2/three')  #=> 3

data/ext/oj/hash.c

@@ -1,32 +1,4 @@
-/* hash.c
- * Copyright (c) 2011, Peter Ohler
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *  - Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 
- *  - Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 
- *  - Neither the name of Peter Ohler nor the names of its contributors may be
- *    used to endorse or promote products derived from this software without
- *    specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// Copyright (c) 2011 Peter Ohler. All rights reserved.
 
 #include "hash.h"
 #include <stdint.h>
@@ -34,19 +6,19 @@
 #define HASH_MASK	0x000003FF
 #define  HASH_SLOT_CNT	1024
 
-typedef struct _KeyVal {
-    struct _KeyVal	*next;
+typedef struct _keyVal {
+    struct _keyVal	*next;
     const char		*key;
     size_t		len;
     VALUE		val;
 } *KeyVal;
 
-struct _Hash {
-    struct _KeyVal	slots[HASH_SLOT_CNT];
+struct _hash {
+    struct _keyVal	slots[HASH_SLOT_CNT];
 };
 
-struct _Hash	class_hash;
-struct _Hash	intern_hash;
+struct _hash	class_hash;
+struct _hash	intern_hash;
 
 // almost the Murmur hash algorithm
 #define M 0x5bd1e995
@@ -85,7 +57,7 @@ hash_calc(const uint8_t *key, size_t len) {
     h ^= h >> 13;
     h *= M;
     h ^= h >> 15;
-    
+
     return h;
 }
 
@@ -114,8 +86,8 @@ hash_get(Hash hash, const char *key, size_t len, VALUE **slotp, VALUE def_value)
     }
     if (0 != slotp) {
 	if (0 != bucket->key) {
-	    KeyVal	b = ALLOC(struct _KeyVal);
-	
+	    KeyVal	b = ALLOC(struct _keyVal);
+
 	    b->next = 0;
 	    bucket->next = b;
 	    bucket = b;
@@ -155,7 +127,7 @@ oj_attr_hash_get(const char *key, size_t len, ID **slotp) {
 char*
 oj_strndup(const char *s, size_t len) {
     char	*d = ALLOC_N(char, len + 1);
-    
+
     memcpy(d, s, len);
     d[len] = '\0';