Commit 384cc7fc authored by loislo@chromium.org's avatar loislo@chromium.org

Heap Snapshot maximum size limit is too low for really big apps.

At the moment the limit is 256MB.

BUG=113015
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9375047

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10676 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 97cbb319
...@@ -1208,11 +1208,13 @@ template <size_t ptr_size> struct SnapshotSizeConstants; ...@@ -1208,11 +1208,13 @@ template <size_t ptr_size> struct SnapshotSizeConstants;
template <> struct SnapshotSizeConstants<4> { template <> struct SnapshotSizeConstants<4> {
static const int kExpectedHeapGraphEdgeSize = 12; static const int kExpectedHeapGraphEdgeSize = 12;
static const int kExpectedHeapEntrySize = 36; static const int kExpectedHeapEntrySize = 36;
static const int kMaxSerializableSnapshotRawSize = 256 * MB;
}; };
template <> struct SnapshotSizeConstants<8> { template <> struct SnapshotSizeConstants<8> {
static const int kExpectedHeapGraphEdgeSize = 24; static const int kExpectedHeapGraphEdgeSize = 24;
static const int kExpectedHeapEntrySize = 48; static const int kExpectedHeapEntrySize = 48;
static const int kMaxSerializableSnapshotRawSize = 768 * MB;
}; };
} // namespace } // namespace
...@@ -3436,15 +3438,13 @@ class OutputStreamWriter { ...@@ -3436,15 +3438,13 @@ class OutputStreamWriter {
bool aborted_; bool aborted_;
}; };
const int HeapSnapshotJSONSerializer::kMaxSerializableSnapshotRawSize =
256 * MB;
void HeapSnapshotJSONSerializer::Serialize(v8::OutputStream* stream) { void HeapSnapshotJSONSerializer::Serialize(v8::OutputStream* stream) {
ASSERT(writer_ == NULL); ASSERT(writer_ == NULL);
writer_ = new OutputStreamWriter(stream); writer_ = new OutputStreamWriter(stream);
HeapSnapshot* original_snapshot = NULL; HeapSnapshot* original_snapshot = NULL;
if (snapshot_->raw_entries_size() >= kMaxSerializableSnapshotRawSize) { if (snapshot_->raw_entries_size() >=
SnapshotSizeConstants<kPointerSize>::kMaxSerializableSnapshotRawSize) {
// The snapshot is too big. Serialize a fake snapshot. // The snapshot is too big. Serialize a fake snapshot.
original_snapshot = snapshot_; original_snapshot = snapshot_;
snapshot_ = CreateFakeSnapshot(); snapshot_ = CreateFakeSnapshot();
...@@ -3471,8 +3471,14 @@ HeapSnapshot* HeapSnapshotJSONSerializer::CreateFakeSnapshot() { ...@@ -3471,8 +3471,14 @@ HeapSnapshot* HeapSnapshotJSONSerializer::CreateFakeSnapshot() {
snapshot_->uid()); snapshot_->uid());
result->AllocateEntries(2, 1, 0); result->AllocateEntries(2, 1, 0);
HeapEntry* root = result->AddRootEntry(1); HeapEntry* root = result->AddRootEntry(1);
const char* text = snapshot_->collection()->names()->GetFormatted(
"The snapshot is too big. "
"Maximum snapshot size is %d MB. "
"Actual snapshot size is %d MB.",
SnapshotSizeConstants<kPointerSize>::kMaxSerializableSnapshotRawSize / MB,
(snapshot_->raw_entries_size() + MB - 1) / MB);
HeapEntry* message = result->AddEntry( HeapEntry* message = result->AddEntry(
HeapEntry::kString, "The snapshot is too big", 0, 4, 0, 0); HeapEntry::kString, text, 0, 4, 0, 0);
root->SetUnidirElementReference(0, 1, message); root->SetUnidirElementReference(0, 1, message);
result->SetDominatorsToSelf(); result->SetDominatorsToSelf();
return result; return result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment