diff options
author | Eric Wong <e@80x24.org> | 2019-04-02 03:06:45 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2019-04-02 03:06:45 +0000 |
commit | 1149d2bf3c1b0baf058be74bffab2591f0f84388 (patch) | |
tree | 8563f2c6ba086c5813df87149c360df3c3616927 | |
parent | 3235b67c4a62ab3bd5f08a8587ce7468049b8752 (diff) | |
download | yahns-1149d2bf3c1b0baf058be74bffab2591f0f84388.tar.gz |
And slightly cleanup the Kgio::DefaultWaiters include for the eventfd path, too. Fixes: 96825e8ca734cfbb ("remove calls to kgio_wait_* able")
-rw-r--r-- | lib/yahns/sigevent_efd.rb | 1 | ||||
-rw-r--r-- | 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 @@ class Yahns::Sigevent # :nodoc: @to_io.close @wr.close end + + def closed? + @to_io.closed? + end end |