diff options
| author | Eric Wong <e@yhbt.net> | 2011-03-06 00:10:50 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2011-03-06 01:06:20 +0000 |
| commit | f14855b5b746c6bb6c6edb0dada2803ab60c5b94 (patch) | |
| tree | c4fe09daf60f9b2181d01bcb9336ab08a561728f | |
| parent | b62672504cfed54fcfa22229e348385c5520210b (diff) | |
| download | sleepy_penguin-f14855b5b746c6bb6c6edb0dada2803ab60c5b94.tar.gz | |
signalfd: gets => take
For consistency with the inotify interface
| -rw-r--r-- | ext/sleepy_penguin/signalfd.c | 4 | ||||
| -rw-r--r-- | test/test_signalfd.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/sleepy_penguin/signalfd.c b/ext/sleepy_penguin/signalfd.c index 435ee24..91b734c 100644 --- a/ext/sleepy_penguin/signalfd.c +++ b/ext/sleepy_penguin/signalfd.c @@ -147,7 +147,7 @@ static ssize_t do_sfd_read(struct signalfd_siginfo *ssi) } #endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */ -static VALUE sfd_gets(VALUE self) +static VALUE sfd_take(VALUE self) { VALUE rv = ssi_alloc(cSigInfo); struct signalfd_siginfo *ssi = DATA_PTR(rv); @@ -204,7 +204,7 @@ void sleepy_penguin_init_signalfd(void) rb_define_const(cSignalFD, "CLOEXEC", INT2NUM(SFD_CLOEXEC)); #endif - rb_define_method(cSignalFD, "gets", sfd_gets, 0); + rb_define_method(cSignalFD, "take", sfd_take, 0); id_for_fd = rb_intern("for_fd"); ssi_members = rb_ary_new(); rb_define_const(cSigInfo, "MEMBERS", ssi_members); diff --git a/test/test_signalfd.rb b/test/test_signalfd.rb index df6b3c9..00fe18f 100644 --- a/test/test_signalfd.rb +++ b/test/test_signalfd.rb @@ -13,10 +13,10 @@ class TestSignalFD < Test::Unit::TestCase @sfd.close if @sfd && ! @sfd.closed? end - def test_gets + def test_take @sfd = SignalFD.new(%w(USR1), 0) pid = fork { sleep 0.01; Process.kill(:USR1, Process.ppid) } - siginfo = @sfd.gets + siginfo = @sfd.take assert_equal Signal.list["USR1"], siginfo.signo assert_equal pid, siginfo.pid assert Process.waitpid2(pid)[1].success? |