* lib/timeout.rb (timeout): new optional argument to specify an

exception class.

* lib/resolv.rb: use Resolv::ResolvTimeout for internal timeout to
avoid problem with timeout of application.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,11 @@
+Wed Jan 16 12:29:14 2002  Tanaka Akira  <akr@m17n.org>
+
+	* lib/timeout.rb (timeout): new optional argument to specify an
+	exception class.
+
+	* lib/resolv.rb: use Resolv::ResolvTimeout for internal timeout to
+	avoid problem with timeout of application. 
+
 Wed Jan 16 11:12:30 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* object.c (rb_Float): remove underscores between digits.

lib/resolv.rb

@@ -258,6 +258,9 @@ class Resolv
   class ResolvError < StandardError
   end
 
+  class ResolvTimeout < TimeoutError
+  end
+
   class Hosts
     DefaultFileName = '/etc/hosts'
 
@@ -426,7 +429,7 @@ class Resolv
           end
           sender.send
           reply = reply_name = nil
-          timeout(tout) { reply, reply_name = q.pop }
+          timeout(tout, ResolvTimeout) { reply, reply_name = q.pop }
           case reply.rcode
           when RCode::NoError
             extract_resources(reply, reply_name, typeclass, &proc)
@@ -753,7 +756,7 @@ class Resolv
                 @nameserver.each {|nameserver|
                   begin
                     yield candidate, tout, nameserver
-                  rescue TimeoutError
+                  rescue ResolvTimeout
                   end
                 }
               }

lib/timeout.rb

@@ -28,13 +28,13 @@
 class TimeoutError<Interrupt
 end
 
-def timeout(sec)
+def timeout(sec, exception=TimeoutError)
   return yield if sec == nil
   begin
     x = Thread.current
     y = Thread.start {
       sleep sec
-      x.raise TimeoutError, "execution expired" if x.alive?
+      x.raise exception, "execution expired" if x.alive?
     }
     yield sec
 #    return true