Add ByteArray interface and provide internal and external implementations.

runtime/vm/object.cc

Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index ecd63e0205d53c58125abc328347963d8999ccc7..25051ad99b2a4d28bad626d21d12f32f56249b0f 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -539,7 +539,7 @@ void Object::Init(Isolate* isolate) {
   const Script& script = Script::Handle(Bootstrap::LoadScript());
 
   // Allocate and initialize the Object class and type.
-  // The Object and ByteBuffer classes are the only pre-allocated
+  // The Object and ExternalByteArray classes are the only pre-allocated
   // non-interface classes in the core library.
   cls = Class::New<Instance>();
   object_store->set_object_class(cls);
@@ -550,9 +550,15 @@ void Object::Init(Isolate* isolate) {
   type = Type::NewNonParameterizedType(cls);
   object_store->set_object_type(type);
 
-  cls = Class::New<ByteBuffer>();
-  object_store->set_byte_buffer_class(cls);
-  cls.set_name(String::Handle(String::NewSymbol("ByteBuffer")));
+  cls = Class::New<InternalByteArray>();
+  object_store->set_internal_byte_array_class(cls);
+  cls.set_name(String::Handle(String::NewSymbol("InternalByteArray")));
+  cls.set_script(script);
+  core_lib.AddClass(cls);
+
+  cls = Class::New<ExternalByteArray>();
+  object_store->set_external_byte_array_class(cls);
+  cls.set_name(String::Handle(String::NewSymbol("ExternalByteArray")));
   cls.set_script(script);
   core_lib.AddClass(cls);
 
@@ -596,6 +602,11 @@ void Object::Init(Isolate* isolate) {
   type = Type::NewNonParameterizedType(cls);
   object_store->set_list_interface(type);
 
+  cls = CreateAndRegisterInterface("ByteArray", script, core_lib);
+  pending_classes.Add(&Class::ZoneHandle(cls.raw()));
+  type = Type::NewNonParameterizedType(cls);
+  object_store->set_byte_array_interface(type);
+
   // The classes 'Null' and 'void' are not registered in the class dictionary,
   // because their names are reserved keywords. Their names are not heap
   // allocated, because the classes reside in the VM isolate.
@@ -667,8 +678,11 @@ void Object::InitFromSnapshot(Isolate* isolate) {
   cls = Class::New<ImmutableArray>();
   object_store->set_immutable_array_class(cls);
 
-  cls = Class::New<ByteBuffer>();
-  object_store->set_byte_buffer_class(cls);
+  cls = Class::New<InternalByteArray>();
+  object_store->set_internal_byte_array_class(cls);
+
+  cls = Class::New<ExternalByteArray>();
+  object_store->set_external_byte_array_class(cls);
 
   cls = Class::New<Instance>();
   object_store->set_object_class(cls);
@@ -1226,9 +1240,12 @@ RawClass* Class::GetClass(ObjectKind kind) {
     case kImmutableArray:
       ASSERT(object_store->immutable_array_class() != Class::null());
       return object_store->immutable_array_class();
-    case kByteBuffer:
-      ASSERT(object_store->byte_buffer_class() != Class::null());
-      return object_store->byte_buffer_class();
+    case kInternalByteArray:
+      ASSERT(object_store->internal_byte_array_class() != Class::null());
+      return object_store->internal_byte_array_class();
+    case kExternalByteArray:
+      ASSERT(object_store->external_byte_array_class() != Class::null());
+      return object_store->external_byte_array_class();
     case kStacktrace:
       ASSERT(object_store->stacktrace_class() != Class::null());
       return object_store->stacktrace_class();
@@ -7433,50 +7450,78 @@ const char* ImmutableArray::ToCString() const {
 }
 
 
-RawByteBuffer* ByteBuffer::New(uint8_t* data,
-                               intptr_t len,
-                               Heap::Space space) {
+intptr_t ByteArray::Length() const {
+  // ByteArray is an abstract class.
+  UNREACHABLE();
+  return 0;
+}
+
+
+const char* ByteArray::ToCString() const {
+  // ByteArray is an abstract class.
+  UNREACHABLE();
+  return "ByteArray";
+}
+
+
+RawInternalByteArray* InternalByteArray::New(intptr_t len,
+                                             Heap::Space space) {
   Isolate* isolate = Isolate::Current();
-  const Class& byte_buffer_class =
-      Class::Handle(isolate->object_store()->byte_buffer_class());
-  ByteBuffer& result = ByteBuffer::Handle();
+  const Class& internal_byte_array_class =
+      Class::Handle(isolate->object_store()->internal_byte_array_class());
+  InternalByteArray& result = InternalByteArray::Handle();
   {
-    RawObject* raw = Object::Allocate(byte_buffer_class,
-                                      ByteBuffer::InstanceSize(),
+    RawObject* raw = Object::Allocate(internal_byte_array_class,
+                                      InternalByteArray::InstanceSize(len),
                                       space);
     NoGCScope no_gc;
     result ^= raw;
     result.SetLength(len);

[Ivan Posva, 2012/01/25 23:49:57]

Not calling bzero here will cause you to leak the byte values of the null
object.

[cshapiro, 2012/01/26 02:25:42]

Right.  I assumed we zero initialized.  Fixed.

-    result.SetData(data);
   }
   return result.raw();
 }
 
 
-bool ByteBuffer::Equals(const Instance& other) const {
-  if (this->raw() == other.raw()) {
-    // Both handles point to the same raw instance.
-    return true;
+RawInternalByteArray* InternalByteArray::New(const uint8_t* data,
+                                             intptr_t len,
+                                             Heap::Space space) {
+  InternalByteArray& result =
+      InternalByteArray::Handle(InternalByteArray::New(len, space));
+  {
+    NoGCScope no_gc;
+    memmove(result.Addr<uint8_t>(0), data, len);
   }
+  return result.raw();
+}
 
-  if (!other.IsByteBuffer() || other.IsNull()) {
-    return false;
-  }
 
-  ByteBuffer& other_array = ByteBuffer::Handle();
-  other_array ^= other.raw();
+const char* InternalByteArray::ToCString() const {
+  return "InternalByteArray";
+}
 
-  intptr_t len = this->Length();
-  if (len != other_array.Length()) {
-    return false;
-  }
 
-  return memcmp(this->Addr<uint8_t>(0), other_array.Addr<uint8_t>(0), len) == 0;
+RawExternalByteArray* ExternalByteArray::New(uint8_t* data,
+                                             intptr_t len,
+                                             Heap::Space space) {
+  Isolate* isolate = Isolate::Current();
+  const Class& external_byte_array_class =
+      Class::Handle(isolate->object_store()->external_byte_array_class());
+  ExternalByteArray& result = ExternalByteArray::Handle();
+  {
+    RawObject* raw = Object::Allocate(external_byte_array_class,
+                                      ExternalByteArray::InstanceSize(),
+                                      space);
+    NoGCScope no_gc;
+    result ^= raw;
+    result.SetLength(len);
+    result.SetData(data);
+  }
+  return result.raw();
 }
 
 
-const char* ByteBuffer::ToCString() const {
-  return "ByteBuffer";
+const char* ExternalByteArray::ToCString() const {
+  return "ExternalByteArray";
 }