murasaki 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 23fed947b6df870405250d679abc7ddad4e621aa
-  data.tar.gz: 3a2c0e0a1bb6030e6cdf65a8ab2253df0c9756a3
+SHA256:
+  metadata.gz: ad4a049570311120ece072730c1b005bc90f5854878fcaf1b5e1a619e26517dc
+  data.tar.gz: db0f726b3185842c74bf3936e6272de4ae61d80533cf711bd785ea61a20746e1
 SHA512:
-  metadata.gz: faec2ae885b618eca239e55324e239a56c746997b8fa127343d109ab603c7f6ebea89f2276b85ba83fcca77ce23768aa0b2af43bdba90319a4430116930b98fe
-  data.tar.gz: 7163f7dc780b5bcab599e0517992bde5b8b7898d9bac549134edced469a6708fd9d12fd01e5bb10e8c99693903641805fc0fb8d0eeaf92f16e3241353d004da1
+  metadata.gz: 4c329162006a69c8f321d2fe74cbe16dd7a4cf7368779f19d2ce0b285d1081ffbdd05ef6aea6655890e239535423e136c0701706104124482c8fe18fda50ebab
+  data.tar.gz: ca8b386203e419ce8931134bb057931d504aac4157c8773da4b2d8c00e0f57ab44a5b9a681db4cd42d3795121d2b35e0314bbc420d327adab4732e6c9376323a

data/lib/murasaki.rb

@@ -3,5 +3,6 @@ require 'nio'
 
 require_relative 'murasaki/version'
 require_relative 'murasaki/event_loop'
+require_relative 'murasaki/io'
 require_relative 'murasaki/timer'
 require_relative 'murasaki/promise'

data/lib/murasaki/event_loop.rb

@@ -15,25 +15,34 @@ module EventLoop
       @queue = Hash.new
       # Root fiber
       @root_fiber = Fiber.current
+      nil
     end
+  end
+end
+
+EventLoop.config
 
+module EventLoop
+  class << self
     # Add timer in event loop
     # @param [EventLoop::Timer] timer timer to insert
     # @return [nil] nil
     def add_timer(timer)
-      config if @selector.nil?
       timer.start_time = Time.now.to_f + timer.time
       @timers << timer
       nil
     end
 
+    def remove_timer(timer)
+      @timers.delete(timer)
+    end
+
     # Register I/O event with queue protection
     # @param [IO] io io to register
     # @param [Symbol] interest :r for read only, :w for write only, and :rw for both
     # @yield what to run when io callbacks
     # @return [nil] nil
     def register(io, interest=(:rw), &callback)
-      config if @selector.nil?
       if @queue[io.to_i].nil?
         @queue[io.to_i] = Array.new
         register_raw(io, interest, callback)
@@ -49,7 +58,6 @@ module EventLoop
     # @param [Proc] callback what to run when io callbacks
     # @return [nil] nil
     def register_raw(io, interest=(:rw), callback)
-      config if @selector.nil?
       @selector.register(io, interest)
       @ios[io] = { callback: callback }
       nil
@@ -59,18 +67,31 @@ module EventLoop
     # @param [IO] io io to deregister
     # @return [nil] nil
     def deregister(io)
-      fd = io.to_i
       @selector.deregister(io)
       @ios.delete(io)
-      next_register = @queue[fd].shift
-      next_register.nil? ? @queue.delete(fd) : register_raw(*next_register)
+      unless io.closed?
+        # If the I/O closed accidentally, it should manually release the queue
+        # Otherwise, there would be a memory leak
+        fd = io.fileno
+        next_register = @queue[fd].shift
+        next_register.nil? ? @queue.delete(fd) : register_raw(*next_register)
+      end
+      nil
+    end
+
+    # Manually release queues of closed I/O
+    # if the I/O has accidentally closed
+    # @param [IO] io io to release
+    # @return [nil] nil
+    def release_queue(io)
+      fd = io.fileno
+      @queue.delete(fd)
       nil
     end
 
     # Run I/O selector once
     # @return [nil] nil
     def run_once
-      config if @selector.nil?
       @selector.select(0.2) do |monitor| # Timeout for 0.2 secs
         @ios[monitor.io][:callback].call(monitor)
       end
@@ -81,7 +102,6 @@ module EventLoop
     # Run timer once
     # @return [nil] nil
     def timer_once
-      config if @selector.nil?
       now_time = Time.now.to_f
       @timers.delete_if do |timer|
         if timer.start_time < now_time
@@ -118,7 +138,6 @@ module EventLoop
     end
 
     def root_fiber
-      config if @selector.nil?
       @root_fiber
     end
   end

data/lib/murasaki/io.rb

@@ -0,0 +1,11 @@
+##
+# Meta-programming IO for Safety Check
+class IO
+  raw_close = instance_method(:close)
+
+  define_method(:close) do
+    # Be sure to clean the queue
+    EventLoop.release_queue(self)
+    raw_close.bind(self).()
+  end
+end

data/lib/murasaki/version.rb

@@ -1,5 +1,5 @@
 # Murasaki Module
 module Murasaki
   # Current Version Code
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: murasaki
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - HeckPsi Lab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r
@@ -34,6 +34,7 @@ files:
 - LICENSE
 - lib/murasaki.rb
 - lib/murasaki/event_loop.rb
+- lib/murasaki/io.rb
 - lib/murasaki/promise.rb
 - lib/murasaki/timer.rb
 - lib/murasaki/version.rb
@@ -60,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Event Kernel for Ruby