From cada9ed5200c75a48ae5eec50c5fb9a3fde44b39 Mon Sep 17 00:00:00 2001
From: "roberto@mrspurr" <roberto@mrspurr>
Date: Wed, 3 Nov 2010 07:08:34 +0100
Subject: [PATCH 1/2] add threads support in urack.rb

---
 contrib/urack.rb | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/contrib/urack.rb b/contrib/urack.rb
index d07fbb16..2fc16a74 100644
--- a/contrib/urack.rb
+++ b/contrib/urack.rb
@@ -9,6 +9,7 @@ require 'optparse'
 
 options = {
         :processes => 1,
+        :threads => 1,
         :master => false,
         :logging => true,
         :static => true,
@@ -19,6 +20,7 @@ options = {
 opts = OptionParser.new do |opts|
 
         opts.on("-p", "--processes=nproc", Integer, '') { |p| options[:processes] = p }
+        opts.on("-t", "--threads=nthreads", Integer, '') { |t| options[:threads] = t }
         opts.on("-M", "--master", '') { options[:master] = true }
         opts.on("-L", "--no-logging", '') { options[:logging] = false }
         opts.on("-S", "--no-static", '') { options[:static] = false }
@@ -37,6 +39,7 @@ end
 
 $requests = 0
 $workers = Array.new
+$mywid = 0
 
 module Rack
 
@@ -74,12 +77,14 @@ module Rack
                         ulog("spawned worker 1 (pid: #{$workers[1]})")
                 elsif $workers[1].to_i == 0
                         $0 = "uRack worker 1"
+			$mywid = 1
                         can_spawn = false
                 end
         else
                 $0 = 'uRack worker 1'
                 $workers[0] = nil
                 $workers[1] = Process.pid
+		$mywid = 1
                 ulog("spawned worker 1 (pid: #{$workers[1]})")
         end
 
@@ -88,6 +93,7 @@ module Rack
                         $workers[p] = Process.fork
                         if $workers[p].to_i == 0
                                 $0 = "uRack worker #{p}"
+				$mywid = p
                                 break
                         elsif $workers[p].to_i > 0
                                 ulog("spawned worker #{p} (pid: #{$workers[p]})")
@@ -107,6 +113,7 @@ module Rack
                                         if $workers[wid].to_i == 0
                                                 $0 = "uRack worker #{wid}"
                                                 i_am_a_child = true
+						$mywid = wid
                                                 break
                                         elsif $workers[wid].to_i > 0
                                                 ulog("respawned worker #{wid} (pid: #{$workers[wid]})")
@@ -118,9 +125,20 @@ module Rack
                 end
         end
         
-        while client = server.accept
-          serve client, app, options
-        end
+	if options[:threads] > 1
+		for t in 1..options[:threads]
+			Thread.new do
+			    ulog("spawning thread #{t} on worker #{$mywid}")
+            		    while client = server.accept
+                		serve client, app, options
+            		    end
+			end
+		end
+	else
+            while client = server.accept
+                serve client, app, options
+            end
+	end
       end
 
       def self.serve(client, app, options)

From 75d210925456f32624cc7a9b3a49361734334fba Mon Sep 17 00:00:00 2001
From: "roberto@mrspurr.local" <roberto@mrspurr.local>
Date: Wed, 3 Nov 2010 07:35:25 +0100
Subject: [PATCH 2/2] added wt.join() in urack.rb

---
 contrib/urack.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contrib/urack.rb b/contrib/urack.rb
index 2fc16a74..2cfd959b 100644
--- a/contrib/urack.rb
+++ b/contrib/urack.rb
@@ -127,12 +127,13 @@ module Rack
         
 	if options[:threads] > 1
 		for t in 1..options[:threads]
-			Thread.new do
+			wt = Thread.new do
 			    ulog("spawning thread #{t} on worker #{$mywid}")
             		    while client = server.accept
                 		serve client, app, options
             		    end
 			end
+			wt.join()
 		end
 	else
             while client = server.accept