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

Side by Side Diff: src/mark-compact.cc

Issue 9323079: Enable non-incremental code compaction. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 10 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
« src/incremental-marking.cc ('K') | « src/mark-compact.h ('k') | 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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 intptr_t reserved = (number_of_pages * Page::kObjectAreaSize); 235 intptr_t reserved = (number_of_pages * Page::kObjectAreaSize);
236 intptr_t free = reserved - space->SizeOfObjects(); 236 intptr_t free = reserved - space->SizeOfObjects();
237 PrintF("[%s]: %d pages, %d (%.1f%%) free\n", 237 PrintF("[%s]: %d pages, %d (%.1f%%) free\n",
238 AllocationSpaceName(space->identity()), 238 AllocationSpaceName(space->identity()),
239 number_of_pages, 239 number_of_pages,
240 static_cast<int>(free), 240 static_cast<int>(free),
241 static_cast<double>(free) * 100 / reserved); 241 static_cast<double>(free) * 100 / reserved);
242 } 242 }
243 243
244 244
245 bool MarkCompactCollector::StartCompaction() { 245 bool MarkCompactCollector::StartCompaction(bool incremental) {
246 if (!compacting_) { 246 if (!compacting_) {
247 ASSERT(evacuation_candidates_.length() == 0); 247 ASSERT(evacuation_candidates_.length() == 0);
248 248
249 CollectEvacuationCandidates(heap()->old_pointer_space()); 249 CollectEvacuationCandidates(heap()->old_pointer_space());
250 CollectEvacuationCandidates(heap()->old_data_space()); 250 CollectEvacuationCandidates(heap()->old_data_space());
251 251
252 if (FLAG_compact_code_space) { 252 if (!incremental) {
Erik Corry 2012/02/07 08:12:58 Please reverse the sense and order of this if.
253 CollectEvacuationCandidates(heap()->code_space()); 253 CollectEvacuationCandidates(heap()->code_space());
254 } else if (FLAG_trace_fragmentation) { 254 } else if (FLAG_trace_fragmentation) {
255 TraceFragmentation(heap()->code_space()); 255 TraceFragmentation(heap()->code_space());
256 } 256 }
257 257
258 if (FLAG_trace_fragmentation) { 258 if (FLAG_trace_fragmentation) {
259 TraceFragmentation(heap()->map_space()); 259 TraceFragmentation(heap()->map_space());
260 TraceFragmentation(heap()->cell_space()); 260 TraceFragmentation(heap()->cell_space());
261 } 261 }
262 262
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
690 if (was_marked_incrementally_ && PreciseSweepingRequired()) { 690 if (was_marked_incrementally_ && PreciseSweepingRequired()) {
691 heap()->incremental_marking()->Abort(); 691 heap()->incremental_marking()->Abort();
692 ClearMarkbits(); 692 ClearMarkbits();
693 AbortCompaction(); 693 AbortCompaction();
694 was_marked_incrementally_ = false; 694 was_marked_incrementally_ = false;
695 } 695 }
696 696
697 // Don't start compaction if we are in the middle of incremental 697 // Don't start compaction if we are in the middle of incremental
698 // marking cycle. We did not collect any slots. 698 // marking cycle. We did not collect any slots.
699 if (!FLAG_never_compact && !was_marked_incrementally_) { 699 if (!FLAG_never_compact && !was_marked_incrementally_) {
700 StartCompaction(); 700 StartCompaction(false);
701 } 701 }
702 702
703 PagedSpaces spaces; 703 PagedSpaces spaces;
704 for (PagedSpace* space = spaces.next(); 704 for (PagedSpace* space = spaces.next();
705 space != NULL; 705 space != NULL;
706 space = spaces.next()) { 706 space = spaces.next()) {
707 space->PrepareForMarkCompact(); 707 space->PrepareForMarkCompact();
708 } 708 }
709 709
710 #ifdef DEBUG 710 #ifdef DEBUG
(...skipping 3375 matching lines...) Expand 10 before | Expand all | Expand 10 after
4086 while (buffer != NULL) { 4086 while (buffer != NULL) {
4087 SlotsBuffer* next_buffer = buffer->next(); 4087 SlotsBuffer* next_buffer = buffer->next();
4088 DeallocateBuffer(buffer); 4088 DeallocateBuffer(buffer);
4089 buffer = next_buffer; 4089 buffer = next_buffer;
4090 } 4090 }
4091 *buffer_address = NULL; 4091 *buffer_address = NULL;
4092 } 4092 }
4093 4093
4094 4094
4095 } } // namespace v8::internal 4095 } } // namespace v8::internal
OLDNEW
« src/incremental-marking.cc ('K') | « src/mark-compact.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698