Make all allocation of external arrays used for IO use the IOBuffer class

runtime/bin/file.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 "bin/file.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
 #include "bin/io_buffer.h"
 #include "bin/thread.h"
@@ skipping 761 matching lines @@
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
-static void FinalizeExternalByteArray(void* peer) {
-  delete[] reinterpret_cast<uint8_t*>(peer);
-}
-
-
 static CObject* FileReadRequest(const CObjectArray& request) {
   if (request.Length() == 3 &&
       request[1]->IsIntptr() &&
       request[2]->IsInt32OrInt64()) {
     File* file = CObjectToFilePointer(request[1]);
     ASSERT(file != NULL);
     if (!file->IsClosed()) {
       int64_t length = CObjectInt32OrInt64ToInt64(request[2]);
-      uint8_t* buffer = new uint8_t[length];
-      int64_t bytes_read = file->Read(buffer, length);
+      Dart_CObject* io_buffer = CObject::NewIOBuffer(length);
+      uint8_t* data = io_buffer->value.as_external_byte_array.data;
+      int64_t bytes_read = file->Read(data, length);
       if (bytes_read >= 0) {
-        void* peer = reinterpret_cast<void*>(buffer);
-        CObject* external_array =
-            new CObjectExternalUint8Array(
-                CObject::NewExternalUint8Array(bytes_read,
-                                               buffer,
-                                               peer,
-                                               FinalizeExternalByteArray));
+        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);
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
 static CObject* FileReadListRequest(const CObjectArray& request) {
   if (request.Length() == 3 &&
       request[1]->IsIntptr() &&
       request[2]->IsInt32OrInt64()) {
     File* file = CObjectToFilePointer(request[1]);
     ASSERT(file != NULL);
     if (!file->IsClosed()) {
       int64_t length = CObjectInt32OrInt64ToInt64(request[2]);
-      uint8_t* buffer = new uint8_t[length];
-      int64_t bytes_read = file->Read(buffer, length);
+      Dart_CObject* io_buffer = CObject::NewIOBuffer(length);
+      uint8_t* data = io_buffer->value.as_external_byte_array.data;
+      int64_t bytes_read = file->Read(data, length);
       if (bytes_read >= 0) {
-        void* peer = reinterpret_cast<void*>(buffer);
-        CObject* external_array =
-            new CObjectExternalUint8Array(
-                CObject::NewExternalUint8Array(length,
-                                               buffer,
-                                               peer,
-                                               FinalizeExternalByteArray));
+        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 {
+        CObject::FreeIOBufferData(io_buffer);
         return CObject::NewOSError();
       }
     } else {
       return CObject::FileClosedError();
     }
   }
   return CObject::IllegalArgumentError();
 }
 
 
@@ skipping 150 matching lines @@
   Dart_EnterScope();
   Dart_SetReturnValue(args, Dart_Null());
   Dart_Port service_port = File::GetServicePort();
   if (service_port != ILLEGAL_PORT) {
     // Return a send port for the service port.
     Dart_Handle send_port = Dart_NewSendPort(service_port);
     Dart_SetReturnValue(args, send_port);
   }
   Dart_ExitScope();
 }