- Improve the formatting of generated source text.

runtime/vm/dart.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 "vm/dart.h"
 
 #include "vm/dart_api_state.h"
 #include "vm/flags.h"
 #include "vm/freelist.h"
 #include "vm/handles.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/port.h"
 #include "vm/snapshot.h"
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 #include "vm/thread_pool.h"
 #include "vm/virtual_memory.h"
 #include "vm/zone.h"
 
 namespace dart {
 
+DECLARE_FLAG(bool, print_bootstrap);
 DECLARE_FLAG(bool, print_class_table);
 DECLARE_FLAG(bool, trace_isolates);
 
 Isolate* Dart::vm_isolate_ = NULL;
 ThreadPool* Dart::thread_pool_ = NULL;
 DebugInfo* Dart::pprof_symbol_generator_ = NULL;
 FileWriterFunction Dart::flow_graph_writer_ = NULL;
 
 // An object visitor which will mark all visited objects. This is used to
 // premark all objects in the vm_isolate_ heap.
@@ skipping 51 matching lines @@
 
 
 Isolate* Dart::CreateIsolate(const char* name_prefix) {
   // Create a new isolate.
   Isolate* isolate = Isolate::Init(name_prefix);
   ASSERT(isolate != NULL);
   return isolate;
 }
 
 
+static void PrintLibrarySources(Isolate* isolate) {
+  const GrowableObjectArray& libs = GrowableObjectArray::Handle(
+      isolate->object_store()->libraries());
+  intptr_t lib_count = libs.Length();
+  Library& lib = Library::Handle();
+  Array& scripts = Array::Handle();
+  Script& script = Script::Handle();
+  String& url = String::Handle();
+  String& source = String::Handle();
+  for (int i = 0; i < lib_count; i++) {
+    lib ^= libs.At(i);
+    url = lib.url();
+    OS::Print("Library %s:\n", url.ToCString());
+    scripts = lib.LoadedScripts();
+    intptr_t script_count = scripts.Length();
+    for (intptr_t i = 0; i < script_count; i++) {
+      script ^= scripts.At(i);
+      url = script.url();
+      source = script.Source();
+      OS::Print("Source for %s:\n", url.ToCString());
+      OS::Print("%s\n", source.ToCString());
+    }

[siva, 2012/07/26 00:51:05]

In the non snapshot case the print-bootstrap flat prints in the following
format:

  if (FLAG_print_bootstrap) {
    OS::Print("Bootstrap source '%s':\n%s\n",
        String::Handle(script.url()).ToCString(),
        String::Handle(script.Source()).ToCString());
  }

We should probably make the two consistent, Also I don't think the non snapshot
version prints dart:io etc.

I would think the best option might be to remove the existing implementation and
always call this new code in both cases from here.

+  }
+}
+
+
 RawError* Dart::InitializeIsolate(const uint8_t* snapshot_buffer, void* data) {
   // Initialize the new isolate.
   TIMERSCOPE(time_isolate_initialization);
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   Zone zone(isolate);
   HandleScope handle_scope(isolate);
   Heap::Init(isolate);
   ObjectStore::Init(isolate);
 
   if (snapshot_buffer == NULL) {
     const Error& error = Error::Handle(Object::Init(isolate));
     if (!error.IsNull()) {
       return error.raw();
     }
   } else {
     // Initialize from snapshot (this should replicate the functionality
     // of Object::Init(..) in a regular isolate creation path.
     Object::InitFromSnapshot(isolate);
     const Snapshot* snapshot = Snapshot::SetupFromBuffer(snapshot_buffer);
     if (FLAG_trace_isolates) {
       OS::Print("Size of isolate snapshot = %ld\n", snapshot->length());
     }
     SnapshotReader reader(snapshot, isolate);
     reader.ReadFullSnapshot();
     if (FLAG_trace_isolates) {
       isolate->heap()->PrintSizes();
     }
+    if (FLAG_print_bootstrap) {
+      PrintLibrarySources(isolate);
+    }
   }
 
   StubCode::Init(isolate);
   isolate->heap()->EnableGrowthControl();
   isolate->set_init_callback_data(data);
   if (FLAG_print_class_table) {
     isolate->class_table()->Print();
   }
   return Error::null();
 }
 
 
 void Dart::ShutdownIsolate() {
   Isolate* isolate = Isolate::Current();
   void* callback_data = isolate->init_callback_data();
   isolate->Shutdown();
   delete isolate;
 
   Dart_IsolateShutdownCallback callback = Isolate::ShutdownCallback();
   if (callback != NULL) {
     (callback)(callback_data);
   }
 }
 
 }  // namespace dart