Revision: 22532
Author: [email protected]
Date: Tue Jul 22 16:30:23 2014 UTC
Log: Set the state of a swept page after being done with sweeping.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/407093004
http://code.google.com/p/v8/source/detail?r=22532
Modified:
/branches/bleeding_edge/src/mark-compact.cc
/branches/bleeding_edge/test/mjsunit/mjsunit.status
/branches/bleeding_edge/test/webkit/webkit.status
=======================================
--- /branches/bleeding_edge/src/mark-compact.cc Tue Jul 22 07:19:46 2014 UTC
+++ /branches/bleeding_edge/src/mark-compact.cc Tue Jul 22 16:30:23 2014 UTC
@@ -3266,12 +3266,6 @@
if (FLAG_print_cumulative_gc_stat) {
start_time = base::OS::TimeCurrentMillis();
}
-
- if (parallelism == MarkCompactCollector::SWEEP_IN_PARALLEL) {
- p->set_parallel_sweeping(MemoryChunk::SWEEPING_FINALIZE);
- } else {
- p->MarkSweptPrecisely();
- }
Address free_start = p->area_start();
ASSERT(reinterpret_cast<intptr_t>(free_start) % (32 * kPointerSize) ==
0);
@@ -3346,6 +3340,14 @@
if (FLAG_print_cumulative_gc_stat) {
space->heap()->AddSweepingTime(base::OS::TimeCurrentMillis() -
start_time);
}
+
+ if (parallelism == MarkCompactCollector::SWEEP_IN_PARALLEL) {
+ // When concurrent sweeping is active, the page will be marked after
+ // sweeping by the main thread.
+ p->set_parallel_sweeping(MemoryChunk::SWEEPING_FINALIZE);
+ } else {
+ p->MarkSweptPrecisely();
+ }
return
FreeList::GuaranteedAllocatable(static_cast<int>(max_freed_bytes));
}
@@ -3998,14 +4000,6 @@
free_list != NULL) ||
(mode == MarkCompactCollector::SWEEP_ON_MAIN_THREAD &&
free_list == NULL));
-
- // When parallel sweeping is active, the page will be marked after
- // sweeping by the main thread.
- if (mode == MarkCompactCollector::SWEEP_IN_PARALLEL) {
- p->set_parallel_sweeping(MemoryChunk::SWEEPING_FINALIZE);
- } else {
- p->MarkSweptConservatively();
- }
intptr_t freed_bytes = 0;
intptr_t max_freed_bytes = 0;
@@ -4027,6 +4021,13 @@
static_cast<int>(size));
max_freed_bytes = Max(freed_bytes, max_freed_bytes);
ASSERT_EQ(0, p->LiveBytes());
+ if (mode == MarkCompactCollector::SWEEP_IN_PARALLEL) {
+ // When concurrent sweeping is active, the page will be marked after
+ // sweeping by the main thread.
+ p->set_parallel_sweeping(MemoryChunk::SWEEPING_FINALIZE);
+ } else {
+ p->MarkSweptConservatively();
+ }
return
FreeList::GuaranteedAllocatable(static_cast<int>(max_freed_bytes));
}
@@ -4084,6 +4085,13 @@
}
p->ResetLiveBytes();
+ if (mode == MarkCompactCollector::SWEEP_IN_PARALLEL) {
+ // When concurrent sweeping is active, the page will be marked after
+ // sweeping by the main thread.
+ p->set_parallel_sweeping(MemoryChunk::SWEEPING_FINALIZE);
+ } else {
+ p->MarkSweptConservatively();
+ }
return
FreeList::GuaranteedAllocatable(static_cast<int>(max_freed_bytes));
}
=======================================
--- /branches/bleeding_edge/test/mjsunit/mjsunit.status Fri Jul 11 11:20:37
2014 UTC
+++ /branches/bleeding_edge/test/mjsunit/mjsunit.status Tue Jul 22 16:30:23
2014 UTC
@@ -147,8 +147,16 @@
'elements-transition-hoisting': [PASS, FAIL],
'getters-on-elements': [PASS, FAIL],
# Tests taking too long
- 'regress/regress-1122': [PASS, TIMEOUT],
- 'regress/regress-331444': [PASS, TIMEOUT],
+ 'debug-stepout-scope-part8': [SKIP],
+ 'mirror-object': [SKIP],
+ 'packed-elements': [SKIP],
+ 'regress/regress-1122': [SKIP],
+ 'regress/regress-331444': [SKIP],
+ 'regress/regress-353551': [SKIP],
+ 'regress/regress-crbug-119926': [SKIP],
+ 'regress/short-circuit': [SKIP],
+ 'unicode-test': [SKIP],
+ 'whitespaces': [SKIP]
}], # 'gc_stress == True'
##############################################################################
=======================================
--- /branches/bleeding_edge/test/webkit/webkit.status Thu May 15 12:46:32
2014 UTC
+++ /branches/bleeding_edge/test/webkit/webkit.status Tue Jul 22 16:30:23
2014 UTC
@@ -48,3 +48,11 @@
'dfg-int-overflow-in-loop': [SKIP],
}], # 'arch == arm64 and simulator_run == True'
]
+
+##############################################################################
+['gc_stress == True', {
+ # Tests taking too long
+ 'fast/js/excessive-comma-usage': [SKIP]
+}], # 'gc_stress == True'
+
+##############################################################################
--
--
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.
