diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/getaddrinfo.c | 12 | ||||
| -rw-r--r-- | ext/socket/socket.c | 19 |
2 files changed, 13 insertions, 18 deletions
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index 0a6af3111f..06daa7cca2 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -105,7 +105,7 @@ struct sockinet { u_short si_port; }; -static struct afd { +static const struct afd { int a_af; int a_addrlen; int a_socklen; @@ -136,14 +136,14 @@ static struct afd { #define PTON_MAX 4 #endif -static int get_name __P((const char *, struct afd *, +static int get_name __P((const char *, const struct afd *, struct addrinfo **, char *, struct addrinfo *, int)); static int get_addr __P((const char *, int, struct addrinfo **, struct addrinfo *, int)); static int str_isnumber __P((const char *)); -static const char *ai_errlist[] = { +static const char *const ai_errlist[] = { "success.", "address family for hostname not supported.", /* EAI_ADDRFAMILY */ "temporary failure in name resolution.", /* EAI_AGAIN */ @@ -418,7 +418,7 @@ getaddrinfo(hostname, servname, hints, res) * non-passive socket -> localhost (127.0.0.1 or ::1) */ if (hostname == NULL) { - struct afd *afd; + const struct afd *afd; int s; for (afd = &afdl[0]; afd->a_af; afd++) { @@ -533,7 +533,7 @@ getaddrinfo(hostname, servname, hints, res) static int get_name(addr, afd, res, numaddr, pai, port0) const char *addr; - struct afd *afd; + const struct afd *afd; struct addrinfo **res; char *numaddr; struct addrinfo *pai; @@ -588,7 +588,7 @@ get_addr(hostname, af, res, pai, port0) struct addrinfo sentinel; struct hostent *hp; struct addrinfo *top, *cur; - struct afd *afd; + const struct afd *afd; int i, error = 0, h_error; char *ap; diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 1c671fdb63..0825e8d155 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -368,9 +368,9 @@ bsock_send(argc, argv, sock) GetOpenFile(sock, fptr); f = GetWriteFile(fptr); fd = fileno(f); - retry: rb_thread_fd_writable(fd); StringValue(mesg); + retry: if (!NIL_P(to)) { StringValue(to); n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags), @@ -380,9 +380,7 @@ bsock_send(argc, argv, sock) n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags)); } if (n < 0) { - switch (errno) { - case EINTR: - rb_thread_schedule(); + if (rb_io_wait_writable(fd)) { goto retry; } rb_sys_fail("send(2)"); @@ -438,9 +436,7 @@ s_recvfrom(sock, argc, argv, from) TRAP_END; if (slen < 0) { - switch (errno) { - case EINTR: - rb_thread_schedule(); + if (rb_io_wait_readable(fd)) { goto retry; } rb_sys_fail("recvfrom(2)"); @@ -1166,8 +1162,9 @@ s_accept(klass, fd, sockaddr, len) rb_gc(); retry = 1; goto retry; - case EINTR: - rb_thread_schedule(); + default: + if (!rb_io_wait_readable(fd)) break; + retry = 0; goto retry; } rb_sys_fail(0); @@ -1431,9 +1428,7 @@ udp_send(argc, argv, sock) freeaddrinfo(res0); return INT2FIX(n); } - switch (errno) { - case EINTR: - rb_thread_schedule(); + if (rb_io_wait_writable(fileno(f))) { goto retry; } } |