From: Eric Wong <normalperson@yhbt.net>
To: sleepy.penguin@librelist.org
Subject: [sleepy.penguin] [PATCH 13/17] kqueue: workaround lack of RSTRUCT* macros on Rubinius
Date: Tue, 30 Apr 2013 02:39:38 +0000 [thread overview]
Message-ID: <1367289582-31293-14-git-send-email-normalperson@yhbt.net> (raw)
In-Reply-To: 1367289582-31293-1-git-send-email-normalperson@yhbt.net
Rubinius will not support RSTRUCT* macros, so converting the
structs to arrays is the least intrusive way to go about our
code.
ref: https://github.com/rubinius/rubinius/issues/494
---
ext/sleepy_penguin/kqueue.c | 70 ++++++++++++++++++++++++++++++++-------------
test/test_kqueue_io.rb | 6 ++++
2 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/ext/sleepy_penguin/kqueue.c b/ext/sleepy_penguin/kqueue.c
index 78a13c3..155204b 100644
--- a/ext/sleepy_penguin/kqueue.c
+++ b/ext/sleepy_penguin/kqueue.c
@@ -24,6 +24,18 @@
# define NUM2USHORT(n) (short)NUM2UINT(n)
#endif
+/*
+ * Rubinius does not support RSTRUCT_* in the C API:
+ * ref: https://github.com/rubinius/rubinius/issues/494
+ */
+#if defined(RUBINIUS)
+# define RBX_STRUCT (1)
+# define RSTRUCT_LEN(s) 0, rb_bug("RSTRUCT_LEN attempted in Rubinius")
+# define RSTRUCT_PTR(s) NULL, rb_bug("RSTRUCT_PTR attempted in Rubinius")
+#else
+# define RBX_STRUCT (0)
+#endif
+
static const long NANO_PER_SEC = 1000000000;
static ID id_for_fd;
static VALUE mEv, mEvFilt, mNote, mVQ;
@@ -233,33 +245,42 @@ static void event_set(struct kevent *event, VALUE *chg)
EV_SET(event, ident, filter, flags, fflags, data, udata);
}
+/* sets ptr and len */
+static void unpack_event(VALUE **ptr, VALUE *len, VALUE *event)
+{
+ switch (TYPE(*event)) {
+ case T_STRUCT:
+ if (RBX_STRUCT) {
+ *event = rb_funcall(*event, rb_intern("to_a"), 0, 0);
+ /* fall-through to T_ARRAY */
+ } else {
+ *len = RSTRUCT_LEN(*event);
+ *ptr = RSTRUCT_PTR(*event);
+ return;
+ }
+ case T_ARRAY:
+ *len = RARRAY_LEN(*event);
+ *ptr = RARRAY_PTR(*event);
+ return;
+ default:
+ rb_raise(rb_eTypeError, "unsupported type in changelist");
+ }
+}
+
static void ary2eventlist(struct kevent *events, VALUE changelist)
{
VALUE *chg = RARRAY_PTR(changelist);
long i = RARRAY_LEN(changelist);
+ VALUE event;
for (; --i >= 0; chg++) {
VALUE clen;
VALUE *cptr;
- switch (TYPE(*chg)) {
- case T_STRUCT:
- clen = RSTRUCT_LEN(*chg);
- cptr = RSTRUCT_PTR(*chg);
- break;
- case T_ARRAY:
- clen = RARRAY_LEN(*chg);
- cptr = RARRAY_PTR(*chg);
- break;
- default:
- rb_raise(rb_eTypeError,
- "unsupported type in changelist");
- }
- if (clen != 6) {
- fprintf(stderr, "clen: %ld\n", clen);
- rb_p(*chg);
+ event = *chg;
+ unpack_event(&cptr, &clen, &event);
+ if (clen != 6)
goto out_list;
- }
event_set(events++, cptr);
}
return;
@@ -273,14 +294,23 @@ out_list:
*/
static void changelist_prepare(struct kevent *events, VALUE changelist)
{
+ VALUE *cptr;
+ VALUE clen;
+ VALUE event;
+
switch (TYPE(changelist)) {
case T_ARRAY:
ary2eventlist(events, changelist);
- break;
+ return;
case T_STRUCT:
- if (RSTRUCT_LEN(changelist) != 6)
+ event = changelist;
+ unpack_event(&cptr, &clen, &event);
+ if (clen != 6)
rb_raise(rb_eTypeError, "event is not a Kevent struct");
- event_set(events, RSTRUCT_PTR(changelist));
+ event_set(events, cptr);
+ return;
+ default:
+ rb_bug("changelist_prepare not type filtered by sp_kevent");
}
}
diff --git a/test/test_kqueue_io.rb b/test/test_kqueue_io.rb
index 904a1cc..076c9f0 100644
--- a/test/test_kqueue_io.rb
+++ b/test/test_kqueue_io.rb
@@ -16,6 +16,12 @@ def teardown
end
end
+ def test_bad_type
+ kq = Kqueue::IO.new
+ @to_close << kq
+ assert_raises(TypeError) { kq.kevent("HI") }
+ end
+
def test_multi_event
kq = Kqueue::IO.new
@to_close << kq
--
1.8.2.1.367.gc875ca7
next prev parent reply other threads:[~2013-04-30 2:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-30 2:39 [sleepy.penguin] [PATCH 0/17] kqueue and epoll fixes Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 01/17] test_epoll: remove assert_nothing_raised Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 02/17] test: remove Rubinius-specific checks and skips Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 03/17] test_epoll: avoid sleeping inside a signal handler Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 04/17] fork-safe "to_io" in high-level epoll/kqueue Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 05/17] test_kqueue: join thread after test Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 06/17] test_kqueue_io: test for multiple event return Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 07/17] test_timerfd: relax timing-sensitive test Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 08/17] kqueue: set zero timeout if not retrieving events Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 09/17] test_epoll: workaround MRI 1.8 threading bug Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 10/17] test_kqueue_io: join thread in test when done using Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 11/17] test_kqueue: only test if IO#autoclose= exists Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 12/17] kqueue/io: fix MRI 1.8 support code for event retrieval Eric Wong
2013-04-30 2:39 ` Eric Wong [this message]
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 14/17] test_epoll: join thread before return from test Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 15/17] test_epoll: increase delay between signal spamming Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 16/17] epoll: clear FD marks snapshot before returning Eric Wong
2013-04-30 2:39 ` [sleepy.penguin] [PATCH 17/17] test_epoll: workaround race condition in test_close Eric Wong
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/sleepy_penguin/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367289582-31293-14-git-send-email-normalperson@yhbt.net \
--to=normalperson@yhbt.net \
--cc=sleepy.penguin@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/sleepy_penguin.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).