From: Eric Wong <normalperson@yhbt.net>
To: ruby.posix.mq@librelist.org
Subject: [PATCH 2/2] avoid deprecated rb_thread_blocking_region in Ruby 2.0/2.1
Date: Sat, 15 Feb 2014 13:33:18 +0000 [thread overview]
Message-ID: <1392471198-16771-2-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: 1392471198-16771-1-git-send-email-normalperson@yhbt.net
This will be removed in Ruby 2.2, so avoid the deprecation warning.
---
ext/posix_mq/posix_mq.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/ext/posix_mq/posix_mq.c b/ext/posix_mq/posix_mq.c
index ad8bcff..cbc32b9 100644
--- a/ext/posix_mq/posix_mq.c
+++ b/ext/posix_mq/posix_mq.c
@@ -95,21 +95,18 @@ static void rb_18_str_set_len(VALUE str, long len)
#define rb_str_set_len rb_18_str_set_len
#endif /* !defined(HAVE_RB_STR_SET_LEN) */
-/* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */
-#if defined(HAVE_RB_THREAD_BLOCKING_REGION) && \
- defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-/*
- * Ruby 1.9 - 2.1 (we use deprecated rb_thread_blocking_region in 2.0+
- * because we can detect (but not use) rb_thread_blocking_region in 1.9.3
- */
-typedef VALUE(*my_blocking_fn_t)(void*);
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) && defined(HAVE_RUBY_THREAD_H)
+/* Ruby 2.0+ */
+# include <ruby/thread.h>
# define WITHOUT_GVL(fn,a,ubf,b) \
- rb_thread_blocking_region((my_blocking_fn_t)(fn),(a),(ubf),(b))
-#elif defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) /* Ruby 2.2+ */
-#include <ruby/thread.h>
+ rb_thread_call_without_gvl((fn),(a),(ubf),(b))
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
+typedef VALUE (*my_blocking_fn_t)(void*);
# define WITHOUT_GVL(fn,a,ubf,b) \
- rb_thread_call_without_gvl((fn),(a),(ubf),(b))
+ rb_thread_blocking_region((my_blocking_fn_t)(fn),(a),(ubf),(b))
+
#else /* Ruby 1.8 */
+/* partial emulation of the 1.9 rb_thread_blocking_region under 1.8 */
# include <rubysig.h>
# define RUBY_UBF_IO ((rb_unblock_function_t *)-1)
typedef void rb_unblock_function_t(void *);
--
1.9.0.rc3.13.gda73b5f
prev parent reply other threads:[~2014-02-15 13:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-15 13:33 [PATCH 1/2] prepare for rb_thread_blocking_region removal Eric Wong
2014-02-15 13:33 ` Eric Wong [this message]
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=1392471198-16771-2-git-send-email-normalperson@yhbt.net \
--to=normalperson@yhbt.net \
--cc=ruby.posix.mq@librelist.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).