| Index: runtime/vm/handles_impl.h
|
| diff --git a/runtime/vm/handles_impl.h b/runtime/vm/handles_impl.h
|
| index eb7be5eb4c18c1209fea58f25011c4e6e58a9c10..3adf2fe7a022ac3394fdfc409e4a302a481c3984 100644
|
| --- a/runtime/vm/handles_impl.h
|
| +++ b/runtime/vm/handles_impl.h
|
| @@ -12,10 +12,8 @@
|
| namespace dart {
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::VisitObjectPointers(
|
| - ObjectPointerVisitor* visitor) {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + VisitObjectPointers(ObjectPointerVisitor* visitor) {
|
| // Visit all zone handles.
|
| HandlesBlock* block = zone_blocks_;
|
| while (block != NULL) {
|
| @@ -29,10 +27,8 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::VisitScopedHandles(
|
| - ObjectPointerVisitor* visitor) {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + VisitScopedHandles(ObjectPointerVisitor* visitor) {
|
| HandlesBlock* block = &first_scoped_block_;
|
| do {
|
| block->VisitObjectPointers(visitor);
|
| @@ -46,9 +42,8 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::Visit(HandleVisitor* visitor) {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::Visit(
|
| + HandleVisitor* visitor) {
|
| // Visit all zone handles.
|
| HandlesBlock* block = zone_blocks_;
|
| while (block != NULL) {
|
| @@ -66,9 +61,7 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::Reset() {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::Reset() {
|
| // Delete all the extra zone handle blocks allocated and reinit the first
|
| // zone block.
|
| if (zone_blocks_ != NULL) {
|
| @@ -88,9 +81,8 @@ void Handles<kHandleSizeInWords,
|
| // allocate a handle in that scope. The function assumes that a
|
| // current handle scope exists. It asserts for this appropriately.
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -uword Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::AllocateHandle(Zone* zone) {
|
| +uword Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + AllocateHandle(Zone* zone) {
|
| #if defined(DEBUG)
|
| Thread* thread = Thread::Current();
|
| ASSERT(thread->top_handle_scope() != NULL);
|
| @@ -105,9 +97,8 @@ uword Handles<kHandleSizeInWords,
|
| // The function assumes that 'zone' is the current zone and asserts for
|
| // this appropriately.
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -uword Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::AllocateZoneHandle(Zone* zone) {
|
| +uword Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + AllocateZoneHandle(Zone* zone) {
|
| #if defined(DEBUG)
|
| Thread* thread = Thread::Current();
|
| ASSERT(thread->zone() == zone);
|
| @@ -123,9 +114,8 @@ uword Handles<kHandleSizeInWords,
|
| // Figure out the current zone using the current Thread and
|
| // check if the specified handle has been allocated in this zone.
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -bool Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::IsZoneHandle(uword handle) {
|
| +bool Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + IsZoneHandle(uword handle) {
|
| // TODO(5411412): Accessing the current thread is a performance problem,
|
| // consider passing it down as a parameter.
|
| Thread* thread = Thread::Current();
|
| @@ -138,9 +128,8 @@ bool Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::DeleteAll() {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + DeleteAll() {
|
| // Delete all the zone allocated handle blocks.
|
| // GCTrace does not need to trace this call to DeleteHandleBlocks,
|
| // since the individual zone deletions will be caught
|
| @@ -157,10 +146,8 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::DeleteHandleBlocks(
|
| - HandlesBlock* blocks) {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + DeleteHandleBlocks(HandlesBlock* blocks) {
|
| while (blocks != NULL) {
|
| HandlesBlock* block = blocks;
|
| blocks = blocks->next_block();
|
| @@ -170,13 +157,12 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::SetupNextScopeBlock() {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + SetupNextScopeBlock() {
|
| if (FLAG_trace_handles) {
|
| OS::PrintErr("*** Handle Counts for (0x%" Px "):Zone = %d,Scoped = %d\n",
|
| - reinterpret_cast<intptr_t>(this),
|
| - CountZoneHandles(), CountScopedHandles());
|
| + reinterpret_cast<intptr_t>(this), CountZoneHandles(),
|
| + CountScopedHandles());
|
| }
|
| if (scoped_blocks_->next_block() == NULL) {
|
| scoped_blocks_->set_next_block(new HandlesBlock(NULL));
|
| @@ -193,9 +179,8 @@ void Handles<kHandleSizeInWords,
|
| // handle blocks to check if the handle is valid, please
|
| // use this only in ASSERT code for verification purposes.
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -bool Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::IsValidScopedHandle(uword handle) const {
|
| +bool Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + IsValidScopedHandle(uword handle) const {
|
| const HandlesBlock* iterator = &first_scoped_block_;
|
| while (iterator != NULL) {
|
| if (iterator->IsValidHandle(handle)) {
|
| @@ -208,9 +193,8 @@ bool Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -bool Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::IsValidZoneHandle(uword handle) const {
|
| +bool Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + IsValidZoneHandle(uword handle) const {
|
| const HandlesBlock* iterator = zone_blocks_;
|
| while (iterator != NULL) {
|
| if (iterator->IsValidHandle(handle)) {
|
| @@ -223,13 +207,12 @@ bool Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::SetupNextZoneBlock() {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + SetupNextZoneBlock() {
|
| if (FLAG_trace_handles) {
|
| OS::PrintErr("*** Handle Counts for (0x%" Px "):Zone = %d,Scoped = %d\n",
|
| - reinterpret_cast<intptr_t>(this),
|
| - CountZoneHandles(), CountScopedHandles());
|
| + reinterpret_cast<intptr_t>(this), CountZoneHandles(),
|
| + CountScopedHandles());
|
| }
|
| zone_blocks_ = new HandlesBlock(zone_blocks_);
|
| ASSERT(zone_blocks_ != NULL);
|
| @@ -238,9 +221,8 @@ void Handles<kHandleSizeInWords,
|
|
|
| #if defined(DEBUG)
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::VerifyScopedHandleState() {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + VerifyScopedHandleState() {
|
| HandlesBlock* block = &first_scoped_block_;
|
| const intptr_t end_index = (kHandleSizeInWords * kHandlesPerChunk);
|
| do {
|
| @@ -254,9 +236,8 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::ZapFreeScopedHandles() {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + ZapFreeScopedHandles() {
|
| HandlesBlock* block = scoped_blocks_;
|
| while (block != NULL) {
|
| block->ZapFreeHandles();
|
| @@ -267,9 +248,8 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -int Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::CountScopedHandles() const {
|
| +int Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + CountScopedHandles() const {
|
| int count = 0;
|
| const HandlesBlock* block = &first_scoped_block_;
|
| do {
|
| @@ -285,9 +265,8 @@ int Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -int Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::CountZoneHandles() const {
|
| +int Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + CountZoneHandles() const {
|
| int count = 0;
|
| const HandlesBlock* block = zone_blocks_;
|
| while (block != NULL) {
|
| @@ -299,9 +278,8 @@ int Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::HandlesBlock::~HandlesBlock() {
|
| +Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::HandlesBlock::
|
| + ~HandlesBlock() {
|
| #if defined(DEBUG)
|
| ReInit();
|
| #endif
|
| @@ -309,9 +287,8 @@ Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::HandlesBlock::ReInit() {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + HandlesBlock::ReInit() {
|
| next_handle_slot_ = 0;
|
| next_block_ = NULL;
|
| #if defined(DEBUG)
|
| @@ -321,22 +298,19 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::HandlesBlock::VisitObjectPointers(
|
| - ObjectPointerVisitor* visitor) {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + HandlesBlock::VisitObjectPointers(ObjectPointerVisitor* visitor) {
|
| ASSERT(visitor != NULL);
|
| for (intptr_t i = 0; i < next_handle_slot_; i += kHandleSizeInWords) {
|
| visitor->VisitPointer(
|
| - reinterpret_cast<RawObject**>(&data_[i + kOffsetOfRawPtr/kWordSize]));
|
| + reinterpret_cast<RawObject**>(&data_[i + kOffsetOfRawPtr / kWordSize]));
|
| }
|
| }
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::HandlesBlock::Visit(HandleVisitor* visitor) {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + HandlesBlock::Visit(HandleVisitor* visitor) {
|
| ASSERT(visitor != NULL);
|
| for (intptr_t i = 0; i < next_handle_slot_; i += kHandleSizeInWords) {
|
| visitor->VisitHandle(reinterpret_cast<uword>(&data_[i]));
|
| @@ -346,13 +320,11 @@ void Handles<kHandleSizeInWords,
|
|
|
| #if defined(DEBUG)
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -void Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::HandlesBlock::ZapFreeHandles() {
|
| +void Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + HandlesBlock::ZapFreeHandles() {
|
| // Reinitialize the handle area to some uninitialized value.
|
| for (intptr_t i = next_handle_slot_;
|
| - i < (kHandleSizeInWords * kHandlesPerChunk);
|
| - i++) {
|
| + i < (kHandleSizeInWords * kHandlesPerChunk); i++) {
|
| data_[i] = kZapUninitializedWord;
|
| }
|
| }
|
| @@ -360,9 +332,8 @@ void Handles<kHandleSizeInWords,
|
|
|
|
|
| template <int kHandleSizeInWords, int kHandlesPerChunk, int kOffsetOfRawPtr>
|
| -int Handles<kHandleSizeInWords,
|
| - kHandlesPerChunk,
|
| - kOffsetOfRawPtr>::HandlesBlock::HandleCount() const {
|
| +int Handles<kHandleSizeInWords, kHandlesPerChunk, kOffsetOfRawPtr>::
|
| + HandlesBlock::HandleCount() const {
|
| return (next_handle_slot_ / kHandleSizeInWords);
|
| }
|
|
|
|
|