From: Eric Wong <normalperson@yhbt.net>
To: ruby.posix.mq@librelist.com
Subject: [PATCH] support autoclose= and autoclose?
Date: Fri, 9 Jan 2015 07:37:01 +0000 [thread overview]
Message-ID: <1420789021-24029-1-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: <1420789021-24029-1-git-send-email-normalperson@yhbt.net>
These are analogous to the identically-named IO methods and useful
when we're inheriting descriptors (or writing tests for inheriting
descriptors).
---
ext/posix_mq/posix_mq.c | 36 +++++++++++++++++++++++++++++++++++-
test/test_posix_mq.rb | 11 +++++++++++
2 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/ext/posix_mq/posix_mq.c b/ext/posix_mq/posix_mq.c
index 93e3913..1b56608 100644
--- a/ext/posix_mq/posix_mq.c
+++ b/ext/posix_mq/posix_mq.c
@@ -38,6 +38,7 @@
struct posix_mq {
mqd_t des;
+ unsigned autoclose:1;
struct mq_attr attr;
VALUE name;
VALUE thread;
@@ -300,7 +301,8 @@ static void _free(void *ptr)
if (mq->des != MQD_INVALID && MQ_IO_NIL_P(mq)) {
/* we ignore errors when gc-ing */
- mq_close(mq->des);
+ if (mq->autoclose)
+ mq_close(mq->des);
errno = 0;
}
xfree(ptr);
@@ -313,6 +315,7 @@ static VALUE alloc(VALUE klass)
VALUE rv = Data_Make_Struct(klass, struct posix_mq, mark, _free, mq);
mq->des = MQD_INVALID;
+ mq->autoclose = 1;
mq->attr.mq_flags = 0;
mq->attr.mq_maxmsg = 0;
mq->attr.mq_msgsize = -1;
@@ -1066,6 +1069,35 @@ static VALUE setnonblock(VALUE self, VALUE nb)
/*
* call-seq:
+ * mq.autoclose = boolean => boolean
+ *
+ * Determines whether or not the _mq_ will be closed automatically
+ * at finalization.
+ */
+static VALUE setautoclose(VALUE self, VALUE autoclose)
+{
+ struct posix_mq *mq = get(self, 1);
+
+ mq->autoclose = RTEST(autoclose) ? 1 : 0;
+ return autoclose;
+}
+
+/*
+ * call-seq:
+ * mq.autoclose? => boolean
+ *
+ * Returns whether or not the _mq_ will be closed automatically
+ * at finalization.
+ */
+static VALUE autoclose_p(VALUE self)
+{
+ struct posix_mq *mq = get(self, 1);
+
+ return mq->autoclose ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq:
* mq.trysend(string [,priority[, timeout]]) => +true+ or +false+
*
* Exactly like POSIX_MQ#send, except it returns +false+ instead of raising
@@ -1155,6 +1187,8 @@ void Init_posix_mq_ext(void)
rb_define_private_method(cPOSIX_MQ, "notify_exec", setnotify_exec, 2);
rb_define_private_method(cPOSIX_MQ, "notify_cleanup", notify_cleanup, 0);
rb_define_method(cPOSIX_MQ, "nonblock?", nonblock_p, 0);
+ rb_define_method(cPOSIX_MQ, "autoclose?", autoclose_p, 0);
+ rb_define_method(cPOSIX_MQ, "autoclose=", setautoclose, 1);
#ifdef MQD_TO_FD
rb_define_method(cPOSIX_MQ, "to_io", to_io, 0);
#endif
diff --git a/test/test_posix_mq.rb b/test/test_posix_mq.rb
index 3583022..a4fc407 100644
--- a/test/test_posix_mq.rb
+++ b/test/test_posix_mq.rb
@@ -245,6 +245,17 @@ class Test_POSIX_MQ < Test::Unit::TestCase
assert_equal @mq.to_io.to_i, @alt.to_io.to_i
assert_raises(ArgumentError) { @alt.name }
assert_raises(Errno::EBADF) { POSIX_MQ.for_fd(1) }
+ @alt.autoclose = false
+ assert_equal false, @alt.autoclose?
+
+ # iterate a bunch and hope GC kicks in
+ fd = @mq.to_io.fileno
+ 10_000.times do
+ mq = POSIX_MQ.for_fd(fd)
+ assert_equal true, mq.autoclose?
+ mq.autoclose = false
+ assert_equal false, mq.autoclose?
+ end
end if POSIX_MQ.respond_to?(:for_fd) && POSIX_MQ.method_defined?(:to_io)
def test_notify
--
EW
parent reply other threads:[~2015-01-09 7:37 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <1420789021-24029-1-git-send-email-normalperson@yhbt.net>]
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://yhbt.net/ruby_posix_mq/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1420789021-24029-1-git-send-email-normalperson@yhbt.net \
--to=normalperson@yhbt.net \
--cc=ruby.posix.mq@librelist.com \
/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://yhbt.net/ruby_posix_mq.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).