Revision: 8416
Author: [email protected]
Date: Fri Jun 24 05:19:57 2011
Log: done
http://code.google.com/p/v8/source/detail?r=8416
Modified:
/branches/experimental/gc/src/heap.cc
/branches/experimental/gc/src/heap.h
/branches/experimental/gc/src/incremental-marking.cc
/branches/experimental/gc/src/incremental-marking.h
=======================================
--- /branches/experimental/gc/src/heap.cc Fri Jun 24 05:19:49 2011
+++ /branches/experimental/gc/src/heap.cc Fri Jun 24 05:19:57 2011
@@ -5618,8 +5618,10 @@
steps_count_ = heap_->incremental_marking()->steps_count();
steps_took_ = heap_->incremental_marking()->steps_took();
- delta_steps_count_ = heap_->incremental_marking()->delta_steps_count();
- delta_steps_took_ = heap_->incremental_marking()->delta_steps_took();
+ steps_count_since_last_gc_ =
+ heap_->incremental_marking()->steps_count_since_last_gc();
+ steps_took_since_last_gc_ =
+ heap_->incremental_marking()->steps_took_since_last_gc();
}
@@ -5658,8 +5660,8 @@
if (steps_count_ > 0) {
if (collector_ == SCAVENGER) {
PrintF(" (+ %d ms in %d steps since last GC)",
- static_cast<int>(delta_steps_took_),
- delta_steps_count_);
+ static_cast<int>(steps_took_since_last_gc_),
+ steps_count_since_last_gc_);
} else {
PrintF(" (+ %d ms in %d steps since start of marking)",
static_cast<int>(steps_took_),
@@ -5701,8 +5703,8 @@
PrintF("promoted=%" V8_PTR_PREFIX "d ", promoted_objects_size_);
if (collector_ == SCAVENGER) {
- PrintF("stepscount=%d ", delta_steps_count_);
- PrintF("stepstook=%d ", static_cast<int>(delta_steps_took_));
+ PrintF("stepscount=%d ", steps_count_since_last_gc_);
+ PrintF("stepstook=%d ", static_cast<int>(steps_took_since_last_gc_));
} else {
PrintF("stepscount=%d ", steps_count_);
PrintF("stepstook=%d ", static_cast<int>(steps_took_));
=======================================
--- /branches/experimental/gc/src/heap.h Fri Jun 24 05:19:49 2011
+++ /branches/experimental/gc/src/heap.h Fri Jun 24 05:19:57 2011
@@ -2153,9 +2153,8 @@
// Incremental marking steps counters.
int steps_count_;
double steps_took_;
-
- int delta_steps_count_;
- double delta_steps_took_;
+ int steps_count_since_last_gc_;
+ double steps_took_since_last_gc_;
Heap* heap_;
};
=======================================
--- /branches/experimental/gc/src/incremental-marking.cc Fri Jun 24
05:19:49 2011
+++ /branches/experimental/gc/src/incremental-marking.cc Fri Jun 24
05:19:57 2011
@@ -41,8 +41,8 @@
marking_deque_memory_(NULL),
steps_count_(0),
steps_took_(0),
- delta_steps_count_(0),
- delta_steps_took_(0),
+ steps_count_since_last_gc_(0),
+ steps_took_since_last_gc_(0),
should_hurry_(false),
allocation_marking_factor_(0),
allocated_(0) {
@@ -419,8 +419,8 @@
}
marking_deque_.set_top(new_top);
- delta_steps_took_ = 0;
- delta_steps_count_ = 0;
+ steps_took_since_last_gc_ = 0;
+ steps_count_since_last_gc_ = 0;
}
@@ -553,7 +553,7 @@
allocated_ = 0;
steps_count_++;
- delta_steps_count_++;
+ steps_count_since_last_gc_++;
if ((steps_count_ % kAllocationMarkingFactorSpeedupInterval) == 0) {
allocation_marking_factor_ += kAllocationMarkingFactorSpeedup;
@@ -567,7 +567,7 @@
double end = OS::TimeCurrentMillis();
double delta = (end - start);
steps_took_ += delta;
- delta_steps_took_ += delta;
+ steps_took_since_last_gc_ += delta;
}
}
=======================================
--- /branches/experimental/gc/src/incremental-marking.h Fri Jun 24 05:19:49
2011
+++ /branches/experimental/gc/src/incremental-marking.h Fri Jun 24 05:19:57
2011
@@ -137,12 +137,12 @@
return steps_took_;
}
- inline int delta_steps_count() {
- return delta_steps_count_;
+ inline int steps_count_since_last_gc() {
+ return steps_count_since_last_gc_;
}
- inline double delta_steps_took() {
- return delta_steps_took_;
+ inline double steps_took_since_last_gc() {
+ return steps_took_since_last_gc_;
}
inline void SetOldSpacePageFlags(MemoryChunk* chunk) {
@@ -163,8 +163,8 @@
void ResetStepCounters() {
steps_count_ = 0;
steps_took_ = 0;
- delta_steps_count_ = 0;
- delta_steps_took_ = 0;
+ steps_count_since_last_gc_ = 0;
+ steps_took_since_last_gc_ = 0;
allocation_marking_factor_ = kInitialAllocationMarkingFactor;
}
@@ -198,8 +198,8 @@
int steps_count_;
double steps_took_;
- int delta_steps_count_;
- double delta_steps_took_;
+ int steps_count_since_last_gc_;
+ double steps_took_since_last_gc_;
bool should_hurry_;
int allocation_marking_factor_;
intptr_t allocated_;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
