Implementation of message reader for converting a message snapshot into a C structure

runtime/vm/snapshot_test.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/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/snapshot.h"
 #include "vm/unit_test.h"
 
@@ skipping 37 matching lines @@
   writer.WriteObject(null_object.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(null_object, serialized_object));
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kNull, value->type);
+  free(value);
 }
 
 
 TEST_CASE(SerializeSmi1) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Smi& smi = Smi::Handle(Smi::New(124));
   writer.WriteObject(smi.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(smi, serialized_object));
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kInt32, value->type);
+  EXPECT_EQ(smi.Value(), value->data.int32);
+  free(value);
 }
 
 
 TEST_CASE(SerializeSmi2) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Smi& smi = Smi::Handle(Smi::New(-1));
   writer.WriteObject(smi.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(smi, serialized_object));
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kInt32, value->type);
+  EXPECT_EQ(smi.Value(), value->data.int32);
+  free(value);
 }
 
 
 TEST_CASE(SerializeDouble) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Double& dbl = Double::Handle(Double::New(101.29));
   writer.WriteObject(dbl.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   const Object& serialized_object = Object::Handle(reader.ReadObject());
   EXPECT(Equals(dbl, serialized_object));
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kDouble, value->type);
+  EXPECT_EQ(dbl.value(), value->data.dbl);
+  free(value);
 }
 
 
 TEST_CASE(SerializeBool) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Bool& bool1 = Bool::Handle(Bool::True());
   const Bool& bool2 = Bool::Handle(Bool::False());
   writer.WriteObject(bool1.raw());
   writer.WriteObject(bool2.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   EXPECT(Bool::True() == reader.ReadObject());
   EXPECT(Bool::False() == reader.ReadObject());
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value1 = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kBool, value1->type);
+  EXPECT_EQ(true, value1->data.bl);
+  Dart_Value* value2 = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kBool, value2->type);
+  EXPECT_EQ(false, value2->data.bl);
+  free(value1);
+  free(value2);
 }
 
 
 TEST_CASE(SerializeBigint) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const Bigint& bigint = Bigint::Handle(Bigint::New(0xfffffffffLL));
   writer.WriteObject(bigint.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   Bigint& obj = Bigint::Handle();
   obj ^= reader.ReadObject();
   OS::Print("%lld", BigintOperations::ToInt64(obj));
   EXPECT_EQ(BigintOperations::ToInt64(bigint), BigintOperations::ToInt64(obj));
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value = mreader.ReadObject();
+  // Bigint not supported.
+  EXPECT(value == NULL);
 }
 
 
 TEST_CASE(SerializeSingletons) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   writer.WriteObject(Object::class_class());
   writer.WriteObject(Object::null_class());
   writer.WriteObject(Object::type_class());
@@ skipping 39 matching lines @@
   EXPECT(Object::exception_handlers_class() == reader.ReadObject());
   EXPECT(Object::context_class() == reader.ReadObject());
   EXPECT(Object::context_scope_class() == reader.ReadObject());
 }
 
 
 TEST_CASE(SerializeString) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
-  String& str = String::Handle(String::New("This string shall be serialized"));
+  static const char* cstr = "This string shall be serialized";
+  String& str = String::Handle(String::New(cstr));
   writer.WriteObject(str.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   String& serialized_str = String::Handle();
   serialized_str ^= reader.ReadObject();
   EXPECT(str.Equals(serialized_str));
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kString, value->type);
+  EXPECT_EQ(0, strcmp(value->data.str, cstr));

[siva, 2012/01/27 01:56:52]

I think we have an EXPECT_STREQ

[Søren Gjesse, 2012/01/27 14:40:03]

Done.

+  free(value);
 }
 
 
 TEST_CASE(SerializeArray) {
   // Write snapshot with object content.
   uint8_t* buffer;
   SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
   const int kArrayLength = 10;
   Array& array = Array::Handle(Array::New(kArrayLength));
   Smi& smi = Smi::Handle();
   for (int i = 0; i < kArrayLength; i++) {
     smi ^= Smi::New(i);
     array.SetAt(i, smi);
   }
   writer.WriteObject(array.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   SnapshotReader reader(snapshot, Isolate::Current());
   Array& serialized_array = Array::Handle();
   serialized_array ^= reader.ReadObject();
   EXPECT(array.Equals(serialized_array));
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kArray, value->type);
+  EXPECT_EQ(kArrayLength, value->data.array.len);
+  for (int i = 0; i < kArrayLength; i++) {
+    Dart_Value* element = value->data.array.values[i];
+    EXPECT_EQ(Dart_Value::kInt32, element->type);
+    EXPECT_EQ(i, element->data.int32);
+    free(element);
+  }
+  free(value);
 }
 
 
 TEST_CASE(SerializeScript) {
   const char* kScriptChars =
       "class A {\n"
       "  static bar() { return 42; }\n"
       "  static fly() { return 5; }\n"
       "}\n";
 
@@ skipping 259 matching lines @@
                                0,
                                NULL);
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
   free(full_snapshot);
   free(script_snapshot);
 }
 
+
+TEST_CASE(IntArrayMessage) {
+  uint8_t* buffer = NULL;
+  MessageWriter writer(&buffer, &allocator);
+
+  static const int kArrayLength = 2;
+  intptr_t data[kArrayLength] = {1, 2};
+  int len = kArrayLength;
+  writer.WriteMessage(len, data);
+
+  // Read object back from the snapshot into a C structure.
+  MessageReader mreader(buffer + Snapshot::kHeaderSize, writer.BytesWritten());
+  Dart_Value* value = mreader.ReadObject();
+  EXPECT_EQ(Dart_Value::kArray, value->type);
+  EXPECT_EQ(kArrayLength, value->data.array.len);
+  for (int i = 0; i < kArrayLength; i++) {
+    Dart_Value* element = value->data.array.values[i];
+    EXPECT_EQ(Dart_Value::kInt32, element->type);
+    EXPECT_EQ(i + 1, element->data.int32);
+    free(element);
+  }
+  free(value);
+}
+
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart