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 c4082dc86b2535fa60b97232778632968e56b17b..a9f14db9fbc4fd279443949a7cc52d045cdd0c8c 100644 (file)
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
- * $Id: ext.c 60 2005-06-08 16:18:32Z tilman $
+ * $Id: ext.c 64 2005-06-27 19:22:58Z tilman $
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -47,10 +47,11 @@
 static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,
-             eEetError, eNameError, ePropError,
+             eEetError, eNameError, ePropError, eStreamError,
+             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;
 
@@ -443,19 +444,24 @@ 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 = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
+               VALUE str;
+
+               if (rb_obj_is_kind_of (stream->ptr[i], cChunk) == Qfalse)
+                       rb_raise (eBadElementError, "stream member is not a Chunk");
 
-               rb_str_append (ret, str);
+               str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
+
+               rb_ary_push (ret, str);
        }
 
-       return ret;
+       return rb_ary_join (ret, Qnil);
 }
 
 static VALUE
@@ -525,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");
@@ -536,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;
 }
@@ -591,9 +599,7 @@ c_to_eet (VALUE self)
        args[1] = rb_funcall (stream, id_serialize, 0);
        chunk = rb_class_new_instance (2, args, cChunk);
 
-       stream = rb_class_new_instance (1, &chunk, cStream);
-
-       return rb_funcall (stream, id_serialize, 0);
+       return rb_funcall (chunk, id_serialize, 0);
 }
 
 static VALUE
@@ -687,10 +693,12 @@ Init_eet_ext ()
        eEetError = rb_define_class_under (m, "EetError", rb_eStandardError);
        eNameError = rb_define_class_under (m, "NameError", eEetError);
        ePropError = rb_define_class_under (m, "PropertyError", eEetError);
+       eStreamError = rb_define_class_under (m, "StreamError", eEetError);
+       eBadElementError = rb_define_class_under (m, "BadElementError",
+                                                 eStreamError);
 
        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");