[PATCH 0/2] ruby: sync database close/destroy

[PATCH 0/2] ruby: sync database close/destroy

[Felipe Contreras]

Sychronize with notmuch API, where notmuch_database_close is different
from notmuch_database_destroy. At least since a long time ago.

Felipe Contreras (2):
  ruby: split database close and destroy
  ruby: cleanup object_destroy()

 bindings/ruby/database.c | 19 ++++++++++++++++++-
 bindings/ruby/defs.h     | 10 +++++-----
 bindings/ruby/init.c     |  1 +
 3 files changed, 24 insertions(+), 6 deletions(-)

-- 
2.32.0.36.g70aac2b1aa

[PATCH 1/2] ruby: split database close and destroy

[Felipe Contreras]

Mirrors the C API: 7864350c (Split notmuch_database_close into two
functions, 2012-04-25).

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 bindings/ruby/database.c | 19 ++++++++++++++++++-
 bindings/ruby/defs.h     |  3 +++
 bindings/ruby/init.c     |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bindings/ruby/database.c b/bindings/ruby/database.c
index d6c804ac..1828dc91 100644
--- a/bindings/ruby/database.c
+++ b/bindings/ruby/database.c
@@ -26,6 +26,19 @@ notmuch_rb_database_alloc (VALUE klass)
     return Data_Wrap_Notmuch_Object (klass, &notmuch_rb_database_type, NULL);
 }
 
+/*
+ * call-seq: DB.destroy => nil
+ *
+ * Destroys the database, freeing all resources allocated for it.
+ */
+VALUE
+notmuch_rb_database_destroy (VALUE self)
+{
+    notmuch_rb_object_destroy (self, &notmuch_rb_database_type);
+
+    return Qnil;
+}
+
 /*
  * call-seq: Notmuch::Database.new(path [, {:create => false, :mode => Notmuch::MODE_READ_ONLY}]) => DB
  *
@@ -113,8 +126,12 @@ notmuch_rb_database_open (int argc, VALUE *argv, VALUE klass)
 VALUE
 notmuch_rb_database_close (VALUE self)
 {
+    notmuch_database_t *db;
     notmuch_status_t ret;
-    ret = notmuch_rb_object_destroy (self, &notmuch_rb_database_type);
+
+    Data_Get_Notmuch_Database (self, db);
+
+    ret = notmuch_database_close (db);
     notmuch_rb_status_raise (ret);
 
     return Qnil;
diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index 995bcafd..daac13ab 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -128,6 +128,9 @@ notmuch_rb_status_raise (notmuch_status_t status);
 VALUE
 notmuch_rb_database_alloc (VALUE klass);
 
+VALUE
+notmuch_rb_database_destroy (VALUE self);
+
 VALUE
 notmuch_rb_database_initialize (int argc, VALUE *argv, VALUE klass);
 
diff --git a/bindings/ruby/init.c b/bindings/ruby/init.c
index d421c601..87f99040 100644
--- a/bindings/ruby/init.c
+++ b/bindings/ruby/init.c
@@ -260,6 +260,7 @@ Init_notmuch (void)
     rb_define_alloc_func (notmuch_rb_cDatabase, notmuch_rb_database_alloc);
     rb_define_singleton_method (notmuch_rb_cDatabase, "open", notmuch_rb_database_open, -1); /* in database.c */
     rb_define_method (notmuch_rb_cDatabase, "initialize", notmuch_rb_database_initialize, -1); /* in database.c */
+    rb_define_method (notmuch_rb_cDatabase, "destroy!", notmuch_rb_database_destroy, 0); /* in database.c */
     rb_define_method (notmuch_rb_cDatabase, "close", notmuch_rb_database_close, 0); /* in database.c */
     rb_define_method (notmuch_rb_cDatabase, "path", notmuch_rb_database_path, 0); /* in database.c */
     rb_define_method (notmuch_rb_cDatabase, "version", notmuch_rb_database_version, 0); /* in database.c */
-- 
2.32.0.36.g70aac2b1aa

[PATCH 2/2] ruby: cleanup object_destroy()

[Felipe Contreras]

It was assumed the destructor of notmuch_rb_database_type did return a
notmuch_status_t because that's what notmuch_database_close returns, and
that value was checked by notmuch_rb_database_close in order to decide
if to raise an exception.

It turns out notmuch_database_destroy was called instead, so nothing was
returned (void).

All the destroy functions are void, and that's what we want.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 bindings/ruby/defs.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index daac13ab..b3f0621c 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -105,19 +105,16 @@ extern const rb_data_type_t notmuch_rb_tags_type;
 #define Data_Get_Notmuch_Tags(obj, ptr) \
     Data_Get_Notmuch_Object ((obj), &notmuch_rb_tags_type, (ptr))
 
-static inline notmuch_status_t
+static inline void
 notmuch_rb_object_destroy (VALUE rb_object, const rb_data_type_t *type)
 {
     void *nm_object;
-    notmuch_status_t ret;
 
     Data_Get_Notmuch_Object (rb_object, type, nm_object);
 
     /* Call the corresponding notmuch_*_destroy function */
-    ret = ((notmuch_status_t (*)(void *)) type->data) (nm_object);
+    ((void (*)(void *)) type->data) (nm_object);
     DATA_PTR (rb_object) = NULL;
-
-    return ret;
 }
 
 /* status.c */
-- 
2.32.0.36.g70aac2b1aa

Re: [PATCH 0/2] ruby: sync database close/destroy

[David Bremner]

Felipe Contreras <felipe.contreras@gmail.com> writes:

> Sychronize with notmuch API, where notmuch_database_close is different
> from notmuch_database_destroy. At least since a long time ago.
>

First patch applied to master.

Second patch seems to have too much fuzz to apply; I guess some changes
to defs.h were applied in a different order to master than in your
branch?

Anyway, content of second patch is fine too, can you rebase?

d

[PATCH v2] ruby: cleanup object_destroy()

[Felipe Contreras]

It was assumed the destructor of notmuch_rb_database_type did return a
notmuch_status_t because that's what notmuch_database_close returns, and
that value was checked by notmuch_rb_database_close in order to decide
if to raise an exception.

It turns out notmuch_database_destroy was called instead, so nothing was
returned (void).

All the destroy functions are void, and that's what we want.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---

Rebased on top of latest master.

 bindings/ruby/defs.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index a33ef0da..e2541e8f 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -136,20 +136,17 @@ notmuch_rb_object_free (void *rb_wrapper)
     talloc_free (rb_wrapper);
 }
 
-static inline notmuch_status_t
+static inline void
 notmuch_rb_object_destroy (VALUE rb_object, const rb_data_type_t *type)
 {
     notmuch_rb_object_t *rb_wrapper;
-    notmuch_status_t ret;
 
     Data_Get_Notmuch_Rb_Object (rb_object, type, rb_wrapper);
 
     /* Call the corresponding notmuch_*_destroy function */
-    ret = ((notmuch_status_t (*)(void *)) type->data) (rb_wrapper->nm_object);
+    ((void (*)(void *)) type->data) (rb_wrapper->nm_object);
     notmuch_rb_object_free (rb_wrapper);
     DATA_PTR (rb_object) = NULL;
-
-    return ret;
 }
 
 /* status.c */
-- 
2.32.0.40.gb9b36f9b52

Re: [PATCH v2] ruby: cleanup object_destroy()

[David Bremner]

Felipe Contreras <felipe.contreras@gmail.com> writes:
> ---
>
> Rebased on top of latest master.

Thanks. Applied to master.