Reviewers: jochen (slow),
Description:
Make GCTracer not reentrant.
BUG=
Please review this at https://codereview.chromium.org/754023003/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+26, -4 lines):
M src/heap/gc-tracer.h
M src/heap/gc-tracer.cc
M src/heap/heap.cc
Index: src/heap/gc-tracer.cc
diff --git a/src/heap/gc-tracer.cc b/src/heap/gc-tracer.cc
index
046ac2cd225766d3f3a422df495c1ac37e13a1d9..c2f6ab6c9d04bde61c42df5d26f580731ca77ab5
100644
--- a/src/heap/gc-tracer.cc
+++ b/src/heap/gc-tracer.cc
@@ -93,7 +93,8 @@ GCTracer::GCTracer(Heap* heap)
longest_incremental_marking_step_(0.0),
cumulative_marking_duration_(0.0),
cumulative_sweeping_duration_(0.0),
- new_space_top_after_gc_(0) {
+ new_space_top_after_gc_(0),
+ start_counter_(0) {
current_ = Event(Event::START, NULL, NULL);
current_.end_time = base::OS::TimeCurrentMillis();
previous_ = previous_mark_compactor_event_ = current_;
@@ -102,6 +103,9 @@ GCTracer::GCTracer(Heap* heap)
void GCTracer::Start(GarbageCollector collector, const char* gc_reason,
const char* collector_reason) {
+ start_counter_++;
+ if (start_counter_ != 1) return;
+
previous_ = current_;
double start_time = base::OS::TimeCurrentMillis();
if (new_space_top_after_gc_ != 0) {
@@ -142,7 +146,22 @@ void GCTracer::Start(GarbageCollector collector, const
char* gc_reason,
}
-void GCTracer::Stop() {
+void GCTracer::Stop(GarbageCollector collector) {
+ start_counter_--;
+ if (start_counter_ != 0) {
+ if (FLAG_trace_gc) {
+ PrintF("[Finished reentrant %s during %s.]\n",
+ collector == SCAVENGER ? "Scavenge" : "Mark-sweep",
+ current_.TypeName(false));
+ }
+ return;
+ }
+
+ DCHECK(start_counter_ >= 0);
+ DCHECK(
+ (collector == SCAVENGER && current_.type == Event::SCAVENGER) ||
+ (collector == MARK_COMPACTOR && current_.type ==
Event::MARK_COMPACTOR));
+
current_.end_time = base::OS::TimeCurrentMillis();
current_.end_object_size = heap_->SizeOfObjects();
current_.end_memory_size = heap_->isolate()->memory_allocator()->Size();
Index: src/heap/gc-tracer.h
diff --git a/src/heap/gc-tracer.h b/src/heap/gc-tracer.h
index
04dac62f0261fe6447eb5a7e6e71bbb5f57e8d4b..3ea1d72bf2c29a3f063cb76ac506f9e4f2ca29e4
100644
--- a/src/heap/gc-tracer.h
+++ b/src/heap/gc-tracer.h
@@ -264,7 +264,7 @@ class GCTracer {
const char* collector_reason);
// Stop collecting data and print results.
- void Stop();
+ void Stop(GarbageCollector collector);
// Log an allocation throughput event.
void AddNewSpaceAllocationTime(double duration, intptr_t
allocation_in_bytes);
@@ -419,6 +419,9 @@ class GCTracer {
// collection.
intptr_t new_space_top_after_gc_;
+ // Counts how many tracers were started without stopping.
+ int start_counter_;
+
DISALLOW_COPY_AND_ASSIGN(GCTracer);
};
}
Index: src/heap/heap.cc
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index
97c7d6dac6434437fa50fa647294c34addbc379f..e38719379b6fced1a9648bf93a2d7c48a1f8db23
100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -844,7 +844,7 @@ bool Heap::CollectGarbage(GarbageCollector collector,
const char* gc_reason,
}
GarbageCollectionEpilogue();
- tracer()->Stop();
+ tracer()->Stop(collector);
}
// Start incremental marking for the next cycle. The heap snapshot
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
