Merge the Merlin heap tracing to top-of-trunk.

runtime/vm/dart_api_impl.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 "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 701 matching lines @@
   if (!callbacks.Contains(callback)) {
     return Api::NewError(
         "%s expects 'callback' to be present in the epilogue callback list.",
         CURRENT_FUNC);
   }
   callbacks.Remove(callback);
   return Api::Success(isolate);
 }
 
 
-DART_EXPORT Dart_Handle Dart_HeapProfile(Dart_HeapProfileWriteCallback callback,
+DART_EXPORT Dart_Handle Dart_HeapProfile(Dart_FileWriteCallback callback,
                                          void* stream) {
   Isolate* isolate = Isolate::Current();
   CHECK_ISOLATE(isolate);
   if (callback == NULL) {
     RETURN_NULL_ERROR(callback);
   }
   isolate->heap()->Profile(callback, stream);
   return Api::Success(isolate);
 }
 
@@ skipping 3671 matching lines @@
       *buffer = NULL;
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 
+DART_EXPORT void Dart_InitHeapTrace(Dart_FileOpenCallback open_function,
+                                    Dart_FileWriteCallback write_function,
+                                    Dart_FileCloseCallback close_function,
+                                    const char* prefix) {
+  HeapTrace::InitTracing(open_function, write_function, close_function, prefix);
+}
+
+
 DART_EXPORT void Dart_InitPerfEventsSupport(Dart_FileWriterFunction function) {
   Dart::set_perf_events_writer(function);
 }
 
 
 // --- Peer support ---
 
 
 DART_EXPORT Dart_Handle Dart_GetPeer(Dart_Handle object, void** peer) {
   if (peer == NULL) {
@@ skipping 27 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success(isolate);
 }
 
 }  // namespace dart