| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <!-- | 2 <!-- |
| 3 Copyright (c) 2015 The Chromium Authors. All rights reserved. | 3 Copyright (c) 2015 The Chromium Authors. All rights reserved. |
| 4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
| 5 found in the LICENSE file. | 5 found in the LICENSE file. |
| 6 --> | 6 --> |
| 7 | 7 |
| 8 <link rel="import" href="/tracing/model/container_memory_dump.html"> | 8 <link rel="import" href="/tracing/model/container_memory_dump.html"> |
| 9 <link rel="import" href="/tracing/model/memory_allocator_dump.html"> | 9 <link rel="import" href="/tracing/model/memory_allocator_dump.html"> |
| 10 <link rel="import" href="/tracing/model/memory_dump_test_utils.html"> | 10 <link rel="import" href="/tracing/model/memory_dump_test_utils.html"> |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 assert.equal(dump.name, 'object7'); | 36 assert.equal(dump.name, 'object7'); |
| 37 assert.equal(dump.fullName, 'v8/objects/object7'); | 37 assert.equal(dump.fullName, 'v8/objects/object7'); |
| 38 assert.strictEqual(dump.containerMemoryDump, containerDump); | 38 assert.strictEqual(dump.containerMemoryDump, containerDump); |
| 39 assert.equal(dump.quantifiedName, '\'v8/objects/object7\' in super dump'); | 39 assert.equal(dump.quantifiedName, '\'v8/objects/object7\' in super dump'); |
| 40 }); | 40 }); |
| 41 | 41 |
| 42 test('memoryAllocatorDumps_aggregateNumericsRecursively', function() { | 42 test('memoryAllocatorDumps_aggregateNumericsRecursively', function() { |
| 43 var md = new ContainerMemoryDump(42); | 43 var md = new ContainerMemoryDump(42); |
| 44 | 44 |
| 45 var oilpanDump = newAllocatorDump(md, 'oilpan', { | 45 var oilpanDump = newAllocatorDump(md, 'oilpan', {numerics: { |
| 46 'objects_count': new ScalarNumeric(unitlessNumber_smallerIsBetter, 7) | 46 objects_count: new ScalarNumeric(unitlessNumber_smallerIsBetter, 7) |
| 47 }); | 47 }}); |
| 48 | 48 |
| 49 addChildDump(oilpanDump, 'bucket1', { | 49 addChildDump(oilpanDump, 'bucket1', {numerics: { |
| 50 size: 512, | 50 size: 512, |
| 51 objects_count: new ScalarNumeric(unitlessNumber_smallerIsBetter, 3), | 51 objects_count: new ScalarNumeric(unitlessNumber_smallerIsBetter, 3), |
| 52 inner_size: 256, | 52 inner_size: 256, |
| 53 outer_size: 1024 | 53 outer_size: 1024 |
| 54 }); | 54 }}); |
| 55 | 55 |
| 56 var oilpanBucket2Dump = addChildDump(oilpanDump, 'bucket2'); | 56 var oilpanBucket2Dump = addChildDump(oilpanDump, 'bucket2'); |
| 57 | 57 |
| 58 var oilpanBucket2StringsDump = addChildDump(oilpanBucket2Dump, 'strings', { | 58 var oilpanBucket2StringsDump = addChildDump(oilpanBucket2Dump, 'strings', { |
| 59 size: 512, | 59 numerics: { |
| 60 objects_count: new ScalarNumeric(unitlessNumber_smallerIsBetter, 4), | 60 size: 512, |
| 61 inner_size: 512, | 61 objects_count: new ScalarNumeric(unitlessNumber_smallerIsBetter, 4), |
| 62 outer_size: 2048 | 62 inner_size: 512, |
| 63 outer_size: 2048 |
| 64 } |
| 63 }); | 65 }); |
| 64 | 66 |
| 65 oilpanDump.aggregateNumericsRecursively(); | 67 oilpanDump.aggregateNumericsRecursively(); |
| 66 | 68 |
| 67 // oilpan has *some* numerics aggregated. | 69 // oilpan has *some* numerics aggregated. |
| 68 checkDumpNumericsAndDiagnostics(oilpanDump, { | 70 checkDumpNumericsAndDiagnostics(oilpanDump, { |
| 69 'objects_count': new ScalarNumeric(unitlessNumber_smallerIsBetter, 7), | 71 objects_count: new ScalarNumeric(unitlessNumber_smallerIsBetter, 7), |
| 70 'inner_size': 768, | 72 inner_size: 768, |
| 71 'outer_size': 3072 | 73 outer_size: 3072 |
| 72 }, {}); | 74 }, {}); |
| 73 | 75 |
| 74 // oilpan/bucket2 has *all* numerics aggregated (except for size). | 76 // oilpan/bucket2 has *all* numerics aggregated (except for size). |
| 75 checkDumpNumericsAndDiagnostics(oilpanBucket2Dump, { | 77 checkDumpNumericsAndDiagnostics(oilpanBucket2Dump, { |
| 76 'objects_count': new ScalarNumeric(unitlessNumber_smallerIsBetter, 4), | 78 objects_count: new ScalarNumeric(unitlessNumber_smallerIsBetter, 4), |
| 77 'inner_size': 512, | 79 inner_size: 512, |
| 78 'outer_size': 2048 | 80 outer_size: 2048 |
| 79 }, {}); | 81 }, {}); |
| 80 | 82 |
| 81 // oilpan/bucket2/strings has *no* numerics aggregated. | 83 // oilpan/bucket2/strings has *no* numerics aggregated. |
| 82 checkDumpNumericsAndDiagnostics(oilpanBucket2StringsDump, { | 84 checkDumpNumericsAndDiagnostics(oilpanBucket2StringsDump, { |
| 83 'size': 512, | 85 size: 512, |
| 84 'objects_count': new ScalarNumeric(unitlessNumber_smallerIsBetter, 4), | 86 objects_count: new ScalarNumeric(unitlessNumber_smallerIsBetter, 4), |
| 85 'inner_size': 512, | 87 inner_size: 512, |
| 86 'outer_size': 2048 | 88 outer_size: 2048 |
| 87 }, {}); | 89 }, {}); |
| 88 }); | 90 }); |
| 89 | 91 |
| 90 test('memoryAllocatorDump_aggregateNumerics', function() { | 92 test('memoryAllocatorDump_aggregateNumerics', function() { |
| 91 function checkAggregateNumerics(numerics, expectedValue, expectedUnit, | 93 function checkAggregateNumerics(numerics, expectedValue, expectedUnit, |
| 92 opt_expectedWarningCount) { | 94 opt_expectedWarningCount) { |
| 93 function checkResult(result) { | 95 function checkResult(result) { |
| 94 if (expectedValue === undefined) { | 96 if (expectedValue === undefined) { |
| 95 assert.isUndefined(result); | 97 assert.isUndefined(result); |
| 96 assert.isUndefined(expectedUnit); // Test sanity check. | 98 assert.isUndefined(expectedUnit); // Test sanity check. |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 var d1 = new MemoryAllocatorDump('v8/isolate1'); | 211 var d1 = new MemoryAllocatorDump('v8/isolate1'); |
| 210 var d2 = new MemoryAllocatorDump('oilpan/document1'); | 212 var d2 = new MemoryAllocatorDump('oilpan/document1'); |
| 211 var link = new MemoryAllocatorDumpLink(d1, d2, 3); | 213 var link = new MemoryAllocatorDumpLink(d1, d2, 3); |
| 212 | 214 |
| 213 assert.strictEqual(link.source, d1); | 215 assert.strictEqual(link.source, d1); |
| 214 assert.strictEqual(link.target, d2); | 216 assert.strictEqual(link.target, d2); |
| 215 assert.strictEqual(link.importance, 3); | 217 assert.strictEqual(link.importance, 3); |
| 216 }); | 218 }); |
| 217 }); | 219 }); |
| 218 </script> | 220 </script> |
| OLD | NEW |