Updated SimpleManyTasksWithZones test to not use PrintJSONForVM

runtime/vm/thread_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/isolate.h"
 #include "vm/lockers.h"
 #include "vm/unit_test.h"
 #include "vm/profiler.h"
 #include "vm/safepoint.h"
@@ skipping 295 matching lines @@
   // Wait until all spawned tasks finish their memory operations.
   {
     MonitorLocker ml(&monitor);
     while (done_count < kTaskCount) {
       ml.Wait();
     }
     // Reset the done counter for use later.
     done_count = 0;
   }
 
+  // Get the information for the current isolate.
+  // We only need to check the current isolate since all tasks are spawned
+  // inside this single isolate.
   JSONStream stream;
-  Service::PrintJSONForVM(&stream, false);
+  {
+    JSONArray arr(&stream);
+    arr.AddValue(isolate, false);

[Cutch, 2016/12/12 21:28:42]

Just call it directly:

isolate->PrintJSON(&stream, false);

[bkonyi, 2016/12/12 21:33:23]

Right... Done.

+  }
   const char* json = stream.ToCString();
 
   // Confirm all expected entries are in the JSON output.
   for (intptr_t i = 0; i < kTaskCount + 1; i++) {
     Thread* thread = threads[i];
-    Isolate* thread_isolate = thread->isolate();
-    // Buffer can handle any possible input length given types.
-    //    char thread_address_buf[96];
-    //    char isolate_address_buf[64];
     Zone* top_zone = thread->zone();
 
     Thread* current_thread = Thread::Current();
     StackZone stack_zone(current_thread);
     Zone* current_zone = current_thread->zone();
 
     // Check that all zones are present with correct sizes.
     while (top_zone != NULL) {
       char* zone_info_buf =
           OS::SCreate(current_zone,
                       "\"type\":\"_Zone\","
                       "\"capacity\":%" Pd
                       ","
                       "\"used\":%" Pd "",
                       top_zone->SizeInBytes(), top_zone->UsedSizeInBytes());
       EXPECT_SUBSTRING(zone_info_buf, json);
       top_zone = top_zone->previous();
     }
 
     // Check the thread exists and is the correct size.
     char* thread_info_buf = OS::SCreate(
         current_zone,
         "\"type\":\"_Thread\","
         "\"id\":\"threads\\/%" Pd "",
         OSThread::ThreadIdToIntPtr(thread->os_thread()->trace_id()));
 
-    // Ensure the isolate for each thread is valid.
-
-    char* isolate_info_buf =
-        OS::SCreate(current_zone,
-                    "\"type\":\"Isolate\","
-                    "\"fixedId\":true,"
-                    "\"id\":\"isolates\\/%" Pd64 "",
-                    static_cast<int64_t>(thread_isolate->main_port()));
-
     EXPECT_SUBSTRING(thread_info_buf, json);
-    EXPECT_SUBSTRING(isolate_info_buf, json);
   }
 
   // Unblock the tasks so they can finish.
   {
     MonitorLocker sync_ml(&sync);
     wait = false;
     sync_ml.NotifyAll();
   }
   // Now wait for them all to exit before destroying the isolate.
   {
@@ skipping 426 matching lines @@
       TransitionVMToBlocked transition(thread);
       MonitorLocker ml(&done_monitor);
       if (done) {
         break;
       }
     }
   }
 }
 
 }  // namespace dart