Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(625)

Unified Diff: runtime/vm/zone_test.cc

Issue 11028145: Changed StackZone and ApiZone to be containers for Zone. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Minor tweak to use RawError instead of RawObject. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/zone.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/zone_test.cc
diff --git a/runtime/vm/zone_test.cc b/runtime/vm/zone_test.cc
index e3e1bd7486db287e2d35aa3f0e11e389948dc888..5d2f7b1cd286f4b2aff7f7cf07c23a998f759245 100644
--- a/runtime/vm/zone_test.cc
+++ b/runtime/vm/zone_test.cc
@@ -20,52 +20,53 @@ UNIT_TEST_CASE(AllocateZone) {
EXPECT(Isolate::Current() == isolate);
EXPECT(isolate->current_zone() == NULL);
{
- StackZone zone(isolate);
+ StackZone stack_zone(isolate);
EXPECT(isolate->current_zone() != NULL);
+ Zone* zone = stack_zone.GetZone();
intptr_t allocated_size = 0;
// The loop is to make sure we overflow one segment and go on
// to the next segment.
for (int i = 0; i < 1000; i++) {
- uword first = zone.AllocUnsafe(2 * kWordSize);
- uword second = zone.AllocUnsafe(3 * kWordSize);
+ uword first = zone->AllocUnsafe(2 * kWordSize);
+ uword second = zone->AllocUnsafe(3 * kWordSize);
EXPECT(first != second);
allocated_size = ((2 + 3) * kWordSize);
}
- EXPECT_LE(allocated_size, zone.SizeInBytes());
+ EXPECT_LE(allocated_size, zone->SizeInBytes());
// Test for allocation of large segments.
const uword kLargeSize = 1 * MB;
const uword kSegmentSize = 64 * KB;
ASSERT(kLargeSize > kSegmentSize);
for (int i = 0; i < 10; i++) {
- EXPECT(zone.AllocUnsafe(kLargeSize) != 0);
+ EXPECT(zone->AllocUnsafe(kLargeSize) != 0);
allocated_size += kLargeSize;
}
- EXPECT_LE(allocated_size, zone.SizeInBytes());
+ EXPECT_LE(allocated_size, zone->SizeInBytes());
// Test corner cases of kSegmentSize.
uint8_t* buffer = NULL;
buffer = reinterpret_cast<uint8_t*>(
- zone.AllocUnsafe(kSegmentSize - kWordSize));
+ zone->AllocUnsafe(kSegmentSize - kWordSize));
EXPECT(buffer != NULL);
buffer[(kSegmentSize - kWordSize) - 1] = 0;
allocated_size += (kSegmentSize - kWordSize);
- EXPECT_LE(allocated_size, zone.SizeInBytes());
+ EXPECT_LE(allocated_size, zone->SizeInBytes());
buffer = reinterpret_cast<uint8_t*>(
- zone.AllocUnsafe(kSegmentSize - (2 * kWordSize)));
+ zone->AllocUnsafe(kSegmentSize - (2 * kWordSize)));
EXPECT(buffer != NULL);
buffer[(kSegmentSize - (2 * kWordSize)) - 1] = 0;
allocated_size += (kSegmentSize - (2 * kWordSize));
- EXPECT_LE(allocated_size, zone.SizeInBytes());
+ EXPECT_LE(allocated_size, zone->SizeInBytes());
buffer = reinterpret_cast<uint8_t*>(
- zone.AllocUnsafe(kSegmentSize + kWordSize));
+ zone->AllocUnsafe(kSegmentSize + kWordSize));
EXPECT(buffer != NULL);
buffer[(kSegmentSize + kWordSize) - 1] = 0;
allocated_size += (kSegmentSize + kWordSize);
- EXPECT_LE(allocated_size, zone.SizeInBytes());
+ EXPECT_LE(allocated_size, zone->SizeInBytes());
}
EXPECT(isolate->current_zone() == NULL);
isolate->Shutdown();
@@ -86,7 +87,7 @@ UNIT_TEST_CASE(AllocGeneric_Success) {
intptr_t allocated_size = 0;
const intptr_t kNumElements = 1000;
- zone.Alloc<uint32_t>(kNumElements);
+ zone.GetZone()->Alloc<uint32_t>(kNumElements);
allocated_size += sizeof(uint32_t) * kNumElements;
EXPECT_LE(allocated_size, zone.SizeInBytes());
}
@@ -109,7 +110,7 @@ UNIT_TEST_CASE(AllocGeneric_Overflow) {
EXPECT(isolate->current_zone() != NULL);
const intptr_t kNumElements = (kIntptrMax / sizeof(uint32_t)) + 1;
- zone.Alloc<uint32_t>(kNumElements);
+ zone.GetZone()->Alloc<uint32_t>(kNumElements);
}
isolate->Shutdown();
delete isolate;
@@ -165,7 +166,7 @@ UNIT_TEST_CASE(ZoneAllocated) {
TEST_CASE(PrintToString) {
StackZone zone(Isolate::Current());
- const char* result = zone.PrintToString("Hello %s!", "World");
+ const char* result = zone.GetZone()->PrintToString("Hello %s!", "World");
EXPECT_STREQ("Hello World!", result);
}
« no previous file with comments | « runtime/vm/zone.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698