Profiler Take 2

runtime/bin/file.cc

 // Copyright (c) 2013, 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 "bin/file.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/io_buffer.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
 #include "include/dart_api.h"
+#include "include/dart_native_api.h"
 
 namespace dart {
 namespace bin {
 
 static const int kMSPerSecond = 1000;
 
 
 // The file pointer has been passed into Dart as an intptr_t and it is safe
 // to pull it out of Dart as a 64-bit integer, cast it to an intptr_t and
 // from there to a File pointer.
 static File* GetFilePointer(Dart_Handle handle) {
   intptr_t value = DartUtils::GetIntptrValue(handle);
   return reinterpret_cast<File*>(value);
 }
 
 
 bool File::ReadFully(void* buffer, int64_t num_bytes) {
   int64_t remaining = num_bytes;
   char* current_buffer = reinterpret_cast<char*>(buffer);
+  Dart_DisableThreadInterrupter();

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

I am wondering if we should have a macro around all blocking calls
and put DisableInterrupts/EnableInterrupts in that macro.

Maybe we could leverage TEMP_FAILURE_RETRY (we seem to wrap all
system calls with this macro). We can't replace TEMP_FAILURE_RETRY
as it is a predefined macro but we could add a new macro which
does the interrupt disable/enable stuff and then calls
TEMP_FAILURE_RETRY

s/TEMP_FAILURE_RETRY/BLOCKING_SYSTEM_CALL/g

#define BLOCKING_SYSTEM_CALL(expression)
  Dart_DisableThreadInterrupter();
  TEMP_FAILURE_RETRY(expression);
  Dart_EnableThreadInterrupter();

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

I'm not sure how to build a macro like that in a portable way. For now I'm going
to explicitly add the ThreadSignalBlocker calls.

   while (remaining > 0) {
     int bytes_read = Read(current_buffer, remaining);
     if (bytes_read <= 0) {
+      Dart_EnableThreadInterrupter();
       return false;
     }
     remaining -= bytes_read;  // Reduce the number of remaining bytes.
     current_buffer += bytes_read;  // Move the buffer forward.
   }
+  Dart_EnableThreadInterrupter();
   return true;
 }
 
 
 bool File::WriteFully(const void* buffer, int64_t num_bytes) {
   int64_t remaining = num_bytes;
   const char* current_buffer = reinterpret_cast<const char*>(buffer);
+  Dart_DisableThreadInterrupter();
   while (remaining > 0) {
     int bytes_read = Write(current_buffer, remaining);
     if (bytes_read < 0) {
+      Dart_EnableThreadInterrupter();
       return false;
     }
     remaining -= bytes_read;  // Reduce the number of remaining bytes.
     current_buffer += bytes_read;  // Move the buffer forward.
   }
+  Dart_EnableThreadInterrupter();
   return true;
 }
 
 
 File::FileOpenMode File::DartModeToFileMode(DartFileOpenMode mode) {
   ASSERT(mode == File::kDartRead ||
          mode == File::kDartWrite ||
          mode == File::kDartAppend);
   if (mode == File::kDartWrite) {
     return File::kWriteTruncate;
@@ skipping 42 matching lines @@
   ASSERT(file != NULL);
   delete file;
   Dart_SetReturnValue(args, Dart_NewInteger(0));
 }
 
 
 void FUNCTION_NAME(File_ReadByte)(Dart_NativeArguments args) {
   File* file = GetFilePointer(Dart_GetNativeArgument(args, 0));
   ASSERT(file != NULL);
   uint8_t buffer;
+  Dart_DisableThreadInterrupter();
   int64_t bytes_read = file->Read(reinterpret_cast<void*>(&buffer), 1);
+  Dart_EnableThreadInterrupter();
   if (bytes_read == 1) {
     Dart_SetReturnValue(args, Dart_NewInteger(buffer));
   } else if (bytes_read == 0) {
     Dart_SetReturnValue(args, Dart_NewInteger(-1));
   } else {
     Dart_Handle err = DartUtils::NewDartOSError();
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
 }
 
 
 void FUNCTION_NAME(File_WriteByte)(Dart_NativeArguments args) {
   File* file = GetFilePointer(Dart_GetNativeArgument(args, 0));
   ASSERT(file != NULL);
   int64_t byte = 0;
   if (DartUtils::GetInt64Value(Dart_GetNativeArgument(args, 1), &byte)) {
     uint8_t buffer = static_cast<uint8_t>(byte & 0xff);
+    Dart_DisableThreadInterrupter();
     int64_t bytes_written = file->Write(reinterpret_cast<void*>(&buffer), 1);
+    Dart_EnableThreadInterrupter();
     if (bytes_written >= 0) {
       Dart_SetReturnValue(args, Dart_NewInteger(bytes_written));
     } else {
       Dart_Handle err = DartUtils::NewDartOSError();
       if (Dart_IsError(err)) Dart_PropagateError(err);
       Dart_SetReturnValue(args, err);
     }
   } else {
     OSError os_error(-1, "Invalid argument", OSError::kUnknown);
     Dart_Handle err = DartUtils::NewDartOSError(&os_error);
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
 }
 
 
 void FUNCTION_NAME(File_Read)(Dart_NativeArguments args) {
   File* file = GetFilePointer(Dart_GetNativeArgument(args, 0));
   ASSERT(file != NULL);
   Dart_Handle length_object = Dart_GetNativeArgument(args, 1);
   int64_t length = 0;
   if (DartUtils::GetInt64Value(length_object, &length)) {
     uint8_t* buffer = NULL;
     Dart_Handle external_array = IOBuffer::Allocate(length, &buffer);
+    Dart_DisableThreadInterrupter();
     int64_t bytes_read = file->Read(reinterpret_cast<void*>(buffer), length);
+    Dart_EnableThreadInterrupter();
     if (bytes_read < 0) {
       Dart_Handle err = DartUtils::NewDartOSError();
       if (Dart_IsError(err)) Dart_PropagateError(err);
       Dart_SetReturnValue(args, err);
     } else {
       if (bytes_read < length) {
         const int kNumArgs = 3;
         Dart_Handle dart_args[kNumArgs];
         dart_args[0] = external_array;
         dart_args[1] = Dart_NewInteger(0);
@@ skipping 34 matching lines @@
   intptr_t start =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 2));
   intptr_t end =
       DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 3));
   intptr_t length = end - start;
   intptr_t array_len = 0;
   Dart_Handle result = Dart_ListLength(buffer_obj, &array_len);
   if (Dart_IsError(result)) Dart_PropagateError(result);
   ASSERT(end <= array_len);
   uint8_t* buffer = new uint8_t[length];
+  Dart_DisableThreadInterrupter();
   int64_t bytes_read = file->Read(reinterpret_cast<void*>(buffer), length);
+  Dart_EnableThreadInterrupter();
   if (bytes_read >= 0) {
     result = Dart_ListSetAsBytes(buffer_obj, start, buffer, bytes_read);
     if (Dart_IsError(result)) {
       delete[] buffer;
       Dart_PropagateError(result);
     }
     Dart_SetReturnValue(args, Dart_NewInteger(bytes_read));
   } else {
     Dart_Handle err = DartUtils::NewDartOSError();
     if (Dart_IsError(err)) Dart_PropagateError(err);
@@ skipping 26 matching lines @@
   void* buffer = NULL;
   Dart_Handle result =
       Dart_TypedDataAcquireData(buffer_obj, &type, &buffer, &buffer_len);
   if (Dart_IsError(result)) Dart_PropagateError(result);
 
   ASSERT(type == Dart_TypedData_kUint8 || type == Dart_TypedData_kInt8);
   ASSERT(end <= buffer_len);
   ASSERT(buffer != NULL);
 
   // Write the data out into the file.
+  Dart_DisableThreadInterrupter();
   int64_t bytes_written = file->Write(reinterpret_cast<void*>(buffer), length);
-
+  Dart_EnableThreadInterrupter();
   // Release the direct pointer acquired above.
   result = Dart_TypedDataReleaseData(buffer_obj);
   if (Dart_IsError(result)) Dart_PropagateError(result);
 
   if (bytes_written != length) {
     Dart_Handle err = DartUtils::NewDartOSError();
     if (Dart_IsError(err)) Dart_PropagateError(err);
     Dart_SetReturnValue(args, err);
   }
 }
@@ skipping 583 matching lines @@
   return CObject::IllegalArgumentError();
 }
 
 
 CObject* File::ReadByteRequest(const CObjectArray& request) {
   if (request.Length() == 1 && request[0]->IsIntptr()) {
     File* file = CObjectToFilePointer(request[0]);
     ASSERT(file != NULL);
     if (!file->IsClosed()) {
       uint8_t buffer;
+      Dart_DisableThreadInterrupter();
       int64_t bytes_read = file->Read(reinterpret_cast<void*>(&buffer), 1);
+      Dart_EnableThreadInterrupter();
       if (bytes_read > 0) {
         return new CObjectIntptr(CObject::NewIntptr(buffer));
       } else if (bytes_read == 0) {
         return new CObjectIntptr(CObject::NewIntptr(-1));
       } else {
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
 CObject* File::WriteByteRequest(const CObjectArray& request) {
   if (request.Length() == 2 &&
       request[0]->IsIntptr() &&
       request[1]->IsInt32OrInt64()) {
     File* file = CObjectToFilePointer(request[0]);
     ASSERT(file != NULL);
     if (!file->IsClosed()) {
       int64_t byte = CObjectInt32OrInt64ToInt64(request[1]);
       uint8_t buffer = static_cast<uint8_t>(byte & 0xff);
+      Dart_DisableThreadInterrupter();
       int64_t bytes_written = file->Write(reinterpret_cast<void*>(&buffer), 1);
+      Dart_EnableThreadInterrupter();
       if (bytes_written > 0) {
         return new CObjectInt64(CObject::NewInt64(bytes_written));
       } else {
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
 CObject* File::ReadRequest(const CObjectArray& request) {
   if (request.Length() == 2 &&
       request[0]->IsIntptr() &&
       request[1]->IsInt32OrInt64()) {
     File* file = CObjectToFilePointer(request[0]);
     ASSERT(file != NULL);
     if (!file->IsClosed()) {
       int64_t length = CObjectInt32OrInt64ToInt64(request[1]);
       Dart_CObject* io_buffer = CObject::NewIOBuffer(length);
       ASSERT(io_buffer != NULL);
       uint8_t* data = io_buffer->value.as_external_typed_data.data;
+      Dart_DisableThreadInterrupter();
       int64_t bytes_read = file->Read(data, length);
+      Dart_EnableThreadInterrupter();
       if (bytes_read >= 0) {
         CObjectExternalUint8Array* external_array =
             new CObjectExternalUint8Array(io_buffer);
         external_array->SetLength(bytes_read);
         CObjectArray* result = new CObjectArray(CObject::NewArray(2));
         result->SetAt(0, new CObjectIntptr(CObject::NewInt32(0)));
         result->SetAt(1, external_array);
         return result;
       } else {
         CObject::FreeIOBufferData(io_buffer);
@@ skipping 11 matching lines @@
   if (request.Length() == 2 &&
       request[0]->IsIntptr() &&
       request[1]->IsInt32OrInt64()) {
     File* file = CObjectToFilePointer(request[0]);
     ASSERT(file != NULL);
     if (!file->IsClosed()) {
       int64_t length = CObjectInt32OrInt64ToInt64(request[1]);
       Dart_CObject* io_buffer = CObject::NewIOBuffer(length);
       ASSERT(io_buffer != NULL);
       uint8_t* data = io_buffer->value.as_external_typed_data.data;
+      Dart_DisableThreadInterrupter();
       int64_t bytes_read = file->Read(data, length);
+      Dart_EnableThreadInterrupter();
       if (bytes_read >= 0) {
         CObjectExternalUint8Array* external_array =
             new CObjectExternalUint8Array(io_buffer);
         external_array->SetLength(bytes_read);
         CObjectArray* result = new CObjectArray(CObject::NewArray(3));
         result->SetAt(0, new CObjectIntptr(CObject::NewInt32(0)));
         result->SetAt(1, new CObjectInt64(CObject::NewInt64(bytes_read)));
         result->SetAt(2, external_array);
         return result;
       } else {
@@ skipping 59 matching lines @@
             int64_t value = CObjectInt32OrInt64ToInt64(array[i + start]);
             buffer_start[i] = static_cast<uint8_t>(value & 0xFF);
           } else {
             // Unsupported type.
             delete[] buffer_start;
             return CObject::IllegalArgumentError();
           }
         }
         start = 0;
       }
+      Dart_DisableThreadInterrupter();
       int64_t bytes_written =
           file->Write(reinterpret_cast<void*>(buffer_start), length);
+      Dart_EnableThreadInterrupter();
       if (!request[1]->IsTypedData()) {
         delete[] buffer_start;
       }
       if (bytes_written >= 0) {
         return new CObjectInt64(CObject::NewInt64(bytes_written));
       } else {
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
@@ skipping 113 matching lines @@
     CObjectArray* wrapper = new CObjectArray(CObject::NewArray(2));
     wrapper->SetAt(0, new CObjectInt32(CObject::NewInt32(CObject::kSuccess)));
     wrapper->SetAt(1, result);
     return wrapper;
   }
   return CObject::IllegalArgumentError();
 }
 
 }  // namespace bin
 }  // namespace dart