From: Eric Wong <e@80x24.org>
To: yahns-public@yhbt.net
Subject: [PATCH] sigevent_*: fixup non-eventfd path
Date: Tue, 2 Apr 2019 03:10:26 +0000 [thread overview]
Message-ID: <20190402031026.26449-1-e@80x24.org> (raw)
And slightly cleanup the Kgio::DefaultWaiters include for
the eventfd path, too.
Fixes: 96825e8ca734cfbb ("remove calls to kgio_wait_* able")
---
lib/yahns/sigevent_efd.rb | 1 -
lib/yahns/sigevent_pipe.rb | 18 +++++++++++++++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/lib/yahns/sigevent_efd.rb b/lib/yahns/sigevent_efd.rb
index 1250cf4..264097d 100644
--- a/lib/yahns/sigevent_efd.rb
+++ b/lib/yahns/sigevent_efd.rb
@@ -3,7 +3,6 @@
# License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt)
# frozen_string_literal: true
class Yahns::Sigevent < SleepyPenguin::EventFD # :nodoc:
- include Kgio::DefaultWaiters
def self.new
super(0, :CLOEXEC)
end
diff --git a/lib/yahns/sigevent_pipe.rb b/lib/yahns/sigevent_pipe.rb
index df4c31a..5d9b441 100644
--- a/lib/yahns/sigevent_pipe.rb
+++ b/lib/yahns/sigevent_pipe.rb
@@ -5,16 +5,24 @@
class Yahns::Sigevent # :nodoc:
attr_reader :to_io
def initialize
- @to_io, @wr = Kgio::Pipe.new
+ @to_io, @wr = IO.pipe
+ end
+
+ def wait_readable(*args)
+ @to_io.wait_readable(*args)
+ end
+
+ def fileno
+ @to_io.fileno
end
def sev_signal
- @wr.kgio_trywrite(".")
+ @wr.write_nonblock(".", exception: false)
end
def yahns_step
# 11 byte strings -> no malloc on YARV
- while String === @to_io.kgio_tryread(11)
+ while String === @to_io.read_nonblock(11, exception: false)
end
:wait_readable
end
@@ -23,4 +31,8 @@ def close
@to_io.close
@wr.close
end
+
+ def closed?
+ @to_io.closed?
+ end
end
--
EW
next reply other threads:[~2019-04-02 3:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-02 3:10 Eric Wong [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-02 3:13 [PATCH] sigevent_*: fixup non-eventfd path 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/yahns/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190402031026.26449-1-e@80x24.org \
--to=e@80x24.org \
--cc=yahns-public@yhbt.net \
/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/yahns.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).