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

Side by Side Diff: src/incremental-marking.cc

Issue 8749008: Fix a compiler error on Windows introduced by r10093 (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 intptr_t bytes_to_process = allocated_ * allocation_marking_factor_; 766 intptr_t bytes_to_process = allocated_ * allocation_marking_factor_;
767 bytes_scanned_ += bytes_to_process; 767 bytes_scanned_ += bytes_to_process;
768 768
769 double start = 0; 769 double start = 0;
770 770
771 if (FLAG_trace_incremental_marking || FLAG_trace_gc) { 771 if (FLAG_trace_incremental_marking || FLAG_trace_gc) {
772 start = OS::TimeCurrentMillis(); 772 start = OS::TimeCurrentMillis();
773 } 773 }
774 774
775 if (state_ == SWEEPING) { 775 if (state_ == SWEEPING) {
776 if (heap_->AdvanceSweepers(bytes_to_process)) { 776 if (heap_->AdvanceSweepers(static_cast<int>(bytes_to_process))) {
777 bytes_scanned_ = 0; 777 bytes_scanned_ = 0;
778 StartMarking(PREVENT_COMPACTION); 778 StartMarking(PREVENT_COMPACTION);
779 } 779 }
780 } else if (state_ == MARKING) { 780 } else if (state_ == MARKING) {
781 Map* filler_map = heap_->one_pointer_filler_map(); 781 Map* filler_map = heap_->one_pointer_filler_map();
782 Map* global_context_map = heap_->global_context_map(); 782 Map* global_context_map = heap_->global_context_map();
783 IncrementalMarkingMarkingVisitor marking_visitor(heap_, this); 783 IncrementalMarkingMarkingVisitor marking_visitor(heap_, this);
784 while (!marking_deque_.IsEmpty() && bytes_to_process > 0) { 784 while (!marking_deque_.IsEmpty() && bytes_to_process > 0) {
785 HeapObject* obj = marking_deque_.Pop(); 785 HeapObject* obj = marking_deque_.Pop();
786 786
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 allocation_marking_factor_ = kInitialAllocationMarkingFactor; 911 allocation_marking_factor_ = kInitialAllocationMarkingFactor;
912 bytes_scanned_ = 0; 912 bytes_scanned_ = 0;
913 } 913 }
914 914
915 915
916 int64_t IncrementalMarking::SpaceLeftInOldSpace() { 916 int64_t IncrementalMarking::SpaceLeftInOldSpace() {
917 return heap_->MaxOldGenerationSize() - heap_->PromotedSpaceSize(); 917 return heap_->MaxOldGenerationSize() - heap_->PromotedSpaceSize();
918 } 918 }
919 919
920 } } // namespace v8::internal 920 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698