зеркало из https://github.com/github/ruby.git
* ext/socket/{basicksocket,init,udpsocket}.c: revert some parts of
r36944. it breaks mswin/mingw ruby and brought into many many crashes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
7d59a96314
Коммит
91987f6b04
|
@ -558,7 +558,8 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
|
|||
GetOpenFile(sock, fptr);
|
||||
arg.fd = fptr->fd;
|
||||
arg.flags = NUM2INT(flags);
|
||||
while ((n = (int)BLOCKING_REGION_FD(func, &arg)) < 0) {
|
||||
while (rb_thread_fd_writable(arg.fd),
|
||||
(n = (int)BLOCKING_REGION_FD(func, &arg)) < 0) {
|
||||
if (rb_io_wait_writable(arg.fd)) {
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -130,6 +130,7 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
|
|||
RBASIC(str)->klass = 0;
|
||||
|
||||
while (rb_io_check_closed(fptr),
|
||||
rb_thread_wait_fd(arg.fd),
|
||||
(slen = BLOCKING_REGION_FD(recvfrom_blocking, &arg)) < 0) {
|
||||
if (!rb_io_wait_readable(fptr->fd)) {
|
||||
rb_sys_fail("recvfrom(2)");
|
||||
|
@ -559,6 +560,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
|
|||
arg.sockaddr = sockaddr;
|
||||
arg.len = len;
|
||||
retry:
|
||||
rb_thread_wait_fd(fd);
|
||||
fd2 = (int)BLOCKING_REGION_FD(accept_blocking, &arg);
|
||||
if (fd2 < 0) {
|
||||
switch (errno) {
|
||||
|
|
|
@ -176,6 +176,7 @@ udp_send(int argc, VALUE *argv, VALUE sock)
|
|||
retry:
|
||||
arg.to = res->ai_addr;
|
||||
arg.tolen = res->ai_addrlen;
|
||||
rb_thread_fd_writable(arg.fd);
|
||||
n = (int)BLOCKING_REGION_FD(rsock_sendto_blocking, &arg);
|
||||
if (n >= 0) {
|
||||
freeaddrinfo(res0);
|
||||
|
|
Загрузка…
Ссылка в новой задаче