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

Side by Side Diff: src/heap-inl.h

Issue 9227007: Version 3.8.6 (Closed) Base URL: http://v8.googlecode.com/svn/trunk/
Patch Set: Created 8 years, 11 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/heap-profiler.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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 return obj; 456 return obj;
457 } 457 }
458 if (obj->IsFailure()) { 458 if (obj->IsFailure()) {
459 unflattened_strings_length_ += length; 459 unflattened_strings_length_ += length;
460 } 460 }
461 return str; 461 return str;
462 } 462 }
463 463
464 464
465 int Heap::AdjustAmountOfExternalAllocatedMemory(int change_in_bytes) { 465 int Heap::AdjustAmountOfExternalAllocatedMemory(int change_in_bytes) {
466 ASSERT(HasBeenSetup()); 466 ASSERT(HasBeenSetUp());
467 int amount = amount_of_external_allocated_memory_ + change_in_bytes; 467 int amount = amount_of_external_allocated_memory_ + change_in_bytes;
468 if (change_in_bytes >= 0) { 468 if (change_in_bytes >= 0) {
469 // Avoid overflow. 469 // Avoid overflow.
470 if (amount > amount_of_external_allocated_memory_) { 470 if (amount > amount_of_external_allocated_memory_) {
471 amount_of_external_allocated_memory_ = amount; 471 amount_of_external_allocated_memory_ = amount;
472 } 472 }
473 int amount_since_last_global_gc = 473 int amount_since_last_global_gc =
474 amount_of_external_allocated_memory_ - 474 amount_of_external_allocated_memory_ -
475 amount_of_external_allocated_memory_at_last_global_gc_; 475 amount_of_external_allocated_memory_at_last_global_gc_;
476 if (amount_since_last_global_gc > external_allocation_limit_) { 476 if (amount_since_last_global_gc > external_allocation_limit_) {
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 702
703 703
704 Heap* _inline_get_heap_() { 704 Heap* _inline_get_heap_() {
705 return HEAP; 705 return HEAP;
706 } 706 }
707 707
708 708
709 } } // namespace v8::internal 709 } } // namespace v8::internal
710 710
711 #endif // V8_HEAP_INL_H_ 711 #endif // V8_HEAP_INL_H_
OLDNEW
« no previous file with comments | « src/heap.cc ('k') | src/heap-profiler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698