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

Side by Side Diff: src/heap.h

Issue 10020032: Fix external allocated memory accounting to use 64 bit values on (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 years, 8 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/api.cc ('k') | src/heap-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 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 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after
1704 1704
1705 // Used to adjust the limits that control the timing of the next GC. 1705 // Used to adjust the limits that control the timing of the next GC.
1706 intptr_t size_of_old_gen_at_last_old_space_gc_; 1706 intptr_t size_of_old_gen_at_last_old_space_gc_;
1707 1707
1708 // Limit on the amount of externally allocated memory allowed 1708 // Limit on the amount of externally allocated memory allowed
1709 // between global GCs. If reached a global GC is forced. 1709 // between global GCs. If reached a global GC is forced.
1710 intptr_t external_allocation_limit_; 1710 intptr_t external_allocation_limit_;
1711 1711
1712 // The amount of external memory registered through the API kept alive 1712 // The amount of external memory registered through the API kept alive
1713 // by global handles 1713 // by global handles
1714 int amount_of_external_allocated_memory_; 1714 intptr_t amount_of_external_allocated_memory_;
1715 1715
1716 // Caches the amount of external memory registered at the last global gc. 1716 // Caches the amount of external memory registered at the last global gc.
1717 int amount_of_external_allocated_memory_at_last_global_gc_; 1717 int amount_of_external_allocated_memory_at_last_global_gc_;
1718 1718
1719 // Indicates that an allocation has failed in the old generation since the 1719 // Indicates that an allocation has failed in the old generation since the
1720 // last GC. 1720 // last GC.
1721 int old_gen_exhausted_; 1721 int old_gen_exhausted_;
1722 1722
1723 Object* roots_[kRootListLength]; 1723 Object* roots_[kRootListLength];
1724 1724
(...skipping 981 matching lines...) Expand 10 before | Expand all | Expand 10 after
2706 AssertNoAllocation no_alloc; // i.e. no gc allowed. 2706 AssertNoAllocation no_alloc; // i.e. no gc allowed.
2707 2707
2708 private: 2708 private:
2709 DISALLOW_IMPLICIT_CONSTRUCTORS(PathTracer); 2709 DISALLOW_IMPLICIT_CONSTRUCTORS(PathTracer);
2710 }; 2710 };
2711 #endif // DEBUG || LIVE_OBJECT_LIST 2711 #endif // DEBUG || LIVE_OBJECT_LIST
2712 2712
2713 } } // namespace v8::internal 2713 } } // namespace v8::internal
2714 2714
2715 #endif // V8_HEAP_H_ 2715 #endif // V8_HEAP_H_
OLDNEW
« no previous file with comments | « src/api.cc ('k') | src/heap-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698