* [PATCH 1/2] ruby: split database close and destroy
2021-07-07 3:45 [PATCH 0/2] ruby: sync database close/destroy Felipe Contreras
@ 2021-07-07 3:45 ` Felipe Contreras
2021-07-07 3:45 ` [PATCH 2/2] ruby: cleanup object_destroy() Felipe Contreras
2021-08-02 17:24 ` [PATCH 0/2] ruby: sync database close/destroy David Bremner
2 siblings, 0 replies; 6+ messages in thread
From: Felipe Contreras @ 2021-07-07 3:45 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner, 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, ¬much_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, ¬much_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, ¬much_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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ruby: cleanup object_destroy()
2021-07-07 3:45 [PATCH 0/2] ruby: sync database close/destroy Felipe Contreras
2021-07-07 3:45 ` [PATCH 1/2] ruby: split database close and destroy Felipe Contreras
@ 2021-07-07 3:45 ` Felipe Contreras
2021-08-02 17:24 ` [PATCH 0/2] ruby: sync database close/destroy David Bremner
2 siblings, 0 replies; 6+ messages in thread
From: Felipe Contreras @ 2021-07-07 3:45 UTC (permalink / raw)
To: notmuch; +Cc: David Bremner, 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), ¬much_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
^ permalink raw reply related [flat|nested] 6+ messages in thread