Revision: 10713
Author: [email protected]
Date: Wed Feb 15 07:42:50 2012
Log: Cleanup idle notification tests.
[email protected]
TEST=cctest/test-api/IdleNotification
Review URL: https://chromiumcodereview.appspot.com/9403014
http://code.google.com/p/v8/source/detail?r=10713
Modified:
/branches/bleeding_edge/test/cctest/test-api.cc
/branches/bleeding_edge/test/cctest/test-heap.cc
=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc Tue Feb 7 01:31:06 2012
+++ /branches/bleeding_edge/test/cctest/test-api.cc Wed Feb 15 07:42:50 2012
@@ -13711,58 +13711,65 @@
THREADED_TEST(IdleNotification) {
v8::HandleScope scope;
LocalContext env;
- CompileRun("function binom(n, m) {"
- " var C = [[1]];"
- " for (var i = 1; i <= n; ++i) {"
- " C[i] = [1];"
- " for (var j = 1; j < i; ++j) {"
- " C[i][j] = C[i-1][j-1] + C[i-1][j];"
- " }"
- " C[i][i] = 1;"
- " }"
- " return C[n][m];"
- "};"
- "binom(1000, 500)");
- bool rv = false;
- for (int i = 0; i < 100; i++) {
- rv = v8::V8::IdleNotification();
- if (rv)
- break;
- }
- CHECK(rv == true);
+ {
+ // Create garbage in old-space to generate work for idle notification.
+ i::AlwaysAllocateScope always_allocate;
+ for (int i = 0; i < 100; i++) {
+ FACTORY->NewFixedArray(1000, i::TENURED);
+ }
+ }
+ bool finshed_idle_work = false;
+ for (int i = 0; i < 100 && !finshed_idle_work; i++) {
+ finshed_idle_work = v8::V8::IdleNotification();
+ }
+ CHECK(finshed_idle_work);
}
// Test that idle notification can be handled and eventually returns true.
// This just checks the contract of the IdleNotification() function,
// and does not verify that it does reasonable work.
-TEST(IdleNotificationWithHint) {
+TEST(IdleNotificationWithSmallHint) {
v8::HandleScope scope;
LocalContext env;
{
+ // Create garbage in old-space to generate work for idle notification.
i::AlwaysAllocateScope always_allocate;
- CompileRun("function binom(n, m) {"
- " var C = [[1]];"
- " for (var i = 1; i <= n; ++i) {"
- " C[i] = [1];"
- " for (var j = 1; j < i; ++j) {"
- " C[i][j] = C[i-1][j-1] + C[i-1][j];"
- " }"
- " C[i][i] = 1;"
- " }"
- " return C[n][m];"
- "};"
- "binom(1000, 500)");
- }
- bool rv = false;
+ for (int i = 0; i < 100; i++) {
+ FACTORY->NewFixedArray(1000, i::TENURED);
+ }
+ }
intptr_t old_size = HEAP->SizeOfObjects();
+ bool finshed_idle_work = false;
bool no_idle_work = v8::V8::IdleNotification(10);
- for (int i = 0; i < 200; i++) {
- rv = v8::V8::IdleNotification(10);
- if (rv)
- break;
- }
- CHECK(rv == true);
+ for (int i = 0; i < 200 && !finshed_idle_work; i++) {
+ finshed_idle_work = v8::V8::IdleNotification(10);
+ }
intptr_t new_size = HEAP->SizeOfObjects();
+ CHECK(finshed_idle_work);
+ CHECK(no_idle_work || new_size < old_size);
+}
+
+
+// This just checks the contract of the IdleNotification() function,
+// and does not verify that it does reasonable work.
+TEST(IdleNotificationWithLargeHint) {
+ v8::HandleScope scope;
+ LocalContext env;
+ {
+ // Create garbage in old-space to generate work for idle notification.
+ i::AlwaysAllocateScope always_allocate;
+ for (int i = 0; i < 100; i++) {
+ FACTORY->NewFixedArray(1000, i::TENURED);
+ }
+ }
+ intptr_t old_size = HEAP->SizeOfObjects();
+ bool finshed_idle_work = false;
+ bool no_idle_work = v8::V8::IdleNotification(900);
+ for (int i = 0; i < 200 && !finshed_idle_work; i++) {
+ finshed_idle_work = v8::V8::IdleNotification(900);
+ }
+ intptr_t new_size = HEAP->SizeOfObjects();
+ CHECK(finshed_idle_work);
CHECK(no_idle_work || new_size < old_size);
}
=======================================
--- /branches/bleeding_edge/test/cctest/test-heap.cc Tue Jan 31 05:33:44
2012
+++ /branches/bleeding_edge/test/cctest/test-heap.cc Wed Feb 15 07:42:50
2012
@@ -1327,35 +1327,6 @@
new_capacity = new_space->Capacity();
CHECK(old_capacity == new_capacity);
}
-
-// This just checks the contract of the IdleNotification() function,
-// and does not verify that it does reasonable work.
-TEST(IdleNotificationAdvancesIncrementalMarking) {
- if (!FLAG_incremental_marking || !FLAG_incremental_marking_steps) return;
- InitializeVM();
- v8::HandleScope scope;
- const char* source = "function binom(n, m) {"
- " var C = [[1]];"
- " for (var i = 1; i <= n; ++i) {"
- " C[i] = [1];"
- " for (var j = 1; j < i; ++j) {"
- " C[i][j] = C[i-1][j-1] + C[i-1][j];"
- " }"
- " C[i][i] = 1;"
- " }"
- " return C[n][m];"
- "};"
- "binom(1000, 500)";
- {
- AlwaysAllocateScope aa_scope;
- CompileRun(source);
- }
- intptr_t old_size = HEAP->SizeOfObjects();
- bool no_idle_work = v8::V8::IdleNotification(900);
- while (!v8::V8::IdleNotification(900)) ;
- intptr_t new_size = HEAP->SizeOfObjects();
- CHECK(no_idle_work || new_size < old_size);
-}
static int NumberOfGlobalObjects() {
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
