Tweaked Stream#serialize to be more GC-friendly.

[ruby-eet.git] / ext / ext.c

diff --git a/ext/ext.c b/ext/ext.c
index 8fe22e30e328c40ebb2fc4f3b12e0dc3e54863e9..a9f14db9fbc4fd279443949a7cc52d045cdd0c8c 100644 (file)
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 62 2005-06-09 17:42:34Z tilman $
+ * $Id: ext.c 64 2005-06-27 19:22:58Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -51,7 +51,7 @@ static VALUE cStream, cChunk,
              eBadElementError,
              sym_lossy, sym_level, sym_quality, sym_char, sym_short,
              sym_long_long, sym_double;
-static ID id_include, id_serialize, id_push, id_keys,
+static ID id_include, id_serialize, id_keys,
           id_to_eet_chunks, id_to_eet_name, id_to_eet_properties,
           id_tag, id_data;
 
@@ -444,11 +444,11 @@ stream_serialize (VALUE self)
        struct RArray *stream;
        long i;
 
-       ret = rb_str_new2 ("");
-
        stream = RARRAY (self);
        if (!stream->len)
-               return ret;
+               return rb_str_new2 ("");
+
+       ret = rb_ary_new ();
 
        for (i = 0; i < stream->len; i++) {
                VALUE str;
@@ -458,10 +458,10 @@ stream_serialize (VALUE self)
 
                str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
 
-               rb_str_append (ret, str);
+               rb_ary_push (ret, str);
        }
 
-       return ret;
+       return rb_ary_join (ret, Qnil);
 }
 
 static VALUE
@@ -531,8 +531,9 @@ chunk_serialize (VALUE self)
 static int
 for_each_prop (VALUE tag, VALUE arg, VALUE stream)
 {
-       VALUE value, type, chunks;
-       long len, i;
+       VALUE value, type, tmp;
+       struct RArray *chunks;
+       long i;
 
        if (rb_obj_is_kind_of (arg, rb_cArray) == Qfalse)
                rb_raise (ePropError, "hash value is not an array");
@@ -542,12 +543,13 @@ for_each_prop (VALUE tag, VALUE arg, VALUE stream)
                return ST_CONTINUE;
 
        type = rb_ary_entry (arg, 1);
-       chunks = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
+       tmp = rb_funcall (value, id_to_eet_chunks, 2, tag, type);
 
-       len = RARRAY (chunks)->len;
+       Check_Type (tmp, T_ARRAY);
+       chunks = RARRAY (tmp);
 
-       for (i = 0; i < len; i++)
-               rb_funcall (stream, id_push, 1, rb_ary_entry (chunks, i));
+       for (i = 0; i < chunks->len; i++)
+               rb_ary_push (stream, chunks->ptr[i]);
 
        return ST_CONTINUE;
 }
@@ -697,7 +699,6 @@ Init_eet_ext ()
 
        id_include = rb_intern ("include?");
        id_serialize = rb_intern ("serialize");
-       id_push = rb_intern ("push");
        id_keys = rb_intern ("keys");
        id_to_eet_chunks = rb_intern ("to_eet_chunks");
        id_to_eet_name = rb_intern ("to_eet_name");