Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1210)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/bin/socket_linux.cc

Issue 165723007: Move signal_blocker to platform and use it by default in TEMP_FAILURE_RETRY. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« runtime/bin/dbg_connection_linux.cc ('K') | « runtime/bin/signal_blocker.h ('k') | runtime/bin/stdio_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket_linux.cc
diff --git a/runtime/bin/socket_linux.cc b/runtime/bin/socket_linux.cc
index 133e3335ec939fa747935b487fc2eaef7b159324..5dce38155dbcdeb4da1080c54f47589ded700f9b 100644
--- a/runtime/bin/socket_linux.cc
+++ b/runtime/bin/socket_linux.cc
@@ -18,8 +18,8 @@
#include "bin/fdutils.h"
#include "bin/file.h"
#include "bin/log.h"
-#include "bin/signal_blocker.h"
#include "bin/socket.h"
+#include "platform/signal_blocker.h"
#include "vm/thread.h"
@@ -39,13 +39,8 @@ SocketAddress::SocketAddress(struct sockaddr* sa) {
bool Socket::FormatNumericAddress(RawAddr* addr, char* address, int len) {
socklen_t salen = SocketAddress::GetAddrLength(addr);
- if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getnameinfo(&addr->addr,
- salen,
- address,
- len,
- NULL,
- 0,
- NI_NUMERICHOST)) != 0) {
+ if (getnameinfo(
+ &addr->addr, salen, address, len, NULL, 0, NI_NUMERICHOST) != 0) {
return false;
}
return true;
@@ -60,8 +55,7 @@ bool Socket::Initialize() {
intptr_t Socket::Create(RawAddr addr) {
intptr_t fd;
- fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(
- addr.ss.ss_family, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0));
+ fd = socket(addr.ss.ss_family, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
if (fd < 0) {
const int kBufferSize = 1024;
char error_buf[kBufferSize];
@@ -75,14 +69,12 @@ intptr_t Socket::Create(RawAddr addr) {
intptr_t Socket::Connect(intptr_t fd, RawAddr addr, const intptr_t port) {
SocketAddress::SetAddrPort(&addr, port);
- intptr_t result = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- connect(fd,
- &addr.addr,
- SocketAddress::GetAddrLength(&addr)));
+ intptr_t result = TEMP_FAILURE_RETRY(
+ connect(fd, &addr.addr, SocketAddress::GetAddrLength(&addr)));
if (result == 0 || errno == EINPROGRESS) {
return fd;
}
- VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+ VOID_TEMP_FAILURE_RETRY(close(fd));
return -1;
}
@@ -103,8 +95,7 @@ intptr_t Socket::Available(intptr_t fd) {
int Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
ASSERT(fd >= 0);
- ssize_t read_bytes = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(read(fd, buffer,
- num_bytes));
+ ssize_t read_bytes = TEMP_FAILURE_RETRY(read(fd, buffer, num_bytes));
ASSERT(EAGAIN == EWOULDBLOCK);
if (read_bytes == -1 && errno == EWOULDBLOCK) {
// If the read would block we need to retry and therefore return 0
@@ -119,9 +110,8 @@ int Socket::RecvFrom(intptr_t fd, void* buffer, intptr_t num_bytes,
RawAddr* addr) {
ASSERT(fd >= 0);
socklen_t addr_len = sizeof(addr->ss);
- ssize_t read_bytes =
- TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- recvfrom(fd, buffer, num_bytes, 0, &addr->addr, &addr_len));
+ ssize_t read_bytes = TEMP_FAILURE_RETRY(
+ recvfrom(fd, buffer, num_bytes, 0, &addr->addr, &addr_len));
if (read_bytes == -1 && errno == EWOULDBLOCK) {
// If the read would block we need to retry and therefore return 0
// as the number of bytes written.
@@ -133,8 +123,7 @@ int Socket::RecvFrom(intptr_t fd, void* buffer, intptr_t num_bytes,
int Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
ASSERT(fd >= 0);
- ssize_t written_bytes = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(write(fd, buffer,
- num_bytes));
+ ssize_t written_bytes = TEMP_FAILURE_RETRY(write(fd, buffer, num_bytes));
ASSERT(EAGAIN == EWOULDBLOCK);
if (written_bytes == -1 && errno == EWOULDBLOCK) {
// If the would block we need to retry and therefore return 0 as
@@ -148,10 +137,9 @@ int Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
int Socket::SendTo(intptr_t fd, const void* buffer, intptr_t num_bytes,
RawAddr addr) {
ASSERT(fd >= 0);
- ssize_t written_bytes =
- TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- sendto(fd, buffer, num_bytes, 0,
- &addr.addr, SocketAddress::GetAddrLength(&addr)));
+ ssize_t written_bytes = TEMP_FAILURE_RETRY(
+ sendto(fd, buffer, num_bytes, 0,
+ &addr.addr, SocketAddress::GetAddrLength(&addr)));
ASSERT(EAGAIN == EWOULDBLOCK);
if (written_bytes == -1 && errno == EWOULDBLOCK) {
// If the would block we need to retry and therefore return 0 as
@@ -166,10 +154,7 @@ intptr_t Socket::GetPort(intptr_t fd) {
ASSERT(fd >= 0);
RawAddr raw;
socklen_t size = sizeof(raw);
- if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- getsockname(fd,
- &raw.addr,
- &size))) {
+ if (getsockname(fd, &raw.addr, &size)) {
const int kBufferSize = 1024;
char error_buf[kBufferSize];
Log::PrintErr("Error getsockname: %s\n",
@@ -184,10 +169,7 @@ SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
ASSERT(fd >= 0);
RawAddr raw;
socklen_t size = sizeof(raw);
- if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- getpeername(fd,
- &raw.addr,
- &size))) {
+ if (getpeername(fd, &raw.addr, &size)) {
const int kBufferSize = 1024;
char error_buf[kBufferSize];
Log::PrintErr("Error getpeername: %s\n",
@@ -275,14 +257,14 @@ bool Socket::ReverseLookup(RawAddr addr,
intptr_t host_len,
OSError** os_error) {
ASSERT(host_len >= NI_MAXHOST);
- int status = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getnameinfo(
+ int status = getnameinfo(
&addr.addr,
SocketAddress::GetAddrLength(&addr),
host,
host_len,
NULL,
0,
- NI_NAMEREQD));
+ NI_NAMEREQD);
if (status != 0) {
ASSERT(*os_error == NULL);
*os_error = new OSError(status,
@@ -310,24 +292,19 @@ intptr_t Socket::CreateBindDatagram(
RawAddr* addr, intptr_t port, bool reuseAddress) {
intptr_t fd;
- fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(
- addr->addr.sa_family,
- SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
- IPPROTO_UDP));
+ fd = socket(addr->addr.sa_family,
+ SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK,
+ IPPROTO_UDP);
if (fd < 0) return -1;
if (reuseAddress) {
int optval = 1;
- VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
}
SocketAddress::SetAddrPort(addr, port);
- if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- bind(fd,
- &addr->addr,
- SocketAddress::GetAddrLength(addr))) < 0) {
- TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+ if (bind(fd, &addr->addr, SocketAddress::GetAddrLength(addr)) < 0) {
+ TEMP_FAILURE_RETRY(close(fd));
return -1;
}
return fd;
@@ -391,26 +368,20 @@ intptr_t ServerSocket::CreateBindListen(RawAddr addr,
bool v6_only) {
intptr_t fd;
- fd = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(socket(
- addr.ss.ss_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0));
+ fd = socket(addr.ss.ss_family, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
if (fd < 0) return -1;
int optval = 1;
- TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval));
if (addr.ss.ss_family == AF_INET6) {
optval = v6_only ? 1 : 0;
- TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval)));
+ setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval));
}
SocketAddress::SetAddrPort(&addr, port);
- if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- bind(fd,
- &addr.addr,
- SocketAddress::GetAddrLength(&addr))) < 0) {
- VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+ if (bind(fd, &addr.addr, SocketAddress::GetAddrLength(&addr)) < 0) {
+ VOID_TEMP_FAILURE_RETRY(close(fd));
return -1;
}
@@ -420,14 +391,13 @@ intptr_t ServerSocket::CreateBindListen(RawAddr addr,
// that we do not get the bad port number again.
intptr_t new_fd = CreateBindListen(addr, 0, backlog, v6_only);
int err = errno;
- VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+ VOID_TEMP_FAILURE_RETRY(close(fd));
errno = err;
return new_fd;
}
- if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(
- listen(fd, backlog > 0 ? backlog : SOMAXCONN)) != 0) {
- VOID_TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+ if (listen(fd, backlog > 0 ? backlog : SOMAXCONN) != 0) {
+ VOID_TEMP_FAILURE_RETRY(close(fd));
return -1;
}
@@ -449,8 +419,8 @@ intptr_t ServerSocket::Accept(intptr_t fd) {
intptr_t socket;
struct sockaddr clientaddr;
socklen_t addrlen = sizeof(clientaddr);
- socket = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(accept4(
- fd, &clientaddr, &addrlen, SOCK_NONBLOCK | SOCK_CLOEXEC));
+ socket = TEMP_FAILURE_RETRY(accept4(
+ fd, &clientaddr, &addrlen, SOCK_NONBLOCK | SOCK_CLOEXEC));
if (socket == -1) {
if (IsTemporaryAcceptError(errno)) {
// We need to signal to the caller that this is actually not an
@@ -466,7 +436,7 @@ intptr_t ServerSocket::Accept(intptr_t fd) {
void Socket::Close(intptr_t fd) {
ASSERT(fd >= 0);
- int err = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(close(fd));
+ int err = TEMP_FAILURE_RETRY(close(fd));
if (err != 0) {
const int kBufferSize = 1024;
char error_buf[kBufferSize];
@@ -478,11 +448,8 @@ void Socket::Close(intptr_t fd) {
bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
int on;
socklen_t len = sizeof(on);
- int err = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
- IPPROTO_TCP,
- TCP_NODELAY,
- reinterpret_cast<void *>(&on),
- &len));
+ int err = getsockopt(
+ fd, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<void *>(&on), &len);
if (err == 0) {
*enabled = on == 1;
}
@@ -492,11 +459,11 @@ bool Socket::GetNoDelay(intptr_t fd, bool* enabled) {
bool Socket::SetNoDelay(intptr_t fd, bool enabled) {
int on = enabled ? 1 : 0;
- return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(fd,
- IPPROTO_TCP,
- TCP_NODELAY,
- reinterpret_cast<char *>(&on),
- sizeof(on))) == 0;
+ return setsockopt(fd,
+ IPPROTO_TCP,
+ TCP_NODELAY,
+ reinterpret_cast<char *>(&on),
+ sizeof(on)) == 0;
}
@@ -506,11 +473,8 @@ bool Socket::GetMulticastLoop(intptr_t fd, intptr_t protocol, bool* enabled) {
int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
int optname = protocol == SocketAddress::TYPE_IPV4
? IP_MULTICAST_LOOP : IPV6_MULTICAST_LOOP;
- if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
- level,
- optname,
- reinterpret_cast<char *>(&on),
- &len)) == 0) {
+ if (getsockopt(
+ fd, level, optname, reinterpret_cast<char *>(&on), &len) == 0) {
*enabled = (on == 1);
return true;
}
@@ -523,11 +487,8 @@ bool Socket::SetMulticastLoop(intptr_t fd, intptr_t protocol, bool enabled) {
int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
int optname = protocol == SocketAddress::TYPE_IPV4
? IP_MULTICAST_LOOP : IPV6_MULTICAST_LOOP;
- return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(fd,
- level,
- optname,
- reinterpret_cast<char *>(&on),
- sizeof(on))) == 0;
+ return setsockopt(
+ fd, level, optname, reinterpret_cast<char *>(&on), sizeof(on)) == 0;
}
@@ -537,11 +498,7 @@ bool Socket::GetMulticastHops(intptr_t fd, intptr_t protocol, int* value) {
int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
int optname = protocol == SocketAddress::TYPE_IPV4
? IP_MULTICAST_TTL : IPV6_MULTICAST_HOPS;
- if (TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
- level,
- optname,
- reinterpret_cast<char *>(&v),
- &len)) == 0) {
+ if (getsockopt(fd, level, optname, reinterpret_cast<char *>(&v), &len) == 0) {
*value = v;
return true;
}
@@ -554,22 +511,16 @@ bool Socket::SetMulticastHops(intptr_t fd, intptr_t protocol, int value) {
int level = protocol == SocketAddress::TYPE_IPV4 ? IPPROTO_IP : IPPROTO_IPV6;
int optname = protocol == SocketAddress::TYPE_IPV4
? IP_MULTICAST_TTL : IPV6_MULTICAST_HOPS;
- return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(fd,
- level,
- optname,
- reinterpret_cast<char *>(&v),
- sizeof(v))) == 0;
+ return setsockopt(
+ fd, level, optname, reinterpret_cast<char *>(&v), sizeof(v)) == 0;
}
bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
int on;
socklen_t len = sizeof(on);
- int err = TEMP_FAILURE_RETRY_BLOCK_SIGNALS(getsockopt(fd,
- SOL_SOCKET,
- SO_BROADCAST,
- reinterpret_cast<char *>(&on),
- &len));
+ int err = getsockopt(
+ fd, SOL_SOCKET, SO_BROADCAST, reinterpret_cast<char *>(&on), &len);
if (err == 0) {
*enabled = on == 1;
}
@@ -579,11 +530,11 @@ bool Socket::GetBroadcast(intptr_t fd, bool* enabled) {
bool Socket::SetBroadcast(intptr_t fd, bool enabled) {
int on = enabled ? 1 : 0;
- return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(fd,
- SOL_SOCKET,
- SO_BROADCAST,
- reinterpret_cast<char *>(&on),
- sizeof(on))) == 0;
+ return setsockopt(fd,
+ SOL_SOCKET,
+ SO_BROADCAST,
+ reinterpret_cast<char *>(&on),
+ sizeof(on)) == 0;
}
@@ -593,8 +544,7 @@ bool Socket::JoinMulticast(
struct group_req mreq;
mreq.gr_interface = interfaceIndex;
memmove(&mreq.gr_group, &addr->ss, SocketAddress::GetAddrLength(addr));
- return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
- fd, proto, MCAST_JOIN_GROUP, &mreq, sizeof(mreq))) == 0;
+ return setsockopt(fd, proto, MCAST_JOIN_GROUP, &mreq, sizeof(mreq)) == 0;
}
@@ -604,8 +554,7 @@ bool Socket::LeaveMulticast(
struct group_req mreq;
mreq.gr_interface = interfaceIndex;
memmove(&mreq.gr_group, &addr->ss, SocketAddress::GetAddrLength(addr));
- return TEMP_FAILURE_RETRY_BLOCK_SIGNALS(setsockopt(
- fd, proto, MCAST_LEAVE_GROUP, &mreq, sizeof(mreq))) == 0;
+ return setsockopt(fd, proto, MCAST_LEAVE_GROUP, &mreq, sizeof(mreq)) == 0;
}
} // namespace bin
« runtime/bin/dbg_connection_linux.cc ('K') | « runtime/bin/signal_blocker.h ('k') | runtime/bin/stdio_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698