Profiler Take 2

runtime/bin/file_android.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include "bin/file.h"
 
 #include <errno.h>  // NOLINT
 #include <fcntl.h>  // NOLINT
 #include <sys/stat.h>  // NOLINT
 #include <sys/types.h>  // NOLINT
 #include <sys/sendfile.h>  // NOLINT
 #include <unistd.h>  // NOLINT
 #include <libgen.h>  // NOLINT
 
 #include "bin/builtin.h"
 #include "bin/log.h"
+#include "bin/signal_blocker.h"
 
 
 namespace dart {
 namespace bin {
 
 class FileHandle {
  public:
   explicit FileHandle(int fd) : fd_(fd) { }
   ~FileHandle() { }
   int fd() const { return fd_; }
@@ skipping 28 matching lines @@
 }
 
 
 bool File::IsClosed() {
   return handle_->fd() == kClosedFd;
 }
 
 
 int64_t File::Read(void* buffer, int64_t num_bytes) {
   ASSERT(handle_->fd() >= 0);
+  // Block profile interrupts while making I/O call.
+  ThreadSignalBlocker tsb(SIGPROF);
   return TEMP_FAILURE_RETRY(read(handle_->fd(), buffer, num_bytes));

[siva, 2013/12/13 21:29:14]

We should consider moving this blocking stuff into TEMP_FAILURE_RETRY using a
new macro (I made that comment in a previous version of your upload).

[Cutch, 2013/12/13 22:40:18]

Not sure how to do that. For now I'm going with ThreadSignalBlocker calls.

 }
 
 
 int64_t File::Write(const void* buffer, int64_t num_bytes) {
   ASSERT(handle_->fd() >= 0);
+  // Block profile interrupts while making I/O call.
+  ThreadSignalBlocker tsb(SIGPROF);
   return TEMP_FAILURE_RETRY(write(handle_->fd(), buffer, num_bytes));
 }
 
 
 off64_t File::Position() {
   ASSERT(handle_->fd() >= 0);
   return lseek64(handle_->fd(), 0, SEEK_CUR);
 }
 
 
@@ skipping 156 matching lines @@
     off64_t offset = 0;
     int result = 1;
     while (result > 0) {
       // Loop to ensure we copy everything, and not only up to 2GB.
       result = TEMP_FAILURE_RETRY(
           sendfile(new_fd, old_fd, &offset, kMaxUint32));
     }
     if (result < 0 && (errno == EINVAL || errno == ENOSYS)) {
       const intptr_t kBufferSize = 8 * 1024;
       uint8_t buffer[kBufferSize];
+      // Block profile interrupts while making I/O call.
+      ThreadSignalBlocker tsb(SIGPROF);
       while ((result = TEMP_FAILURE_RETRY(
           read(old_fd, buffer, kBufferSize))) > 0) {
         int wrote = TEMP_FAILURE_RETRY(write(new_fd, buffer, result));
         if (wrote != result) {
           result = -1;
           break;
         }
       }
     }
     if (result < 0) {
@@ skipping 152 matching lines @@
   return (file_1_info.st_ino == file_2_info.st_ino &&
           file_1_info.st_dev == file_2_info.st_dev) ?
       File::kIdentical :
       File::kDifferent;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)