evt 0.1.4 → 0.2.0

data/lib/evt.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'evt/version'
-require_relative 'evt/io'
-require_relative 'evt_ext'
 require_relative 'evt/scheduler'
+require_relative 'evt_ext'
 
 module Evt
 end

data/lib/evt/scheduler.rb

@@ -2,56 +2,55 @@
 
 require 'fiber'
 require 'socket'
-
-begin
-  require 'io/nonblock'
-rescue LoadError
-  # Ignore.
-end
+require 'io/nonblock'
 
 class Evt::Scheduler
   def initialize
     @readable = {}
     @writable = {}
+    @iovs = {}
     @waiting = {}
-    @blocking = []
+    
+    @lock = Mutex.new
+    @locking = 0
+    @ready = []
 
     @ios = ObjectSpace::WeakMap.new
     init_selector
   end
 
-  attr :readable
-  attr :writable
-  attr :waiting
-  attr :blocking
+  attr_reader :readable
+  attr_reader :writable
+  attr_reader :waiting
 
   def next_timeout
     _fiber, timeout = @waiting.min_by{|key, value| value}
 
     if timeout
       offset = timeout - current_time
-
-      if offset < 0
-        return 0
-      else
-        return offset
-      end
+      offset < 0 ? 0 : offset
     end
   end
 
   def run
-    while @readable.any? or @writable.any? or @waiting.any?
-      readable, writable = self.wait
-
-      # puts "readable: #{readable}" if readable&.any?
-      # puts "writable: #{writable}" if writable&.any?
+    while @readable.any? or @writable.any? or @waiting.any? or @iovs.any? or @locking.positive?
+      readable, writable, iovs = self.wait
 
       readable&.each do |io|
-        @readable[io]&.resume
+        fiber = @readable.delete(io)
+        fiber&.resume
       end
 
       writable&.each do |io|
-        @writable[io]&.resume
+        fiber = @writable.delete(io)
+        fiber&.resume
+      end
+
+      unless iovs.nil?
+        iovs&.each do |io|
+          fiber = @iovs.delete(io)
+          fiber&.resume
+        end
       end
 
       if @waiting.any?
@@ -67,96 +66,56 @@ class Evt::Scheduler
           end
         end
       end
-    end
-  end
 
-  def for_fd(fd)
-    @ios[fd] ||= ::IO.for_fd(fd, autoclose: false)
-  end
-
-  def wait_readable(io)
-    @readable[io] = Fiber.current
-    self.register(io, IO::WAIT_READABLE)
-    Fiber.yield
-    @readable.delete(io)
-    self.deregister(io)
-    return true
-  end
+      if @ready.any?
+        ready = nil
 
-  def wait_readable_fd(fd)
-    wait_readable(
-      for_fd(fd)
-    )
-  end
-
-  def wait_writable(io)
-    @writable[io] = Fiber.current
-    self.register(io, IO::WAIT_WRITABLE)
-    Fiber.yield
-    @writable.delete(io)
-    self.deregister(io)
-    return true
-  end
+        @lock.synchronize do
+          ready, @ready = @ready, []
+        end
 
-  def wait_writable_fd(fd)
-    wait_writable(
-      for_fd(fd)
-    )
+        ready.each do |fiber|
+          fiber.resume
+        end
+      end
+    end
   end
 
   def current_time
     Process.clock_gettime(Process::CLOCK_MONOTONIC)
   end
 
-  def wait_sleep(duration = nil)
-    @waiting[Fiber.current] = current_time + duration
-
-    Fiber.yield
-
-    return true
-  end
-
-  def wait_any(io, events, duration)
-    unless (events & IO::WAIT_READABLE).zero?
-      @readable[io] = Fiber.current
-    end
-
-    unless (events & IO::WAIT_WRITABLE).zero?
-      @writable[io] = Fiber.current
-    end
-
+  def io_wait(io, events, duration)
+    @readable[io] = Fiber.current unless (events & IO::READABLE).zero?
+    @writable[io] = Fiber.current unless (events & IO::WRITABLE).zero?
     self.register(io, events)
-
     Fiber.yield
-
-    @readable.delete(io)
-    @writable.delete(io)
     self.deregister(io)
-
-    return true
+    true
   end
 
-
-  def wait_for_single_fd(fd, events, duration)
-    wait_any(
-      for_fd(fd),
-      events,
-      duration
-    )
+  def kernel_sleep(duration = nil)
+    @waiting[Fiber.current] = current_time + duration if duration.nil?
+    Fiber.yield
+    true
   end
 
-  def enter_blocking_region
-    # puts "Enter blocking region: #{caller.first}"
+  def mutex_lock(mutex)
+    @locking += 1
+    Fiber.yield
+  ensure
+    @locking -= 1
   end
 
-  def exit_blocking_region
-    # puts "Exit blocking region: #{caller.first}"
-    @blocking << caller.first
+  def mutex_unlock(mutex, fiber)
+    @lock.synchronize do
+      @ready << fiber
+    end
   end
 
   def fiber(&block)
     fiber = Fiber.new(blocking: false, &block)
     fiber.resume
-    return fiber
+    fiber
   end
 end

data/lib/evt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Evt
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Delton Ding
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -32,20 +32,23 @@ extensions:
 - ext/evt/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - evt.gemspec
+- ext/evt/epoll.h
 - ext/evt/evt.c
 - ext/evt/evt.h
 - ext/evt/extconf.rb
+- ext/evt/iocp.h
+- ext/evt/kqueue.h
+- ext/evt/select.h
+- ext/evt/uring.h
 - lib/evt.rb
-- lib/evt/io.rb
 - lib/evt/scheduler.rb
 - lib/evt/version.rb
 homepage: https://github.com/dsh0416/evt
@@ -62,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.1
+      version: 2.8.0.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.2
 signing_key:
 specification_version: 4
 summary: A low-level Event Handler designed for Ruby 3 Scheduler

data/.travis.yml

@@ -1,25 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm: 2.7.1
-matrix:
-  include:
-    - rvm: 2.7.1
-      os: linux
-    - rvm: 2.7.1
-      os: osx
-    - rvm: ruby-head
-  allow_failures:
-    - rvm: ruby-head
-  fast_finish: true
-
-before_install: gem install bundler -v 2.1.4
-script:
-  - gem list -l
-  - bundle exec rake compile
-  - bundle exec rake
-
-bundler_args: --jobs 1 --retry 3
-
-notifications:
-  email: false

data/Gemfile.lock

@@ -1,24 +0,0 @@
-PATH
-  remote: .
-  specs:
-    evt (0.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    minitest (5.14.1)
-    rake (12.3.3)
-    rake-compiler (1.1.1)
-      rake
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  evt!
-  minitest (~> 5.0)
-  rake (~> 12.0)
-  rake-compiler (~> 1.0)
-
-BUNDLED WITH
-   2.2.0.dev

data/lib/evt/io.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-# Patch for 2.7.1 when testing
-if RUBY_VERSION.start_with?('2.7')
-  class IO
-    WAIT_READABLE = 1
-    WAIT_WRITABLE = 2
-  end
-end