Commit d8bc471b authored by hablich's avatar hablich Committed by Commit bot

Revert of [heap] Respect idle deadline in AdvanceIncrementalMarking more...

Revert of [heap] Respect idle deadline in AdvanceIncrementalMarking more carefully. (patchset #4 id:60001 of https://codereview.chromium.org/1855943002/ )

Reason for revert:
Reverting because of https://bugs.chromium.org/p/chromium/issues/detail?id=601204

Original issue's description:
> [heap] Respect idle deadline in AdvanceIncrementalMarking more carefully.
>
> Committed: https://crrev.com/0eb53167f492a44d26b68c2197e37452f70c3a4f
> Cr-Commit-Position: refs/heads/master@{#35288}

TBR=ulan@chromium.org,hpayer@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1870613002

Cr-Commit-Position: refs/heads/master@{#35319}
parent 3df0a8c1
......@@ -113,10 +113,6 @@ class GCIdleTimeHandler {
// Incremental marking step time.
static const size_t kIncrementalMarkingStepTimeInMs = 1;
// Minimum incremental marking step time.
static const size_t kMinIncrementalMarkingStepTimeInMs =
kIncrementalMarkingStepTimeInMs + 1;
static const size_t kMinTimeForOverApproximatingWeakClosureInMs;
// Number of times we will return a Nothing action in the current mode
......
......@@ -1008,17 +1008,20 @@ double IncrementalMarking::AdvanceIncrementalMarking(
heap()
->tracer()
->FinalIncrementalMarkCompactSpeedInBytesPerMillisecond());
double remaining_time_in_ms =
deadline_in_ms - heap()->MonotonicallyIncreasingTimeInMs();
while (remaining_time_in_ms >=
GCIdleTimeHandler::kMinIncrementalMarkingStepTimeInMs) {
intptr_t bytes_processed =
double remaining_time_in_ms = 0.0;
intptr_t bytes_processed = 0;
do {
bytes_processed =
Step(step_size_in_bytes, step_actions.completion_action,
step_actions.force_marking, step_actions.force_completion);
remaining_time_in_ms =
deadline_in_ms - heap()->MonotonicallyIncreasingTimeInMs();
if (bytes_processed == 0) break;
}
} while (bytes_processed > 0 &&
remaining_time_in_ms >=
2.0 * GCIdleTimeHandler::kIncrementalMarkingStepTimeInMs &&
!IsComplete() &&
!heap()->mark_compact_collector()->marking_deque()->IsEmpty());
return remaining_time_in_ms;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment