Encapsulate adding a timeout Request

Author: eregon

lib/timeout.rb

@@ -54,8 +54,6 @@ def self.handle_timeout(message) # :nodoc:
   private_constant :GET_TIME
 
   class State
-    attr_reader :condvar, :queue, :queue_mutex # shared with Timeout.timeout()
-
     def initialize
       @condvar = ConditionVariable.new
       @queue = Queue.new
@@ -132,6 +130,13 @@ def ensure_timeout_thread_created
         end
       end
     end
+
+    def add_request(request)
+      @queue_mutex.synchronize do
+        @queue << request
+        @condvar.signal
+      end
+    end
   end
   private_constant :State
 
@@ -263,10 +268,7 @@ def self.timeout(sec, klass = nil, message = nil, &block)   #:yield: +sec+
 
     perform = Proc.new do |exc|
       request = Request.new(Thread.current, sec, exc, message)
-      state.queue_mutex.synchronize do
-        state.queue << request
-        state.condvar.signal
-      end
+      state.add_request(request)
       begin
         return yield(sec)
       ensure