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

Side by Side Diff: src/heap.cc

Issue 460042: Merge bleeding_edge revision 3406 and 3410 to 1.3 branch.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/1.3/
Patch Set: Created 11 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 | « src/heap.h ('k') | src/version.cc » ('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 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 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 3329 matching lines...) Expand 10 before | Expand all | Expand 10 after
3340 heap_configured = true; 3340 heap_configured = true;
3341 return true; 3341 return true;
3342 } 3342 }
3343 3343
3344 3344
3345 bool Heap::ConfigureHeapDefault() { 3345 bool Heap::ConfigureHeapDefault() {
3346 return ConfigureHeap(FLAG_max_new_space_size / 2, FLAG_max_old_space_size); 3346 return ConfigureHeap(FLAG_max_new_space_size / 2, FLAG_max_old_space_size);
3347 } 3347 }
3348 3348
3349 3349
3350 void Heap::RecordStats(HeapStats* stats) {
3351 stats->new_space_size = new_space_.Size();
3352 stats->new_space_capacity = new_space_.Capacity();
3353 stats->old_pointer_space_size = old_pointer_space_->Size();
3354 stats->old_pointer_space_capacity = old_pointer_space_->Capacity();
3355 stats->old_data_space_size = old_data_space_->Size();
3356 stats->old_data_space_capacity = old_data_space_->Capacity();
3357 stats->code_space_size = code_space_->Size();
3358 stats->code_space_capacity = code_space_->Capacity();
3359 stats->map_space_size = map_space_->Size();
3360 stats->map_space_capacity = map_space_->Capacity();
3361 stats->cell_space_size = cell_space_->Size();
3362 stats->cell_space_capacity = cell_space_->Capacity();
3363 stats->lo_space_size = lo_space_->Size();
3364 GlobalHandles::RecordStats(stats);
3365 }
3366
3367
3350 int Heap::PromotedSpaceSize() { 3368 int Heap::PromotedSpaceSize() {
3351 return old_pointer_space_->Size() 3369 return old_pointer_space_->Size()
3352 + old_data_space_->Size() 3370 + old_data_space_->Size()
3353 + code_space_->Size() 3371 + code_space_->Size()
3354 + map_space_->Size() 3372 + map_space_->Size()
3355 + cell_space_->Size() 3373 + cell_space_->Size()
3356 + lo_space_->Size(); 3374 + lo_space_->Size();
3357 } 3375 }
3358 3376
3359 3377
(...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after
4035 for (int i = 0; i < kNumberOfCaches; i++) { 4053 for (int i = 0; i < kNumberOfCaches; i++) {
4036 if (caches_[i] != NULL) { 4054 if (caches_[i] != NULL) {
4037 delete caches_[i]; 4055 delete caches_[i];
4038 caches_[i] = NULL; 4056 caches_[i] = NULL;
4039 } 4057 }
4040 } 4058 }
4041 } 4059 }
4042 4060
4043 4061
4044 } } // namespace v8::internal 4062 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/heap.h ('k') | src/version.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698