Index: src/api.cc |
diff --git a/src/api.cc b/src/api.cc |
index f8a7dfa1f9984f7218a612f917d090679017845c..b33e14c014131e2888f298ff37b8326f8a30eea4 100644 |
--- a/src/api.cc |
+++ b/src/api.cc |
@@ -4855,22 +4855,7 @@ bool V8::IsProfilerPaused() { |
void V8::ResumeProfilerEx(int flags, int tag) { |
#ifdef ENABLE_LOGGING_AND_PROFILING |
i::Isolate* isolate = i::Isolate::Current(); |
Søren Thygesen Gjesse
2011/06/24 11:30:05
Is it correct that there is no GC now?
mnaganov (inactive)
2011/06/24 11:37:59
Yes. GC was here to grap a heap snaphot (because t
|
- if (flags & PROFILER_MODULE_HEAP_SNAPSHOT) { |
- // Snapshot mode: resume modules, perform GC, then pause only |
- // those modules which haven't been started prior to making a |
- // snapshot. |
- |
- // Make a GC prior to taking a snapshot. |
- isolate->heap()->CollectAllGarbage(false); |
- // Reset snapshot flag and CPU module flags. |
- flags &= ~(PROFILER_MODULE_HEAP_SNAPSHOT | PROFILER_MODULE_CPU); |
- const int current_flags = isolate->logger()->GetActiveProfilerModules(); |
- isolate->logger()->ResumeProfiler(flags, tag); |
- isolate->heap()->CollectAllGarbage(false); |
- isolate->logger()->PauseProfiler(~current_flags & flags, tag); |
- } else { |
- isolate->logger()->ResumeProfiler(flags, tag); |
- } |
+ isolate->logger()->ResumeProfiler(flags, tag); |
#endif |
} |
@@ -5720,7 +5705,6 @@ uint64_t HeapGraphNode::GetId() const { |
#ifdef ENABLE_LOGGING_AND_PROFILING |
i::Isolate* isolate = i::Isolate::Current(); |
IsDeadCheck(isolate, "v8::HeapGraphNode::GetId"); |
- ASSERT(ToInternal(this)->snapshot()->type() != i::HeapSnapshot::kAggregated); |
return ToInternal(this)->id(); |
#else |
return 0; |
@@ -5728,18 +5712,6 @@ uint64_t HeapGraphNode::GetId() const { |
} |
-int HeapGraphNode::GetInstancesCount() const { |
-#ifdef ENABLE_LOGGING_AND_PROFILING |
- i::Isolate* isolate = i::Isolate::Current(); |
- IsDeadCheck(isolate, "v8::HeapGraphNode::GetInstancesCount"); |
- ASSERT(ToInternal(this)->snapshot()->type() == i::HeapSnapshot::kAggregated); |
- return static_cast<int>(ToInternal(this)->id()); |
-#else |
- return 0; |
-#endif |
-} |
- |
- |
int HeapGraphNode::GetSelfSize() const { |
#ifdef ENABLE_LOGGING_AND_PROFILING |
i::Isolate* isolate = i::Isolate::Current(); |
@@ -5987,9 +5959,6 @@ const HeapSnapshot* HeapProfiler::TakeSnapshot(Handle<String> title, |
case HeapSnapshot::kFull: |
internal_type = i::HeapSnapshot::kFull; |
break; |
- case HeapSnapshot::kAggregated: |
- internal_type = i::HeapSnapshot::kAggregated; |
- break; |
default: |
UNREACHABLE(); |
} |