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

* ext/socket/socket.c (bsock_recv_nonblock): new method

BasicSocket#recv_nonblock.
  (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
  IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
  (unix_recvfrom_nonblock): removed.  UNIXSocket#is removed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2006-06-17 15:53:28 +00:00
parent 35c8ae84e5
commit e997ab09ba
4 changed files with 143 additions and 135 deletions

View file

@ -101,11 +101,11 @@ class TestUNIXSocket < Test::Unit::TestCase
s2.close
end
def test_noname_recvfrom_nonblock
def test_noname_recv_nonblock
s1, s2 = UNIXSocket.pair
s2.write("a")
IO.select [s1]
assert_equal(["a", ["AF_UNIX", ""]], s1.recvfrom_nonblock(10))
assert_equal("a", s1.recv_nonblock(10))
ensure
s1.close
s2.close
@ -123,7 +123,7 @@ class TestUNIXSocket < Test::Unit::TestCase
def test_dgram_pair
s1, s2 = UNIXSocket.pair(Socket::SOCK_DGRAM)
assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) }
assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) }
s2.send("", 0)
s2.send("haha", 0)
s2.send("", 0)
@ -132,7 +132,7 @@ class TestUNIXSocket < Test::Unit::TestCase
assert_equal("haha", s1.recv(10))
assert_equal("", s1.recv(10))
assert_equal("", s1.recv(10))
assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) }
assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) }
ensure
s1.close
s2.close
@ -140,7 +140,7 @@ class TestUNIXSocket < Test::Unit::TestCase
def test_seqpacket_pair
s1, s2 = UNIXSocket.pair(Socket::SOCK_SEQPACKET)
assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) }
assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) }
s2.send("", 0)
s2.send("haha", 0)
s2.send("", 0)
@ -149,7 +149,7 @@ class TestUNIXSocket < Test::Unit::TestCase
assert_equal("haha", s1.recv(10))
assert_equal("", s1.recv(10))
assert_equal("", s1.recv(10))
assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) }
assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) }
rescue Errno::EPROTONOSUPPORT
ensure
s1.close if s1