sleepy_penguin 1.4.0 → 2.0.0

data/test/test_eventfd.rb

@@ -14,6 +14,7 @@ class TestEventFD < Test::Unit::TestCase
       assert_kind_of Integer, EventFD::CLOEXEC
     defined?(EventFD::SEMAPHORE) and
       assert_kind_of Integer, EventFD::SEMAPHORE
+    assert_equal 0xfffffffffffffffe, EventFD::MAX
   end
 
   def test_new
@@ -27,6 +28,15 @@ class TestEventFD < Test::Unit::TestCase
     assert_equal(Fcntl::O_NONBLOCK, flags)
   end if defined?(EventFD::NONBLOCK)
 
+  def test_new_nonblock_cloexec_sym
+    efd = EventFD.new(0, [:NONBLOCK,:CLOEXEC])
+    flags = efd.fcntl(Fcntl::F_GETFL) & Fcntl::O_NONBLOCK
+    assert_equal(Fcntl::O_NONBLOCK, flags)
+
+    flags = efd.fcntl(Fcntl::F_GETFD) & Fcntl::FD_CLOEXEC
+    assert_equal(Fcntl::FD_CLOEXEC, flags)
+  end if defined?(EventFD::NONBLOCK) && defined?(EventFD::CLOEXEC)
+
   def test_new_cloexec
     efd = EventFD.new(0, EventFD::CLOEXEC)
     flags = efd.fcntl(Fcntl::F_GETFD) & Fcntl::FD_CLOEXEC
@@ -35,14 +45,22 @@ class TestEventFD < Test::Unit::TestCase
 
   def test_incr_value
     efd = EventFD.new(0)
-    assert_nil efd.incr(1)
+    assert_equal true, efd.incr(1)
     assert_equal 1, efd.value
 
-    assert_raises(Errno::EAGAIN) { efd.value_nonblock }
-    assert_nil efd.incr(9)
-    assert_equal 9, efd.value_nonblock
+    assert_nil efd.value(true)
+    assert_equal true, efd.incr(9)
+    assert_equal 9, efd.value(true)
+
+    assert_equal true, efd.incr(0xfffffffffffffffe)
+    assert_equal false, efd.incr(1, true)
+  end
 
-    assert_nil efd.incr(0xfffffffffffffffe)
-    assert_raises(Errno::EAGAIN) { efd.incr_nonblock 1 }
+  def test_incr_value_semaphore
+    efd = EventFD.new(6, :SEMAPHORE)
+    6.times { assert_equal 1, efd.value }
+    assert_nil efd.value(true)
+    assert_equal true, efd.incr(1)
+    assert_equal 1, efd.value
   end
 end if defined?(SleepyPenguin::EventFD)

data/test/test_inotify.rb

@@ -1,17 +1,35 @@
 require 'test/unit'
 require 'fcntl'
 require 'tempfile'
+require 'set'
 $-w = true
 require 'sleepy_penguin'
 
 class TestInotify < Test::Unit::TestCase
   include SleepyPenguin
+  attr_reader :ino
+
+  def teardown
+    ObjectSpace.each_object(Inotify) { |io| io.close unless io.closed? }
+    ObjectSpace.each_object(Tempfile) { |io| io.close unless io.closed? }
+  end
 
   def test_new
-    ino = Inotify.new
+    @ino = Inotify.new
     assert_kind_of(IO, ino)
   end
 
+  def test_constants
+    (Inotify.constants - IO.constants).each do |const|
+      case const.to_sym
+      when :Event, :Enumerator
+      else
+        nr = Inotify.const_get(const)
+        assert nr <= 0xffffffff, "#{const}=#{nr}"
+      end
+    end
+  end
+
   def test_dup
     a = Inotify.new
     b = a.dup
@@ -59,4 +77,65 @@ class TestInotify < Test::Unit::TestCase
     assert_equal second_id, ino.take.object_id
     assert_nil ino.take(true)
   end
+
+  def test_add_take_symbols
+    ino = Inotify.new :CLOEXEC
+    tmp1 = Tempfile.new 'take'
+    tmp2 = Tempfile.new 'take'
+    wd = ino.add_watch File.dirname(tmp1.path), :MOVE
+    assert_kind_of Integer, wd
+    File.rename tmp1.path, tmp2.path
+    event = ino.take
+    assert_equal wd, event.wd
+    assert_kind_of Inotify::Event, event
+    assert_equal File.basename(tmp1.path), event.name
+    others = ino.instance_variable_get(:@inotify_tmp)
+    assert_kind_of Array, others
+    assert_equal 1, others.size
+    assert_equal File.basename(tmp2.path), others[0].name
+    assert_equal [ :MOVED_FROM ], event.events
+    assert_equal [ :MOVED_TO ], others[0].events
+    assert_equal wd, others[0].wd
+    second_id = others[0].object_id
+    assert_equal second_id, ino.take.object_id
+    assert_nil ino.take(true)
+  end
+
+  def test_each
+    ino = Inotify.new :CLOEXEC
+    tmp1 = Tempfile.new 'take'
+    wd = ino.add_watch tmp1.path, :OPEN
+    assert_kind_of Integer, wd
+    nr = 5
+    o = File.open(tmp1.path)
+    ino.each do |event|
+      assert_equal [:OPEN], event.events
+      break if (nr -= 1) == 0
+      o = File.open(tmp1.path)
+    end
+    assert_equal 0, nr
+  end
+
+  def test_close_threadable
+    ino = Inotify.new
+    tmp = []
+    thr = Thread.new do
+      until ino.closed?
+        tmp << Time.now
+        Thread.pass
+      end
+    end
+    t0 = Time.now
+    ino.close
+    t1 = Time.now
+    between = []
+    thr.join
+    tmp.each do |t|
+      if t > t0 && t < t1
+        between << t
+      end
+    end
+    assert tmp.size > 0, "tmp.size=#{tmp.size}"
+    assert between.size > 0, "between.size=#{between.size}"
+  end if RUBY_VERSION.to_f >= 1.9
 end

data/test/test_signalfd.rb

@@ -0,0 +1,94 @@
+require 'test/unit'
+require "dl"
+begin
+  require "dl/func"
+rescue LoadError
+end
+$-w = true
+require 'sleepy_penguin'
+
+class TestSignalFD < Test::Unit::TestCase
+  include SleepyPenguin
+
+  def setup
+    @sfd = nil
+    trap(:USR1, "IGNORE")
+    trap(:USR2, "IGNORE")
+  end
+
+  def teardown
+    @sfd.close if @sfd && ! @sfd.closed?
+    trap(:USR1, "DEFAULT")
+    trap(:USR2, "DEFAULT")
+  end
+
+  def test_rt_constants
+    assert [33,34].include?(SignalFD::RTMIN)
+    assert_equal 64, SignalFD::RTMAX
+  end
+
+  def test_new_with_flags
+    @sfd = SignalFD.new(%w(USR1), [:CLOEXEC,:NONBLOCK])
+    assert_instance_of SignalFD, @sfd
+  end if defined?(SignalFD::CLOEXEC) && defined?(SignalFD::NONBLOCK)
+
+  def test_new_with_sym_flag
+    @sfd = SignalFD.new(%w(USR1), :CLOEXEC)
+    assert_instance_of SignalFD, @sfd
+  end if defined?(SignalFD::CLOEXEC)
+
+  def test_take
+    @sfd = SignalFD.new(%w(USR1), 0)
+    pid = fork { sleep 0.01; Process.kill(:USR1, Process.ppid) }
+    siginfo = @sfd.take
+    assert_equal Signal.list["USR1"], siginfo.signo
+    assert_equal pid, siginfo.pid
+    assert Process.waitpid2(pid)[1].success?
+  end if RUBY_VERSION =~ %r{\A1\.9}
+
+  def test_take_nonblock
+    @sfd = SignalFD.new(%w(USR1), :NONBLOCK)
+    assert_nil @sfd.take(true)
+    assert_nil IO.select [ @sfd ], nil, nil, 0
+    pid = fork { sleep 0.01; Process.kill(:USR1, Process.ppid) }
+    siginfo = @sfd.take(true)
+    if siginfo
+      assert_equal Signal.list["USR1"], siginfo.signo
+      assert_equal pid, siginfo.pid
+    else
+      warn "WARNING: SignalFD#take(nonblock=true) broken"
+    end
+    assert Process.waitpid2(pid)[1].success?
+  end if RUBY_VERSION =~ %r{\A1\.9}
+
+  def test_update
+    assert_nothing_raised do
+      @sfd = SignalFD.new
+      @sfd.update! Signal.list["USR1"]
+      @sfd.update! [ "USR1", Signal.list["USR2"] ]
+      @sfd.update! [ "USR1", :USR2 ]
+      @sfd.update! [ Signal.list["USR1"], Signal.list["USR2"] ]
+    end
+  end
+
+  def test_with_sigqueue
+    sig = Signal.list["USR2"]
+    @sfd = SignalFD.new(:USR2)
+    libc = DL::Handle.new("libc.so.6")
+    if defined?(DL::Function)
+      sigqueue = libc["sigqueue"]
+      sigqueue = DL::CFunc.new(sigqueue, DL::TYPE_INT, "sigqueue")
+      args = [DL::TYPE_INT, DL::TYPE_INT,DL::TYPE_INT]
+      sigqueue = DL::Function.new(sigqueue, args, DL::TYPE_INT)
+    else
+      sigqueue = libc["sigqueue", "IIII"]
+    end
+    pid = fork { sleep 0.01; sigqueue.call(Process.ppid, sig, 666)  }
+    siginfo = @sfd.take
+    assert_equal sig, siginfo.signo
+    assert_equal pid, siginfo.pid
+    assert Process.waitpid2(pid)[1].success?
+    assert_equal 666, siginfo.ptr
+    assert_equal 666, siginfo.int
+  end if RUBY_VERSION =~ %r{\A1\.9}
+end if defined?(SleepyPenguin::SignalFD)

data/test/test_signalfd_siginfo.rb

@@ -0,0 +1,32 @@
+require 'test/unit'
+$-w = true
+require 'sleepy_penguin'
+
+class TestSignalFDSigInfo < Test::Unit::TestCase
+  include SleepyPenguin
+
+  def test_members
+    members = SignalFD::SigInfo::MEMBERS
+    assert_equal 16, members.size
+    a = SignalFD::SigInfo.new
+    members.each { |k| assert_equal 0, a.__send__(k) }
+  end
+
+  def test_equality
+    a = SignalFD::SigInfo.new
+    b = SignalFD::SigInfo.new
+    assert_equal a, b
+
+    c = Class.new(SignalFD::SigInfo).new
+    assert_equal a, c
+    assert c != c.to_hash
+  end
+
+  def test_to_hash
+    hash = SignalFD::SigInfo.new.to_hash
+    assert_instance_of Hash, hash
+    members = SignalFD::SigInfo::MEMBERS
+    assert_equal members.size, hash.size
+    members.each { |k| assert_equal 0, hash[k] }
+  end
+end if defined?(SleepyPenguin::SignalFD)

data/test/test_timerfd.rb

@@ -13,26 +13,56 @@ class TestTimerFD < Test::Unit::TestCase
   end
 
   def test_create
-    tfd = TimerFD.create
+    tfd = TimerFD.new
     assert_kind_of(IO, tfd)
   end
 
   def test_create_nonblock
-    tfd = TimerFD.create(TimerFD::REALTIME, TimerFD::NONBLOCK)
+    tfd = TimerFD.new(TimerFD::REALTIME, TimerFD::NONBLOCK)
+    flags = tfd.fcntl(Fcntl::F_GETFL) & Fcntl::O_NONBLOCK
+    assert_equal(Fcntl::O_NONBLOCK, flags)
+  end if defined?(TimerFD::NONBLOCK)
+
+  def test_create_nonblock_sym
+    tfd = TimerFD.new(:REALTIME, :NONBLOCK)
     flags = tfd.fcntl(Fcntl::F_GETFL) & Fcntl::O_NONBLOCK
     assert_equal(Fcntl::O_NONBLOCK, flags)
   end if defined?(TimerFD::NONBLOCK)
 
   def test_create_cloexec
-    tfd = TimerFD.create(TimerFD::REALTIME, TimerFD::CLOEXEC)
+    tfd = TimerFD.new(TimerFD::REALTIME, TimerFD::CLOEXEC)
     flags = tfd.fcntl(Fcntl::F_GETFD) & Fcntl::FD_CLOEXEC
     assert_equal(Fcntl::FD_CLOEXEC, flags)
   end if defined?(TimerFD::CLOEXEC)
 
   def test_settime
-    tfd = TimerFD.create(TimerFD::REALTIME)
+    tfd = TimerFD.new(TimerFD::REALTIME)
     assert_equal([0, 0], tfd.settime(TimerFD::ABSTIME, 0, 0.01))
     sleep 0.01
     assert_equal 1, tfd.expirations
   end
+
+  def test_settime_symbol
+    tfd = TimerFD.new(:REALTIME)
+    assert_equal([0, 0], tfd.settime(:ABSTIME, 0, 0.01))
+    sleep 0.01
+    assert_equal 1, tfd.expirations
+  end
+
+  def test_gettime
+    tfd = TimerFD.new :REALTIME
+    now = Time.now.to_i
+    assert_equal([0, 0], tfd.settime(nil, 0, now + 5))
+    interval, value = tfd.gettime
+    assert_equal 0, interval
+    assert_in_delta now + 5, value, 0.01
+  end
+
+  def test_expirations_nonblock
+    tfd = TimerFD.new(:MONOTONIC)
+    assert_equal([0, 0], tfd.settime(0, 0, 0.01))
+    assert_nil tfd.expirations(true)
+    sleep 0.01
+    assert_equal 1, tfd.expirations
+  end
 end if defined?(SleepyPenguin::TimerFD)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sleepy_penguin
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
-  - 1
-  - 4
+  - 2
+  - 0
   - 0
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - sleepy_penguin hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +00:00
+date: 2011-03-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
 description: |-
   sleepy_penguin provides access to newer, Linux-only system calls to wait
   on events from traditionally non-I/O sources.  Bindings to the eventfd,
-  timerfd, and epoll interfaces are provided.
+  timerfd, inotify, signalfd and epoll interfaces are provided.
 email: sleepy.penguin@librelist.com
 executables: []
 
@@ -64,9 +64,13 @@ extra_rdoc_files:
 - NEWS
 - ChangeLog
 - lib/sleepy_penguin.rb
+- lib/sleepy_penguin/signalfd/sig_info.rb
+- lib/sleepy_penguin/sp.rb
 - ext/sleepy_penguin/init.c
 - ext/sleepy_penguin/epoll.c
 - ext/sleepy_penguin/eventfd.c
+- ext/sleepy_penguin/inotify.c
+- ext/sleepy_penguin/signalfd.c
 - ext/sleepy_penguin/timerfd.c
 files: 
 - .document
@@ -89,13 +93,17 @@ files:
 - ext/sleepy_penguin/extconf.rb
 - ext/sleepy_penguin/init.c
 - ext/sleepy_penguin/inotify.c
-- ext/sleepy_penguin/nonblock.h
+- ext/sleepy_penguin/missing_epoll.h
+- ext/sleepy_penguin/missing_inotify.h
+- ext/sleepy_penguin/signalfd.c
 - ext/sleepy_penguin/sleepy_penguin.h
 - ext/sleepy_penguin/timerfd.c
+- ext/sleepy_penguin/util.c
 - ext/sleepy_penguin/value2timespec.h
 - lib/sleepy_penguin.rb
+- lib/sleepy_penguin/signalfd/sig_info.rb
+- lib/sleepy_penguin/sp.rb
 - pkg.mk
-- script/isolate_for_tests
 - setup.rb
 - sleepy_penguin.gemspec
 - test/test_epoll.rb
@@ -103,6 +111,8 @@ files:
 - test/test_epoll_optimizations.rb
 - test/test_eventfd.rb
 - test/test_inotify.rb
+- test/test_signalfd.rb
+- test/test_signalfd_siginfo.rb
 - test/test_timerfd.rb
 has_rdoc: true
 homepage: http://bogomips.org/sleepy_penguin/
@@ -138,13 +148,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rainbows
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Linux I/O events for Ruby
 test_files: 
 - test/test_epoll_optimizations.rb
+- test/test_signalfd_siginfo.rb
 - test/test_epoll.rb
+- test/test_signalfd.rb
 - test/test_inotify.rb
 - test/test_eventfd.rb
 - test/test_epoll_gc.rb

data/ext/sleepy_penguin/nonblock.h

@@ -1,19 +0,0 @@
-#ifndef SLEEPY_PENGUIN_NONBLOCK_H
-#define SLEEPY_PENGUIN_NONBLOCK_H
-#include <unistd.h>
-#include <fcntl.h>
-#include <ruby.h>
-static void set_nonblock(int fd)
-{
-	int flags = fcntl(fd, F_GETFL);
-
-	if (flags == -1)
-		rb_sys_fail("fcntl(F_GETFL)");
-	if ((flags & O_NONBLOCK) == O_NONBLOCK)
-		return;
-	flags = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-	if (flags == -1)
-		rb_sys_fail("fcntl(F_SETFL)");
-}
-
-#endif /* SLEEPY_PENGUIN_NONBLOCK_H */