dbus 0.1.7 → 0.1.8

data/ext/ruby-dbus-connection.c

@@ -8,37 +8,72 @@
 
 #include "ruby-dbus.h"
 
+typedef struct _RubyDBusConnection {
+  DBusConnection *conn;
+  VALUE callbacks;
+} RubyDBusConnection;
+
 VALUE cDBusConnection;
 
 static void
-rdbus_free_connection(void *conn)
+rdbus_mark_connection(RubyDBusConnection *wrapper)
+{
+  DEBUG("DBusConnection.mark <%p>", wrapper->conn);
+  rb_gc_mark(wrapper->callbacks);
+}
+
+static void
+rdbus_free_connection(RubyDBusConnection *wrapper)
 {
-  DEBUG("DBusConnection.free <%p>", conn);
-  dbus_connection_unref((DBusConnection *)conn);
+  DEBUG("DBusConnection.free <%p>", wrapper->conn);
+  dbus_connection_unref(wrapper->conn);
+  rb_ary_clear(wrapper->callbacks);
+  wrapper->conn = NULL;
+  wrapper->callbacks = Qnil;
+  ruby_xfree(wrapper);
+}
+
+static RubyDBusConnection *
+rdbus_get_connection_wrapper(VALUE obj)
+{
+  RubyDBusConnection *wrapper;
+
+  wrapper = NULL;
+  Data_Get_Struct(obj, RubyDBusConnection, wrapper);
+  if (wrapper == NULL)
+    rb_raise(eDBusError, "Failed to retrieve DATA object for DBusConnection");
+  return wrapper;
 }
 
 VALUE 
 rdbus_new_connection(DBusConnection *conn, gboolean owner)
 {
+  RubyDBusConnection *wrapper;
+
+  wrapper = ALLOC(RubyDBusConnection);
+  wrapper->conn = conn;
+  wrapper->callbacks = rb_ary_new();
+
   if (!owner)
-    dbus_connection_ref(conn);
-  DEBUG("DBusConnection.new <%p> owner=%d", conn, owner);
-  return Data_Wrap_Struct(cDBusConnection, NULL, rdbus_free_connection, conn);
+    dbus_connection_ref(wrapper->conn);
+  DEBUG("DBusConnection.new <%p> owner=%d", wrapper->conn, owner);
+  return Data_Wrap_Struct(cDBusConnection, rdbus_mark_connection, rdbus_free_connection, wrapper);
 }
 
 DBusConnection *
 rdbus_get_connection(VALUE obj)
 {
-  DBusConnection *conn;
-
-  conn = NULL;
-  Data_Get_Struct(obj, DBusConnection, conn);
-  if (conn == NULL)
-    rb_raise(eDBusError, "Failed to retrieve DATA object for DBusConnection");
-  return conn;
+  return rdbus_get_connection_wrapper(obj)->conn;
 }
 
-/* Helpers */
+static void
+rdbus_register_connection_callback(VALUE self, VALUE callback)
+{
+  RubyDBusConnection *wrapper;
+
+  wrapper = rdbus_get_connection_wrapper(self);
+  rb_ary_push(wrapper->callbacks, callback);
+}
 
 /*
  *  call-seq:
@@ -440,9 +475,6 @@ _on_object_path_unregister(DBusConnection *conn, void *user_data)
   if (exc)
     rb_warn("Unregister callback raised exception (ignored)");
 
-  rb_gc_unregister_address(&unregister_cb);
-  rb_gc_unregister_address(&message_cb);
-
   ruby_xfree(data);
 }
 
@@ -517,8 +549,8 @@ cDBusConnection_register_object_path(VALUE self, VALUE path,
   if (dbus_connection_register_object_path(CONN_GET(self), StringValuePtr(path),
                                            &vtable, (void *)user_data))
   {
-    rb_gc_register_address(&unregister_cb);
-    rb_gc_register_address(&message_cb);
+    rdbus_register_connection_callback(self, unregister_cb);
+    rdbus_register_connection_callback(self, message_cb);
     return Qtrue;
   }
 
@@ -561,8 +593,8 @@ cDBusConnection_register_fallback(VALUE self, VALUE path,
   if (dbus_connection_register_fallback(CONN_GET(self), StringValuePtr(path),
                                         &vtable, (void *)user_data))
   {
-    rb_gc_register_address(&unregister_cb);
-    rb_gc_register_address(&message_cb);
+    rdbus_register_connection_callback(self, unregister_cb);
+    rdbus_register_connection_callback(self, message_cb);
     return Qtrue;
   }
 
@@ -573,10 +605,7 @@ cDBusConnection_register_fallback(VALUE self, VALUE path,
 static void
 _free_filter_data(void *user_data)
 {
-  VALUE *data = (VALUE*)user_data;
-  VALUE filter_cb = data[0];
-  rb_gc_unregister_address(&filter_cb);
-  ruby_xfree(data);
+  ruby_xfree(user_data);
 }
 
 static VALUE
@@ -645,7 +674,7 @@ cDBusConnection_add_filter(VALUE self, VALUE filter_cb)
   if (dbus_connection_add_filter(CONN_GET(self), _on_filter_message,
                                  (void*)data, _free_filter_data))
   {
-    rb_gc_register_address(&filter_cb);
+    rdbus_register_connection_callback(self, filter_cb);
     return Qtrue;
   }
 

data/ext/ruby-dbus-message-iter.c

@@ -9,12 +9,10 @@
 #include <stdlib.h>
 #include "ruby-dbus.h"
 
-/* NB: We wrap DBusMessageIter so that we are able to unref the associated message (if any)
- *     when the DBusMessageIter instance is GC'd. */
-struct _RubyDBusMessageIter {
+typedef struct _RubyDBusMessageIter {
   DBusMessageIter *real_iter;
   DBusMessage *message;
-};
+} RubyDBusMessageIter;
 
 VALUE cDBusMessageIter;
 

data/ext/ruby-dbus-message.c

@@ -10,6 +10,7 @@
 
 VALUE cDBusMessage;
 
+#ifdef RDBUS_DEBUG
 static const char *
 rdbus_message_type_string(DBusMessage *message)
 {
@@ -31,6 +32,7 @@ rdbus_message_type_string(DBusMessage *message)
       return "Unknown";
   }
 }
+#endif
 
 static void
 rdbus_free_message(void *message)

data/ext/ruby-dbus.h

@@ -81,8 +81,6 @@ extern VALUE cDBusMessageIter;
 extern VALUE cDBusPendingCall;
 extern VALUE eDBusError;
 
-typedef struct _RubyDBusMessageIter RubyDBusMessageIter;
-
 void Init_dbus_bus();
 void Init_dbus_connection();
 void Init_dbus_message();

data/lib/dbus/version.rb

@@ -13,7 +13,7 @@ module DBus
   module BindingVersion
     VERSION_MAJOR = 0
     VERSION_MINOR = 1
-    VERSION_PATCH = 7
+    VERSION_PATCH = 8
   end
   
   # Contains the string version of the D-BUS bindings

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: dbus
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
-date: 2004-12-11
+  version: 0.1.8
+date: 2004-12-12
 summary: Ruby bindings for D-BUS.
 require_paths: 
   - lib