Commit eb0f6479 authored by Keishi Hattori's avatar Keishi Hattori Committed by Commit Bot

Oilpan: Fix unexpected GCState transition for incremental idle gc

Bug: 849627
Change-Id: I03070180380f739f079ca8e04011a94696ea7a08
Reviewed-on: https://chromium-review.googlesource.com/1088271
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarMichael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564922}
parent 5c4f5303
...@@ -730,7 +730,7 @@ void ThreadState::ScheduleIncrementalMarkingFinalize() { ...@@ -730,7 +730,7 @@ void ThreadState::ScheduleIncrementalMarkingFinalize() {
} }
void ThreadState::ScheduleIdleGC() { void ThreadState::ScheduleIdleGC() {
if (GCState() != kNoGCScheduled) if (GcState() != kNoGCScheduled)
return; return;
SetGCState(kIdleGCScheduled); SetGCState(kIdleGCScheduled);
if (IsSweepingInProgress()) if (IsSweepingInProgress())
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
from contrib.oilpan import oilpan_gc_times from contrib.oilpan import oilpan_gc_times
from telemetry import decorators
from telemetry.internal.results import page_test_results from telemetry.internal.results import page_test_results
from telemetry.page import page as page_module from telemetry.page import page as page_module
from telemetry.testing import options_for_unittests from telemetry.testing import options_for_unittests
...@@ -155,6 +156,7 @@ class OilpanGCTimesTest(page_test_test_case.PageTestTestCase): ...@@ -155,6 +156,7 @@ class OilpanGCTimesTest(page_test_test_case.PageTestTestCase):
self.assertEquals(2, len(getMetric(results, self.assertEquals(2, len(getMetric(results,
'oilpan_idle_complete_sweep'))) 'oilpan_idle_complete_sweep')))
@decorators.Disabled('all')
def testForSmoothness(self): def testForSmoothness(self):
ps = self.CreateStorySetFromFileInUnittestDataDir( ps = self.CreateStorySetFromFileInUnittestDataDir(
'create_many_objects.html') 'create_many_objects.html')
...@@ -168,6 +170,7 @@ class OilpanGCTimesTest(page_test_test_case.PageTestTestCase): ...@@ -168,6 +170,7 @@ class OilpanGCTimesTest(page_test_test_case.PageTestTestCase):
gc_events.extend(results.FindAllPageSpecificValuesNamed(label)) gc_events.extend(results.FindAllPageSpecificValuesNamed(label))
self.assertLess(0, len(gc_events)) self.assertLess(0, len(gc_events))
@decorators.Disabled('all')
def testForBlinkPerf(self): def testForBlinkPerf(self):
ps = self.CreateStorySetFromFileInUnittestDataDir( ps = self.CreateStorySetFromFileInUnittestDataDir(
'create_many_objects.html') 'create_many_objects.html')
......
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