kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/resolv.rb (Resolv::DNS): retry IO.select for premature wakeup.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-10-31 12:03:49 +00:00
parent 687c41dc4d
commit 6533f070ba
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Oct 31 21:02:43 2011 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS): retry IO.select for premature wakeup.
Mon Oct 31 20:14:22 2011 Tanaka Akira <akr@fsij.org> Mon Oct 31 20:14:22 2011 Tanaka Akira <akr@fsij.org>
* io.c (fd_set_cloexec): clear CLOEXEC flag for standard file * io.c (fd_set_cloexec): clear CLOEXEC flag for standard file

9
lib/resolv.rb
View file

@ -657,16 +657,19 @@ class Resolv
end end
def request(sender, tout) def request(sender, tout)
timelimit = Time.now + tout start = Time.now
timelimit = start + tout
sender.send sender.send
while true while true
now = Time.now before_select = Time.now
timeout = timelimit - now timeout = timelimit - before_select
if timeout <= 0 if timeout <= 0
raise ResolvTimeout raise ResolvTimeout
end end
select_result = IO.select(@socks, nil, nil, timeout) select_result = IO.select(@socks, nil, nil, timeout)
if !select_result if !select_result
after_select = Time.now
next if after_select < timelimit
raise ResolvTimeout raise ResolvTimeout
end end
begin begin

6
test/resolv/test_dns.rb
View file

@ -114,7 +114,8 @@ class TestResolvDNS < Test::Unit::TestCase
start = Time.now start = Time.now
dns.getresources("foo.example.org", Resolv::DNS::Resource::IN::A) dns.getresources("foo.example.org", Resolv::DNS::Resource::IN::A)
} }
diff = Time.now - start t2 = Time.now
diff = t2 - start
assert rv.empty?, "unexpected: #{rv.inspect} (expected empty)" assert rv.empty?, "unexpected: #{rv.inspect} (expected empty)"
assert_operator 0.1, :<=, diff assert_operator 0.1, :<=, diff
@ -123,7 +124,8 @@ class TestResolvDNS < Test::Unit::TestCase
start = Time.now start = Time.now
dns.getresources("foo.example.org", Resolv::DNS::Resource::IN::A) dns.getresources("foo.example.org", Resolv::DNS::Resource::IN::A)
} }
diff = Time.now - start t2 = Time.now
diff = t2 - start
assert rv.empty?, "unexpected: #{rv.inspect} (expected empty)" assert rv.empty?, "unexpected: #{rv.inspect} (expected empty)"
assert_operator 0.3, :<=, diff assert_operator 0.3, :<=, diff
} }