From a3d3d13711869d420b4473d492bd788ebe493053 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Mon, 27 Dec 2010 02:58:31 +0000
Subject: thread_*: unindent

Hopefully this will make our code easier to follow.
---
 lib/rainbows/thread_pool.rb | 136 +++++++++++++++++++++-----------------------
 1 file changed, 66 insertions(+), 70 deletions(-)

(limited to 'lib/rainbows/thread_pool.rb')

diff --git a/lib/rainbows/thread_pool.rb b/lib/rainbows/thread_pool.rb
index 321d3e4..f6420ae 100644
--- a/lib/rainbows/thread_pool.rb
+++ b/lib/rainbows/thread_pool.rb
@@ -1,82 +1,78 @@
 # -*- encoding: binary -*-
 
-module Rainbows
+# Implements a worker thread pool model.  This is suited for platforms
+# like Ruby 1.9, where the cost of dynamically spawning a new thread
+# for every new client connection is higher than with the ThreadSpawn
+# model.
+#
+# This model should provide a high level of compatibility with all
+# Ruby implementations, and most libraries and applications.
+# Applications running under this model should be thread-safe
+# but not necessarily reentrant.
+#
+# Applications using this model are required to be thread-safe.
+# Threads are never spawned dynamically under this model.  If you're
+# connecting to external services and need to perform DNS lookups,
+# consider using the "resolv-replace" library which replaces parts of
+# the core Socket package with concurrent DNS lookup capabilities.
+#
+# This model probably less suited for many slow clients than the
+# others and thus a lower +worker_connections+ setting is recommended.
 
-  # Implements a worker thread pool model.  This is suited for platforms
-  # like Ruby 1.9, where the cost of dynamically spawning a new thread
-  # for every new client connection is higher than with the ThreadSpawn
-  # model.
-  #
-  # This model should provide a high level of compatibility with all
-  # Ruby implementations, and most libraries and applications.
-  # Applications running under this model should be thread-safe
-  # but not necessarily reentrant.
-  #
-  # Applications using this model are required to be thread-safe.
-  # Threads are never spawned dynamically under this model.  If you're
-  # connecting to external services and need to perform DNS lookups,
-  # consider using the "resolv-replace" library which replaces parts of
-  # the core Socket package with concurrent DNS lookup capabilities.
-  #
-  # This model probably less suited for many slow clients than the
-  # others and thus a lower +worker_connections+ setting is recommended.
+module Rainbows::ThreadPool
+  include Rainbows::Base
 
-  module ThreadPool
-    include Base
-
-    def worker_loop(worker) # :nodoc:
-      init_worker_process(worker)
-      pool = (1..worker_connections).map do
-        Thread.new { LISTENERS.size == 1 ? sync_worker : async_worker }
-      end
-
-      while G.alive
-        # if any worker dies, something is serious wrong, bail
-        pool.each do |thr|
-          G.tick or break
-          thr.join(1) and G.quit!
-        end
-      end
-      join_threads(pool)
+  def worker_loop(worker) # :nodoc:
+    init_worker_process(worker)
+    pool = (1..worker_connections).map do
+      Thread.new { LISTENERS.size == 1 ? sync_worker : async_worker }
     end
 
-    def sync_worker # :nodoc:
-      s = LISTENERS[0]
-      begin
-        c = s.kgio_accept and process_client(c)
-      rescue => e
-        Error.listen_loop(e)
-      end while G.alive
+    while G.alive
+      # if any worker dies, something is serious wrong, bail
+      pool.each do |thr|
+        G.tick or break
+        thr.join(1) and G.quit!
+      end
     end
+    join_threads(pool)
+  end
 
-    def async_worker # :nodoc:
-      begin
-        # TODO: check if select() or accept() is a problem on large
-        # SMP systems under Ruby 1.9.  Hundreds of native threads
-        # all working off the same socket could be a thundering herd
-        # problem.  On the other hand, a thundering herd may not
-        # even incur as much overhead as an extra Mutex#synchronize
-        ret = IO.select(LISTENERS, nil, nil, 1) and ret[0].each do |s|
-          s = s.kgio_tryaccept and process_client(s)
-        end
-      rescue Errno::EINTR
-      rescue => e
-        Error.listen_loop(e)
-      end while G.alive
-    end
+  def sync_worker # :nodoc:
+    s = LISTENERS[0]
+    begin
+      c = s.kgio_accept and process_client(c)
+    rescue => e
+      Rainbows::Error.listen_loop(e)
+    end while G.alive
+  end
 
-    def join_threads(threads) # :nodoc:
-      G.quit!
-      threads.delete_if do |thr|
-        G.tick
-        begin
-          thr.run
-          thr.join(0.01)
-        rescue
-          true
-        end
-      end until threads.empty?
-    end
+  def async_worker # :nodoc:
+    begin
+      # TODO: check if select() or accept() is a problem on large
+      # SMP systems under Ruby 1.9.  Hundreds of native threads
+      # all working off the same socket could be a thundering herd
+      # problem.  On the other hand, a thundering herd may not
+      # even incur as much overhead as an extra Mutex#synchronize
+      ret = IO.select(LISTENERS, nil, nil, 1) and ret[0].each do |s|
+        s = s.kgio_tryaccept and process_client(s)
+      end
+    rescue Errno::EINTR
+    rescue => e
+      Rainbows::Error.listen_loop(e)
+    end while G.alive
+  end
 
+  def join_threads(threads) # :nodoc:
+    G.quit!
+    threads.delete_if do |thr|
+      G.tick
+      begin
+        thr.run
+        thr.join(0.01)
+      rescue
+        true
+      end
+    end until threads.empty?
   end
 end
-- 
cgit v1.2.3-24-ge0c7