Look for the directory where libruby.so lives.

[ruby-ecore.git] / src / ecore_job / rb_job.c

diff --git a/src/ecore_job/rb_job.c b/src/ecore_job/rb_job.c
index 255c1d6527ff7939f2607e00ad8b5209469ea356..516ceccc1a60e888c99505a94165bdc63e2541a6 100644 (file)
--- a/src/ecore_job/rb_job.c
+++ b/src/ecore_job/rb_job.c
@@ -1,5 +1,5 @@
 /*
- * $Id: rb_job.c 25 2004-06-26 23:07:01Z tilman $
+ * $Id: rb_job.c 67 2004-08-12 20:08:13Z tilman $
  *
  * Copyright (C) 2004 Tilman Sauerbeck (tilman at code-monkey de)
  *
@@ -20,70 +20,86 @@
 
 #include <ruby.h>
 
+#include <Ecore.h>
 #include <Ecore_Job.h>
 #include <stdbool.h>
 
 #include "rb_ecore_job.h"
 
 typedef struct {
-       Ecore_Job *job;
-       void *cb;
+       Ecore_Job *real;
+       VALUE callback;
        bool deleted;
-} RbEcoreJob;
-
-static VALUE cJob;
+} RbJob;
 
 static void on_job (void *data)
 {
-       RbEcoreJob *job = data;
+       RbJob *job = data;
 
-       rb_funcall ((VALUE) job->cb, rb_intern ("call"), 0);
+       rb_funcall (job->callback, rb_intern ("call"), 0);
        job->deleted = true;
 }
 
-static VALUE c_init (VALUE self)
+static void c_mark (RbJob *job)
 {
-       RbEcoreJob *job = NULL;
-
-       Data_Get_Struct (self, RbEcoreJob, job);
-
-       job->cb = (void *) rb_block_proc ();
-       job->job = ecore_job_add (on_job, job);
-
-       return self;
+       rb_gc_mark (job->callback);
 }
 
-static void c_free (RbEcoreJob *job)
+static void c_free (RbJob *job)
 {
-       if (job->job && !job->deleted)
-               ecore_job_del (job->job);
+       if (job->real && !job->deleted)
+               ecore_job_del (job->real);
+
+       ecore_shutdown ();
 
        free (job);
 }
 
+/*
+ * call-seq:
+ *  Ecore::Job::Job.new { block } => job
+ *
+ * Creates an Ecore::Job::Job object.
+ * After execution, the object will be deleted.
+ */
 static VALUE c_new (VALUE klass)
 {
        VALUE self;
-       RbEcoreJob *job;
+       RbJob *job;
+
+       if (!rb_block_given_p ())
+               return Qnil;
+
+       self = Data_Make_Struct (klass, RbJob, c_mark, c_free, job);
+
+       ecore_init ();
 
-       self = Data_Make_Struct (klass, RbEcoreJob, NULL, c_free, job);
+       job->callback = rb_block_proc ();
+       job->deleted = false;
+       job->real = ecore_job_add (on_job, job);
 
        rb_obj_call_init (self, 0, NULL);
 
        return self;
 }
 
+/*
+ * call-seq:
+ *  job.delete => nil
+ *
+ * Deletes <i>job</i>.
+ */
 static VALUE c_delete (VALUE self)
 {
        VALUE ret = Qfalse;
-       RbEcoreJob *job = NULL;
+       RbJob *job = NULL;
 
-       Data_Get_Struct (self, RbEcoreJob, job);
+       Data_Get_Struct (self, RbJob, job);
 
-       if (job->job && !job->deleted) {
-               ecore_job_del (job->job);
+       if (job->real && !job->deleted) {
+               ecore_job_del (job->real);
                job->deleted = true;
-               job->job = NULL;
+               job->real = NULL;
                ret = Qtrue;
        }
 
@@ -92,10 +108,8 @@ static VALUE c_delete (VALUE self)
 
 void Init_Job (void)
 {
-       cJob = rb_define_class_under (mJob, "Job", rb_cObject);
+       VALUE c = rb_define_class_under (mJob, "Job", rb_cObject);
 
-       rb_define_singleton_method (cJob, "new", c_new, 0);
-       rb_define_method (cJob, "initialize", c_init, 0);
-       rb_define_method (cJob, "delete", c_delete, 0);
+       rb_define_singleton_method (c, "new", c_new, 0);
+       rb_define_method (c, "delete", c_delete, 0);
 }
-