thread_tools 0.25 → 0.26

data/lib/thread_tools/debugmutex.rb

@@ -3,27 +3,40 @@
 #
 # Mutex
 #
-# This class will make things slower, expect more contentions than normal
-# I derived this mutex because I needed to check contention levels and trace
-# owner changes
+# This class will make things slower, expect more contentions than normal, so
+# don't use to protect small blocks or tight loops
+#
+# I derived this mutex because I needed to check contention levels, trace
+# ownership changes and catch simple lock inversions
+#
+# Use .inspect method to get a small report
 
 require 'thread'
 
 
 module ThreadTools
 
+    class EMutexOrder < Exception
+    end
+
     class DebugMutex < Mutex
+        attr_reader :out_of_order_locks
         attr_reader :contentions
         attr_reader :owner
 
         def initialize
             @contentions = 0
+            @out_of_order_locks = 0
         end
 
         def lock
             unless try_lock
                 super
                 @owner = Thread.current
+                if @owner[:locks].nil?
+                    @owner[:locks] = []
+                end
+                @owner[:locks] << self
             end
             self
         end
@@ -34,12 +47,28 @@ module ThreadTools
                 @contentions += 1
             else
                 @owner = Thread.current
+                if @owner[:locks].nil?
+                    @owner[:locks] = []
+                end
+                @owner[:locks] << self
             end
             ret
         end
 
+        # throws EMutexOrder, mutex remains locked in this case
         def unlock
-            @owner = nil
+            if (!@owner.nil?)
+                if (@owner[:locks].last == self)
+                    @owner[:locks].pop
+                else
+                    if @owner[:locks].delete(self)
+                        @out_of_order_locks += 1
+                        raise EMutexOrder.new("Expected #{@owner[:locks].last}")
+                    end
+                    # if called again let it pass
+                end
+                @owner = nil
+            end
             super
         end
 
@@ -51,6 +80,17 @@ module ThreadTools
                 unlock
             end
         end
+
+        def inspect
+            "Owner #{@owner}, Contentions #{@contentions}, Out of order acquisitions #{@out_of_order_locks}"
+        end
+
+        # just for fun
+        def self.unlock_all(thread)
+            thread[:locks].reverse_each do |l|
+                l.unlock
+            end
+        end
     end
 
 end

data/lib/thread_tools/mongrel_pool.rb

@@ -13,7 +13,7 @@ require File.expand_path(File.dirname(__FILE__)+'/threadpool')
 module Mongrel
     class HttpServer
 
-        def run(_pool_size = 100)
+        def run(_pool_size = 50)
             trap("TERM") { stop } # trap "kill"
 
             @thread_pool = ThreadTools::ThreadPool.new(_pool_size, @workers)

data/lib/thread_tools/semaphore.rb

@@ -20,19 +20,23 @@ module ThreadTools
         end
 
         def acquire
+            ret = 0
             @mtx.synchronize do
                 @cv.wait(@mtx) until @count > 0
                 @count -= 1
+                ret = @count
             end
-            @count
+            ret
         end
 
         def release
+            ret = 0
             @mtx.synchronize do
                 @count += 1
+                ret = @count
                 @cv.signal
             end
-            @count
+            ret
         end
     end
 

data/lib/thread_tools/threadpool.rb

@@ -25,6 +25,8 @@ module ThreadTools
         attr_accessor :kill_worker_on_exception
         # number of worker threads
         attr_reader :size
+        # if set to true a new worker is created if the pool is empty
+        attr_accessor :create_on_spawn
 
         # _size should be at least 1
         def initialize(_size, _thr_group = nil)
@@ -34,6 +36,7 @@ module ThreadTools
             @pool_cv = ConditionVariable.new
             @pool = []
             @thr_grp = _thr_group
+            @create_on_spawn = false
             _size = 1 if _size < 1
             _size.times { create_worker }
         end
@@ -76,6 +79,10 @@ module ThreadTools
         def spawn(*args, &block)
             thr = nil
             @pool_mtx.synchronize do
+                # creates a new worker thread if pool is empty and flag is set
+                if (@create_on_spawn && @pool.empty?)
+                    create_worker
+                end
                 # wait here until a worker is available
                 @pool_cv.wait(@pool_mtx) until !(thr = @pool.shift).nil?
                 thr[:jobs] << { :args => args, :block => block }
@@ -98,4 +105,4 @@ module ThreadTools
         end
     end
 
-end
+end

data/test/test_debugmutex.rb

@@ -44,4 +44,17 @@ class DebugMutexTest < Test::Unit::TestCase
         # owner is nil
         assert_nil(mtx.owner)
     end
+
+    def test_lock_ordering
+        mtxA = ThreadTools::DebugMutex.new
+        mtxB = ThreadTools::DebugMutex.new
+
+        mtxA.lock
+        mtxB.lock
+        assert_raise ThreadTools::EMutexOrder do
+          mtxA.unlock # wrong unlock order
+        end
+        # ensure correct ordering
+        ThreadTools::DebugMutex.unlock_all(Thread.current)
+    end
 end

data/thread_tools.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name = %q{thread_tools}
-    s.version = '0.25'
+    s.version = '0.26'
     s.summary = %q{Utilities for threaded apps}
     s.platform = Gem::Platform::RUBY
     s.email = %q{daniel@tralamazza.com}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thread_tools
 version: !ruby/object:Gem::Version 
-  version: "0.25"
+  version: "0.26"
 platform: ruby
 authors: 
 - Daniel Tralamazza
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +02:00
+date: 2009-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: []