diff options
author | Ali Ijaz Sheikh <ofrobots@google.com> | 2016-04-07 14:06:55 -0700 |
---|---|---|
committer | Ali Ijaz Sheikh <ofrobots@google.com> | 2016-04-14 10:03:39 -0700 |
commit | 52af5c4eebf4de8638aef0338bd826656312a02a (patch) | |
tree | 628dc9fb0b558c3a73a2160706fef368876fe548 /deps/v8/src/heap/memory-reducer.cc | |
parent | 6e3e8acc7cc7ebd3d67db5ade1247b8b558efe09 (diff) | |
download | node-new-52af5c4eebf4de8638aef0338bd826656312a02a.tar.gz |
deps: upgrade V8 to 5.0.71.32
* Pick up the branch head for V8 5.0 stable [1]
* Edit v8 gitignore to allow trace_event copy
* Update V8 DEP trace_event as per deps/v8/DEPS [2]
[1] https://chromium.googlesource.com/v8/v8.git/+/3c67831
[2] https://chromium.googlesource.com/chromium/src/base/trace_event/common/+/4b09207e447ae5bd34643b4c6321bee7b76d35f9
Ref: https://github.com/nodejs/node/pull/5945
PR-URL: https://github.com/nodejs/node/pull/6111
Reviewed-By: targos - Michaƫl Zasso <mic.besace@gmail.com>
Reviewed-By: bnoordhuis - Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: indutny - Fedor Indutny <fedor.indutny@gmail.com>
Diffstat (limited to 'deps/v8/src/heap/memory-reducer.cc')
-rw-r--r-- | deps/v8/src/heap/memory-reducer.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/deps/v8/src/heap/memory-reducer.cc b/deps/v8/src/heap/memory-reducer.cc index ee1009134b..f53730785a 100644 --- a/deps/v8/src/heap/memory-reducer.cc +++ b/deps/v8/src/heap/memory-reducer.cc @@ -47,7 +47,7 @@ void MemoryReducer::TimerTask::RunInternal() { event.should_start_incremental_gc = is_idle || optimize_for_memory; event.can_start_incremental_gc = heap->incremental_marking()->IsStopped() && - heap->incremental_marking()->CanBeActivated(); + (heap->incremental_marking()->CanBeActivated() || optimize_for_memory); memory_reducer_->NotifyTimer(event); } @@ -118,9 +118,8 @@ void MemoryReducer::NotifyMarkCompact(const Event& event) { } } - -void MemoryReducer::NotifyContextDisposed(const Event& event) { - DCHECK_EQ(kContextDisposed, event.type); +void MemoryReducer::NotifyPossibleGarbage(const Event& event) { + DCHECK_EQ(kPossibleGarbage, event.type); Action old_action = state_.action; state_ = Step(state_, event); if (old_action != kWait && state_.action == kWait) { @@ -147,14 +146,14 @@ MemoryReducer::State MemoryReducer::Step(const State& state, if (event.type == kTimer) { return state; } else { - DCHECK(event.type == kContextDisposed || event.type == kMarkCompact); + DCHECK(event.type == kPossibleGarbage || event.type == kMarkCompact); return State( kWait, 0, event.time_ms + kLongDelayMs, event.type == kMarkCompact ? event.time_ms : state.last_gc_time_ms); } case kWait: switch (event.type) { - case kContextDisposed: + case kPossibleGarbage: return state; case kTimer: if (state.started_gcs >= kMaxNumberOfGCs) { |