From fa622de470d475f0afc94cb619cc69e7e127830c Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 22 Dec 2009 01:22:32 -0800
Subject: common Rainbows.sleep(nr) method

We'll export this across the board to all Rack applications
to sleep with.  This provides the optimum method of sleeping
regardless of the concurrency model you choose.  This method
is still highly not recommended for pure event-driven models
like Rev or EventMachine (but the threaded/fiber/actor-based
variants are fine).
---
 t/simple-http_Revactor.ru           |  1 -
 t/simple-http_ThreadPool.ru         |  1 -
 t/simple-http_ThreadSpawn.ru        |  1 -
 t/sleep.ru                          | 11 +----------
 t/t9000.ru                          | 11 +----------
 t/worker-follows-master-to-death.ru |  7 +------
 6 files changed, 3 insertions(+), 29 deletions(-)

(limited to 't')

diff --git a/t/simple-http_Revactor.ru b/t/simple-http_Revactor.ru
index 9b9c56a..aa37aea 100644
--- a/t/simple-http_Revactor.ru
+++ b/t/simple-http_Revactor.ru
@@ -1,7 +1,6 @@
 use Rack::ContentLength
 use Rack::ContentType
 run lambda { |env|
-  Actor.sleep 1
   if env['rack.multithread'] == false && env['rainbows.model'] == :Revactor
     [ 200, {}, [ Thread.current.inspect << "\n" ] ]
   else
diff --git a/t/simple-http_ThreadPool.ru b/t/simple-http_ThreadPool.ru
index 4bb7348..cd5df82 100644
--- a/t/simple-http_ThreadPool.ru
+++ b/t/simple-http_ThreadPool.ru
@@ -1,7 +1,6 @@
 use Rack::ContentLength
 use Rack::ContentType
 run lambda { |env|
-  sleep 1
   if env['rack.multithread'] && env['rainbows.model'] == :ThreadPool
     [ 200, {}, [ Thread.current.inspect << "\n" ] ]
   else
diff --git a/t/simple-http_ThreadSpawn.ru b/t/simple-http_ThreadSpawn.ru
index aa1accb..ea5dee2 100644
--- a/t/simple-http_ThreadSpawn.ru
+++ b/t/simple-http_ThreadSpawn.ru
@@ -1,7 +1,6 @@
 use Rack::ContentLength
 use Rack::ContentType
 run lambda { |env|
-  sleep 1
   if env['rack.multithread'] && env['rainbows.model'] == :ThreadSpawn
     [ 200, {}, [ Thread.current.inspect << "\n" ] ]
   else
diff --git a/t/sleep.ru b/t/sleep.ru
index d0fd832..b57efc3 100644
--- a/t/sleep.ru
+++ b/t/sleep.ru
@@ -7,16 +7,7 @@ run lambda { |env|
   nr = 1
   env["PATH_INFO"] =~ %r{/([\d\.]+)\z} and nr = $1.to_f
 
-  (case env['rainbows.model']
-  when :FiberPool, :FiberSpawn
-    Rainbows::Fiber
-  when :Revactor
-    Actor
-  when :RevFiberSpawn
-    Rainbows::Fiber::Rev
-  else
-    Kernel
-  end).sleep(nr)
+  Rainbows.sleep(nr)
 
   [ 200, {'Content-Type' => 'text/plain'}, [ "Hello\n" ] ]
 }
diff --git a/t/t9000.ru b/t/t9000.ru
index abf36b2..66643b6 100644
--- a/t/t9000.ru
+++ b/t/t9000.ru
@@ -3,16 +3,7 @@ use Rack::ContentType
 use Rainbows::AppPool, :size => ENV['APP_POOL_SIZE'].to_i
 class Sleeper
   def call(env)
-    (case env['rainbows.model']
-    when :FiberPool, :FiberSpawn
-      Rainbows::Fiber
-    when :Revactor
-      Actor
-    when :RevFiberSpawn
-      Rainbows::Fiber::Rev
-    else
-      Kernel
-    end).sleep(1)
+    Rainbows.sleep(1)
     [ 200, {}, [ "#{object_id}\n" ] ]
   end
 end
diff --git a/t/worker-follows-master-to-death.ru b/t/worker-follows-master-to-death.ru
index ed2a519..b372afd 100644
--- a/t/worker-follows-master-to-death.ru
+++ b/t/worker-follows-master-to-death.ru
@@ -6,12 +6,7 @@ run lambda { |env|
 
   case env["PATH_INFO"]
   when %r{/sleep/(\d+)}
-    (case env['rainbows.model']
-    when :Revactor
-      Actor
-    else
-      Kernel
-    end).sleep($1.to_i)
+    Rainbows.sleep($1.to_i)
   end
   [ 200, headers, [ "#$$\n" ] ]
 }
-- 
cgit v1.2.3-24-ge0c7