Revision: 9614 Author: [email protected] Date: Thu Oct 13 09:11:18 2011 Log: Return empty HeapStatistics for uninitialized isolate.
[email protected] Review URL: http://codereview.chromium.org/8278001 http://code.google.com/p/v8/source/detail?r=9614 Modified: /branches/bleeding_edge/src/api.cc ======================================= --- /branches/bleeding_edge/src/api.cc Wed Oct 12 05:23:06 2011 +++ /branches/bleeding_edge/src/api.cc Thu Oct 13 09:11:18 2011 @@ -3961,6 +3961,15 @@ void v8::V8::GetHeapStatistics(HeapStatistics* heap_statistics) { + if (!i::Isolate::Current()->IsInitialized()) { + // Isolate is unitialized thus heap is not configured yet. + heap_statistics->set_total_heap_size(0); + heap_statistics->set_total_heap_size_executable(0); + heap_statistics->set_used_heap_size(0); + heap_statistics->set_heap_size_limit(0); + return; + } + i::Heap* heap = i::Isolate::Current()->heap(); heap_statistics->set_total_heap_size(heap->CommittedMemory()); heap_statistics->set_total_heap_size_executable( -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
