oj 1.1.1 → 1.2.0

data/README.md

@@ -20,15 +20,15 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 *Fast XML parser and marshaller on RubyGems*: https://rubygems.org/gems/ox
 
-*Fast XML parser and marshaller on GitHub*: https://rubygems.org/gems/ox
+*Fast XML parser and marshaller on GitHub*: https://github.com/ohler55/ox
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.1.1
+### Release 1.2.0
 
- - The encoding option can now be an Encoding Object or a String.
+ - Removed the encoding option and fixed a misunderstanding of the string encoding. Unicode code points are now used instead of byte codes. This is not compatible with previous releases but is compliant with RFC4627.
 
- - Fixed Rubinius errors.
+ - Time encoding in :object mode is faster and higher nanosecond precision.
 
 ## <a name="description">Description</a>
 
@@ -59,12 +59,6 @@ methods exist then the Oj internal Object variable encoding is used.
 
 Oj is compatible with Ruby 1.8.7, 1.9.2, 1.9.3, JRuby, and RBX.
 
-## <a name="plans">Planned Releases</a>
-
-- Release 1.0.1: Optimize the Oj::Doc dump() method to be native.
-
-- Release 1.1: A JSON stream parser. Pushed out for the Oj::Doc parser.
-
 ## <a name="compare">Comparisons</a>
 
 ### Fast Oj::Doc parser comparisons

data/ext/oj/dump.c

@@ -30,6 +30,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <sys/time.h>
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
@@ -38,6 +39,17 @@
 #include "oj.h"
 #include "cache8.h"
 
+#ifdef RUBY_API_VERSION_MAJOR
+#define HAS_TIMESPEC
+#endif
+
+#ifndef HAVE_RUBY_ENCODING_H
+#define rb_eEncodingError	rb_eException
+#endif
+#ifdef RUBINIUS
+#define rb_eEncodingError	rb_eException
+#endif
+
 typedef unsigned long   ulong;
 
 typedef struct _Out {
@@ -89,7 +101,7 @@ static int	dump_attr_cb(ID key, VALUE value, Out out);
 static void	dump_obj_attrs(VALUE obj, int with_class, slot_t id, int depth, Out out);
 
 static void     grow(Out out, size_t len);
-static size_t	json_friendly_size(const u_char *str, size_t len);
+static size_t	hibit_friendly_size(const u_char *str, size_t len);
 static size_t	ascii_friendly_size(const u_char *str, size_t len);
 
 static void	dump_leaf_to_json(Leaf leaf, Options copts, Out out);
@@ -103,7 +115,7 @@ static void	dump_leaf_hash(Leaf leaf, int depth, Out out);
 
 static const char	hex_chars[17] = "0123456789abcdef";
 
-static char     json_friendly_chars[256] = "\
+static char     hibit_friendly_chars[256] = "\
 66666666222622666666666666666666\
 11211111111111121111111111111111\
 11111111111111111111111111112111\
@@ -113,22 +125,24 @@ static char     json_friendly_chars[256] = "\
 11111111111111111111111111111111\
 11111111111111111111111111111111";
 
+// High bit set characters are always encoded as unicode. Worse case is 3
+// bytes per character in the output. That makes this conservative.
 static char     ascii_friendly_chars[256] = "\
 66666666222622666666666666666666\
 11211111111111121111111111111111\
 11111111111111111111111111112111\
 11111111111111111111111111111116\
-66666666666666666666666666666666\
-66666666666666666666666666666666\
-66666666666666666666666666666666\
-66666666666666666666666666666666";
+33333333333333333333333333333333\
+33333333333333333333333333333333\
+33333333333333333333333333333333\
+33333333333333333333333333333333";
 
 inline static size_t
-json_friendly_size(const u_char *str, size_t len) {
+hibit_friendly_size(const u_char *str, size_t len) {
     size_t	size = 0;
 
     for (; 0 < len; str++, len--) {
-	size += json_friendly_chars[*str];
+	size += hibit_friendly_chars[*str];
     }
     return size - len * (size_t)'0';
 }
@@ -215,6 +229,58 @@ dump_hex(u_char c, Out out) {
     *out->cur++ = hex_chars[d];
 }
 
+const char*
+dump_unicode(const char *str, const char *end, Out out) {
+    uint32_t	code = 0;
+    uint8_t	b = *(uint8_t*)str;
+    int		i, cnt;
+    
+    if (0xC0 == (0xE0 & b)) {
+	cnt = 1;
+	code = b & 0x0000001F;
+    } else if (0xE0 == (0xF0 & b)) {
+	cnt = 2;
+	code = b & 0x0000000F;
+    } else if (0xF0 == (0xF8 & b)) {
+	cnt = 3;
+	code = b & 0x00000007;
+    } else if (0xF8 == (0xFC & b)) {
+	cnt = 4;
+	code = b & 0x00000003;
+    } else if (0xFC == (0xFE & b)) {
+	cnt = 5;
+	code = b & 0x00000001;
+    } else {
+        rb_raise(rb_eEncodingError, "Invalid Unicode\n");
+    }
+    str++;
+    for (; 0 < cnt; cnt--, str++) {
+	b = *(uint8_t*)str;
+	if (end <= str || 0x80 != (0xC0 & b)) {
+	    rb_raise(rb_eEncodingError, "Invalid Unicode\n");
+	}
+	code = (code << 6) | (b & 0x0000003F);
+    }
+    if (0x0000FFFF < code) {
+	uint32_t	c1;
+
+	code -= 0x00010000;
+	c1 = ((code >> 10) & 0x000003FF) + 0x0000D800;
+	code = (code & 0x000003FF) + 0x0000DC00;
+	*out->cur++ = '\\';
+	*out->cur++ = 'u';
+	for (i = 3; 0 <= i; i--) {
+	    *out->cur++ = hex_chars[(uint8_t)(c1 >> (i * 4)) & 0x0F];
+	}
+    }
+    *out->cur++ = '\\';
+    *out->cur++ = 'u';
+    for (i = 3; 0 <= i; i--) {
+	*out->cur++ = hex_chars[(uint8_t)(code >> (i * 4)) & 0x0F];
+    }	
+    return str - 1;
+}
+
 // returns 0 if not using circular references, -1 if not further writing is
 // needed (duplicate), and a positive value if the object was added to the cache.
 static long
@@ -383,8 +449,8 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 	cmap = ascii_friendly_chars;
 	size = ascii_friendly_size((u_char*)str, cnt);
     } else {
-	cmap = json_friendly_chars;
-	size = json_friendly_size((u_char*)str, cnt);
+	cmap = hibit_friendly_chars;
+	size = hibit_friendly_size((u_char*)str, cnt);
     }
     if (out->end - out->cur <= (long)size + 10) { // extra 10 for escaped first char, quotes, and sym
 	grow(out, size + 10);
@@ -410,10 +476,12 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 	}
 	*out->cur++ = '"';
     } else {
+	const char	*end = str + cnt;
+
 	if (is_sym) {
 	    *out->cur++ = ':';
 	}
-	for (; 0 < cnt; cnt--, str++) {
+	for (; str < end; str++) {
 	    switch (cmap[(u_char)*str]) {
 	    case '1':
 		*out->cur++ = *str;
@@ -429,18 +497,15 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 		default:	*out->cur++ = *str;	break;
 		}
 		break;
-	    case '6':
+	    case '3': // Unicode
+		str = dump_unicode(str, end, out);
+		break;
+	    case '6': // control characters
 		*out->cur++ = '\\';
 		*out->cur++ = 'u';
-		if ((u_char)*str <= 0x7F) {
-		    *out->cur++ = '0';
-		    *out->cur++ = '0';
-		    dump_hex((u_char)*str, out);
-		} else { // continuation?
-		    *out->cur++ = '0';
-		    *out->cur++ = '0';
-		    dump_hex((u_char)*str, out);
-		}
+		*out->cur++ = '0';
+		*out->cur++ = '0';
+		dump_hex((u_char)*str, out);
 		break;
 	    default:
 		break; // ignore, should never happen if the table is correct
@@ -847,16 +912,22 @@ dump_hash(VALUE obj, int depth, int mode, Out out) {
 
 static void
 dump_time(VALUE obj, Out out) {
-    char        buf[64];
-    char        *b = buf + sizeof(buf) - 1;
-    time_t      sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
-    long        usec = NUM2LONG(rb_funcall2(obj, oj_tv_usec_id, 0, 0));
-    char        *dot = b - 7;
-    long        size;
+    char		buf[64];
+    char		*b = buf + sizeof(buf) - 1;
+    long		size;
+    char		*dot = b - 10;
+#ifdef HAS_TIMESPEC
+    struct timespec	ts = rb_time_timespec(obj);
+    time_t		sec = ts.tv_sec;
+    long		nsec = ts.tv_nsec;
+#else
+    time_t		sec = NUM2LONG(rb_funcall2(obj, oj_tv_sec_id, 0, 0));
+    long		nsec = NUM2LONG(rb_funcall2(obj, oj_tv_nsec_id, 0, 0));
+#endif
 
     *b-- = '\0';
-    for (; dot < b; b--, usec /= 10) {
-	*b = '0' + (usec % 10);
+    for (; dot < b; b--, nsec /= 10) {
+	*b = '0' + (nsec % 10);
     }
     *b-- = '.';
     for (; 0 < sec; b--, sec /= 10) {

data/ext/oj/fast.c

@@ -774,11 +774,6 @@ doc_init(Doc doc) {
     *doc->where = 0;
     doc->data = 0;
     doc->self = Qundef;
-#ifdef HAVE_RUBY_ENCODING_H
-    doc->encoding = oj_default_options.encoding;
-#else
-    doc->encoding = 0;
-#endif
     doc->size = 0;
     doc->json = 0;
     doc->batches = &doc->batch0;
@@ -1156,7 +1151,7 @@ doc_open_file(VALUE clas, VALUE filename) {
     fseek(f, 0, SEEK_SET);
     if (len != fread(json, 1, len, f)) {
         fclose(f);
-        rb_raise(rb_eLoadError, "Failed to read %ld bytes from %s.\n", len, path);
+        rb_raise(rb_eLoadError, "Failed to read %lu bytes from %s.\n", (unsigned long)len, path);
     }
     fclose(f);
     json[len] = '\0';

data/ext/oj/load.c

@@ -50,11 +50,6 @@ typedef struct _ParseInfo {
     char	*str;		/* buffer being read from */
     char	*s;		/* current position in buffer */
     CircArray	circ_array;
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding	*encoding;
-#else
-    void	*encoding;
-#endif
     Options	options;
 } *ParseInfo;
 
@@ -602,20 +597,14 @@ read_str(ParseInfo pi, int hint) {
     case T_STRING:
 	obj = rb_str_new2(text);
 #ifdef HAVE_RUBY_ENCODING_H
-	if (0 != pi->encoding) {
-	    rb_enc_associate(obj, pi->encoding);
-	}
+	rb_enc_associate(obj, oj_utf8_encoding);
 #endif
 	break;
     case T_SYMBOL:
 #ifdef HAVE_RUBY_ENCODING_H
-	if (0 != pi->encoding) {
-	    obj = rb_str_new2(text);
-	    rb_enc_associate(obj, pi->encoding);
-	    obj = rb_funcall(obj, oj_to_sym_id, 0);
-	} else {
-	    obj = ID2SYM(rb_intern(text));
-	}
+	obj = rb_str_new2(text);
+	rb_enc_associate(obj, oj_utf8_encoding);
+	obj = rb_funcall(obj, oj_to_sym_id, 0);
 #else
 	obj = ID2SYM(rb_intern(text));
 #endif
@@ -625,13 +614,9 @@ read_str(ParseInfo pi, int hint) {
 	obj = Qundef;
 	if (':' == *text && !escaped) { // Symbol
 #ifdef HAVE_RUBY_ENCODING_H
-	    if (0 != pi->encoding) {
-		obj = rb_str_new2(text + 1);
-		rb_enc_associate(obj, pi->encoding);
-		obj = rb_funcall(obj, oj_to_sym_id, 0);
-	    } else {
-		obj = ID2SYM(rb_intern(text + 1));
-	    }
+	    obj = rb_str_new2(text + 1);
+	    rb_enc_associate(obj, oj_utf8_encoding);
+	    obj = rb_funcall(obj, oj_to_sym_id, 0);
 #else
 	    obj = ID2SYM(rb_intern(text + 1));
 #endif
@@ -647,9 +632,7 @@ read_str(ParseInfo pi, int hint) {
 	if (Qundef == obj) {
 	    obj = rb_str_new2(text);
 #ifdef HAVE_RUBY_ENCODING_H
-	    if (0 != pi->encoding) {
-		rb_enc_associate(obj, pi->encoding);
-	    }
+	    rb_enc_associate(obj, oj_utf8_encoding);
 #endif
 	}
 	break;
@@ -749,23 +732,24 @@ read_num(ParseInfo pi) {
 
 static VALUE
 read_time(ParseInfo pi) {
-    VALUE       args[2];
-    long        v = 0;
-    long        v2 = 0;
+    time_t	v = 0;
+    long	v2 = 0;
 
     for (; '0' <= *pi->s && *pi->s <= '9'; pi->s++) {
 	v = v * 10 + (*pi->s - '0');
     }
     if ('.' == *pi->s) {
+	int	cnt;
+
 	pi->s++;
-	for (; '0' <= *pi->s && *pi->s <= '9'; pi->s++) {
+	for (cnt = 9; 0 < cnt && '0' <= *pi->s && *pi->s <= '9'; pi->s++, cnt--) {
 	    v2 = v2 * 10 + (*pi->s - '0');
 	}
+	for (; 0 < cnt; cnt--) {
+	    v2 *= 10;
+	}
     }
-    args[0] = LONG2NUM(v);
-    args[1] = LONG2NUM(v2);
-
-    return rb_funcall2(oj_time_class, oj_at_id, 2, args);
+    return rb_time_nano_new(v, v2);
 }
 
 static VALUE
@@ -801,33 +785,61 @@ read_nil(ParseInfo pi) {
     return Qnil;
 }
 
-static char
+static uint32_t
 read_hex(ParseInfo pi, char *h) {
-    uint8_t	b = 0;
-
-    if ('0' <= *h && *h <= '9') {
-	b = *h - '0';
-    } else if ('A' <= *h && *h <= 'F') {
-	b = *h - 'A' + 10;
-    } else if ('a' <= *h && *h <= 'f') {
-	b = *h - 'a' + 10;
-    } else {
-	pi->s = h;
-	raise_error("invalid hex character", pi->str, pi->s);
-    }
-    h++;
-    b = b << 4;
-    if ('0' <= *h && *h <= '9') {
-	b += *h - '0';
-    } else if ('A' <= *h && *h <= 'F') {
-	b += *h - 'A' + 10;
-    } else if ('a' <= *h && *h <= 'f') {
-	b += *h - 'a' + 10;
+    uint32_t	b = 0;
+    int		i;
+
+    // TBD this can be made faster with a table
+    for (i = 0; i < 4; i++, h++) {
+	b = b << 4;
+	if ('0' <= *h && *h <= '9') {
+	    b += *h - '0';
+	} else if ('A' <= *h && *h <= 'F') {
+	    b += *h - 'A' + 10;
+	} else if ('a' <= *h && *h <= 'f') {
+	    b += *h - 'a' + 10;
+	} else {
+	    pi->s = h;
+	    raise_error("invalid hex character", pi->str, pi->s);
+	}
+    }
+    return b;
+}
+
+static char*
+unicode_to_chars(ParseInfo pi, char *t, uint32_t code) {
+    if (0x0000007F >= code) {
+	*t = (char)code;
+    } else if (0x000007FF >= code) {
+	*t++ = 0xC0 | (code >> 6);
+	*t = 0x80 | (0x3F & code);
+    } else if (0x0000FFFF >= code) {
+	*t++ = 0xE0 | (code >> 12);
+	*t++ = 0x80 | ((code >> 6) & 0x3F);
+	*t = 0x80 | (0x3F & code);
+    } else if (0x001FFFFF >= code) {
+	*t++ = 0xF0 | (code >> 18);
+	*t++ = 0x80 | ((code >> 12) & 0x3F);
+	*t++ = 0x80 | ((code >> 6) & 0x3F);
+	*t = 0x80 | (0x3F & code);
+    } else if (0x03FFFFFF >= code) {
+	*t++ = 0xF8 | (code >> 24);
+	*t++ = 0x80 | ((code >> 18) & 0x3F);
+	*t++ = 0x80 | ((code >> 12) & 0x3F);
+	*t++ = 0x80 | ((code >> 6) & 0x3F);
+	*t = 0x80 | (0x3F & code);
+    } else if (0x7FFFFFFF >= code) {
+	*t++ = 0xFC | (code >> 30);
+	*t++ = 0x80 | ((code >> 24) & 0x3F);
+	*t++ = 0x80 | ((code >> 18) & 0x3F);
+	*t++ = 0x80 | ((code >> 12) & 0x3F);
+	*t++ = 0x80 | ((code >> 6) & 0x3F);
+	*t = 0x80 | (0x3F & code);
     } else {
-	pi->s = h;
-	raise_error("invalid hex character", pi->str, pi->s);
+	raise_error("invalid Unicode", pi->str, pi->s);
     }
-    return (char)b;
+    return t;
 }
 
 /* Assume the value starts immediately and goes until the quote character is
@@ -838,6 +850,7 @@ read_quoted_value(ParseInfo pi) {
     char	*value = 0;
     char	*h = pi->s; // head
     char	*t = h;     // tail
+    uint32_t	code;
     
     h++;	// skip quote character
     t++;
@@ -859,13 +872,24 @@ read_quoted_value(ParseInfo pi) {
 	    case '\\':	*t = '\\';	break;
 	    case 'u':
 		h++;
-		*t = read_hex(pi, h);
-		h += 2;
-		if ('\0' != *t) {
-		    t++;
+		code = read_hex(pi, h);
+		h += 3;
+		if (0x0000D800 <= code && code <= 0x0000DFFF) {
+		    uint32_t	c1 = (code - 0x0000D800) & 0x000003FF;
+		    uint32_t	c2;
+
+		    h++;
+		    if ('\\' != *h || 'u' != *(h + 1)) {
+			pi->s = h;
+			raise_error("invalid escaped character", pi->str, pi->s);
+		    }
+		    h += 2;
+		    c2 = read_hex(pi, h);
+		    h += 3;
+		    c2 = (c2 - 0x0000DC00) & 0x000003FF;
+		    code = ((c1 << 10) | c2) + 0x00010000;
 		}
-		*t = read_hex(pi, h);
-		h++;
+		t = unicode_to_chars(pi, t, code);
 		break;
 	    default:
 		pi->s = h;
@@ -897,12 +921,6 @@ oj_parse(char *json, Options options) {
     if (Yes == options->circular) {
 	pi.circ_array = circ_array_new();
     }
-#ifdef HAVE_RUBY_ENCODING_H
-    pi.encoding = options->encoding;
-    //pi.encoding = ('\0' == *options->encoding) ? 0 : rb_enc_find(options->encoding);
-#else
-    pi.encoding = 0;
-#endif
     pi.options = options;
     obj = read_next(&pi, 0);
     if (Yes == options->circular) {

data/ext/oj/oj.c

@@ -52,7 +52,6 @@ void Init_oj();
 VALUE    Oj = Qnil;
 
 ID	oj_as_json_id;
-ID	oj_at_id;
 ID	oj_fileno_id;
 ID	oj_instance_variables_id;
 ID	oj_json_create_id;
@@ -61,10 +60,9 @@ ID	oj_string_id;
 ID	oj_to_hash_id;
 ID	oj_to_json_id;
 ID	oj_to_sym_id;
+ID	oj_write_id;
 ID	oj_tv_nsec_id;
 ID	oj_tv_sec_id;
-ID	oj_tv_usec_id;
-ID	oj_write_id;
 
 VALUE	oj_bag_class;
 VALUE	oj_date_class;
@@ -78,7 +76,6 @@ static VALUE	ascii_only_sym;
 static VALUE	auto_define_sym;
 static VALUE	circular_sym;
 static VALUE	compat_sym;
-static VALUE	encoding_sym;
 static VALUE	indent_sym;
 static VALUE	mode_sym;
 static VALUE	null_sym;
@@ -99,8 +96,11 @@ static VALUE	keep = Qnil;
 Cache   oj_class_cache = 0;
 Cache   oj_attr_cache = 0;
 
+#ifdef HAVE_RUBY_ENCODING_H
+rb_encoding	*oj_utf8_encoding = 0;
+#endif
+
 struct _Options	oj_default_options = {
-    0,			// encoding
     0,			// indent
     No,			// circular
     Yes,		// auto_define
@@ -116,7 +116,6 @@ static VALUE	define_mimic_json(VALUE self);
  *
  * Returns the default load and dump options as a Hash. The options are
  * - indent: [Fixnum] number of spaces to indent each element in an JSON document
- * - encoding: [String|Encoding] character encoding for the JSON coument
  * - circular: [true|false|nil] support circular references while dumping
  * - auto_define: [true|false|nil] automatically define classes if they do not exist
  * - symbol_keys: [true|false|nil] use symbols instead of strings for hash keys
@@ -127,9 +126,6 @@ static VALUE
 get_def_opts(VALUE self) {
     VALUE       opts = rb_hash_new();
     
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_hash_aset(opts, encoding_sym, (0 == oj_default_options.encoding) ? Qnil : rb_enc_from_encoding(oj_default_options.encoding));
-#endif
     rb_hash_aset(opts, indent_sym, INT2FIX(oj_default_options.indent));
     rb_hash_aset(opts, circular_sym, (Yes == oj_default_options.circular) ? Qtrue : ((No == oj_default_options.circular) ? Qfalse : Qnil));
     rb_hash_aset(opts, auto_define_sym, (Yes == oj_default_options.auto_define) ? Qtrue : ((No == oj_default_options.auto_define) ? Qfalse : Qnil));
@@ -150,7 +146,6 @@ get_def_opts(VALUE self) {
  * Sets the default options for load and dump.
  * @param [Hash] opts options to change
  * @param [Fixnum] :indent number of spaces to indent each element in an JSON document
- * @param [String] :encoding character encoding for the JSON file
  * @param [true|false|nil] :circular support circular references while dumping
  * @param [true|false|nil] :auto_define automatically define classes if they do not exist
  * @param [true|false|nil] :symbol_keys convert hash keys to symbols
@@ -177,21 +172,6 @@ set_def_opts(VALUE self, VALUE opts) {
     VALUE       v;
     
     Check_Type(opts, T_HASH);
-
-#ifdef HAVE_RUBY_ENCODING_H
-    if (Qtrue == rb_funcall(opts, rb_intern("has_key?"), 1, encoding_sym)) {
-	v = rb_hash_lookup(opts, encoding_sym);
-	if (Qnil == v) {
-	    oj_default_options.encoding = 0;
-	} else if (T_STRING == rb_type(v)) {
-	    oj_default_options.encoding = rb_enc_find(StringValuePtr(v));
-	} else if (rb_cEncoding == rb_obj_class(v)) {
-	    oj_default_options.encoding = rb_to_encoding(v);
-	} else {
-	    rb_raise(rb_eArgError, ":encoding must be nil, a String, or an Encoding.\n");
-	}
-    }
-#endif
     v = rb_hash_aref(opts, indent_sym);
     if (Qnil != v) {
         Check_Type(v, T_FIXNUM);
@@ -250,17 +230,6 @@ parse_options(VALUE ropts, Options copts) {
             }
             copts->indent = NUM2INT(v);
         }
-#ifdef HAVE_RUBY_ENCODING_H
-        if (Qnil != (v = rb_hash_lookup(ropts, encoding_sym))) {
-	    if (T_STRING == rb_type(v)) {
-		oj_default_options.encoding = rb_enc_find(StringValuePtr(v));
-	    } else if (rb_cEncoding == rb_obj_class(v)) {
-		oj_default_options.encoding = rb_to_encoding(v);
-	    } else {
-		rb_raise(rb_eArgError, ":encoding must be nil, a String, or an Encoding.\n");
-	    }
-        }
-#endif
         if (Qnil != (v = rb_hash_lookup(ropts, mode_sym))) {
             if (object_sym == v) {
                 copts->mode = ObjectMode;
@@ -430,9 +399,7 @@ dump(int argc, VALUE *argv, VALUE self) {
     }
     rstr = rb_str_new2(json);
 #ifdef HAVE_RUBY_ENCODING_H
-    if (0 != copts.encoding) {
-        rb_enc_associate(rstr, copts.encoding);
-    }
+    rb_enc_associate(rstr, oj_utf8_encoding);
 #endif
     xfree(json);
 
@@ -475,9 +442,7 @@ mimic_dump(int argc, VALUE *argv, VALUE self) {
     }
     rstr = rb_str_new2(json);
 #ifdef ENCODING_INLINE_MAX
-    if (0 != copts.encoding) {
-	rb_enc_associate(rstr, copts.encoding);
-    }
+    rb_enc_associate(rstr, oj_utf8_encoding);
 #endif
     if (2 <= argc && Qnil != argv[1]) {
 	VALUE	io = argv[1];
@@ -615,9 +580,7 @@ mimic_generate_core(int argc, VALUE *argv, Options copts) {
     }
     rstr = rb_str_new2(json);
 #ifdef ENCODING_INLINE_MAX
-    if (0 != copts->encoding) {
-        rb_enc_associate(rstr, copts->encoding);
-    }
+    rb_enc_associate(rstr, oj_utf8_encoding);
 #endif
     xfree(json);
 
@@ -732,6 +695,7 @@ define_mimic_json(VALUE self) {
 	symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));	rb_ary_push(keep, symbolize_names_sym);
 
 	oj_default_options.mode = CompatMode;
+	oj_default_options.ascii_only = Yes;
     }
     return mimic;
 }
@@ -754,7 +718,6 @@ void Init_oj() {
     rb_define_module_function(Oj, "to_file", to_file, -1);
 
     oj_as_json_id = rb_intern("as_json");
-    oj_at_id = rb_intern("at");
     oj_fileno_id = rb_intern("fileno");
     oj_instance_variables_id = rb_intern("instance_variables");
     oj_json_create_id = rb_intern("json_create");
@@ -763,10 +726,9 @@ void Init_oj() {
     oj_to_hash_id = rb_intern("to_hash");
     oj_to_json_id = rb_intern("to_json");
     oj_to_sym_id = rb_intern("to_sym");
+    oj_write_id = rb_intern("write");
     oj_tv_nsec_id = rb_intern("tv_nsec");
     oj_tv_sec_id = rb_intern("tv_sec");
-    oj_tv_usec_id = rb_intern("tv_usec");
-    oj_write_id = rb_intern("write");
 
     oj_bag_class = rb_const_get_at(Oj, rb_intern("Bag"));
     oj_struct_class = rb_const_get(rb_cObject, rb_intern("Struct"));
@@ -778,7 +740,6 @@ void Init_oj() {
     auto_define_sym = ID2SYM(rb_intern("auto_define"));	rb_ary_push(keep, auto_define_sym);
     circular_sym = ID2SYM(rb_intern("circular"));	rb_ary_push(keep, circular_sym);
     compat_sym = ID2SYM(rb_intern("compat"));		rb_ary_push(keep, compat_sym);
-    encoding_sym = ID2SYM(rb_intern("encoding"));	rb_ary_push(keep, encoding_sym);
     indent_sym = ID2SYM(rb_intern("indent"));		rb_ary_push(keep, indent_sym);
     mode_sym = ID2SYM(rb_intern("mode"));		rb_ary_push(keep, mode_sym);
     symbol_keys_sym = ID2SYM(rb_intern("symbol_keys"));	rb_ary_push(keep, symbol_keys_sym);
@@ -790,7 +751,7 @@ void Init_oj() {
 
     oj_default_options.mode = ObjectMode;
 #ifdef HAVE_RUBY_ENCODING_H
-    oj_default_options.encoding = rb_enc_find("UTF-8");
+    oj_utf8_encoding = rb_enc_find("UTF-8");
 #endif
 
     oj_cache_new(&oj_class_cache);

data/ext/oj/oj.h

@@ -61,8 +61,10 @@ extern "C" {
 #undef T_RATIONAL
 #undef T_COMPLEX
 #define NO_RSTRUCT 1
+#ifndef IVAR_HELPERS
 #define IVAR_HELPERS 0
 #endif
+#endif
 
 #if IVAR_HELPERS
 #include "ruby/st.h"
@@ -99,12 +101,6 @@ typedef struct _DumpOpts {
 } *DumpOpts;
 
 typedef struct _Options {
-#ifdef HAVE_RUBY_ENCODING_H
-    rb_encoding	*encoding;
-#else
-    void	*encoding;
-#endif
-    //char        encoding[64];	// encoding, stored in the option to avoid GC invalidation in default values
     int         indent;		// indention for dump, default 2
     char        circular;	// YesNo
     char        auto_define;	// YesNo
@@ -148,6 +144,9 @@ extern void	oj_init_doc(void);
 
 extern VALUE    Oj;
 extern struct _Options	oj_default_options;
+#ifdef HAVE_RUBY_ENCODING_H
+extern rb_encoding	*oj_utf8_encoding;
+#endif
 
 extern VALUE	oj_bag_class;
 extern VALUE	oj_date_class;
@@ -159,7 +158,6 @@ extern VALUE	oj_time_class;
 extern VALUE	oj_slash_string;
 
 extern ID	oj_as_json_id;
-extern ID	oj_at_id;
 extern ID	oj_instance_variables_id;
 extern ID	oj_json_create_id;
 extern ID	oj_string_id;
@@ -168,7 +166,6 @@ extern ID	oj_to_json_id;
 extern ID	oj_to_sym_id;
 extern ID	oj_tv_nsec_id;
 extern ID	oj_tv_sec_id;
-extern ID	oj_tv_usec_id;
 
 extern Cache    oj_class_cache;
 extern Cache    oj_attr_cache;

data/lib/oj/version.rb

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

data/test/boo.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'yajl'
+require 'oj'
+
+iter = 100
+s = File.read("boo.json")
+start = Time.now
+iter.times do
+  Oj.load(s)
+end
+oj_dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/second" % [iter, oj_dt, iter/oj_dt]
+
+start = Time.now
+iter.times do
+  Yajl::Parser.parse(s)
+end
+yajl_dt = Time.now - start
+puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parsed/second" % [iter, yajl_dt, iter/yajl_dt]
+
+puts "Oj is %0.1f times faster than YAJL" % [yajl_dt / oj_dt]

data/test/{perf2.rb → foo.rb}

@@ -15,19 +15,6 @@ opts = OptionParser.new
 opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
 files = opts.parse(ARGV)
 
-class Foo
-  def initialize()
-    @x = true
-    @y = 58
-  end
-  def to_json()
-    %{{"x":#{@x},"y":#{@y}}}
-  end
-  def to_hash()
-    { 'x' => @x, 'y' => @y }
-  end
-end
-
 iter = 100000
 s = %{
 { "class": "Foo::Bar",
@@ -36,41 +23,36 @@ s = %{
 }
 }
 
-obj = Oj.load(s)
-obj["foo"] = Foo.new()
-
-Oj.default_options = { :indent => 0, :effort => :internal }
-
-puts
-
 start = Time.now
 iter.times do
   Oj.load(s)
 end
-dt = Time.now - start
-puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
+oj_dt = Time.now - start
+puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, oj_dt, iter/oj_dt/1000.0]
 
 start = Time.now
 iter.times do
   Yajl::Parser.parse(s)
 end
-dt = Time.now - start
-puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, dt, iter/dt/1000.0]
+yajl_dt = Time.now - start
+puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, yajl_dt, iter/yajl_dt/1000.0]
 
-puts
+puts "Oj is %0.1f times faster than YAJL at parsing." % [yajl_dt / oj_dt]
 
+
+obj = Oj.load(s)
 start = Time.now
 iter.times do
   Oj.dump(obj)
 end
-dt = Time.now - start
-puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
+oj_dt = Time.now - start
+puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, oj_dt, iter/oj_dt/1000.0]
 
 start = Time.now
 iter.times do
   Yajl::Encoder.encode(obj)
 end
-dt = Time.now - start
-puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, dt, iter/dt/1000.0]
+yajl_dt = Time.now - start
+puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, yajl_dt, iter/yajl_dt/1000.0]
 
-puts
+puts "Oj is %0.1f times faster than YAJL at dumping." % [yajl_dt / oj_dt]

data/test/tests.rb

@@ -67,8 +67,7 @@ class Juice < ::Test::Unit::TestCase
 
   def test0_get_options
     opts = Oj.default_options()
-    assert_equal({ :encoding=>Encoding.find('UTF-8'),
-                   :indent=>0,
+    assert_equal({ :indent=>0,
                    :circular=>false,
                    :auto_define=>true,
                    :symbol_keys=>false,
@@ -78,7 +77,6 @@ class Juice < ::Test::Unit::TestCase
 
   def test0_set_options
     orig = {
-      :encoding=>nil,
       :indent=>0,
       :circular=>false,
       :auto_define=>true,
@@ -86,7 +84,6 @@ class Juice < ::Test::Unit::TestCase
       :ascii_only=>false,
       :mode=>:object}
     o2 = {
-      :encoding=>"UTF-8",
       :indent=>4,
       :circular=>true,
       :auto_define=>false,
@@ -96,7 +93,6 @@ class Juice < ::Test::Unit::TestCase
     o3 = { :indent => 4 }
     Oj.default_options = o2
     opts = Oj.default_options()
-    o2[:encoding] = Encoding.find('UTF-8')
     assert_equal(opts, o2);
     Oj.default_options = o3 # see if it throws an exception
     Oj.default_options = orig # return to original
@@ -147,11 +143,22 @@ class Juice < ::Test::Unit::TestCase
   end
 
   def test_encode
-    Oj.default_options = { :encoding => 'UTF-8' }
+    opts = Oj.default_options
+    Oj.default_options = { :ascii_only => false }
     dump_and_load("ぴーたー", false)
     Oj.default_options = { :ascii_only => true }
+    json = Oj.dump("ぴーたー")
+    assert_equal(%{"\\u3074\\u30fc\\u305f\\u30fc"}, json)
     dump_and_load("ぴーたー", false)
-    Oj.default_options = { :encoding => nil, :ascii_only => false }
+    Oj.default_options = opts
+  end
+
+  def test_unicode
+    # hits the 3 normal ranges and one extended surrogate pair
+    json = %{"\\u019f\\u05e9\\u3074\\ud834\\udd1e"}
+    obj = Oj.load(json)
+    json2 = Oj.dump(obj, :ascii_only => true)
+    assert_equal(json, json2)
   end
 
   def test_array
@@ -202,7 +209,7 @@ class Juice < ::Test::Unit::TestCase
   def test_time_compat
     t = Time.local(2012, 1, 5, 23, 58, 7)
     json = Oj.dump(t, :mode => :compat)
-    assert_equal(%{1325775487.000000}, json)
+    assert_equal(%{1325775487.000000000}, json)
   end    
   def test_time_object
     t = Time.now()

data/test/where.rb

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby -wW1
+# encoding: UTF-8
+
+$: << '.'
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'optparse'
+require 'perf'
+require 'oj'
+
+$verbose = false
+$indent = 0
+$iter = 1000000
+
+opts = OptionParser.new
+opts.on("-v", "verbose")                                    { $verbose = true }
+opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
+opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+$obj = {
+  'a' => 'Alpha', # string
+  'b' => true,    # boolean
+  'c' => 12345,   # number
+  'd' => [ true, [false, [12345, nil], 3.967, ['something', false], nil]], # mix it up array
+  'e' => { 'one' => 1, 'two' => 2 }, # hash
+  'f' => nil,     # nil
+  'g' => 12345678901234567890123456789, # big number
+  '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 => $indent, :mode => :strict }
+
+$json = Oj.dump($obj)
+
+if $verbose
+  puts "json:\n#{$json}\n"
+end
+
+puts '-' * 80
+puts "Parse Performance"
+Oj::Fast.open($json) do |fast|
+  fast.move('/d/2/4/2')
+  puts fast.where2?
+  puts fast.where?
+  perf = Perf.new()
+  perf.add('Oj:fast', 'where') { fast.where? }
+  perf.add('Oj:fast2', 'where2') { fast.where2? }
+  perf.run($iter)
+end
+puts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -32,13 +32,12 @@ files:
 - ext/oj/fast.c
 - ext/oj/load.c
 - ext/oj/oj.c
+- test/boo.rb
 - test/files.rb
+- test/foo.rb
 - test/perf.rb
-- test/perf1.rb
-- test/perf2.rb
 - test/perf_fast.rb
 - test/perf_obj.rb
-- test/perf_obj_old.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
 - test/sample/change.rb
@@ -58,6 +57,7 @@ files:
 - test/test_fast.rb
 - test/test_mimic.rb
 - test/tests.rb
+- test/where.rb
 - LICENSE
 - README.md
 homepage: https://github.com/ohler55/oj
@@ -83,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 1.8.21
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true

data/test/perf1.rb

@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-#require 'test/unit'
-require 'optparse'
-require 'oj'
-require 'ox'
-
-$indent = 2
-
-opts = OptionParser.new
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-iter = 100000
-s = %{
-{ "class": "Foo::Bar",
-  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
-  "attr2": { "one": 1 }
-}
-}
-#s = File.read('sample.json')
-
-Oj.default_options = { :indent => 0 }
-
-obj = Oj.load(s)
-xml = Ox.dump(obj, :indent => 0)
-
-puts xml
-
-start = Time.now
-iter.times do
-  Oj.load(s)
-end
-dt = Time.now - start
-puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Ox.load(xml)
-end
-dt = Time.now - start
-puts "%d Ox.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
-
-puts
-
-start = Time.now
-iter.times do
-  Oj.dump(obj)
-end
-dt = Time.now - start
-puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Ox.dump(obj)
-end
-dt = Time.now - start
-puts "%d Ox.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
-
-puts

data/test/perf_obj_old.rb

@@ -1,213 +0,0 @@
-#!/usr/bin/env ruby -wW1
-
-$: << '.'
-$: << '..'
-$: << '../lib'
-$: << '../ext'
-
-if __FILE__ == $0
-  if (i = ARGV.index('-I'))
-    x,path = ARGV.slice!(i, 2)
-    $: << path
-  end
-end
-
-require 'optparse'
-require 'ox'
-require 'oj'
-require 'perf'
-require 'sample'
-require 'files'
-
-$verbose = 0
-$circular = false
-$indent = 0
-
-do_sample = false
-do_files = false
-
-do_load = false
-do_dump = false
-do_read = false
-do_write = false
-$iter = 1000
-
-opts = OptionParser.new
-opts.on("-v", "increase verbosity")                         { $verbose += 1 }
-
-opts.on("-c", "circular options")                           { $circular = true }
-
-opts.on("-s", "load and dump as sample Ruby object")        { do_sample = true }
-opts.on("-f", "load and dump as files Ruby object")         { do_files = true }
-
-opts.on("-l", "load")                                       { do_load = true }
-opts.on("-d", "dump")                                       { do_dump = true }
-opts.on("-r", "read")                                       { do_read = true }
-opts.on("-w", "write")                                      { do_write = true }
-opts.on("-a", "load, dump, read and write")                 { do_load = true; do_dump = true; do_read = true; do_write = true }
-
-opts.on("-i", "--iterations [Int]", Integer, "iterations")  { |i| $iter = i }
-
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-if files.empty?
-  data = []
-  obj = do_sample ? sample_doc(2) : files('..')
-  mars = Marshal.dump(obj)
-  xml = Ox.dump(obj, :indent => $indent, circular: $circular)
-  json = Oj.dump(obj, :indent => $indent, circular: $circular)
-  File.open('sample.xml', 'w') { |f| f.write(xml) }
-  File.open('sample.json', 'w') { |f| f.write(json) }
-  File.open('sample.marshal', 'w') { |f| f.write(mars) }
-  data << { :file => 'sample.xml', :obj => obj, :xml => xml, :marshal => mars, :json => json }
-else
-  puts "loading and parsing #{files}\n\n"
-  # TBD change to allow xml and json
-  data = files.map do |f|
-    xml = File.read(f)
-    obj = Ox.load(xml);
-    mars = Marshal.dump(obj)
-    json = Oj.dump(obj, :indent => $indent, circular: $circular)
-    { :file => f, :obj => obj, :xml => xml, :marshal => mars, :json => json }
-  end
-end
-
-$ox_load_time = 0
-$mars_load_time = 0
-$ox_dump_time = 0
-$oj_dump_time = 0
-$mars_dump_time = 0
-
-def perf_load(d)
-  filename = d[:file]
-  marshal_filename = 'sample.marshal'
-  xml = d[:xml]
-  mars = d[:marshal]
-  json = d[:json]
-
-  if 0 < $verbose
-    obj = Ox.load(xml, :mode => :object, :trace => $verbose)
-    return
-  end
-  start = Time.now
-  (1..$iter).each do
-    obj = Ox.load(xml, :mode => :object)
-  end
-  $ox_load_time = Time.now - start
-  puts "Parsing #{$iter} times with Ox took #{$ox_load_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    obj = Oj.load(json, :mode => :object)
-  end
-  $oj_load_time = Time.now - start
-  puts "Parsing #{$iter} times with Oj took #{$oj_load_time} seconds."
-  
-  start = Time.now
-  (1..$iter).each do
-    obj = Marshal.load(mars)
-  end
-  $mars_load_time = Time.now - start
-  puts "Marshalling #{$iter} times took #{$mars_load_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal loading.\n\n" % [$mars_load_time/$ox_load_time]
-end
-
-def perf_dump(d)
-  obj = d[:obj]
-
-  start = Time.now
-  (1..$iter).each do
-    xml = Ox.dump(obj, :indent => $indent, :circular => $circular)
-    #puts "*** ox:\n#{xml}"
-  end
-  $ox_dump_time = Time.now - start
-  puts "Ox dumping #{$iter} times with ox took #{$ox_dump_time} seconds."
-
-  Oj.default_options = {:indent => $indent}
-  start = Time.now
-  (1..$iter).each do
-    json = Oj.dump(obj)
-  end
-  $oj_dump_time = Time.now - start
-  puts "Oj dumping #{$iter} times with oj took #{$oj_dump_time} seconds."
-
-  obj = d[:obj]
-  start = Time.now
-  (1..$iter).each do
-    m = Marshal.dump(obj)
-  end
-  $mars_dump_time = Time.now - start
-  puts "Marshal dumping #{$iter} times took #{$mars_dump_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [$mars_dump_time/$ox_dump_time]
-end
-
-def perf_read(d)
-  ox_read_time = 0
-  mars_read_time = 0
-
-  filename = d[:file]
-  marshal_filename = 'sample.marshal'
-  xml = d[:xml]
-  mars = d[:marshal]
-
-  # now load from the file
-  start = Time.now
-  (1..$iter).each do
-    obj = Ox.load_file(filename, :mode => :object)
-  end
-  ox_read_time = Time.now - start
-  puts "Loading and parsing #{$iter} times with ox took #{ox_read_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    m = File.read(marshal_filename)
-    obj = Marshal.load(m)
-  end
-  mars_read_time = Time.now - start
-  puts "Reading and marshalling #{$iter} times took #{mars_read_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal loading and parsing.\n\n" % [mars_read_time/ox_read_time]
-
-end
-
-def perf_write(d)
-  ox_write_time = 0
-  mars_write_time = 0
-  
-  ox_filename = 'out.xml'
-  marshal_filename = 'out.marshal'
-  obj = d[:obj]
-
-  start = Time.now
-  (1..$iter).each do
-    xml = Ox.to_file(ox_filename, obj, :indent => $indent)
-  end
-  ox_write_time = Time.now - start
-  puts "Ox dumping #{$iter} times with ox took #{ox_write_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    m = Marshal.dump(obj, circular: $circular)
-    File.open(marshal_filename, "w") { |f| f.write(m) }
-  end
-  mars_write_time = Time.now - start
-  puts "Marshal dumping and writing #{$iter} times took #{mars_write_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [mars_write_time/ox_write_time]
-
-end
-
-#if do_sample or do_files
-  data.each do |d|
-    puts "Using file #{d[:file]}."
-    
-    perf_load(d) if do_load
-    perf_dump(d) if do_dump
-    if do_load and do_dump
-      puts ">>> Ox is %0.1f faster than Marshal dumping and loading.\n\n" % [($mars_load_time + $mars_dump_time)/($ox_load_time + $ox_dump_time)] unless 0 == $mars_load_time
-    end
-
-    perf_read(d) if do_read
-    perf_write(d) if do_write
-
-  end
-#end