From 40445641f11f01c6a24bf96c8b80eed5fd33a512 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 28 Dec 2010 17:59:27 -0800
Subject: complete Rev => Coolio renaming

We use Cool.io internally everywhere now, but preserve
Rev-based models for anybody using them.
---
 lib/rainbows/fiber/coolio.rb           | 12 +++++++++
 lib/rainbows/fiber/coolio/heartbeat.rb | 15 +++++++++++
 lib/rainbows/fiber/coolio/methods.rb   | 47 ++++++++++++++++++++++++++++++++++
 lib/rainbows/fiber/coolio/server.rb    | 32 +++++++++++++++++++++++
 lib/rainbows/fiber/coolio/sleeper.rb   | 15 +++++++++++
 lib/rainbows/fiber/rev.rb              | 12 ---------
 lib/rainbows/fiber/rev/heartbeat.rb    | 15 -----------
 lib/rainbows/fiber/rev/methods.rb      | 47 ----------------------------------
 lib/rainbows/fiber/rev/server.rb       | 32 -----------------------
 lib/rainbows/fiber/rev/sleeper.rb      | 15 -----------
 10 files changed, 121 insertions(+), 121 deletions(-)
 create mode 100644 lib/rainbows/fiber/coolio.rb
 create mode 100644 lib/rainbows/fiber/coolio/heartbeat.rb
 create mode 100644 lib/rainbows/fiber/coolio/methods.rb
 create mode 100644 lib/rainbows/fiber/coolio/server.rb
 create mode 100644 lib/rainbows/fiber/coolio/sleeper.rb
 delete mode 100644 lib/rainbows/fiber/rev.rb
 delete mode 100644 lib/rainbows/fiber/rev/heartbeat.rb
 delete mode 100644 lib/rainbows/fiber/rev/methods.rb
 delete mode 100644 lib/rainbows/fiber/rev/server.rb
 delete mode 100644 lib/rainbows/fiber/rev/sleeper.rb

(limited to 'lib/rainbows/fiber')

diff --git a/lib/rainbows/fiber/coolio.rb b/lib/rainbows/fiber/coolio.rb
new file mode 100644
index 0000000..cb602d8
--- /dev/null
+++ b/lib/rainbows/fiber/coolio.rb
@@ -0,0 +1,12 @@
+# -*- encoding: binary -*-
+# :enddoc:
+require 'rainbows/coolio_support'
+require 'rainbows/fiber'
+require 'rainbows/fiber/io'
+
+module Rainbows::Fiber::Coolio
+  autoload :Heartbeat, 'rainbows/fiber/coolio/heartbeat'
+  autoload :Server, 'rainbows/fiber/coolio/server'
+  autoload :Sleeper, 'rainbows/fiber/coolio/sleeper'
+end
+require 'rainbows/fiber/coolio/methods'
diff --git a/lib/rainbows/fiber/coolio/heartbeat.rb b/lib/rainbows/fiber/coolio/heartbeat.rb
new file mode 100644
index 0000000..f48f7ef
--- /dev/null
+++ b/lib/rainbows/fiber/coolio/heartbeat.rb
@@ -0,0 +1,15 @@
+# -*- encoding: binary -*-
+# :enddoc:
+class Rainbows::Fiber::Coolio::Heartbeat < Coolio::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/coolio/methods.rb b/lib/rainbows/fiber/coolio/methods.rb
new file mode 100644
index 0000000..64b0ee6
--- /dev/null
+++ b/lib/rainbows/fiber/coolio/methods.rb
@@ -0,0 +1,47 @@
+# -*- encoding: binary -*-
+# :enddoc:
+module Rainbows::Fiber::Coolio::Methods
+  class Watcher < Coolio::IOWatcher
+    def initialize(fio, flag)
+      @f = Fiber.current
+      super(fio, flag)
+      attach(Coolio::Loop.default)
+    end
+
+    def on_readable
+      @f.resume
+    end
+
+    alias on_writable on_readable
+  end
+
+  def close
+    @w.detach if defined?(@w) && @w.attached?
+    @r.detach if defined?(@r) && @r.attached?
+    super
+  end
+
+  def kgio_wait_writable
+    @w = Watcher.new(self, :w) unless defined?(@w)
+    @w.enable unless @w.enabled?
+    Fiber.yield
+    @w.disable
+  end
+
+  def kgio_wait_readable
+    @r = Watcher.new(self, :r) unless defined?(@r)
+    @r.enable unless @r.enabled?
+    Fiber.yield
+    @r.disable
+  end
+end
+
+[
+  Rainbows::Fiber::IO,
+  Rainbows::Client,
+  # the next two trigger autoload, ugh, oh well...
+  Rainbows::Fiber::IO::Socket,
+  Rainbows::Fiber::IO::Pipe
+].each do |klass|
+  klass.__send__(:include, Rainbows::Fiber::Coolio::Methods)
+end
diff --git a/lib/rainbows/fiber/coolio/server.rb b/lib/rainbows/fiber/coolio/server.rb
new file mode 100644
index 0000000..0de1ab3
--- /dev/null
+++ b/lib/rainbows/fiber/coolio/server.rb
@@ -0,0 +1,32 @@
+# -*- encoding: binary -*-
+# :enddoc:
+class Rainbows::Fiber::Coolio::Server < Coolio::IOWatcher
+  G = Rainbows::G
+  include Rainbows::ProcessClient
+
+  def to_io
+    @io
+  end
+
+  def initialize(io)
+    @io = io
+    super(self, :r)
+  end
+
+  def close
+    detach if attached?
+    @io.close
+  end
+
+  def on_readable
+    return if G.cur >= MAX
+    c = @io.kgio_tryaccept and Fiber.new { process(c) }.resume
+  end
+
+  def process(io)
+    G.cur += 1
+    process_client(io)
+  ensure
+    G.cur -= 1
+  end
+end
diff --git a/lib/rainbows/fiber/coolio/sleeper.rb b/lib/rainbows/fiber/coolio/sleeper.rb
new file mode 100644
index 0000000..a11623a
--- /dev/null
+++ b/lib/rainbows/fiber/coolio/sleeper.rb
@@ -0,0 +1,15 @@
+# -*- encoding: binary -*-
+# :enddoc:
+class Rainbows::Fiber::Coolio::Sleeper < Coolio::TimerWatcher
+
+  def initialize(seconds)
+    @f = Fiber.current
+    super(seconds, false)
+    attach(Coolio::Loop.default)
+    Fiber.yield
+  end
+
+  def on_timer
+    @f.resume
+  end
+end
diff --git a/lib/rainbows/fiber/rev.rb b/lib/rainbows/fiber/rev.rb
deleted file mode 100644
index 00e439e..0000000
--- a/lib/rainbows/fiber/rev.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- encoding: binary -*-
-# :enddoc:
-require 'rainbows/coolio_support'
-require 'rainbows/fiber'
-require 'rainbows/fiber/io'
-
-module Rainbows::Fiber::Rev
-  autoload :Heartbeat, 'rainbows/fiber/rev/heartbeat'
-  autoload :Server, 'rainbows/fiber/rev/server'
-  autoload :Sleeper, 'rainbows/fiber/rev/sleeper'
-end
-require 'rainbows/fiber/rev/methods'
diff --git a/lib/rainbows/fiber/rev/heartbeat.rb b/lib/rainbows/fiber/rev/heartbeat.rb
deleted file mode 100644
index f9ef573..0000000
--- a/lib/rainbows/fiber/rev/heartbeat.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- encoding: binary -*-
-# :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/methods.rb b/lib/rainbows/fiber/rev/methods.rb
deleted file mode 100644
index 4421fd3..0000000
--- a/lib/rainbows/fiber/rev/methods.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- encoding: binary -*-
-# :enddoc:
-module Rainbows::Fiber::Rev::Methods
-  class Watcher < Rev::IOWatcher
-    def initialize(fio, flag)
-      @f = Fiber.current
-      super(fio, flag)
-      attach(Rev::Loop.default)
-    end
-
-    def on_readable
-      @f.resume
-    end
-
-    alias on_writable on_readable
-  end
-
-  def close
-    @w.detach if defined?(@w) && @w.attached?
-    @r.detach if defined?(@r) && @r.attached?
-    super
-  end
-
-  def kgio_wait_writable
-    @w = Watcher.new(self, :w) unless defined?(@w)
-    @w.enable unless @w.enabled?
-    Fiber.yield
-    @w.disable
-  end
-
-  def kgio_wait_readable
-    @r = Watcher.new(self, :r) unless defined?(@r)
-    @r.enable unless @r.enabled?
-    Fiber.yield
-    @r.disable
-  end
-end
-
-[
-  Rainbows::Fiber::IO,
-  Rainbows::Client,
-  # the next two trigger autoload, ugh, oh well...
-  Rainbows::Fiber::IO::Socket,
-  Rainbows::Fiber::IO::Pipe
-].each do |klass|
-  klass.__send__(:include, Rainbows::Fiber::Rev::Methods)
-end
diff --git a/lib/rainbows/fiber/rev/server.rb b/lib/rainbows/fiber/rev/server.rb
deleted file mode 100644
index 9998cde..0000000
--- a/lib/rainbows/fiber/rev/server.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- encoding: binary -*-
-# :enddoc:
-class Rainbows::Fiber::Rev::Server < Rev::IOWatcher
-  G = Rainbows::G
-  include Rainbows::ProcessClient
-
-  def to_io
-    @io
-  end
-
-  def initialize(io)
-    @io = io
-    super(self, :r)
-  end
-
-  def close
-    detach if attached?
-    @io.close
-  end
-
-  def on_readable
-    return if G.cur >= MAX
-    c = @io.kgio_tryaccept and Fiber.new { process(c) }.resume
-  end
-
-  def process(io)
-    G.cur += 1
-    process_client(io)
-  ensure
-    G.cur -= 1
-  end
-end
diff --git a/lib/rainbows/fiber/rev/sleeper.rb b/lib/rainbows/fiber/rev/sleeper.rb
deleted file mode 100644
index 51f4527..0000000
--- a/lib/rainbows/fiber/rev/sleeper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- encoding: binary -*-
-# :enddoc:
-class Rainbows::Fiber::Rev::Sleeper < Rev::TimerWatcher
-
-  def initialize(seconds)
-    @f = Fiber.current
-    super(seconds, false)
-    attach(Rev::Loop.default)
-    Fiber.yield
-  end
-
-  def on_timer
-    @f.resume
-  end
-end
-- 
cgit v1.2.3-24-ge0c7