Created methods to surface zone memory information for each isolate and thread in JSON.

runtime/vm/isolate_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 "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/isolate.h"
 #include "vm/lockers.h"
 #include "vm/thread_barrier.h"
@@ skipping 228 matching lines @@
 
   // Restore, then clear interrupts.  The world is as it was.
   interrupt_bits = thread->GetAndClearInterrupts();
   EXPECT_EQ(kMessageInterrupt, interrupt_bits);
   EXPECT_EQ(IsolateTestHelper::GetStackLimit(thread),
             IsolateTestHelper::GetSavedStackLimit(thread));
   EXPECT_EQ(kZero, IsolateTestHelper::GetDeferredInterruptsMask(thread));
   EXPECT_EQ(kZero, IsolateTestHelper::GetDeferredInterrupts(thread));
 }
 
+
+#ifndef RELEASE

[Cutch, 2016/12/06 19:11:14]

this doesn't look right.

[bkonyi, 2016/12/08 18:04:14]

Yes, you're right. I've switched to if defined(DEBUG).

+UNIT_TEST_CASE(PrintIsolateInformationToJSON) {
+  Dart_Isolate isolate = Dart_CreateIsolate(
+      NULL, NULL, bin::isolate_snapshot_buffer, NULL, NULL, NULL);
+  EXPECT_EQ(isolate, Dart_CurrentIsolate());
+  JSONStream stream;
+  {
+    JSONObject obj(&stream);

[Cutch, 2016/12/06 19:11:14]

These should probably be rewritten as service tests (see service_test.cc)

[bkonyi, 2016/12/08 18:04:14]

As discussed offline, will add a test once I start using the service to
communicate with the Observatory.

+    reinterpret_cast<Isolate*>(isolate)->PrintThreadsInfoToJSONObject(&obj);
+  }
+
+  char isolate_buf[64];
+  const char* json = stream.ToCString();
+  snprintf(isolate_buf, sizeof(isolate_buf),
+           "\"isolate_address\":\"0x%" Px "\"",
+           reinterpret_cast<uword>(isolate));

[siva, 2016/12/07 22:12:52]

We use OS::SNPrint and not snprintf in order to make the code portable.

[bkonyi, 2016/12/08 18:04:14]

Acknowledged.

+  EXPECT_SUBSTRING(isolate_buf, json);
+

[siva, 2016/12/07 22:12:52]

How does this verify all the threads info that was added to the JSON stream.

[bkonyi, 2016/12/08 18:04:14]

Acknowledged. I'll be removing this test either way.

+  Dart_ShutdownIsolate();
+}
+
+
+UNIT_TEST_CASE(PrintAllIsolateInformationToJSON) {
+  Dart_Isolate isolate0 = TestCase::CreateTestIsolate();
+  EXPECT_EQ(isolate0, Dart_CurrentIsolate());
+
+  char isolate0_buf[64];
+  snprintf(isolate0_buf, sizeof(isolate0_buf),
+           "\"isolate_address\":\"0x%" Px "\"",
+           reinterpret_cast<uword>(isolate0));
+  {
+    JSONStream stream;
+    Isolate::PrintAllIsolatesMemoryInfoToJSONLocked(&stream);
+    const char* json = stream.ToCString();
+    EXPECT_SUBSTRING(isolate0_buf, json);
+  }
+
+  Dart_ExitIsolate();
+  // Create a second isolate to ensure info for all isolates is returned.
+  Dart_Isolate isolate1 = TestCase::CreateTestIsolate();
+  EXPECT_EQ(isolate1, Dart_CurrentIsolate());
+
+  char isolate1_buf[64];
+  snprintf(isolate1_buf, sizeof(isolate1_buf),
+           "\"isolate_address\":\"0x%" Px "\"",
+           reinterpret_cast<uword>(isolate1));
+  {
+    JSONStream stream;
+    Isolate::PrintAllIsolatesMemoryInfoToJSONLocked(&stream);
+    const char* json = stream.ToCString();
+    EXPECT_SUBSTRING(isolate0_buf, json);
+    EXPECT_SUBSTRING(isolate1_buf, json);
+  }
+
+  Dart_ShutdownIsolate();
+  Dart_EnterIsolate(isolate0);
+  Dart_ShutdownIsolate();
+}
+#endif
+
 }  // namespace dart