rb-kqueue 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/rb-kqueue.rb

@@ -13,7 +13,7 @@ require 'rb-kqueue/queue'
 # * {Watcher} -- A watcher for a single sort of event
 # * {Event} -- A notification that an event has occurred
 module KQueue
-  VERSION = [0, 0, 2]
+  VERSION = [0, 0, 3]
 
   # Raise an exception for a native kqueue error.
   #

data/lib/rb-kqueue/native.rb

@@ -33,5 +33,8 @@ module KQueue
 
     attach_function :kqueue, [], :int
     attach_function :kevent, [:int, :pointer, :int, :pointer, :int, :pointer], :int
+
+    attach_function :open, [:string, :int], :int
+    attach_function :close, [:int], :int
   end
 end

data/lib/rb-kqueue/queue.rb

@@ -66,6 +66,10 @@ module KQueue
     # The {Event#data} field is set to the number of bytes available.
     # When the last writer disconnects, {Event#eof?} will be set.
     #
+    # Note that this isn't compatible with JRuby
+    # unless a native-code file descriptor is passed in.
+    # This means the file descriptor must be returned by an FFI-wrapped C function.
+    #
     # @param fd [IO, Fixnum] A Ruby IO stream, or the file descriptor
     #   for a native IO stream.
     # @yield [event] A block that will be run when the specified stream
@@ -75,7 +79,6 @@ module KQueue
     # @return [Watcher] The Watcher for this event.
     # @raise [SystemCallError] If something goes wrong when registering the Watcher.
     def watch_stream_for_read(fd, &callback)
-      fd = fd.fileno if fd.respond_to?(:fileno)
       Watcher::ReadWrite.new(self, fd, :read, callback)
     end
 
@@ -97,6 +100,10 @@ module KQueue
     # It's possible for {Event#eof?} to be set while there's still
     # data pending in the socket buffer.
     #
+    # Note that this isn't compatible with JRuby
+    # unless a native-code file descriptor is passed in.
+    # This means the file descriptor must be returned by an FFI-wrapped C function.
+    #
     # @param fd [Socket, Fixnum] A Ruby Socket, or the file descriptor
     #   for a native Socket.
     # @param low_water [Fixnum] The low-water mark for new data.
@@ -107,7 +114,6 @@ module KQueue
     # @return [Watcher] The Watcher for this event.
     # @raise [SystemCallError] If something goes wrong when registering the Watcher.
     def watch_socket_for_read(fd, low_water = nil, &callback)
-      fd = fd.fileno if fd.respond_to?(:fileno)
       Watcher::SocketReadWrite.new(self, fd, :read, low_water, callback)
     end
 
@@ -119,6 +125,10 @@ module KQueue
     # remaining in the write buffer.
     # When the reader disconnects, {Event#eof?} will be set.
     #
+    # Note that this isn't compatible with JRuby
+    # unless a native-code file descriptor is passed in.
+    # This means the file descriptor must be returned by an FFI-wrapped C function.
+    #
     # @param fd [IO, Fixnum] A Ruby IO stream, or the file descriptor
     #   for a native IO stream.
     # @yield [event] A block that will be run when the specified stream
@@ -128,7 +138,6 @@ module KQueue
     # @return [Watcher] The Watcher for this event.
     # @raise [SystemCallError] If something goes wrong when registering the Watcher.
     def watch_stream_for_write(fd, &callback)
-      fd = fd.fileno if fd.respond_to?(:fileno)
       Watcher::ReadWrite.new(self, fd, :write, callback)
     end
 
@@ -146,6 +155,10 @@ module KQueue
     # It's possible for {Event#eof?} to be set while there's still
     # data pending in the socket buffer.
     #
+    # Note that this isn't compatible with JRuby
+    # unless a native-code file descriptor is passed in.
+    # This means the file descriptor must be returned by an FFI-wrapped C function.
+    #
     # @param fd [Socket, Fixnum] A Ruby Socket, or the file descriptor
     #   for a native Socket.
     # @param low_water [Fixnum] The low-water mark for new data.
@@ -156,7 +169,6 @@ module KQueue
     # @return [Watcher] The Watcher for this event.
     # @raise [SystemCallError] If something goes wrong when registering the Watcher.
     def watch_socket_for_write(fd, low_water = nil, &callback)
-      fd = fd.fileno if fd.respond_to?(:fileno)
       Watcher::SocketReadWrite.new(self, fd, :write, low_water, callback)
     end
 

data/lib/rb-kqueue/watcher/file.rb

@@ -13,7 +13,42 @@ module KQueue
       # @private
       def initialize(queue, path, flags, callback)
         @path = path
-        @file = File.open(path) # TODO: not JRuby-compatible
+        @fd = Native.open(path, 0) # 0 means "read only"
+
+        if @fd < 0
+          raise SystemCallError.new(
+            "Failed to open file #{path}" +
+            case FFI.errno
+            when Errno::EACCES::Errno; ": Permission denied."
+            when Errno::EAGAIN::Errno; ": Slave side of a locked pseudo-terminal device."
+            when Errno::EFAULT::Errno; ": Outside the process's allocated address space."
+            when Errno::EINTR::Errno; ": Interrupted."
+            when Errno::ELOOP::Errno; ": Too many symbolic links (possible loop)."
+            when Errno::EMFILE::Errno; ": Too many open files."
+            when Errno::ENAMETOOLONG::Errno; ": Name too long."
+            when Errno::ENFILE::Errno; ": System file table is full."
+            when Errno::ENOENT::Errno; ": File doesn't exist."
+            when Errno::ENOTDIR::Errno; ": A component of the path prefix is not a directory."
+            when Errno::ENXIO::Errno; ": The device associated with this file doesn't exist."
+            when Errno::EOPNOTSUPP::Errno; ": File type not supported."
+            when Errno::EOVERFLOW::Errno; ": File too big."
+            else; ""
+            end,
+            FFI.errno)
+        end
+
+        ObjectSpace.define_finalizer(self, lambda do
+            next unless Native.close(@fd) < 0
+            raise SystemCallError.new(
+              "Failed to close file #{path}" +
+              case FFI.errno
+              when Errno::EBADF::Errno; ": Invalid file descriptor."
+              when Errno::EINTR::Errno; ": Closing interrupted."
+              when Errno::EIO::Errno; ": IO error."
+              else; ""
+              end,
+              FFI.errno)
+          end)
         super(queue, @file.fileno, :vnode, flags, nil, callback)
       end
     end

data/lib/rb-kqueue/watcher/read_write.rb

@@ -9,6 +9,13 @@ module KQueue
     # Note that read and write events for sockets
     # use the {SocketReadWrite} class.
     class ReadWrite < Watcher
+      # The Ruby IO object from which the file descriptor was extracted.
+      # This is only set if an IO object was used to construct this watcher.
+      # Otherwise, it's `nil`.
+      #
+      # @return [IO, nil]
+      attr_reader :io
+
       # The file descriptor for the stream being watched.
       #
       # @return [Fixnum]
@@ -23,6 +30,11 @@ module KQueue
       #
       # @private
       def initialize(queue, fd, type, callback)
+        if fd.is_a?(IO)
+          @io = fd
+          fd = fd.fileno
+        end
+
         @fd = fd
         @type = type
         super(queue, @fd, type, [], nil, callback)

data/lib/rb-kqueue/watcher/socket_read_write.rb

@@ -20,6 +20,11 @@ module KQueue
       #
       # @private
       def initialize(queue, fd, type, low_water, callback)
+        if fd.is_a?(IO)
+          @io = fd
+          fd = fd.fileno
+        end
+
         @fd = fd
         @type = type
 

data/rb-kqueue.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rb-kqueue}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Weizenbaum"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rb-kqueue
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nathan Weizenbaum