| Index: src/heap-profiler.cc
|
| ===================================================================
|
| --- src/heap-profiler.cc (revision 13098)
|
| +++ src/heap-profiler.cc (working copy)
|
| @@ -65,23 +65,29 @@
|
| }
|
|
|
|
|
| -HeapSnapshot* HeapProfiler::TakeSnapshot(const char* name,
|
| - int type,
|
| - v8::ActivityControl* control) {
|
| +HeapSnapshot* HeapProfiler::TakeSnapshot(
|
| + const char* name,
|
| + int type,
|
| + v8::ActivityControl* control,
|
| + v8::HeapProfiler::ObjectNameResolver* resolver) {
|
| ASSERT(Isolate::Current()->heap_profiler() != NULL);
|
| return Isolate::Current()->heap_profiler()->TakeSnapshotImpl(name,
|
| type,
|
| - control);
|
| + control,
|
| + resolver);
|
| }
|
|
|
|
|
| -HeapSnapshot* HeapProfiler::TakeSnapshot(String* name,
|
| - int type,
|
| - v8::ActivityControl* control) {
|
| +HeapSnapshot* HeapProfiler::TakeSnapshot(
|
| + String* name,
|
| + int type,
|
| + v8::ActivityControl* control,
|
| + v8::HeapProfiler::ObjectNameResolver* resolver) {
|
| ASSERT(Isolate::Current()->heap_profiler() != NULL);
|
| return Isolate::Current()->heap_profiler()->TakeSnapshotImpl(name,
|
| type,
|
| - control);
|
| + control,
|
| + resolver);
|
| }
|
|
|
|
|
| @@ -122,16 +128,18 @@
|
| }
|
|
|
|
|
| -HeapSnapshot* HeapProfiler::TakeSnapshotImpl(const char* name,
|
| - int type,
|
| - v8::ActivityControl* control) {
|
| +HeapSnapshot* HeapProfiler::TakeSnapshotImpl(
|
| + const char* name,
|
| + int type,
|
| + v8::ActivityControl* control,
|
| + v8::HeapProfiler::ObjectNameResolver* resolver) {
|
| HeapSnapshot::Type s_type = static_cast<HeapSnapshot::Type>(type);
|
| HeapSnapshot* result =
|
| snapshots_->NewSnapshot(s_type, name, next_snapshot_uid_++);
|
| bool generation_completed = true;
|
| switch (s_type) {
|
| case HeapSnapshot::kFull: {
|
| - HeapSnapshotGenerator generator(result, control);
|
| + HeapSnapshotGenerator generator(result, control, resolver);
|
| generation_completed = generator.GenerateSnapshot();
|
| break;
|
| }
|
| @@ -147,10 +155,13 @@
|
| }
|
|
|
|
|
| -HeapSnapshot* HeapProfiler::TakeSnapshotImpl(String* name,
|
| - int type,
|
| - v8::ActivityControl* control) {
|
| - return TakeSnapshotImpl(snapshots_->names()->GetName(name), type, control);
|
| +HeapSnapshot* HeapProfiler::TakeSnapshotImpl(
|
| + String* name,
|
| + int type,
|
| + v8::ActivityControl* control,
|
| + v8::HeapProfiler::ObjectNameResolver* resolver) {
|
| + return TakeSnapshotImpl(snapshots_->names()->GetName(name), type, control,
|
| + resolver);
|
| }
|
|
|
| void HeapProfiler::StartHeapObjectsTrackingImpl() {
|
|
|