oj 3.11.5 → 3.16.5

data/ext/oj/string_writer.c

@@ -3,6 +3,7 @@
 
 #include "dump.h"
 #include "encode.h"
+#include "mem.h"
 
 extern VALUE Oj;
 
@@ -20,7 +21,7 @@ static void push_type(StrWriter sw, DumpType type) {
     if (sw->types_end <= sw->types + sw->depth + 1) {
         size_t size = (sw->types_end - sw->types) * 2;
 
-        REALLOC_N(sw->types, char, size);
+        OJ_R_REALLOC_N(sw->types, char, size);
         sw->types_end = sw->types + size;
     }
     sw->depth++;
@@ -43,7 +44,7 @@ static void maybe_comma(StrWriter sw) {
 void oj_str_writer_init(StrWriter sw, int buf_size) {
     sw->opts       = oj_default_options;
     sw->depth      = 0;
-    sw->types      = ALLOC_N(char, 256);
+    sw->types      = OJ_R_ALLOC_N(char, 256);
     sw->types_end  = sw->types + 256;
     *sw->types     = '\0';
     sw->keyWritten = 0;
@@ -53,10 +54,13 @@ void oj_str_writer_init(StrWriter sw, int buf_size) {
     } else if (buf_size < 1024) {
         buf_size = 1024;
     }
-    sw->out.buf        = ALLOC_N(char, buf_size);
-    sw->out.end        = sw->out.buf + buf_size - 10;
-    sw->out.allocated  = true;
-    sw->out.cur        = sw->out.buf;
+    // Must be allocated. Using the out.stack_buffer results in double frees
+    // and I haven't figured out why yet.
+    sw->out.buf       = OJ_R_ALLOC_N(char, buf_size);
+    sw->out.cur       = sw->out.buf;
+    sw->out.end       = sw->out.buf + buf_size - BUFFER_EXTRA;
+    sw->out.allocated = true;
+
     *sw->out.cur       = '\0';
     sw->out.circ_cache = NULL;
     sw->out.circ_cnt   = 0;
@@ -66,7 +70,6 @@ void oj_str_writer_init(StrWriter sw, int buf_size) {
     sw->out.depth      = 0;
     sw->out.argc       = 0;
     sw->out.argv       = NULL;
-    sw->out.caller     = 0;
     sw->out.ropts      = NULL;
     sw->out.omit_nil   = oj_default_options.dump_opts.omit_nil;
 }
@@ -222,16 +225,35 @@ void oj_str_writer_pop_all(StrWriter sw) {
     }
 }
 
-static void str_writer_free(void *ptr) {
+static void string_writer_free(void *ptr) {
     StrWriter sw;
 
     if (0 == ptr) {
         return;
     }
     sw = (StrWriter)ptr;
-    xfree(sw->out.buf);
-    xfree(sw->types);
-    xfree(ptr);
+
+    oj_out_free(&sw->out);
+
+    OJ_R_FREE(sw->types);
+    OJ_R_FREE(ptr);
+}
+
+static const rb_data_type_t oj_string_writer_type = {
+    "Oj/string_writer",
+    {
+        NULL,
+        string_writer_free,
+        NULL,
+    },
+    0,
+    0,
+};
+
+StrWriter oj_str_writer_unwrap(VALUE writer) {
+    StrWriter sw;
+    TypedData_Get_Struct(writer, struct _strWriter, &oj_string_writer_type, sw);
+    return sw;
 }
 
 /* Document-method: new
@@ -248,10 +270,10 @@ static void str_writer_free(void *ptr) {
  * should be.
  *
  * - *io* [_IO_] stream to write to
- * - *options* [_Hash_] formating options
+ * - *options* [_Hash_] formatting options
  */
 static VALUE str_writer_new(int argc, VALUE *argv, VALUE self) {
-    StrWriter sw = ALLOC(struct _strWriter);
+    StrWriter sw = OJ_R_ALLOC(struct _strWriter);
 
     oj_str_writer_init(sw, 0);
     if (1 == argc) {
@@ -261,7 +283,7 @@ static VALUE str_writer_new(int argc, VALUE *argv, VALUE self) {
     sw->out.argv   = argv + 1;
     sw->out.indent = sw->opts.indent;
 
-    return Data_Wrap_Struct(oj_string_writer_class, 0, str_writer_free, sw);
+    return TypedData_Wrap_Struct(oj_string_writer_class, &oj_string_writer_type, sw);
 }
 
 /* Document-method: push_key
@@ -273,9 +295,9 @@ static VALUE str_writer_new(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key pending for the next push
  */
 static VALUE str_writer_push_key(VALUE self, VALUE key) {
-    StrWriter sw = (StrWriter)DATA_PTR(self);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
 
-    rb_check_type(key, T_STRING);
     oj_str_writer_push_key(sw, StringValuePtr(key));
 
     return Qnil;
@@ -289,7 +311,8 @@ static VALUE str_writer_push_key(VALUE self, VALUE key) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_object(int argc, VALUE *argv, VALUE self) {
-    StrWriter sw = (StrWriter)DATA_PTR(self);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
 
     switch (argc) {
     case 0: oj_str_writer_push_object(sw, 0); break;
@@ -297,7 +320,6 @@ static VALUE str_writer_push_object(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_object(sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_object(sw, StringValuePtr(argv[0]));
         }
         break;
@@ -318,7 +340,8 @@ static VALUE str_writer_push_object(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_array(int argc, VALUE *argv, VALUE self) {
-    StrWriter sw = (StrWriter)DATA_PTR(self);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
 
     switch (argc) {
     case 0: oj_str_writer_push_array(sw, 0); break;
@@ -326,7 +349,6 @@ static VALUE str_writer_push_array(int argc, VALUE *argv, VALUE self) {
         if (Qnil == argv[0]) {
             oj_str_writer_push_array(sw, 0);
         } else {
-            rb_check_type(argv[0], T_STRING);
             oj_str_writer_push_array(sw, StringValuePtr(argv[0]));
         }
         break;
@@ -347,14 +369,16 @@ static VALUE str_writer_push_array(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_value(int argc, VALUE *argv, VALUE self) {
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+
     switch (argc) {
-    case 1: oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0); break;
+    case 1: oj_str_writer_push_value(sw, *argv, 0); break;
     case 2:
         if (Qnil == argv[1]) {
-            oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, 0);
+            oj_str_writer_push_value(sw, *argv, 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
-            oj_str_writer_push_value((StrWriter)DATA_PTR(self), *argv, StringValuePtr(argv[1]));
+            oj_str_writer_push_value(sw, *argv, StringValuePtr(argv[1]));
         }
         break;
     default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_value'."); break;
@@ -372,17 +396,16 @@ static VALUE str_writer_push_value(int argc, VALUE *argv, VALUE self) {
  * - *key* [_String_] the key if adding to an object in the JSON document
  */
 static VALUE str_writer_push_json(int argc, VALUE *argv, VALUE self) {
-    rb_check_type(argv[0], T_STRING);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+
     switch (argc) {
-    case 1: oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0); break;
+    case 1: oj_str_writer_push_json(sw, StringValuePtr(*argv), 0); break;
     case 2:
         if (Qnil == argv[1]) {
-            oj_str_writer_push_json((StrWriter)DATA_PTR(self), StringValuePtr(*argv), 0);
+            oj_str_writer_push_json(sw, StringValuePtr(*argv), 0);
         } else {
-            rb_check_type(argv[1], T_STRING);
-            oj_str_writer_push_json((StrWriter)DATA_PTR(self),
-                                    StringValuePtr(*argv),
-                                    StringValuePtr(argv[1]));
+            oj_str_writer_push_json(sw, StringValuePtr(*argv), StringValuePtr(argv[1]));
         }
         break;
     default: rb_raise(rb_eArgError, "Wrong number of argument to 'push_json'."); break;
@@ -396,7 +419,10 @@ static VALUE str_writer_push_json(int argc, VALUE *argv, VALUE self) {
  * currently open.
  */
 static VALUE str_writer_pop(VALUE self) {
-    oj_str_writer_pop((StrWriter)DATA_PTR(self));
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+
+    oj_str_writer_pop(sw);
     return Qnil;
 }
 
@@ -407,7 +433,10 @@ static VALUE str_writer_pop(VALUE self) {
  * currently open.
  */
 static VALUE str_writer_pop_all(VALUE self) {
-    oj_str_writer_pop_all((StrWriter)DATA_PTR(self));
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+
+    oj_str_writer_pop_all(sw);
 
     return Qnil;
 }
@@ -418,7 +447,8 @@ static VALUE str_writer_pop_all(VALUE self) {
  * Reset the writer back to the empty state.
  */
 static VALUE str_writer_reset(VALUE self) {
-    StrWriter sw = (StrWriter)DATA_PTR(self);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
 
     sw->depth      = 0;
     *sw->types     = '\0';
@@ -437,8 +467,9 @@ static VALUE str_writer_reset(VALUE self) {
  * *return* [_String_]
  */
 static VALUE str_writer_to_s(VALUE self) {
-    StrWriter sw   = (StrWriter)DATA_PTR(self);
-    VALUE     rstr = rb_str_new(sw->out.buf, sw->out.cur - sw->out.buf);
+    StrWriter sw;
+    TypedData_Get_Struct(self, struct _strWriter, &oj_string_writer_type, sw);
+    VALUE rstr = rb_str_new(sw->out.buf, sw->out.cur - sw->out.buf);
 
     return oj_encode(rstr);
 }
@@ -449,7 +480,7 @@ static VALUE str_writer_to_s(VALUE self) {
  * Returns the contents of the writer as a JSON element. If called from inside
  * an array or hash by Oj the raw buffer will be used othersize a more
  * inefficient parse of the contents and a return of the result is
- * completed. The parse uses the trict mode.
+ * completed. The parse uses the strict mode.
  *
  * *return* [_Hash_|_Array_|_String_|_Integer_|_Float_|_True_|_False_|_nil|)
  */
@@ -466,11 +497,13 @@ static VALUE str_writer_as_json(VALUE self) {
  * by pushing values into the document. Pushing an array or an object will
  * create that element in the JSON document and subsequent pushes will add the
  * elements to that array or object until a pop() is called. When complete
- * calling to_s() will return the JSON document. Note tha calling to_s() before
+ * calling to_s() will return the JSON document. Note that calling to_s() before
  * construction is complete will return the document in it's current state.
  */
-void oj_string_writer_init() {
+void oj_string_writer_init(void) {
     oj_string_writer_class = rb_define_class_under(Oj, "StringWriter", rb_cObject);
+    rb_gc_register_address(&oj_string_writer_class);
+    rb_undef_alloc_func(oj_string_writer_class);
     rb_define_module_function(oj_string_writer_class, "new", str_writer_new, -1);
     rb_define_method(oj_string_writer_class, "push_key", str_writer_push_key, 1);
     rb_define_method(oj_string_writer_class, "push_object", str_writer_push_object, -1);

data/ext/oj/trace.h

@@ -17,12 +17,39 @@ typedef enum {
 
 struct _parseInfo;
 
-extern void
-            oj_trace(const char *func, VALUE obj, const char *file, int line, int depth, TraceWhere where);
+extern void oj_trace(const char *func, VALUE obj, const char *file, int line, int depth, TraceWhere where);
 extern void oj_trace_parse_in(const char *func, struct _parseInfo *pi, const char *file, int line);
-extern void
-            oj_trace_parse_call(const char *func, struct _parseInfo *pi, const char *file, int line, VALUE obj);
+extern void oj_trace_parse_call(const char *func, struct _parseInfo *pi, const char *file, int line, VALUE obj);
 extern void oj_trace_parse_hash_end(struct _parseInfo *pi, const char *file, int line);
 extern void oj_trace_parse_array_end(struct _parseInfo *pi, const char *file, int line);
 
+#ifdef OJ_ENABLE_TRACE_LOG
+#define TRACE(option, func, obj, depth, where)                 \
+    if (RB_UNLIKELY(Yes == option)) {                          \
+        oj_trace(func, obj, __FILE__, __LINE__, depth, where); \
+    }
+#define TRACE_PARSE_IN(option, func, pi)                 \
+    if (RB_UNLIKELY(Yes == option)) {                    \
+        oj_trace_parse_in(func, pi, __FILE__, __LINE__); \
+    }
+#define TRACE_PARSE_CALL(option, func, pi, obj)                 \
+    if (RB_UNLIKELY(Yes == option)) {                           \
+        oj_trace_parse_call(func, pi, __FILE__, __LINE__, obj); \
+    }
+#define TRACE_PARSE_HASH_END(option, pi)                 \
+    if (RB_UNLIKELY(Yes == option)) {                    \
+        oj_trace_parse_hash_end(pi, __FILE__, __LINE__); \
+    }
+#define TRACE_PARSE_ARRAY_END(option, pi)                 \
+    if (RB_UNLIKELY(Yes == option)) {                     \
+        oj_trace_parse_array_end(pi, __FILE__, __LINE__); \
+    }
+#else
+#define TRACE(option, func, obj, depth, where)
+#define TRACE_PARSE_IN(option, func, pi)
+#define TRACE_PARSE_CALL(option, func, pi, obj)
+#define TRACE_PARSE_HASH_END(option, pi)
+#define TRACE_PARSE_ARRAY_END(option, pi)
+#endif
+
 #endif /* OJ_TRACE_H */