posix_mq RubyGem user+dev discussion/patches/pulls/bugs/help
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: ruby-posix-mq@bogomips.org
Subject: [PATCH] support idempotent POSIX_MQ#close
Date: Tue,  2 Feb 2016 22:54:20 +0000	[thread overview]
Message-ID: <20160202225420.32565-1-e@80x24.org> (raw)

IO#close under Ruby 2.3 is idempotent, we shall follow suit
with POSIX_MQ#close
---
 ext/posix_mq/extconf.rb | 11 +++++++++++
 ext/posix_mq/posix_mq.c | 10 +++++++++-
 test/test_posix_mq.rb   | 16 +++++++++++++++-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/ext/posix_mq/extconf.rb b/ext/posix_mq/extconf.rb
index eb799b2..d433d1d 100644
--- a/ext/posix_mq/extconf.rb
+++ b/ext/posix_mq/extconf.rb
@@ -14,4 +14,15 @@
 have_func("__mq_oshandle")
 have_func("mq_timedsend")
 have_func("mq_timedreceive")
+
+r, w = IO.pipe
+r.close
+w.close
+begin
+  r.close
+  $CPPFLAGS += ' -DIDEMPOTENT_IO_CLOSE=1'
+rescue IOError
+  $CPPFLAGS += ' -DIDEMPOTENT_IO_CLOSE=0'
+end
+
 create_makefile("posix_mq_ext")
diff --git a/ext/posix_mq/posix_mq.c b/ext/posix_mq/posix_mq.c
index 5e1b3b8..0567676 100644
--- a/ext/posix_mq/posix_mq.c
+++ b/ext/posix_mq/posix_mq.c
@@ -824,7 +824,15 @@ static VALUE setattr(VALUE self, VALUE astruct)
  */
 static VALUE _close(VALUE self)
 {
-	struct posix_mq *mq = get(self, 1);
+	struct posix_mq *mq;
+
+	if (IDEMPOTENT_IO_CLOSE) { /* defined in extconf.rb */
+		mq = get(self, 0);
+		if (!mq || (mq->des == MQD_INVALID))
+			return Qnil;
+	} else {
+		mq = get(self, 1);
+	}
 
 	if (! MQ_IO_CLOSE(mq)) {
 		if (mq_close(mq->des) < 0)
diff --git a/test/test_posix_mq.rb b/test/test_posix_mq.rb
index d726d36..e831012 100644
--- a/test/test_posix_mq.rb
+++ b/test/test_posix_mq.rb
@@ -152,7 +152,21 @@ def test_open
       assert_equal true, mq.send("HI", 0)
       assert_equal 1, mq.attr.curmsgs
       assert_nil mq.close
-      assert_raises(IOError) { mq.close }
+
+      r, w = IO.pipe
+      w.close
+      r.close
+      idempotent_close = begin
+        r.close
+        true
+      rescue IOError
+        false
+      end
+      if idempotent_close
+        2.times { assert_nil mq.close }
+      else
+        assert_raises(IOError) { mq.close }
+      end
     end
     assert @mq.closed?
     @mq = nil
-- 
EW


                 reply	other threads:[~2016-02-02 22:54 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20160202225420.32565-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=ruby-posix-mq@bogomips.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://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).