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

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

Issue 10376008: Use correct size of promoted space for setting promotion and allocation limits. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Remove new-line Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/heap.cc ('k') | src/incremental-marking-inl.h » ('j') | 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 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 heap_->PromotedTotalSize(); 944 heap_->PromotedTotalSize();
945 steps_count_since_last_gc_ = 0; 945 steps_count_since_last_gc_ = 0;
946 steps_took_since_last_gc_ = 0; 946 steps_took_since_last_gc_ = 0;
947 bytes_rescanned_ = 0; 947 bytes_rescanned_ = 0;
948 allocation_marking_factor_ = kInitialAllocationMarkingFactor; 948 allocation_marking_factor_ = kInitialAllocationMarkingFactor;
949 bytes_scanned_ = 0; 949 bytes_scanned_ = 0;
950 } 950 }
951 951
952 952
953 int64_t IncrementalMarking::SpaceLeftInOldSpace() { 953 int64_t IncrementalMarking::SpaceLeftInOldSpace() {
954 return heap_->MaxOldGenerationSize() - heap_->PromotedSpaceSize(); 954 return heap_->MaxOldGenerationSize() - heap_->PromotedSpaceSizeOfObjects();
955 } 955 }
956 956
957 } } // namespace v8::internal 957 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/heap.cc ('k') | src/incremental-marking-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698