libuv 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 761d4fa5d96a80530d0b0edd0cb39b8495f81535
-  data.tar.gz: e5e2f17be5d237f0ac49f5973ef4f21a8cb33fe6
+  metadata.gz: 4ac0d4db86cce332900390f7f86ed875d8a192c7
+  data.tar.gz: 192887b8679a7f4faf3f646326b51a0aced660a1
 SHA512:
-  metadata.gz: 7d64a84900c157f15e2ede04a848ce9ca961145bd961635dc0db125a82cd10e6448a0fa25bc0c12f9b530053f919eed7aeb95bcc99cbea75981b0f11dd16f8e1
-  data.tar.gz: 8164ddfc3a957a5cbb99f8428bb89159fde23fbee6b1c6398b6ebefd90a9e7b0f232c0eab6453da5afdf91b75b364a742a05b86e780ed44f0815a69abb66abfd
+  metadata.gz: 84ad189d9d92d8d0726bbd802458f05b72936eb0ade2825202624126a16e453fbad8040b61797f0e473cec7bddef3dfbf0fba64c3a6699dfcae75e04351f534a
+  data.tar.gz: 86500e813b9655a07499e3a06ceafd0dbfc797bcedbe8c5e07daf7263f883d4c5590353cb4ea1faee8e7479fc1e4bba9c67b36cfcb809f685f5b62dc6b4f12b2

data/.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - ruby-head
-  - rbx-2
+  - rbx
   - jruby-19mode
 branches:
   only:

data/lib/libuv/async.rb

@@ -6,7 +6,7 @@ module Libuv
         def initialize(loop, callback = nil, &blk)
             @loop = loop
             @callback = callback || blk
-            async_ptr = ::Libuv::Ext.create_handle(:uv_async)
+            async_ptr = ::Libuv::Ext.allocate_handle_async
             error = check_result(::Libuv::Ext.async_init(loop.handle, async_ptr, callback(:on_async)))
 
             super(async_ptr, error)

data/lib/libuv/check.rb

@@ -8,7 +8,7 @@ module Libuv
             @loop = loop
             @callback = callback || blk
 
-            check_ptr = ::Libuv::Ext.create_handle(:uv_check)
+            check_ptr = ::Libuv::Ext.allocate_handle_check
             error = check_result(::Libuv::Ext.check_init(loop.handle, check_ptr))
 
             super(check_ptr, error)

data/lib/libuv/dns.rb

@@ -35,7 +35,7 @@ module Libuv
             @port = port
             @hint = hint
             @complete = false
-            @pointer = ::Libuv::Ext.create_request(:uv_getaddrinfo)
+            @pointer = ::Libuv::Ext.allocate_request_getaddrinfo
             @error = nil    # error in callback
 
             error = check_result ::Libuv::Ext.getaddrinfo(@loop, @pointer, callback(:on_complete), domain, port.to_s, HINTS[hint])

data/lib/libuv/ext/ext.rb

@@ -48,7 +48,7 @@ module Libuv
 
         # We need to calculate where the FS request data is located using req_size
         class FsRequest < FFI::Struct
-            layout :req_data, [:uint8, Ext.req_size(:uv_req)],
+            layout :req_data, [:uint8, Ext.req_size(:req)],
                    :fs_type, :uv_fs_type,
                    :loop, :uv_loop_t,
                    :fs_callback, :pointer,
@@ -84,6 +84,11 @@ module Libuv
         attach_function :walk, :uv_walk, [:uv_loop_t, :uv_walk_cb, :pointer], :void, :blocking => true
         attach_function :close, :uv_close, [:uv_handle_t, :uv_close_cb], :void, :blocking => true
         attach_function :is_closing, :uv_is_closing, [:uv_handle_t], :int, :blocking => true
+        # TODO:: Implement https://github.com/joyent/libuv/commit/0ecee213eac91beca141130cff2c7826242dab5a
+        # uv_recv_buffer_size
+        # uv_send_buffer_size
+        # https://github.com/joyent/libuv/commit/4ca9a363897cfa60f4e2229e4f15ac5abd7fd103
+        # uv_fileno
 
         attach_function :buf_init, :uv_buf_init, [:pointer, :size_t], UvBuf.by_value, :blocking => true
 
@@ -159,7 +164,7 @@ module Libuv
         attach_function :timer_again, :uv_timer_again, [:uv_timer_t], :int, :blocking => true
         attach_function :timer_set_repeat, :uv_timer_set_repeat, [:uv_timer_t, :int64_t], :void, :blocking => true
         attach_function :timer_get_repeat, :uv_timer_get_repeat, [:uv_timer_t], :int64_t, :blocking => true
-#:addrinfo
+        #:addrinfo
         attach_function :getaddrinfo, :uv_getaddrinfo, [:uv_loop_t, :uv_getaddrinfo_t, :uv_getaddrinfo_cb, :string, :string, UvAddrinfo.by_ref], :int, :blocking => true
         attach_function :freeaddrinfo, :uv_freeaddrinfo, [UvAddrinfo.by_ref], :void, :blocking => true
 
@@ -189,6 +194,7 @@ module Libuv
         attach_function :fs_mkdir, :uv_fs_mkdir, [:uv_loop_t, :uv_fs_t, :string, :int, :uv_fs_cb], :int, :blocking => true
         attach_function :fs_rmdir, :uv_fs_rmdir, [:uv_loop_t, :uv_fs_t, :string, :uv_fs_cb], :int, :blocking => true
         attach_function :fs_readdir, :uv_fs_readdir, [:uv_loop_t, :uv_fs_t, :string, :int, :uv_fs_cb], :int, :blocking => true
+        attach_function :fs_readdir_next, :uv_fs_readdir_next, [:uv_fs_t, :uv_dirent_t], :int, :blocking => true
         attach_function :fs_stat, :uv_fs_stat, [:uv_loop_t, :uv_fs_t, :string, :uv_fs_cb], :int, :blocking => true
         attach_function :fs_fstat, :uv_fs_fstat, [:uv_loop_t, :uv_fs_t, :uv_file, :uv_fs_cb], :int, :blocking => true
         attach_function :fs_rename, :uv_fs_rename, [:uv_loop_t, :uv_fs_t, :string, :string, :uv_fs_cb], :int, :blocking => true
@@ -252,12 +258,15 @@ module Libuv
         attach_function :thread_join, :uv_thread_join, [:uv_thread_t], :int, :blocking => true
 
 
-        def self.create_handle(type)
-            LIBC.malloc(Ext.handle_size(type))
+        # Predetermine the handle sizes
+        enum_type(:uv_handle_type).symbols.each do |handle_type|
+            handle_size = Ext.handle_size(handle_type)
+            define_singleton_method(:"allocate_handle_#{handle_type}") { LIBC.malloc(handle_size) }
         end
 
-        def self.create_request(type)
-            LIBC.malloc(Ext.req_size(type))
+        enum_type(:uv_req_type).symbols.each do |request_type|
+            request_size = Ext.req_size(request_type)
+            define_singleton_method(:"allocate_request_#{request_type}") { LIBC.malloc(request_size) }
         end
     end
 end

data/lib/libuv/ext/platform/unix.rb

@@ -2,6 +2,39 @@ module Libuv
     module Ext
         typedef :int, :uv_os_sock_t
         
+        # blksize_t, in_addr_t is not yet part of types.conf on linux
+        typedef :long, :blksize_t
+        typedef :uint32, :in_addr_t
+        typedef :ushort, :in_port_t
+
+        class InAddr < FFI::Struct
+            layout :s_addr, :in_addr_t
+        end
+
+        class SockaddrIn < FFI::Struct
+            layout :sin_family, :sa_family_t,
+                   :sin_port, :in_port_t,
+                   :sin_addr, InAddr,
+                   :sin_zero, [:char, 8]
+        end
+
+        class U6Addr < FFI::Union
+            layout :__u6_addr8, [:uint8, 16],
+                   :__u6_addr16, [:uint16, 8]
+        end
+
+        class In6Addr < FFI::Struct
+            layout :__u6_addr, U6Addr
+        end
+
+        class SockaddrIn6 < FFI::Struct
+            layout :sin6_family, :sa_family_t,
+                   :sin6_port, :in_port_t,
+                   :sin6_flowinfo, :uint32,
+                   :sin6_addr, In6Addr,
+                   :sin6_scope_id, :uint32
+        end
+        
         class UvBuf < FFI::Struct
             layout :base, :pointer, :len, :size_t
         end
@@ -14,5 +47,21 @@ module Libuv
         end
 
         attach_function :ntohs, [:ushort], :ushort, :blocking => true
+
+        class Sockaddr < FFI::Struct
+            layout :sa_family, :sa_family_t,
+                   :sa_data, [:char, 14]
+        end
+
+        class UvAddrinfo < FFI::Struct
+            layout  :flags, :int,
+                    :family, :int,
+                    :socktype, :int,
+                    :protocol, :int,
+                    :addrlen, :socklen_t,
+                    :addr, Sockaddr.by_ref,
+                    :canonname, :string,
+                    :next, UvAddrinfo.by_ref
+        end
     end
 end

data/lib/libuv/ext/types.rb

@@ -1,55 +1,53 @@
 require 'socket'    # Addrinfo
 
-module FFI::Platform
-    def self.linux?
-        IS_LINUX
-    end
-end
 
 module Libuv
     module Ext
-        # Defined in platform code
-        class UvAddrinfo < FFI::Struct; end
+        # Needs to be defined so we can self reference
+        class UvAddrinfo < FFI::Struct
+            layout  :flags, :int
+        end
 
-        require 'libuv/ext/platform/linux.rb' if FFI::Platform.linux?
+        # Defined in platform code
+        #require 'libuv/ext/platform/linux.rb' if FFI::Platform.linux?
         require 'libuv/ext/platform/unix.rb' if FFI::Platform.unix?
         require 'libuv/ext/platform/darwin_x64.rb' if FFI::Platform.mac? and FFI::Platform::ARCH == 'x86_64'
         require 'libuv/ext/platform/windows.rb' if FFI::Platform.windows?
 
 
         enum :uv_handle_type, [
-            :uv_unknown_handle, 0,
-            :uv_async, # start UV_HANDLE_TYPE_MAP
-            :uv_check,
-            :uv_fs_event,
-            :uv_fs_poll,
-            :uv_handle,
-            :uv_idle,
-            :uv_pipe,
-            :uv_poll,
-            :uv_prepare,
-            :uv_process,
-            :uv_stream,
-            :uv_tcp,
-            :uv_timer,
-            :uv_tty,
-            :uv_udp,
-            :uv_signal, # end UV_HANDLE_TYPE_MAP
-            :uv_file,
-            :uv_handle_type_max
+            :unknown_handle, 0,
+            :async, # start UV_HANDLE_TYPE_MAP
+            :check,
+            :fs_event,
+            :fs_poll,
+            :handle,
+            :idle,
+            :pipe,
+            :poll,
+            :prepare,
+            :process,
+            :stream,
+            :tcp,
+            :timer,
+            :tty,
+            :udp,
+            :signal, # end UV_HANDLE_TYPE_MAP
+            :file,
+            :handle_type_max
         ]
         enum :uv_req_type, [
-            :uv_unknown_req, 0,
-            :uv_req,         # start UV_REQ_TYPE_MAP
-            :uv_connect,
-            :uv_write,
-            :uv_shutdown,
-            :uv_udp_send,
-            :uv_fs,
-            :uv_work,
-            :uv_getaddrinfo, # end UV_REQ_TYPE_MAP
-            :uv_req_type_private,
-            :uv_req_type_max
+            :unknown_req, 0,
+            :req,         # start UV_REQ_TYPE_MAP
+            :connect,
+            :write,
+            :shutdown,
+            :udp_send,
+            :fs,
+            :work,
+            :getaddrinfo, # end UV_REQ_TYPE_MAP
+            :req_type_private,
+            :req_type_max
         ]
         enum :uv_membership, [
             :uv_leave_group, 0,
@@ -93,6 +91,23 @@ module Libuv
             :UV_RUN_ONCE,
             :UV_RUN_NOWAIT
         ]
+        enum :uv_dirent_type, [
+            :UV_DIRENT_UNKNOWN, 0,
+            :UV_DIRENT_FILE,
+            :UV_DIRENT_DIR,
+            :UV_DIRENT_LINK,
+            :UV_DIRENT_FIFO,
+            :UV_DIRENT_SOCKET,
+            :UV_DIRENT_CHAR,
+            :UV_DIRENT_BLOCK
+        ]
+
+        class UvDirent < FFI::Struct
+            layout  :name, :string,
+                    :type, :uv_dirent_type
+        end
+        typedef UvDirent.by_ref, :uv_dirent_t
+
 
         typedef UvBuf.by_ref, :uv_buf_t
         typedef SockaddrIn.by_ref, :sockaddr_in4

data/lib/libuv/file.rb

@@ -18,14 +18,14 @@ module Libuv
             @path, @flags, @mode = path, flags, mode
             @request_refs = {}
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @defer, request, ::Libuv::Ext.fs_open(@loop, request, @path, @flags, @mode, callback(:on_open))
             nil
         end
 
         def close
             @closed = true
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check(@defer, request, ::Libuv::Ext.fs_close(@loop.handle, request, @fileno, callback(:on_close)))
             nil # pre-check returns a promise
         end
@@ -37,7 +37,7 @@ module Libuv
 
             buffer1 = FFI::MemoryPointer.new(length)
             buffer  = ::Libuv::Ext.buf_init(buffer1, length)
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
 
             @request_refs[request.address] = [deferred, buffer1]
 
@@ -53,7 +53,7 @@ module Libuv
 
             buffer1 = FFI::MemoryPointer.from_string(data)
             buffer  = ::Libuv::Ext.buf_init(buffer1, length)
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
 
             @request_refs[request.address] = [deferred, buffer1]
 
@@ -63,7 +63,7 @@ module Libuv
         def sync
             deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             @request_refs[request.address] = deferred
 
             pre_check deferred, request, ::Libuv::Ext.fs_fsync(@loop.handle, request, @fileno, callback(:on_sync))
@@ -72,7 +72,7 @@ module Libuv
         def datasync
             deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             @request_refs[request.address] = deferred
 
             pre_check deferred, request, ::Libuv::Ext.fs_fdatasync(@loop.handle, request, @fileno, callback(:on_datasync))
@@ -82,7 +82,7 @@ module Libuv
             assert_type(Integer, offset, "offset must be an Integer")
             deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             @request_refs[request.address] = deferred
 
             pre_check deferred, request, ::Libuv::Ext.fs_ftruncate(@loop.handle, request, @fileno, offset, callback(:on_truncate))
@@ -93,7 +93,7 @@ module Libuv
             assert_type(Integer, mtime, "mtime must be an Integer")
             deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             @request_refs[request.address] = deferred
 
             pre_check deferred, request, ::Libuv::Ext.fs_futime(@loop.handle, request, @fileno, atime, mtime, callback(:on_utime))
@@ -103,7 +103,7 @@ module Libuv
             assert_type(Integer, mode, "mode must be an Integer")
             deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             @request_refs[request.address] = deferred
 
             pre_check deferred, request, ::Libuv::Ext.fs_fchmod(@loop.handle, request, @fileno, mode, callback(:on_chmod))
@@ -114,7 +114,7 @@ module Libuv
             assert_type(Integer, gid, "gid must be an Integer")
             deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             @request_refs[request.address] = deferred
 
             pre_check deferred, request, ::Libuv::Ext.fs_fchown(@loop.handle, request, @fileno, uid, gid, callback(:on_chown))

data/lib/libuv/filesystem.rb

@@ -11,7 +11,7 @@ module Libuv
             assert_type(String, path, "path must be a String")
             @unlink_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @unlink_deferred, request, ::Libuv::Ext.fs_unlink(@loop, request, path, callback(:on_unlink))
             @unlink_deferred.promise
         end
@@ -21,7 +21,7 @@ module Libuv
             assert_type(Integer, mode, "mode must be an Integer")
             @mkdir_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @mkdir_deferred, request, ::Libuv::Ext.fs_mkdir(@loop, request, path, mode, callback(:on_mkdir))
             @mkdir_deferred.promise
         end
@@ -30,7 +30,7 @@ module Libuv
             assert_type(String, path, "path must be a String")
             @rmdir_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @rmdir_deferred, request, ::Libuv::Ext.fs_rmdir(@loop, request, path, callback(:on_rmdir))
             @rmdir_deferred.promise
         end
@@ -39,7 +39,7 @@ module Libuv
             assert_type(String, path, "path must be a String")
             @readdir_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @readdir_deferred, request, ::Libuv::Ext.fs_readdir(@loop, request, path, 0, callback(:on_readdir))
             @readdir_deferred.promise
         end
@@ -49,7 +49,7 @@ module Libuv
             assert_type(String, new_path, "new_path must be a String")
             @rename_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @rename_deferred, request, ::Libuv::Ext.fs_rename(@loop, request, old_path, new_path, callback(:on_rename))
             @rename_deferred.promise
         end
@@ -59,7 +59,7 @@ module Libuv
             assert_type(Integer, mode, "mode must be an Integer")
             @chmod_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @chmod_deferred, request, ::Libuv::Ext.fs_chmod(@loop, request, path, mode, callback(:on_chmod))
             @chmod_deferred.promise
         end
@@ -70,7 +70,7 @@ module Libuv
             assert_type(Integer, mtime, "mtime must be an Integer")
             @utime_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @utime_deferred, request, ::Libuv::Ext.fs_utime(@loop, request, path, atime, mtime, callback(:on_utime))
             @utime_deferred.promise
         end
@@ -79,7 +79,7 @@ module Libuv
             assert_type(String, path, "path must be a String")
             @stat_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @stat_deferred, request, ::Libuv::Ext.fs_lstat(@loop, request, path, callback(:on_stat))
             @stat_deferred.promise
         end
@@ -89,7 +89,7 @@ module Libuv
             assert_type(String, new_path, "new_path must be a String")
             @link_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @link_deferred, request, ::Libuv::Ext.fs_link(@loop, request, old_path, new_path, callback(:on_link))
             @link_deferred.promise
         end
@@ -99,7 +99,7 @@ module Libuv
             assert_type(String, new_path, "new_path must be a String")
             @symlink_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @symlink_deferred, request, ::Libuv::Ext.fs_symlink(@loop, request, old_path, new_path, 0, callback(:on_symlink))
             @symlink_deferred.promise
         end
@@ -108,7 +108,7 @@ module Libuv
             assert_type(String, path, "path must be a String")
             @readlink_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @readlink_deferred, request, ::Libuv::Ext.fs_readlink(@loop, request, path, callback(:on_readlink))
             @readlink_deferred.promise
         end
@@ -119,7 +119,7 @@ module Libuv
             assert_type(Integer, gid, "gid must be an Integer")
             @chown_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @chown_deferred, request, ::Libuv::Ext.fs_chown(@loop, request, path, uid, gid, callback(:on_chown))
             @chown_deferred.promise
         end
@@ -158,8 +158,18 @@ module Libuv
         def on_readdir(req)
             if post_check(req, @readdir_deferred)
                 num_files = req[:result]
-                string_ptr = req[:ptr]
-                files = string_ptr.null? ? [] : string_ptr.read_array_of_type(FFI::TYPE_STRING, :read_string, num_files)
+
+                info = ::Libuv::Ext::UvDirent.new
+                files = []
+                ret = 1
+                loop do
+                    ret = ::Libuv::Ext.fs_readdir_next(req, info)
+                    files << [info[:name], info[:type]]
+
+                    # EOF is the alternative
+                    break unless ret == 0
+                end
+
                 cleanup(req)
                 @readdir_deferred.resolve(files)
             end

data/lib/libuv/fs_event.rb

@@ -8,7 +8,7 @@ module Libuv
         def initialize(loop, path)
             @loop = loop
 
-            fs_event_ptr = ::Libuv::Ext.create_handle(:uv_fs_event)
+            fs_event_ptr = ::Libuv::Ext.allocate_handle_fs_event
             error = check_result ::Libuv::Ext.fs_event_init(loop.handle, fs_event_ptr, path, callback(:on_fs_event), 0)
 
             super(fs_event_ptr, error)

data/lib/libuv/idle.rb

@@ -8,7 +8,7 @@ module Libuv
             @loop = loop
             @callback = callback || blk
 
-            idle_ptr = ::Libuv::Ext.create_handle(:uv_idle)
+            idle_ptr = ::Libuv::Ext.allocate_handle_idle
             error = check_result(::Libuv::Ext.idle_init(loop.handle, idle_ptr))
 
             super(idle_ptr, error)

data/lib/libuv/mixins/fs_checks.rb

@@ -6,7 +6,7 @@ module Libuv
         def stat
             @stat_deferred = @loop.defer
 
-            request = ::Libuv::Ext.create_request(:uv_fs)
+            request = ::Libuv::Ext.allocate_request_fs
             pre_check @stat_deferred, request, ::Libuv::Ext.fs_fstat(@loop.handle, request, @fileno, callback(:on_stat))
             @stat_deferred.promise
         end

data/lib/libuv/mixins/stream.rb

@@ -32,7 +32,7 @@ module Libuv
         # Shutsdown the writes on the handle waiting until the last write is complete before triggering the callback
         def shutdown
             return if @closed
-            error = check_result ::Libuv::Ext.shutdown(::Libuv::Ext.create_request(:uv_shutdown), handle, callback(:on_shutdown))
+            error = check_result ::Libuv::Ext.shutdown(::Libuv::Ext.allocate_request_shutdown, handle, callback(:on_shutdown))
             reject(error) if error
         end
 
@@ -62,7 +62,7 @@ module Libuv
 
                     # local as this variable will be available until the handle is closed
                     @write_callbacks ||= {}
-                    req = ::Libuv::Ext.create_request(:uv_write)
+                    req = ::Libuv::Ext.allocate_request_write
                     @write_callbacks[req.address] = [deferred, buffer1]
                     error = check_result ::Libuv::Ext.write(req, handle, buffer, 1, callback(:write_complete))
 

data/lib/libuv/pipe.rb

@@ -9,7 +9,7 @@ module Libuv
         def initialize(loop, ipc, acceptor = nil)
             @loop, @ipc = loop, ipc
 
-            pipe_ptr = ::Libuv::Ext.create_handle(:uv_pipe)
+            pipe_ptr = ::Libuv::Ext.allocate_handle_pipe
             error = check_result(::Libuv::Ext.pipe_init(loop.handle, pipe_ptr, ipc ? 1 : 0))
             error = check_result(::Libuv::Ext.accept(acceptor, pipe_ptr)) if acceptor && error.nil?
             
@@ -68,7 +68,7 @@ module Libuv
             assert_type(String, name, "name must be a String")
             begin
                 name = windows_path name if FFI::Platform.windows?
-                ::Libuv::Ext.pipe_connect(::Libuv::Ext.create_request(:uv_connect), handle, name, callback(:on_connect))
+                ::Libuv::Ext.pipe_connect(::Libuv::Ext.allocate_request_connect, handle, name, callback(:on_connect))
             rescue Exception => e
                 reject(e)
             end
@@ -100,7 +100,7 @@ module Libuv
 
 
                     @write_callbacks << [deferred, callback]
-                    req = ::Libuv::Ext.create_request(:uv_write)
+                    req = ::Libuv::Ext.allocate_request_write
                     error = check_result ::Libuv::Ext.write2(req, handle, buffer, 1, fd.handle, callback)
 
                     if error
@@ -135,9 +135,9 @@ module Libuv
             # Hide the accept logic
             remote = nil
             case pending
-            when :uv_tcp
+            when :tcp
                 remote = TCP.new(loop, handle)
-            when :uv_pipe
+            when :pipe
                 remote = Pipe.new(loop, @ipc, handle)
             else
                 raise NotImplementedError, "IPC for handle #{pending} not supported"

data/lib/libuv/prepare.rb

@@ -8,7 +8,7 @@ module Libuv
             @loop = loop
             @callback = callback || blk
 
-            prepare_ptr = ::Libuv::Ext.create_handle(:uv_prepare)
+            prepare_ptr = ::Libuv::Ext.allocate_handle_prepare
             error = check_result(::Libuv::Ext.prepare_init(loop.handle, prepare_ptr))
 
             super(prepare_ptr, error)

data/lib/libuv/signal.rb

@@ -19,7 +19,7 @@ module Libuv
         def initialize(loop)
             @loop = loop
 
-            signal_ptr = ::Libuv::Ext.create_handle(:uv_signal)
+            signal_ptr = ::Libuv::Ext.allocate_handle_signal
             error = check_result(::Libuv::Ext.signal_init(loop.handle, signal_ptr))
 
             super(signal_ptr, error)

data/lib/libuv/tcp.rb

@@ -18,7 +18,7 @@ module Libuv
         def initialize(loop, acceptor = nil)
             @loop = loop
 
-            tcp_ptr = ::Libuv::Ext.create_handle(:uv_tcp)
+            tcp_ptr = ::Libuv::Ext.allocate_handle_tcp
             error = check_result(::Libuv::Ext.tcp_init(loop.handle, tcp_ptr))
 
             if acceptor && error.nil?
@@ -291,7 +291,7 @@ module Libuv
 
 
             def connect_req
-                ::Libuv::Ext.create_request(:uv_connect)
+                ::Libuv::Ext.allocate_request_connect
             end
 
             def tcp_connect(callback)

data/lib/libuv/timer.rb

@@ -6,7 +6,7 @@ module Libuv
         def initialize(loop, callback = nil)
             @loop, @callback = loop, callback
             
-            timer_ptr = ::Libuv::Ext.create_handle(:uv_timer)
+            timer_ptr = ::Libuv::Ext.allocate_handle_timer
             error = check_result(::Libuv::Ext.timer_init(loop.handle, timer_ptr))
             @stopped = true
 

data/lib/libuv/tty.rb

@@ -6,7 +6,7 @@ module Libuv
         def initialize(loop, fileno, readable)
             @loop = loop
 
-            tty_ptr = ::Libuv::Ext.create_handle(:uv_tty)
+            tty_ptr = ::Libuv::Ext.allocate_handle_tty
             error = check_result(::Libuv::Ext.tty_init(loop.handle, tty_ptr, fileno, readable ? 1 : 0))
             
             super(tty_ptr, error)

data/lib/libuv/udp.rb

@@ -13,7 +13,7 @@ module Libuv
         def initialize(loop)
             @loop = loop
 
-            udp_ptr = ::Libuv::Ext.create_handle(:uv_udp)
+            udp_ptr = ::Libuv::Ext.allocate_handle_udp
             error = check_result(::Libuv::Ext.udp_init(loop.handle, udp_ptr))
             @request_refs = {}
 
@@ -189,7 +189,7 @@ module Libuv
 
 
         def send_req
-            ::Libuv::Ext.create_request(:uv_udp_send)
+            ::Libuv::Ext.allocate_request_udp_send
         end
 
         def create_sockaddr(ip, port)

data/lib/libuv/version.rb

@@ -1,3 +1,3 @@
 module Libuv
-    VERSION = '1.0.3'
+    VERSION = '1.1.0'
 end

data/lib/libuv/work.rb

@@ -14,7 +14,7 @@ module Libuv
 
             @work = work
             @complete = false
-            @pointer = ::Libuv::Ext.create_request(:uv_work)
+            @pointer = ::Libuv::Ext.allocate_request_work
             @error = nil    # error in callback
 
             error = check_result ::Libuv::Ext.queue_work(@loop, @pointer, callback(:on_work), callback(:on_complete))

data/spec/coroutines_spec.rb

@@ -1,136 +1,140 @@
 require 'libuv'
-require 'libuv/coroutines' # adds support for coroutines
 
+# No support for Fibers in jRuby
+if RUBY_PLATFORM != 'java'
+	require 'libuv/coroutines' # adds support for coroutines
 
-describe Object do
-	before :each do
-		@log = []
-		@general_failure = []
 
-		@loop = Libuv::Loop.default
-		@timeout = @loop.timer do
-			@timeout.close
-			@loop.stop
-			@general_failure << "test timed out"
-		end
-		@timeout.start(5000)
-	end
-	
-	describe 'serial execution' do
-		it "should wait for work to complete and return the result" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-					rescue Exception => e
-						@general_failure << "error in logger #{e.inspect}"
-					end
-				end
-
-
-				@log << co(@loop.work(proc {
-					sleep 1
-					'work done'
-				}))
-				@log << 'after work'
+	describe Object do
+		before :each do
+			@log = []
+			@general_failure = []
 
+			@loop = Libuv::Loop.default
+			@timeout = @loop.timer do
 				@timeout.close
 				@loop.stop
-			}
-
-			expect(@general_failure).to eq([])
-			expect(@log).to eq(['work done', 'after work'])
+				@general_failure << "test timed out"
+			end
+			@timeout.start(5000)
 		end
-
-		it "should raise an error if the promise is rejected" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-					rescue Exception => e
-						@general_failure << "error in logger #{e.inspect}"
+		
+		describe 'serial execution' do
+			it "should wait for work to complete and return the result" do
+				@loop.run { |logger|
+					logger.progress do |level, errorid, error|
+						begin
+							@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+						rescue Exception => e
+							@general_failure << "error in logger #{e.inspect}"
+						end
 					end
-				end
 
-				begin
+
 					@log << co(@loop.work(proc {
-						raise 'rejected'
+						sleep 1
+						'work done'
 					}))
 					@log << 'after work'
-				rescue => e
-					@log << e.message
-				end
-
-				@timeout.close
-				@loop.stop
-			}
 
-			expect(@general_failure).to eq([])
-			expect(@log).to eq(['rejected'])
-		end
+					@timeout.close
+					@loop.stop
+				}
+
+				expect(@general_failure).to eq([])
+				expect(@log).to eq(['work done', 'after work'])
+			end
+
+			it "should raise an error if the promise is rejected" do
+				@loop.run { |logger|
+					logger.progress do |level, errorid, error|
+						begin
+							@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+						rescue Exception => e
+							@general_failure << "error in logger #{e.inspect}"
+						end
+					end
 
-		it "should return the results of multiple promises" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
 					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-					rescue Exception => e
-						@general_failure << "error in logger #{e.inspect}"
+						@log << co(@loop.work(proc {
+							raise 'rejected'
+						}))
+						@log << 'after work'
+					rescue => e
+						@log << e.message
 					end
-				end
 
+					@timeout.close
+					@loop.stop
+				}
+
+				expect(@general_failure).to eq([])
+				expect(@log).to eq(['rejected'])
+			end
+
+			it "should return the results of multiple promises" do
+				@loop.run { |logger|
+					logger.progress do |level, errorid, error|
+						begin
+							@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+						rescue Exception => e
+							@general_failure << "error in logger #{e.inspect}"
+						end
+					end
 
-				job1 = @loop.work(proc {
-					sleep 1
-					'job1'
-				})
 
-				job2 = @loop.work(proc {
-					sleep 1
-					'job2'
-				})
+					job1 = @loop.work(proc {
+						sleep 1
+						'job1'
+					})
 
-				# Job1 and Job2 are executed in parallel
-				result1, result2 = co(job1, job2)
+					job2 = @loop.work(proc {
+						sleep 1
+						'job2'
+					})
 
-				@log << result1
-				@log << result2
-				@log << 'after work'
+					# Job1 and Job2 are executed in parallel
+					result1, result2 = co(job1, job2)
 
-				@timeout.close
-				@loop.stop
-			}
+					@log << result1
+					@log << result2
+					@log << 'after work'
 
-			expect(@general_failure).to eq([])
-			expect(@log).to eq(['job1', 'job2', 'after work'])
-		end
+					@timeout.close
+					@loop.stop
+				}
 
+				expect(@general_failure).to eq([])
+				expect(@log).to eq(['job1', 'job2', 'after work'])
+			end
 
-		it "should provide a callback option for progress events" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
-					rescue Exception => e
-						@general_failure << "error in logger #{e.inspect}"
+
+			it "should provide a callback option for progress events" do
+				@loop.run { |logger|
+					logger.progress do |level, errorid, error|
+						begin
+							@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+						rescue Exception => e
+							@general_failure << "error in logger #{e.inspect}"
+						end
 					end
-				end
 
-				timer = @loop.timer
-				timer.start(0)
-				co(timer) do
-					@log << 'in timer'
-					timer.close  # close will resolve the promise
-				end
+					timer = @loop.timer
+					timer.start(0)
+					co(timer) do
+						@log << 'in timer'
+						timer.close  # close will resolve the promise
+					end
 
-				@log << 'after timer'
+					@log << 'after timer'
 
-				@timeout.close
-				@loop.stop
-			}
+					@timeout.close
+					@loop.stop
+				}
 
-			expect(@log).to eq(['in timer', 'after timer'])
-			expect(@general_failure).to eq([])
+				expect(@log).to eq(['in timer', 'after timer'])
+				expect(@general_failure).to eq([])
+			end
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libuv
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Bulat Shakirzyanov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -122,7 +122,6 @@ files:
 - lib/libuv/error.rb
 - lib/libuv/ext/ext.rb
 - lib/libuv/ext/platform/darwin_x64.rb
-- lib/libuv/ext/platform/linux.rb
 - lib/libuv/ext/platform/unix.rb
 - lib/libuv/ext/platform/windows.rb
 - lib/libuv/ext/tasks.rb
@@ -346,6 +345,7 @@ files:
 - ext/libuv/test/test-getaddrinfo.c
 - ext/libuv/test/test-getnameinfo.c
 - ext/libuv/test/test-getsockname.c
+- ext/libuv/test/test-handle-fileno.c
 - ext/libuv/test/test-hrtime.c
 - ext/libuv/test/test-idle.c
 - ext/libuv/test/test-ip4-addr.c
@@ -364,6 +364,7 @@ files:
 - ext/libuv/test/test-pass-always.c
 - ext/libuv/test/test-ping-pong.c
 - ext/libuv/test/test-pipe-bind-error.c
+- ext/libuv/test/test-pipe-close-stdout-read-stdin.c
 - ext/libuv/test/test-pipe-connect-error.c
 - ext/libuv/test/test-pipe-getsockname.c
 - ext/libuv/test/test-pipe-sendmsg.c
@@ -382,6 +383,7 @@ files:
 - ext/libuv/test/test-shutdown-twice.c
 - ext/libuv/test/test-signal-multiple-loops.c
 - ext/libuv/test/test-signal.c
+- ext/libuv/test/test-socket-buffer-size.c
 - ext/libuv/test/test-spawn.c
 - ext/libuv/test/test-stdio-over-pipes.c
 - ext/libuv/test/test-tcp-bind-error.c
@@ -399,6 +401,7 @@ files:
 - ext/libuv/test/test-tcp-shutdown-after-write.c
 - ext/libuv/test/test-tcp-try-write.c
 - ext/libuv/test/test-tcp-unexpected-read.c
+- ext/libuv/test/test-tcp-write-after-connect.c
 - ext/libuv/test/test-tcp-write-queue-order.c
 - ext/libuv/test/test-tcp-write-to-half-open-connection.c
 - ext/libuv/test/test-tcp-writealot.c
@@ -421,6 +424,7 @@ files:
 - ext/libuv/test/test-udp-options.c
 - ext/libuv/test/test-udp-send-and-recv.c
 - ext/libuv/test/test-udp-send-immediate.c
+- ext/libuv/test/test-udp-send-unreachable.c
 - ext/libuv/test/test-udp-try-send.c
 - ext/libuv/test/test-walk-handles.c
 - ext/libuv/test/test-watcher-cross-stop.c
@@ -446,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: libuv bindings for Ruby

data/lib/libuv/ext/platform/linux.rb

@@ -1,53 +0,0 @@
-module Libuv
-    module Ext
-        # blksize_t, in_addr_t is not yet part of types.conf on linux
-        typedef :long, :blksize_t
-        typedef :uint32, :in_addr_t
-        typedef :ushort, :in_port_t
-
-
-        class Sockaddr < FFI::Struct
-            layout :sa_family, :sa_family_t,
-                   :sa_data, [:char, 14]
-        end
-
-        class InAddr < FFI::Struct
-            layout :s_addr, :in_addr_t
-        end
-
-        class SockaddrIn < FFI::Struct
-            layout :sin_family, :sa_family_t,
-                   :sin_port, :in_port_t,
-                   :sin_addr, InAddr,
-                   :sin_zero, [:char, 8]
-        end
-
-        class U6Addr < FFI::Union
-            layout :__u6_addr8, [:uint8, 16],
-                   :__u6_addr16, [:uint16, 8]
-        end
-
-        class In6Addr < FFI::Struct
-            layout :__u6_addr, U6Addr
-        end
-
-        class SockaddrIn6 < FFI::Struct
-            layout :sin6_family, :sa_family_t,
-                   :sin6_port, :in_port_t,
-                   :sin6_flowinfo, :uint32,
-                   :sin6_addr, In6Addr,
-                   :sin6_scope_id, :uint32
-        end
-
-        class UvAddrinfo < FFI::Struct
-            layout  :flags, :int,
-                    :family, :int,
-                    :socktype, :int,
-                    :protocol, :int,
-                    :addrlen, :socklen_t,
-                    :addr, Sockaddr.by_ref,
-                    :canonname, :string,
-                    :next, UvAddrinfo.by_ref
-        end
-    end
-end