evt 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a9531f3994696a84020be4779721295f069bdffef6640bad51e3a5e7ec2fe03
-  data.tar.gz: e3767ace4df611ed920321830ec2bb9569736f650e9c84dd20b1247f09294431
+  metadata.gz: 76ad8c49742b3360c317120ecd68d3eadf7f5f654a5dd37b45cf4b5d0b59d75c
+  data.tar.gz: 33ac090cef3e427c7e6e2e6fb21f7eb5741ce5d3827542980727cce3d7e8eeb3
 SHA512:
-  metadata.gz: ca313fa9c2ef76fb2dd6c2f552856dff76701d6db44d4298a37b0fab0b97213b3074983b7fcaf9d6614fce5181345ffcc6ac29cb33fd4264d4257146056bff72
-  data.tar.gz: 7e5d2c57a5d7a9d2a6c000f537108448188988ef5fe3729e58787df49c46de9d1498c81b89af360a6dc680598c6d577043589b8d8dd09acff058601f83984f12
+  metadata.gz: 5781576a0d1a8e2c43117b1cce3569dd13b4141bcab4523556ba1d28fda071f3fe819e24bee0fe3578541a9d3450112b7e6246e0cbb5f1ebe9345edc72e98c24
+  data.tar.gz: fe5cd53d17c3df49bb169f759b66b1a7119ef649445c55270ead245069a5c6c242bdf44fde8e234552bcfc8f90ac7eafde7539198af2c1ef64e0d478e2ffb67f

data/ext/evt/epoll.h

@@ -4,8 +4,6 @@
 
 #if HAVE_SYS_EPOLL_H
 
-void epoll_internal_deregister(int epfd, int fd);
-
 VALUE method_scheduler_epoll_init(VALUE self) {
     rb_iv_set(self, "@epfd", INT2NUM(epoll_create(1))); // Size of epoll is ignored after Linux 2.6.8.
     return Qnil;
@@ -69,7 +67,6 @@ VALUE method_scheduler_epoll_wait(VALUE self) {
             obj_io = (VALUE) events[i].data.ptr;
             rb_funcall(writables, id_push, 1, obj_io);
         }
-        epoll_internal_deregister(epfd, events[i].data.fd);
     }
 
     result = rb_ary_new2(2);
@@ -78,13 +75,16 @@ VALUE method_scheduler_epoll_wait(VALUE self) {
     return result;
 }
 
-VALUE method_scheduler_epoll_backend(VALUE klass) {
-    return rb_str_new_cstr("epoll");
+VALUE method_scheduler_epoll_deregister(VALUE self, VALUE io) {
+    ID id_fileno = rb_intern("fileno");
+    int epfd = NUM2INT(rb_iv_get(self, "@epfd"));
+    int fd = NUM2INT(rb_funcall(io, id_fileno, 0));
+    epoll_ctl(epfd, EPOLL_CTL_DEL, fd, NULL); // Require Linux 2.6.9 for NULL event.
+    return Qnil;
 }
 
-void epoll_internal_deregister(int epfd, int fd) {
-    epoll_ctl(epfd, EPOLL_CTL_DEL, fd, NULL);
+VALUE method_scheduler_epoll_backend(VALUE klass) {
+    return rb_str_new_cstr("epoll");
 }
-
 #endif
 #endif

data/ext/evt/evt.c

@@ -24,6 +24,7 @@ void Init_evt_ext()
     rb_define_singleton_method(Bundled, "epoll_backend", method_scheduler_epoll_backend, 0);
     rb_define_method(Bundled, "epoll_init_selector", method_scheduler_epoll_init, 0);
     rb_define_method(Bundled, "epoll_register", method_scheduler_epoll_register, 2);
+    rb_define_method(Bundled, "epoll_deregister", method_scheduler_epoll_deregister, 1);
     rb_define_method(Bundled, "epoll_wait", method_scheduler_epoll_wait, 0);
 #endif
 #if HAVE_SYS_EVENT_H

data/ext/evt/evt.h

@@ -45,6 +45,7 @@ void Init_evt_ext();
 #if HAVE_SYS_EPOLL_H
     VALUE method_scheduler_epoll_init(VALUE self);
     VALUE method_scheduler_epoll_register(VALUE self, VALUE io, VALUE interest);
+    VALUE method_scheduler_epoll_deregister(VALUE self, VALUE io);
     VALUE method_scheduler_epoll_wait(VALUE self);
     VALUE method_scheduler_epoll_backend(VALUE klass);
     #include <sys/epoll.h>

data/lib/evt/backends/bundled.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Evt::Bundled
-  MAXIMUM_TIMEOUT = 5
+  MAXIMUM_TIMEOUT = 5000
   COLLECT_COUNTER_MAX = 16384
 
   def initialize
@@ -26,7 +26,7 @@ class Evt::Bundled
     _fiber, timeout = @waiting.min_by{ |key, value| value }
 
     if timeout
-      offset = timeout - current_time
+      offset = (timeout - current_time) * 1000 # Use mililisecond
       return 0 if offset < 0
       return offset if offset < MAXIMUM_TIMEOUT
     end
@@ -101,6 +101,7 @@ class Evt::Bundled
     @writable[io] = Fiber.current unless (events & IO::WRITABLE).zero?
     self.register(io, events)
     Fiber.yield
+    self.deregister(io)
     true
   end
 

data/lib/evt/backends/epoll.rb

@@ -17,6 +17,10 @@ class Evt::Epoll < Evt::Bundled
     epoll_register(io, interest)
   end
 
+  def deregister(io)
+    epoll_deregister(io)
+  end
+
   def wait
     epoll_wait
   end

data/lib/evt/backends/iocp.rb

@@ -15,6 +15,9 @@ class Evt::Iocp < Evt::Bundled
     # Placeholder
   end
 
+  def deregister(io)
+  end
+
   def io_read(io, buffer, offset, length)
     # Placeholder
   end

data/lib/evt/backends/kqueue.rb

@@ -17,6 +17,9 @@ class Evt::Kqueue < Evt::Bundled
     kqueue_register(io, interest)
   end
 
+  def deregister(io)
+  end
+
   def wait
     kqueue_wait
   end

data/lib/evt/backends/select.rb

@@ -17,6 +17,9 @@ class Evt::Select < Evt::Bundled
     # Select is stateless
   end
 
+  def deregister(io)
+  end
+
   def wait
     select_wait
   rescue Errno::EBADF => _

data/lib/evt/backends/uring.rb

@@ -17,6 +17,9 @@ class Evt::Uring < Evt::Bundled
     uring_register(io, interest)
   end
 
+  def deregister(io)
+  end
+
   def io_read(io, buffer, offset, length)
     uring_io_read(io, buffer, offset, length)
   end

data/lib/evt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evt
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Delton Ding