Profiler Take 2

runtime/bin/socket_android.cc

Index: runtime/bin/socket_android.cc
diff --git a/runtime/bin/socket_android.cc b/runtime/bin/socket_android.cc
index 72a03bd47850b69961ccd581e1a0aa5b6cb0ca17..3ba7ea14871cc840bfef9f0fadce46eb5a141ba4 100644
--- a/runtime/bin/socket_android.cc
+++ b/runtime/bin/socket_android.cc
@@ -16,6 +16,7 @@
 #include "bin/fdutils.h"
 #include "bin/file.h"
 #include "bin/log.h"
+#include "bin/signal_blocker.h"
 #include "bin/socket.h"
 
 
@@ -104,6 +105,8 @@ intptr_t Socket::Available(intptr_t fd) {
 
 int Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
   ASSERT(fd >= 0);
+  // Block profile interrupts while making I/O call.
+  ThreadSignalBlocker tsb(SIGPROF);
   ssize_t read_bytes = TEMP_FAILURE_RETRY(read(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
   if (read_bytes == -1 && errno == EWOULDBLOCK) {
@@ -119,6 +122,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);
+  // Block profile interrupts while making I/O call.
+  ThreadSignalBlocker tsb(SIGPROF);
   ssize_t read_bytes =
       TEMP_FAILURE_RETRY(
           recvfrom(fd, buffer, num_bytes, 0, &addr->addr, &addr_len));
@@ -133,6 +138,8 @@ 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);
+  // Block profile interrupts while making I/O call.
+  ThreadSignalBlocker tsb(SIGPROF);
   ssize_t written_bytes = TEMP_FAILURE_RETRY(write(fd, buffer, num_bytes));
   ASSERT(EAGAIN == EWOULDBLOCK);
   if (written_bytes == -1 && errno == EWOULDBLOCK) {
@@ -147,6 +154,8 @@ 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);
+  // Block profile interrupts while making I/O call.
+  ThreadSignalBlocker tsb(SIGPROF);
   ssize_t written_bytes =
       TEMP_FAILURE_RETRY(
           sendto(fd, buffer, num_bytes, 0,