sleepy_penguin 3.1.0.26.g7181 → 3.2.0

data/test/test_epoll_io.rb

@@ -8,7 +8,6 @@ require 'sleepy_penguin'
 
 class TestEpollIO < Test::Unit::TestCase
   include SleepyPenguin
-  RBX = defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'rbx')
 
   def setup
     @rd, @wr = IO.pipe
@@ -21,4 +20,16 @@ class TestEpollIO < Test::Unit::TestCase
     @epio.epoll_wait { |events, obj| ev << [ events, obj ] }
     assert_equal([[Epoll::OUT, @wr]], ev)
   end
-end
+
+  class EpSub < Epoll::IO
+    def self.new
+      super(SleepyPenguin::Epoll::CLOEXEC)
+    end
+  end
+
+  def test_subclass
+    tmp = EpSub.new
+    assert_equal Fcntl::FD_CLOEXEC, tmp.fcntl(Fcntl::F_GETFD)
+    assert_nil tmp.close
+  end
+end if defined?(SleepyPenguin::Epoll)

data/test/test_epoll_optimizations.rb

@@ -9,7 +9,6 @@ require 'sleepy_penguin'
 
 class TestEpollOptimizations < Test::Unit::TestCase
   include SleepyPenguin
-  RBX = defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'rbx')
   IO_PURGATORY = []
 
   def setup

data/test/test_inotify.rb

@@ -107,4 +107,4 @@ class TestInotify < Test::Unit::TestCase
     end
     assert_equal 0, nr
   end
-end
+end if defined?(SleepyPenguin::Inotify)

data/test/test_kqueue.rb

@@ -0,0 +1,75 @@
+require 'test/unit'
+$-w = true
+Thread.abort_on_exception = true
+require 'sleepy_penguin'
+
+class TestKqueue < Test::Unit::TestCase
+  include SleepyPenguin
+
+  def test_kqueue
+    kq = Kqueue.new
+    assert_kind_of IO, kq.to_io
+    rd, wr = IO.pipe
+    ev = Kevent[rd.fileno, EvFilt::READ, Ev::ADD|Ev::ONESHOT, 0, 0, rd]
+    thr = Thread.new do
+      kq.kevent(ev)
+      wr.syswrite "."
+    end
+
+    events = []
+    n = kq.kevent(nil, 1) do |kevent|
+      assert_kind_of Kevent, kevent
+      events << kevent
+    end
+    assert_equal 1, events.size
+    assert_equal rd.fileno, events[0][0]
+    assert_equal EvFilt::READ, events[0][1]
+    assert_equal 1, n
+
+    # we should be drained
+    events = []
+    n = kq.kevent(nil, 1, 0) do |kevent|
+      assert_kind_of Kevent, kevent
+      events << kevent
+    end
+    assert_equal 0, events.size
+    assert_equal 0, n
+    thr.join
+
+    # synchronous add
+    events = []
+    ev = Kevent[wr.fileno, EvFilt::WRITE, Ev::ADD|Ev::ONESHOT, 0, 0, wr]
+    kq.kevent(ev)
+    n = kq.kevent(nil, 1, 0) do |kevent|
+      assert_kind_of Kevent, kevent
+      events << kevent
+    end
+    assert_equal 1, events.size
+    assert_equal wr.fileno, events[0][0]
+    assert_equal EvFilt::WRITE, events[0][1]
+    assert_equal 1, n
+  ensure
+    kq.close
+    rd.close if rd
+    wr.close if wr
+  end
+
+  def test_usable_after_fork
+    kq = Kqueue.new
+    pid = fork do
+      begin
+        ok = false
+        assert_equal(0, kq.kevent(nil, 1, 0.1) { exit!(false) })
+        ok = true
+      ensure
+        exit!(ok)
+      end
+    end
+    assert_equal(0, kq.kevent(nil, 1, 0.1) { exit!(false) })
+    _, status = Process.waitpid2(pid)
+    assert status.success?, status.inspect
+  ensure
+    kq.close
+  end
+end if defined?(SleepyPenguin::Kqueue) &&
+       IO.instance_methods.include?(:autoclose=)

data/test/test_kqueue_io.rb

@@ -0,0 +1,114 @@
+require 'test/unit'
+$-w = true
+Thread.abort_on_exception = true
+require 'sleepy_penguin'
+
+class TestKqueueIO < Test::Unit::TestCase
+  include SleepyPenguin
+
+  def setup
+    @to_close = []
+  end
+
+  def teardown
+    @to_close.each do |io|
+      io.close unless io.closed?
+    end
+  end
+
+  def test_io_like
+    kq = Kqueue::IO.new
+    @to_close << kq
+    assert_equal kq, kq.to_io
+    assert_kind_of Integer, kq.fileno
+  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
+    list = []
+    pipes = [ IO.pipe, IO.pipe, IO.pipe, IO.pipe ]
+    pipes.each do |(r,w)|
+      @to_close << r
+      @to_close << w
+      list << Kevent[r.fileno, EvFilt::READ, Ev::ADD|Ev::ONESHOT, 0, 0, r]
+    end
+    kq.kevent(list)
+
+    pipes.each do |(_,w)|
+      w.syswrite('.')
+    end
+    received = []
+    seen = {}
+    kq.kevent(nil, 1) do |*args|
+      received << args
+      assert_equal 6, args.size
+      assert_kind_of IO, args[5]
+      assert_nil seen[args[5]]
+      seen[args[5]] = true
+    end
+
+    assert_equal 1, received.size
+
+    kq.kevent(nil, 666) do |*args|
+      received << args
+      assert_equal 6, args.size
+      assert_kind_of IO, args[5]
+      assert_nil seen[args[5]]
+      seen[args[5]] = true
+    end
+    assert_equal 4, received.size
+  end
+
+  def test_xthread
+    kq = Kqueue::IO.new
+    assert_kind_of IO, kq
+    rd, wr = IO.pipe
+    ev = Kevent[rd.fileno, EvFilt::READ, Ev::ADD|Ev::ONESHOT, 0, 0, rd]
+    thr = Thread.new do
+      kq.kevent(ev)
+      wr.syswrite "."
+    end
+
+    events = []
+    n = kq.kevent(nil, 1) do |ident,filter,flags,fflags,data,udata|
+      events << [ ident,filter,flags,fflags,data,udata ]
+    end
+    assert_equal 1, events.size
+    assert_equal rd.fileno, events[0][0]
+    assert_equal EvFilt::READ, events[0][1]
+    assert_equal 1, n
+
+    thr.join
+
+    # we should be drained
+    events = []
+    n = kq.kevent(nil, 1, 0) do |ident,filter,flags,fflags,data,udata|
+      events << [ ident,filter,flags,fflags,data,udata ]
+    end
+    assert_equal 0, events.size
+    assert_equal 0, n
+
+    # synchronous add
+    events = []
+    ev = Kevent[wr.fileno, EvFilt::WRITE, Ev::ADD|Ev::ONESHOT, 0, 0, wr]
+    kq.kevent(ev)
+    n = kq.kevent(nil, 1, 0) do |ident,filter,flags,fflags,data,udata|
+      events << [ ident,filter,flags,fflags,data,udata ]
+    end
+    assert_equal 1, events.size
+    assert_equal wr.fileno, events[0][0]
+    assert_equal EvFilt::WRITE, events[0][1]
+    assert_equal 1, n
+  ensure
+    kq.close
+    rd.close if rd
+    wr.close if wr
+  end
+end if defined?(SleepyPenguin::Kqueue::IO)

data/test/test_timerfd.rb

@@ -65,9 +65,9 @@ class TestTimerFD < Test::Unit::TestCase
 
   def test_expirations_nonblock
     tfd = TimerFD.new(:MONOTONIC)
-    assert_equal([0, 0], tfd.settime(0, 0, 0.01))
+    assert_equal([0, 0], tfd.settime(0, 0, 0.05))
     assert_nil tfd.expirations(true)
-    sleep 0.01
+    sleep 0.05
     assert_equal 1, tfd.expirations
   end
 end if defined?(SleepyPenguin::TimerFD)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sleepy_penguin
 version: !ruby/object:Gem::Version
-  version: 3.1.0.26.g7181
-  prerelease: 9
+  version: 3.2.0
+  prerelease: 
 platform: ruby
 authors:
 - sleepy_penguin hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wrongdoc
@@ -48,7 +48,9 @@ description: ! 'sleepy_penguin provides access to newer, Linux-only system calls
 
   on events from traditionally non-I/O sources.  Bindings to the eventfd,
 
-  timerfd, inotify, and epoll interfaces are provided.'
+  timerfd, inotify, and epoll interfaces are provided.  Experimental support
+
+  for kqueue on FreeBSD (and likely OpenBSD/NetBSD) are also provided.'
 email: sleepy.penguin@librelist.org
 executables: []
 extensions:
@@ -62,6 +64,9 @@ extra_rdoc_files:
 - lib/sleepy_penguin.rb
 - lib/sleepy_penguin/epoll.rb
 - lib/sleepy_penguin/epoll/io.rb
+- lib/sleepy_penguin/kevent.rb
+- lib/sleepy_penguin/kqueue.rb
+- lib/sleepy_penguin/kqueue/io.rb
 - lib/sleepy_penguin/signalfd/sig_info.rb
 - lib/sleepy_penguin/sp.rb
 - ext/sleepy_penguin/epoll.c
@@ -70,6 +75,7 @@ extra_rdoc_files:
 - ext/sleepy_penguin/inotify.c
 - ext/sleepy_penguin/signalfd.c
 - ext/sleepy_penguin/timerfd.c
+- ext/sleepy_penguin/kqueue.c
 files:
 - .document
 - .gitignore
@@ -89,8 +95,10 @@ files:
 - ext/sleepy_penguin/epoll.c
 - ext/sleepy_penguin/eventfd.c
 - ext/sleepy_penguin/extconf.rb
+- ext/sleepy_penguin/git_version.h
 - ext/sleepy_penguin/init.c
 - ext/sleepy_penguin/inotify.c
+- ext/sleepy_penguin/kqueue.c
 - ext/sleepy_penguin/missing_epoll.h
 - ext/sleepy_penguin/missing_inotify.h
 - ext/sleepy_penguin/missing_rb_thread_fd_close.h
@@ -103,21 +111,26 @@ files:
 - lib/sleepy_penguin.rb
 - lib/sleepy_penguin/epoll.rb
 - lib/sleepy_penguin/epoll/io.rb
+- lib/sleepy_penguin/kevent.rb
+- lib/sleepy_penguin/kqueue.rb
+- lib/sleepy_penguin/kqueue/io.rb
 - lib/sleepy_penguin/signalfd/sig_info.rb
 - lib/sleepy_penguin/sp.rb
 - pkg.mk
 - setup.rb
 - sleepy_penguin.gemspec
+- test/test_constants.rb
 - test/test_epoll.rb
 - test/test_epoll_gc.rb
 - test/test_epoll_io.rb
 - test/test_epoll_optimizations.rb
 - test/test_eventfd.rb
 - test/test_inotify.rb
+- test/test_kqueue.rb
+- test/test_kqueue_io.rb
 - test/test_signalfd.rb
 - test/test_signalfd_siginfo.rb
 - test/test_timerfd.rb
-- test/test_epoll_gc_per_thread.rb
 homepage: http://bogomips.org/sleepy_penguin/
 licenses:
 - LGPLv2.1
@@ -139,24 +152,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: rainbows
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Linux I/O events for Ruby
 test_files:
-- test/test_epoll_gc.rb
-- test/test_inotify.rb
-- test/test_signalfd.rb
+- test/test_epoll_optimizations.rb
+- test/test_constants.rb
+- test/test_signalfd_siginfo.rb
 - test/test_epoll.rb
-- test/test_epoll_gc_per_thread.rb
+- test/test_signalfd.rb
+- test/test_kqueue_io.rb
+- test/test_inotify.rb
+- test/test_kqueue.rb
 - test/test_eventfd.rb
-- test/test_timerfd.rb
-- test/test_signalfd_siginfo.rb
-- test/test_epoll_optimizations.rb
+- test/test_epoll_gc.rb
 - test/test_epoll_io.rb
-has_rdoc: 
+- test/test_timerfd.rb

data/test/test_epoll_gc_per_thread.rb

@@ -1,23 +0,0 @@
-__END__
-require 'test/unit'
-$-w = true
-require 'sleepy_penguin'
-
-class TestEpollGcPerThread < Test::Unit::TestCase
-  include SleepyPenguin
-
-  def test_per_thread_gc_storm
-    thr = []
-    pipes = []
-    100000.times do
-      t = Thread.new do
-        ep = Epoll.new
-        ep.add(r, Epoll::IN)
-        ep.wait { |
-      end
-
-      thr << t
-      if thr.size > 100
-    end
-  end
-end