From: Felipe Contreras <felipe.contreras@gmail.com>
To: notmuch@notmuchmail.org
Cc: David Bremner <david@tethera.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 1/2] ruby: split database close and destroy
Date: Tue, 6 Jul 2021 22:45:32 -0500 [thread overview]
Message-ID: <20210707034533.3137309-2-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210707034533.3137309-1-felipe.contreras@gmail.com>
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
next prev parent reply other threads:[~2021-07-07 3:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-07 3:45 [PATCH 0/2] ruby: sync database close/destroy Felipe Contreras
2021-07-07 3:45 ` Felipe Contreras [this message]
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
2021-08-03 18:44 ` [PATCH v2] ruby: cleanup object_destroy() Felipe Contreras
2021-08-04 1:46 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210707034533.3137309-2-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).