sleepy_penguin 3.1.0 → 3.1.0.26.g7181

data/test/test_epoll.rb

@@ -26,12 +26,12 @@ class TestEpoll < Test::Unit::TestCase
 
   def test_cross_thread
     tmp = []
-    Thread.new { sleep 0.100; @ep.add(@wr, Epoll::OUT) }
     t0 = Time.now
+    Thread.new { sleep 0.100; @ep.add(@wr, Epoll::OUT) }
     @ep.wait { |flags,obj| tmp << [ flags, obj ] }
     elapsed = Time.now - t0
     assert elapsed >= 0.100
-    assert_equal [[Epoll::OUT, @wr]], tmp
+    assert_equal [[Epoll::OUT, @wr]], tmp, tmp.inspect
   end
 
   def test_fork_safe
@@ -48,6 +48,19 @@ class TestEpoll < Test::Unit::TestCase
     assert_equal [[Epoll::IN, @rd]], tmp
   end
 
+  def test_dup_and_fork
+    epdup = @ep.dup
+    @ep.close
+    assert ! epdup.closed?
+    pid = fork do
+      exit(!epdup.closed? && @ep.closed?)
+    end
+    _, status = Process.waitpid2(pid)
+    assert status.success?, status.inspect
+  ensure
+    epdup.close
+  end
+
   def test_after_fork_usability
     fork { @ep.add(@rd, Epoll::IN); exit!(0) }
     fork { @ep.set(@rd, Epoll::IN); exit!(0) }
@@ -345,7 +358,11 @@ class TestEpoll < Test::Unit::TestCase
   def test_new
     @ep.close
     io = Epoll.new.to_io
-    assert_equal 0, io.fcntl(Fcntl::F_GETFD)
+    if RUBY_VERSION.to_f >= 2.0
+      assert_equal 1, io.fcntl(Fcntl::F_GETFD)
+    else
+      assert_equal 0, io.fcntl(Fcntl::F_GETFD)
+    end
   end
 
   def test_delete
@@ -399,7 +416,7 @@ class TestEpoll < Test::Unit::TestCase
   def test_include?
     assert ! @ep.include?(@rd)
     @ep.add @rd, Epoll::IN
-    assert @ep.include?(@rd)
+    assert @ep.include?(@rd), @ep.instance_variable_get(:@marks).inspect
     assert @ep.include?(@rd.fileno)
     assert ! @ep.include?(@wr)
     assert ! @ep.include?(@wr.fileno)
@@ -473,22 +490,26 @@ class TestEpoll < Test::Unit::TestCase
     nr = 10
     nr.times do
       r, w = IO.pipe
-      pipes[r] = w
+      lock.synchronize { pipes[r] = w }
       @ep.add(r, Epoll::IN | Epoll::ET | Epoll::ONESHOT)
 
       t = Thread.new do
         sleep 2
         events = 0
         @ep.wait(maxevents) do |_,obj|
-          assert pipes.include?(obj), "#{obj.inspect} is unknown"
-          lock.synchronize { ok << obj }
+          lock.synchronize do
+            assert pipes.include?(obj), "#{obj.inspect} is unknown"
+            ok << obj
+          end
           events += 1
         end
         events
       end
       thr << t
     end
-    pipes.each_value { |w| w.syswrite '.' }
+    lock.synchronize do
+      pipes.each_value { |w| w.syswrite '.' }
+    end
     thr.each do |t|
       begin
         t.run

data/test/test_epoll_gc.rb

@@ -42,6 +42,8 @@ class TestEpollGC < Test::Unit::TestCase
         2048.times { IO.pipe; File.open(__FILE__)}
         done = true
       end
+    rescue Errno::EMFILE, Errno::ENFILE
+      Thread.new { GC.start }.join
     end while true
   end
 end if ENV["GC_STRESS"].to_i != 0

data/test/test_epoll_gc_per_thread.rb

@@ -0,0 +1,23 @@
+__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

data/test/test_epoll_io.rb

@@ -0,0 +1,24 @@
+require 'test/unit'
+require 'fcntl'
+require 'socket'
+require 'thread'
+$-w = true
+Thread.abort_on_exception = true
+require 'sleepy_penguin'
+
+class TestEpollIO < Test::Unit::TestCase
+  include SleepyPenguin
+  RBX = defined?(RUBY_ENGINE) && (RUBY_ENGINE == 'rbx')
+
+  def setup
+    @rd, @wr = IO.pipe
+    @epio = Epoll::IO.new(nil)
+  end
+
+  def test_add_wait
+    @epio.epoll_ctl(Epoll::CTL_ADD, @wr, Epoll::OUT)
+    ev = []
+    @epio.epoll_wait { |events, obj| ev << [ events, obj ] }
+    assert_equal([[Epoll::OUT, @wr]], ev)
+  end
+end

data/test/test_epoll_optimizations.rb

@@ -28,7 +28,7 @@ class TestEpollOptimizations < Test::Unit::TestCase
     end
     assert_nil err
     lines = io.readlines; io.close
-    assert_equal 1, lines.grep(/^epoll_ctl/).size
+    assert_equal 1, lines.grep(/^epoll_ctl/).size, lines.inspect
     assert_match(/EPOLL_CTL_ADD/, lines.grep(/^epoll_ctl/)[0])
 
     io, err = Strace.me { @ep.set(@wr, Epoll::OUT | Epoll::ONESHOT) }

data/test/test_eventfd.rb

@@ -20,6 +20,11 @@ class TestEventFD < Test::Unit::TestCase
   def test_new
     efd = EventFD.new 0
     assert_kind_of(IO, efd)
+    if RUBY_VERSION.to_f >= 2.0
+      assert_equal 1, efd.fcntl(Fcntl::F_GETFD)
+    else
+      assert_equal 0, efd.fcntl(Fcntl::F_GETFD)
+    end
   end
 
   def test_new_nonblock

data/test/test_inotify.rb

@@ -17,6 +17,11 @@ class TestInotify < Test::Unit::TestCase
   def test_new
     @ino = Inotify.new
     assert_kind_of(IO, ino)
+    if RUBY_VERSION.to_f >= 2.0
+      assert_equal 1, ino.fcntl(Fcntl::F_GETFD)
+    else
+      assert_equal 0, ino.fcntl(Fcntl::F_GETFD)
+    end
   end
 
   def test_constants
@@ -30,19 +35,6 @@ class TestInotify < Test::Unit::TestCase
     end
   end
 
-  def test_dup
-    a = Inotify.new
-    b = a.dup
-    assert a.fileno != b.fileno
-    abuf = a.instance_variable_get(:@inotify_buf)
-    bbuf = b.instance_variable_get(:@inotify_buf)
-    assert abuf.object_id != bbuf.object_id, "#{a.inspect} #{b.inspect}"
-
-    atmp = a.instance_variable_get(:@inotify_tmp)
-    btmp = b.instance_variable_get(:@inotify_tmp)
-    assert_equal atmp.object_id, btmp.object_id
-  end
-
   def test_new_nonblock
     ino = Inotify.new Inotify::NONBLOCK
     flags = ino.fcntl(Fcntl::F_GETFL) & Fcntl::O_NONBLOCK

data/test/test_timerfd.rb

@@ -15,6 +15,11 @@ class TestTimerFD < Test::Unit::TestCase
   def test_create
     tfd = TimerFD.new
     assert_kind_of(IO, tfd)
+    if RUBY_VERSION.to_f >= 2.0
+      assert_equal 1, tfd.fcntl(Fcntl::F_GETFD)
+    else
+      assert_equal 0, tfd.fcntl(Fcntl::F_GETFD)
+    end
   end
 
   def test_create_nonblock

metadata

@@ -1,68 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sleepy_penguin
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 0
-  version: 3.1.0
+version: !ruby/object:Gem::Version
+  version: 3.1.0.26.g7181
+  prerelease: 9
 platform: ruby
-authors: 
+authors:
 - sleepy_penguin hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: wrongdoc
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        version: "1.5"
+      - !ruby/object:Gem::Version
+        version: '1.5'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: strace_me
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: strace_me
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id002
-description: |-
-  sleepy_penguin provides access to newer, Linux-only system calls to wait
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+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, inotify, and epoll interfaces are provided.
+
+  timerfd, inotify, and epoll interfaces are provided.'
 email: sleepy.penguin@librelist.org
 executables: []
-
-extensions: 
+extensions:
 - ext/sleepy_penguin/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README
 - TODO
 - NEWS
 - ChangeLog
 - lib/sleepy_penguin.rb
+- lib/sleepy_penguin/epoll.rb
+- lib/sleepy_penguin/epoll/io.rb
 - lib/sleepy_penguin/signalfd/sig_info.rb
 - lib/sleepy_penguin/sp.rb
 - ext/sleepy_penguin/epoll.c
@@ -71,7 +70,7 @@ extra_rdoc_files:
 - ext/sleepy_penguin/inotify.c
 - ext/sleepy_penguin/signalfd.c
 - ext/sleepy_penguin/timerfd.c
-files: 
+files:
 - .document
 - .gitignore
 - .manifest
@@ -88,7 +87,6 @@ files:
 - Rakefile
 - TODO
 - ext/sleepy_penguin/epoll.c
-- ext/sleepy_penguin/epoll_green.h
 - ext/sleepy_penguin/eventfd.c
 - ext/sleepy_penguin/extconf.rb
 - ext/sleepy_penguin/init.c
@@ -103,6 +101,8 @@ files:
 - ext/sleepy_penguin/util.c
 - ext/sleepy_penguin/value2timespec.h
 - lib/sleepy_penguin.rb
+- lib/sleepy_penguin/epoll.rb
+- lib/sleepy_penguin/epoll/io.rb
 - lib/sleepy_penguin/signalfd/sig_info.rb
 - lib/sleepy_penguin/sp.rb
 - pkg.mk
@@ -110,55 +110,53 @@ files:
 - sleepy_penguin.gemspec
 - 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_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: []
-
+licenses:
+- LGPLv2.1
+- LGPLv3
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - -t
 - sleepy_penguin - Linux I/O events for Ruby
 - -W
 - http://bogomips.org/sleepy_penguin.git/tree/%s
-require_paths: 
+require_paths:
 - lib
-- ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: rainbows
 rubygems_version: 1.8.24
 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_files:
+- test/test_epoll_gc.rb
 - test/test_inotify.rb
+- test/test_signalfd.rb
+- test/test_epoll.rb
+- test/test_epoll_gc_per_thread.rb
 - test/test_eventfd.rb
-- test/test_epoll_gc.rb
 - test/test_timerfd.rb
+- test/test_signalfd_siginfo.rb
+- test/test_epoll_optimizations.rb
+- test/test_epoll_io.rb
+has_rdoc: 

data/ext/sleepy_penguin/epoll_green.h

@@ -1,95 +0,0 @@
-/* this file is only used by Matz Ruby 1.8 which used green threads */
-
-/*
- * we have to worry about green threads and always pass zero
- * as the timeout for epoll_wait :(
- */
-#include <rubysig.h>
-#include <sys/time.h>
-
-/* in case _BSD_SOURCE doesn't give us this macro */
-#ifndef timersub
-#  define timersub(a, b, result) \
-do { \
-	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
-	(result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
-	if ((result)->tv_usec < 0) { \
-		--(result)->tv_sec; \
-		(result)->tv_usec += 1000000; \
-	} \
-} while (0)
-#endif
-
-static int safe_epoll_wait(struct ep_per_thread *ept)
-{
-	int n;
-
-	do {
-		TRAP_BEG;
-		n = epoll_wait(ept->ep->fd, ept->events, ept->maxevents, 0);
-		TRAP_END;
-	} while (n == -1 && errno == EINTR && ep_fd_check(ept->ep));
-
-	return n;
-}
-
-static int epwait_forever(struct ep_per_thread *ept)
-{
-	int n;
-
-	do {
-		(void)rb_io_wait_readable(ept->ep->fd);
-		n = safe_epoll_wait(ept);
-	} while (n == 0);
-
-	return n;
-}
-
-static int epwait_timed(struct ep_per_thread *ept)
-{
-	struct timeval tv;
-
-	tv.tv_sec = ept->timeout / 1000;
-	tv.tv_usec = (ept->timeout % 1000) * 1000;
-
-	for (;;) {
-		struct timeval t0, now, diff;
-		int n;
-		int fd = ept->ep->fd;
-		fd_set rfds;
-
-		FD_ZERO(&rfds);
-		FD_SET(fd, &rfds);
-
-		gettimeofday(&t0, NULL);
-		(void)rb_thread_select(fd + 1, &rfds, NULL, NULL, &tv);
-		n = safe_epoll_wait(ept);
-		if (n != 0)
-			return n;
-
-		/* XXX use CLOCK_MONOTONIC if people care about 1.8... */
-		gettimeofday(&now, NULL);
-		timersub(&now, &t0, &diff);
-		timersub(&tv, &diff, &tv);
-
-		if (tv.tv_usec < 0 || tv.tv_sec < 0)
-			return (n == -1) ? 0 : n;
-	}
-
-	assert("should never get here (epwait_timed)");
-	return -1;
-}
-
-static VALUE real_epwait(struct ep_per_thread *ept)
-{
-	int n;
-
-	if (ept->timeout == -1)
-		n = epwait_forever(ept);
-	else if (ept->timeout == 0)
-		n = safe_epoll_wait(ept);
-	else
-		n = epwait_timed(ept);
-
-	return epwait_result(ept, n);
-}