coolio_fiber_spawn: decrease CPU usage for keepalive

Blindly resuming fibers every second is a waste of cycles, we
can use the ZZ hash in regular FiberSpawn to resume expired
fibers on an as-needed basis.

While we're at it, merge the keepalive-timeout class into the
heartbeat, there's no reason to have separate timers and
classes here.

4 files changed, 7 insertions, 24 deletions

diff --git a/lib/rainbows/fiber/rev.rb b/lib/rainbows/fiber/rev.rb
index be1b3d9..cf70367 100644
--- a/lib/rainbows/fiber/rev.rb
+++ b/lib/rainbows/fiber/rev.rb
@@ -11,7 +11,6 @@ require 'rainbows/fiber/io'
 
 module Rainbows::Fiber::Rev
   autoload :Heartbeat, 'rainbows/fiber/rev/heartbeat'
-  autoload :Kato, 'rainbows/fiber/rev/kato'
   autoload :Server, 'rainbows/fiber/rev/server'
   autoload :Sleeper, 'rainbows/fiber/rev/sleeper'
 end
diff --git a/lib/rainbows/fiber/rev/heartbeat.rb b/lib/rainbows/fiber/rev/heartbeat.rb
index 9411b4a..f9ef573 100644
--- a/lib/rainbows/fiber/rev/heartbeat.rb
+++ b/lib/rainbows/fiber/rev/heartbeat.rb
@@ -2,7 +2,14 @@
 # :enddoc:
 class Rainbows::Fiber::Rev::Heartbeat < Rev::TimerWatcher
   G = Rainbows::G
+
+  # ZZ gets populated by read_expire in rainbows/fiber/io/methods
+  ZZ = Rainbows::Fiber::ZZ
   def on_timer
     exit if (! G.tick && G.cur <= 0)
+    now = Time.now
+    fibs = []
+    ZZ.delete_if { |fib, time| now >= time ? fibs << fib : ! fib.alive? }
+    fibs.each { |fib| fib.resume if fib.alive? }
   end
 end
diff --git a/lib/rainbows/fiber/rev/kato.rb b/lib/rainbows/fiber/rev/kato.rb
deleted file mode 100644
index 056b6ef..0000000
--- a/lib/rainbows/fiber/rev/kato.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- encoding: binary -*-
-# :enddoc:
-# keep-alive timeout class
-class Rainbows::Fiber::Rev::Kato < Rev::TimerWatcher
-  def initialize
-    @watch = []
-    super(1, true)
-  end
-
-  def <<(fiber)
-    @watch << fiber
-    enable unless enabled?
-  end
-
-  def on_timer
-    @watch.uniq!
-    while f = @watch.shift
-      f.resume if f.alive?
-    end
-    disable
-  end
-end
diff --git a/lib/rainbows/fiber/rev/methods.rb b/lib/rainbows/fiber/rev/methods.rb
index 4345bdb..4421fd3 100644
--- a/lib/rainbows/fiber/rev/methods.rb
+++ b/lib/rainbows/fiber/rev/methods.rb
@@ -31,7 +31,6 @@ module Rainbows::Fiber::Rev::Methods
   def kgio_wait_readable
     @r = Watcher.new(self, :r) unless defined?(@r)
     @r.enable unless @r.enabled?
-    KATO << Fiber.current
     Fiber.yield
     @r.disable
   end