OLD | NEW |
1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
2 <!-- | 2 <!-- |
3 Copyright 2016 The Chromium Authors. All rights reserved. | 3 Copyright 2016 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/core/test_utils.html"> | 8 <link rel="import" href="/tracing/core/test_utils.html"> |
9 <link rel="import" href="/tracing/metrics/system_health/memory_metric.html"> | 9 <link rel="import" href="/tracing/metrics/system_health/memory_metric.html"> |
10 <link rel="import" href="/tracing/metrics/value_list.html"> | 10 <link rel="import" href="/tracing/metrics/value_list.html"> |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 var gpuDump = newAllocatorDump(pmdGpu4, 'gpu', | 307 var gpuDump = newAllocatorDump(pmdGpu4, 'gpu', |
308 { 'memtrack_pss': 666 /* ignored */ }); | 308 { 'memtrack_pss': 666 /* ignored */ }); |
309 var memtrackDump = addChildDump(gpuDump, 'android_memtrack', | 309 var memtrackDump = addChildDump(gpuDump, 'android_memtrack', |
310 { 'memtrack_pss': 777 /* ignored */}); | 310 { 'memtrack_pss': 777 /* ignored */}); |
311 addChildDump(memtrackDump, 'gl', { 'memtrack_pss': 5000 }); | 311 addChildDump(memtrackDump, 'gl', { 'memtrack_pss': 5000 }); |
312 addChildDump(memtrackDump, 'graphics', { 'ignored': 7000 }); | 312 addChildDump(memtrackDump, 'graphics', { 'ignored': 7000 }); |
313 addChildDump(memtrackDump, 'gfx', { 'memtrack_pss': 4000 }); | 313 addChildDump(memtrackDump, 'gfx', { 'memtrack_pss': 4000 }); |
314 return [gpuDump]; | 314 return [gpuDump]; |
315 })(); | 315 })(); |
316 }, { | 316 }, { |
317 'memory:chrome:all:android_memtrack:gfx': expectBytes([0, 0, 0, 4000]), | 317 'memory:chrome:all:subsystem:gpu:android_memtrack:gfx:memtrack_pss': |
318 'memory:chrome:all:android_memtrack:gl': expectBytes([0, 0, 500, 5000]), | 318 expectBytes([0, 0, 0, 4000]), |
319 'memory:chrome:all:android_memtrack:graphics': expectBytes([0, 0, 700, 0]), | 319 'memory:chrome:all:subsystem:gpu:android_memtrack:gl:memtrack_pss': |
| 320 expectBytes([0, 0, 500, 5000]), |
| 321 'memory:chrome:all:subsystem:gpu:android_memtrack:graphics:memtrack_pss': |
| 322 expectBytes([0, 0, 700, 0]), |
320 'memory:chrome:all:dump_count:detailed': expectUnitless(0), | 323 'memory:chrome:all:dump_count:detailed': expectUnitless(0), |
321 'memory:chrome:all:dump_count:light': expectUnitless(4), | 324 'memory:chrome:all:dump_count:light': expectUnitless(4), |
322 'memory:chrome:all:dump_count:total': expectUnitless(4), | 325 'memory:chrome:all:dump_count:total': expectUnitless(4), |
323 'memory:chrome:all:process_count': expectUnitless([3, 3, 3, 3]), | 326 'memory:chrome:all:process_count': expectUnitless([3, 3, 3, 3]), |
324 'memory:chrome:all:subsystem:gpu': expectBytes([30, 0, 300, 0]), | 327 'memory:chrome:all:subsystem:gpu:effective_size': |
325 'memory:chrome:all:subsystem:gpu:allocated_objects': | 328 expectBytes([30, 0, 300, 0]), |
| 329 'memory:chrome:all:subsystem:gpu:allocated_objects_size': |
326 expectBytes([25, 0, 0, 0]), | 330 expectBytes([25, 0, 0, 0]), |
327 'memory:chrome:all:subsystem:malloc': | 331 'memory:chrome:all:subsystem:malloc:effective_size': |
328 expectBytes([8 + 16, 120 - 40, 8000, 80000]), | 332 expectBytes([8 + 16, 120 - 40, 8000, 80000]), |
329 'memory:chrome:all:subsystem:malloc:allocated_objects': | 333 'memory:chrome:all:subsystem:malloc:allocated_objects_size': |
330 expectBytes([4, 750, 4000, 0]), | 334 expectBytes([4, 750, 4000, 0]), |
331 'memory:chrome:all:subsystem:partition_alloc': | 335 'memory:chrome:all:subsystem:partition_alloc:effective_size': |
332 expectBytes([32, 320, 0, 5e5]), | 336 expectBytes([32, 320, 0, 5e5]), |
333 'memory:chrome:all:subsystem:tracing': expectBytes([0, 40, 0, 0]), | 337 'memory:chrome:all:subsystem:tracing:effective_size': |
334 'memory:chrome:all:subsystem:v8': expectBytes([0, 650 + 970, 0, 4e5]), | 338 expectBytes([0, 40, 0, 0]), |
335 'memory:chrome:all:subsystem:v8:allocated_objects': | 339 'memory:chrome:all:subsystem:v8:effective_size': |
| 340 expectBytes([0, 650 + 970, 0, 4e5]), |
| 341 'memory:chrome:all:subsystem:v8:allocated_objects_size': |
336 expectBytes([0, 860, 0, 0]), | 342 expectBytes([0, 860, 0, 0]), |
337 'memory:chrome:browser:process_count': expectUnitless([1, 1, 1, 1]), | 343 'memory:chrome:browser:process_count': expectUnitless([1, 1, 1, 1]), |
338 'memory:chrome:browser:subsystem:malloc': | 344 'memory:chrome:browser:subsystem:malloc:effective_size': |
339 expectBytes([8, 120 - 40, 8000, 80000]), | 345 expectBytes([8, 120 - 40, 8000, 80000]), |
340 'memory:chrome:browser:subsystem:malloc:allocated_objects': | 346 'memory:chrome:browser:subsystem:malloc:allocated_objects_size': |
341 expectBytes([4, 0, 4000, 0]), | 347 expectBytes([4, 0, 4000, 0]), |
342 'memory:chrome:browser:subsystem:tracing': expectBytes([0, 40, 0, 0]), | 348 'memory:chrome:browser:subsystem:tracing:effective_size': |
343 'memory:chrome:gpu_process:android_memtrack:gfx': | 349 expectBytes([0, 40, 0, 0]), |
| 350 'memory:chrome:gpu_process:subsystem:gpu:android_memtrack:gfx:memtrack_pss': |
344 expectBytes([0, 0, 0, 4000]), | 351 expectBytes([0, 0, 0, 4000]), |
345 'memory:chrome:gpu_process:android_memtrack:gl': | 352 'memory:chrome:gpu_process:subsystem:gpu:android_memtrack:gl:memtrack_pss': |
346 expectBytes([0, 0, 500, 5000]), | 353 expectBytes([0, 0, 500, 5000]), |
347 'memory:chrome:gpu_process:android_memtrack:graphics': | 354 'memory:chrome:gpu_process:subsystem:gpu:android_memtrack:graphics:memtrack_
pss': |
348 expectBytes([0, 0, 700, 0]), | 355 expectBytes([0, 0, 700, 0]), |
349 'memory:chrome:gpu_process:process_count': expectUnitless([1, 0, 1, 1]), | 356 'memory:chrome:gpu_process:process_count': expectUnitless([1, 0, 1, 1]), |
350 'memory:chrome:gpu_process:subsystem:gpu': expectBytes([30, 0, 300, 0]), | 357 'memory:chrome:gpu_process:subsystem:gpu:effective_size': |
351 'memory:chrome:gpu_process:subsystem:gpu:allocated_objects': | 358 expectBytes([30, 0, 300, 0]), |
| 359 'memory:chrome:gpu_process:subsystem:gpu:allocated_objects_size': |
352 expectBytes([25, 0, 0, 0]), | 360 expectBytes([25, 0, 0, 0]), |
353 'memory:chrome:renderer:process_count': expectUnitless([1, 2, 1, 1]), | 361 'memory:chrome:renderer:process_count': expectUnitless([1, 2, 1, 1]), |
354 'memory:chrome:renderer:subsystem:malloc': expectBytes([16, 0, 0, 0]), | 362 'memory:chrome:renderer:subsystem:malloc:effective_size': |
355 'memory:chrome:renderer:subsystem:malloc:allocated_objects': | 363 expectBytes([16, 0, 0, 0]), |
| 364 'memory:chrome:renderer:subsystem:malloc:allocated_objects_size': |
356 expectBytes([0, 750, 0, 0]), | 365 expectBytes([0, 750, 0, 0]), |
357 'memory:chrome:renderer:subsystem:partition_alloc': | 366 'memory:chrome:renderer:subsystem:partition_alloc:effective_size': |
358 expectBytes([32, 320, 0, 5e5]), | 367 expectBytes([32, 320, 0, 5e5]), |
359 'memory:chrome:renderer:subsystem:v8': expectBytes([0, 650 + 970, 0, 4e5]), | 368 'memory:chrome:renderer:subsystem:v8:effective_size': |
360 'memory:chrome:renderer:subsystem:v8:allocated_objects': | 369 expectBytes([0, 650 + 970, 0, 4e5]), |
| 370 'memory:chrome:renderer:subsystem:v8:allocated_objects_size': |
361 expectBytes([0, 860, 0, 0]) | 371 expectBytes([0, 860, 0, 0]) |
362 }); | 372 }); |
363 | 373 |
364 memoryMetricTest('mmapsValues_unknownBrowser', function(model) { | 374 memoryMetricTest('mmapsValues_unknownBrowser', function(model) { |
365 var pBrowser = createProcessWithName(model, 'Browser'); | 375 var pBrowser = createProcessWithName(model, 'Browser'); |
366 var pRendererA = createProcessWithName(model, 'Renderer'); | 376 var pRendererA = createProcessWithName(model, 'Renderer'); |
367 var pRendererB = createProcessWithName(model, 'Renderer'); | 377 var pRendererB = createProcessWithName(model, 'Renderer'); |
368 var pRendererC = createProcessWithName(model, 'Renderer'); | 378 var pRendererC = createProcessWithName(model, 'Renderer'); |
369 | 379 |
370 // Timestamp 1. | 380 // Timestamp 1. |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
463 ]; | 473 ]; |
464 pmdBrowser3.vmRegions = VMRegionClassificationNode.fromRegions([ | 474 pmdBrowser3.vmRegions = VMRegionClassificationNode.fromRegions([ |
465 new VMRegion(0xABCD, 1024, 0, '/dev/ashmem/dalvik-non moving space', | 475 new VMRegion(0xABCD, 1024, 0, '/dev/ashmem/dalvik-non moving space', |
466 { 'privateDirtyResident': 150 }) | 476 { 'privateDirtyResident': 150 }) |
467 ]); | 477 ]); |
468 }, { | 478 }, { |
469 'memory:chrome:all:dump_count:detailed': expectUnitless(2), | 479 'memory:chrome:all:dump_count:detailed': expectUnitless(2), |
470 'memory:chrome:all:dump_count:light': expectUnitless(1), | 480 'memory:chrome:all:dump_count:light': expectUnitless(1), |
471 'memory:chrome:all:dump_count:total': expectUnitless(3), | 481 'memory:chrome:all:dump_count:total': expectUnitless(3), |
472 'memory:chrome:all:process_count': expectUnitless([1, 1, 1]), | 482 'memory:chrome:all:process_count': expectUnitless([1, 1, 1]), |
473 'memory:chrome:all:subsystem:malloc': expectBytes([0, 32, 48]), | 483 'memory:chrome:all:subsystem:malloc:effective_size': |
| 484 expectBytes([0, 32, 48]), |
474 'memory:chrome:all:vmstats:ashmem:pss': expectBytes([0, 0]), | 485 'memory:chrome:all:vmstats:ashmem:pss': expectBytes([0, 0]), |
475 'memory:chrome:all:vmstats:java_heap:private_dirty': | 486 'memory:chrome:all:vmstats:java_heap:private_dirty': |
476 expectBytes([100, 150]), | 487 expectBytes([100, 150]), |
477 'memory:chrome:all:vmstats:native_heap:pss': expectBytes([0, 0]), | 488 'memory:chrome:all:vmstats:native_heap:pss': expectBytes([0, 0]), |
478 'memory:chrome:all:vmstats:overall:private_dirty': | 489 'memory:chrome:all:vmstats:overall:private_dirty': |
479 expectBytes([100, 150]), | 490 expectBytes([100, 150]), |
480 'memory:chrome:all:vmstats:overall:pss': expectBytes([0, 0]), | 491 'memory:chrome:all:vmstats:overall:pss': expectBytes([0, 0]), |
481 'memory:chrome:browser:process_count': expectUnitless([1, 1, 1]), | 492 'memory:chrome:browser:process_count': expectUnitless([1, 1, 1]), |
482 'memory:chrome:browser:subsystem:malloc': expectBytes([0, 32, 48]), | 493 'memory:chrome:browser:subsystem:malloc:effective_size': |
| 494 expectBytes([0, 32, 48]), |
483 'memory:chrome:browser:vmstats:ashmem:pss': expectBytes([0, 0]), | 495 'memory:chrome:browser:vmstats:ashmem:pss': expectBytes([0, 0]), |
484 'memory:chrome:browser:vmstats:java_heap:private_dirty': | 496 'memory:chrome:browser:vmstats:java_heap:private_dirty': |
485 expectBytes([100, 150]), | 497 expectBytes([100, 150]), |
486 'memory:chrome:browser:vmstats:native_heap:pss': expectBytes([0, 0]), | 498 'memory:chrome:browser:vmstats:native_heap:pss': expectBytes([0, 0]), |
487 'memory:chrome:browser:vmstats:overall:private_dirty': | 499 'memory:chrome:browser:vmstats:overall:private_dirty': |
488 expectBytes([100, 150]), | 500 expectBytes([100, 150]), |
489 'memory:chrome:browser:vmstats:overall:pss': expectBytes([0, 0]) | 501 'memory:chrome:browser:vmstats:overall:pss': expectBytes([0, 0]) |
490 }); | 502 }); |
491 | 503 |
492 memoryMetricTest('combined_multipleBrowsers', function(model) { | 504 memoryMetricTest('combined_multipleBrowsers', function(model) { |
(...skipping 28 matching lines...) Expand all Loading... |
521 var pmdRenderer2 = addProcessMemoryDump(gmd2, pRenderer1, 8); | 533 var pmdRenderer2 = addProcessMemoryDump(gmd2, pRenderer1, 8); |
522 pmdRenderer2.memoryAllocatorDumps = [ | 534 pmdRenderer2.memoryAllocatorDumps = [ |
523 newAllocatorDump(pmdBrowser2, 'malloc', { size: 32 }) | 535 newAllocatorDump(pmdBrowser2, 'malloc', { size: 32 }) |
524 ]; | 536 ]; |
525 | 537 |
526 // Timestamp 3 (Chrome 2). | 538 // Timestamp 3 (Chrome 2). |
527 var gmd3 = addGlobalMemoryDump(model, 20, DETAILED); | 539 var gmd3 = addGlobalMemoryDump(model, 20, DETAILED); |
528 var pmdBrowser3 = addProcessMemoryDump(gmd3, pChrome2, 20); | 540 var pmdBrowser3 = addProcessMemoryDump(gmd3, pChrome2, 20); |
529 pmdBrowser3.memoryAllocatorDumps = [ | 541 pmdBrowser3.memoryAllocatorDumps = [ |
530 newAllocatorDump(pmdBrowser3, 'malloc', { size: 64 }), | 542 newAllocatorDump(pmdBrowser3, 'malloc', { size: 64 }), |
531 newAllocatorDump(pmdBrowser3, 'sqlite', { size: 128 }) | 543 newAllocatorDump(pmdBrowser3, 'sqlite', { size: 128 }), |
| 544 newAllocatorDump(pmdBrowser3, 'discardable', { |
| 545 size: 8388608, |
| 546 locked_size: 4194304 |
| 547 }) |
532 ]; | 548 ]; |
533 pmdBrowser3.vmRegions = VMRegionClassificationNode.fromRegions([ | 549 pmdBrowser3.vmRegions = VMRegionClassificationNode.fromRegions([ |
534 new VMRegion(0xABCD, 99, 0, '/dev/ashmem/dalvik-non moving space', | 550 new VMRegion(0xABCD, 99, 0, '/dev/ashmem/dalvik-non moving space', |
535 { 'privateDirtyResident': 256 }) | 551 { 'privateDirtyResident': 256 }) |
536 ]); | 552 ]); |
537 | 553 |
538 // Timestamp 4 (Chrome 2 + Renderer). | 554 // Timestamp 4 (Chrome 2 + Renderer). |
539 var gmd4 = addGlobalMemoryDump(model, 30, LIGHT); | 555 var gmd4 = addGlobalMemoryDump(model, 30, LIGHT); |
540 var pmdBrowser4 = addProcessMemoryDump(gmd4, pChrome2, 28); | 556 var pmdBrowser4 = addProcessMemoryDump(gmd4, pChrome2, 28); |
541 pmdBrowser4.memoryAllocatorDumps = [ | 557 pmdBrowser4.memoryAllocatorDumps = [ |
542 newAllocatorDump(pmdBrowser4, 'malloc', { size: 512 }) | 558 newAllocatorDump(pmdBrowser4, 'malloc', { size: 512 }), |
| 559 newAllocatorDump(pmdBrowser3, 'discardable', { size: 16777216 }) |
543 ]; | 560 ]; |
544 var pmdRenderer4 = addProcessMemoryDump(gmd4, pRenderer2, 32); | 561 var pmdRenderer4 = addProcessMemoryDump(gmd4, pRenderer2, 32); |
545 pmdRenderer4.memoryAllocatorDumps = [ | 562 pmdRenderer4.memoryAllocatorDumps = [ |
546 newAllocatorDump(pmdRenderer4, 'malloc', { size: 1024 }), | 563 newAllocatorDump(pmdRenderer4, 'malloc', { size: 1024 }), |
547 newAllocatorDump(pmdRenderer4, 'v8', { size: 2048 }) | 564 newAllocatorDump(pmdRenderer4, 'v8', { size: 2048 }) |
548 ]; | 565 ]; |
549 | 566 |
550 // Timestamp 5 (Unknown browser). | 567 // Timestamp 5 (Unknown browser). |
551 var gmd5 = addGlobalMemoryDump(model, 40, LIGHT); | 568 var gmd5 = addGlobalMemoryDump(model, 40, LIGHT); |
552 var pmdBrowser5 = addProcessMemoryDump(gmd5, pUnknownBrowser, 40); | 569 var pmdBrowser5 = addProcessMemoryDump(gmd5, pUnknownBrowser, 40); |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 var memtrackDump = addChildDump(gpuDump, 'android_memtrack'); | 601 var memtrackDump = addChildDump(gpuDump, 'android_memtrack'); |
585 addChildDump(memtrackDump, 'gl', { 'memtrack_pss': 2097152 }); | 602 addChildDump(memtrackDump, 'gl', { 'memtrack_pss': 2097152 }); |
586 return [gpuDump]; | 603 return [gpuDump]; |
587 })(); | 604 })(); |
588 }, { | 605 }, { |
589 // WebView (GMD1, GMD6). | 606 // WebView (GMD1, GMD6). |
590 'memory:webview:all:dump_count:detailed': expectUnitless(1), | 607 'memory:webview:all:dump_count:detailed': expectUnitless(1), |
591 'memory:webview:all:dump_count:light': expectUnitless(1), | 608 'memory:webview:all:dump_count:light': expectUnitless(1), |
592 'memory:webview:all:dump_count:total': expectUnitless(2), | 609 'memory:webview:all:dump_count:total': expectUnitless(2), |
593 'memory:webview:all:process_count': expectUnitless([1, 1]), | 610 'memory:webview:all:process_count': expectUnitless([1, 1]), |
594 'memory:webview:all:subsystem:malloc': expectBytes([2, 16384]), | 611 'memory:webview:all:subsystem:malloc:effective_size': |
595 'memory:webview:all:subsystem:v8': expectBytes([4, 0]), | 612 expectBytes([2, 16384]), |
596 'memory:webview:all:subsystem:v8:allocated_objects': | 613 'memory:webview:all:subsystem:v8:effective_size': expectBytes([4, 0]), |
| 614 'memory:webview:all:subsystem:v8:allocated_objects_size': |
597 expectBytes([0, 32768]), | 615 expectBytes([0, 32768]), |
598 'memory:webview:all:vmstats:ashmem:pss': expectBytes([0]), | 616 'memory:webview:all:vmstats:ashmem:pss': expectBytes([0]), |
599 'memory:webview:all:vmstats:java_heap:private_dirty': expectBytes([65536]), | 617 'memory:webview:all:vmstats:java_heap:private_dirty': expectBytes([65536]), |
600 'memory:webview:all:vmstats:native_heap:pss': expectBytes([0]), | 618 'memory:webview:all:vmstats:native_heap:pss': expectBytes([0]), |
601 'memory:webview:all:vmstats:overall:private_dirty': expectBytes([65536]), | 619 'memory:webview:all:vmstats:overall:private_dirty': expectBytes([65536]), |
602 'memory:webview:all:vmstats:overall:pss': expectBytes([0]), | 620 'memory:webview:all:vmstats:overall:pss': expectBytes([0]), |
603 'memory:webview:browser:process_count': expectUnitless([1, 1]), | 621 'memory:webview:browser:process_count': expectUnitless([1, 1]), |
604 'memory:webview:browser:subsystem:malloc': expectBytes([2, 16384]), | 622 'memory:webview:browser:subsystem:malloc:effective_size': |
605 'memory:webview:browser:subsystem:v8': expectBytes([4, 0]), | 623 expectBytes([2, 16384]), |
606 'memory:webview:browser:subsystem:v8:allocated_objects': | 624 'memory:webview:browser:subsystem:v8:effective_size': expectBytes([4, 0]), |
| 625 'memory:webview:browser:subsystem:v8:allocated_objects_size': |
607 expectBytes([0, 32768]), | 626 expectBytes([0, 32768]), |
608 'memory:webview:browser:vmstats:ashmem:pss': expectBytes([0]), | 627 'memory:webview:browser:vmstats:ashmem:pss': expectBytes([0]), |
609 'memory:webview:browser:vmstats:java_heap:private_dirty': | 628 'memory:webview:browser:vmstats:java_heap:private_dirty': |
610 expectBytes([65536]), | 629 expectBytes([65536]), |
611 'memory:webview:browser:vmstats:native_heap:pss': expectBytes([0]), | 630 'memory:webview:browser:vmstats:native_heap:pss': expectBytes([0]), |
612 'memory:webview:browser:vmstats:overall:private_dirty': | 631 'memory:webview:browser:vmstats:overall:private_dirty': |
613 expectBytes([65536]), | 632 expectBytes([65536]), |
614 'memory:webview:browser:vmstats:overall:pss': expectBytes([0]), | 633 'memory:webview:browser:vmstats:overall:pss': expectBytes([0]), |
615 | 634 |
616 // Chrome 1 (GMD3, GMD4). | 635 // Chrome 1 (GMD3, GMD4). |
617 'memory:chrome:all:android_memtrack:gl': expectBytes([0, 2097152]), | 636 'memory:chrome:all:subsystem:gpu:android_memtrack:gl:memtrack_pss': |
| 637 expectBytes([0, 2097152]), |
618 'memory:chrome:all:dump_count:detailed': expectUnitless(2), | 638 'memory:chrome:all:dump_count:detailed': expectUnitless(2), |
619 'memory:chrome:all:dump_count:light': expectUnitless(0), | 639 'memory:chrome:all:dump_count:light': expectUnitless(0), |
620 'memory:chrome:all:dump_count:total': expectUnitless(2), | 640 'memory:chrome:all:dump_count:total': expectUnitless(2), |
621 'memory:chrome:all:process_count': expectUnitless([3, 2]), | 641 'memory:chrome:all:process_count': expectUnitless([3, 2]), |
622 'memory:chrome:all:subsystem:gpu': expectBytes([0, 1048576]), | 642 'memory:chrome:all:subsystem:gpu:effective_size': |
623 'memory:chrome:all:subsystem:malloc': expectBytes([32, 131072]), | 643 expectBytes([0, 1048576]), |
624 'memory:chrome:all:subsystem:sqlite': expectBytes([0, 262144]), | 644 'memory:chrome:all:subsystem:malloc:effective_size': |
| 645 expectBytes([32, 131072]), |
| 646 'memory:chrome:all:subsystem:sqlite:effective_size': |
| 647 expectBytes([0, 262144]), |
625 'memory:chrome:all:vmstats:ashmem:pss': expectBytes([0, 0]), | 648 'memory:chrome:all:vmstats:ashmem:pss': expectBytes([0, 0]), |
626 'memory:chrome:all:vmstats:java_heap:private_dirty': | 649 'memory:chrome:all:vmstats:java_heap:private_dirty': |
627 expectBytes([8 + 16, 524288]), | 650 expectBytes([8 + 16, 524288]), |
628 'memory:chrome:all:vmstats:native_heap:pss': expectBytes([0, 0]), | 651 'memory:chrome:all:vmstats:native_heap:pss': expectBytes([0, 0]), |
629 'memory:chrome:all:vmstats:overall:private_dirty': | 652 'memory:chrome:all:vmstats:overall:private_dirty': |
630 expectBytes([8 + 16, 524288]), | 653 expectBytes([8 + 16, 524288]), |
631 'memory:chrome:all:vmstats:overall:pss': expectBytes([0, 0]), | 654 'memory:chrome:all:vmstats:overall:pss': expectBytes([0, 0]), |
632 'memory:chrome:browser:process_count': expectUnitless([1, 1]), | 655 'memory:chrome:browser:process_count': expectUnitless([1, 1]), |
633 'memory:chrome:browser:subsystem:malloc': expectBytes([0, 131072]), | 656 'memory:chrome:browser:subsystem:malloc:effective_size': |
634 'memory:chrome:browser:subsystem:sqlite': expectBytes([0, 262144]), | 657 expectBytes([0, 131072]), |
| 658 'memory:chrome:browser:subsystem:sqlite:effective_size': |
| 659 expectBytes([0, 262144]), |
635 'memory:chrome:browser:vmstats:ashmem:pss': expectBytes([0, 0]), | 660 'memory:chrome:browser:vmstats:ashmem:pss': expectBytes([0, 0]), |
636 'memory:chrome:browser:vmstats:java_heap:private_dirty': | 661 'memory:chrome:browser:vmstats:java_heap:private_dirty': |
637 expectBytes([8, 524288]), | 662 expectBytes([8, 524288]), |
638 'memory:chrome:browser:vmstats:native_heap:pss': expectBytes([0, 0]), | 663 'memory:chrome:browser:vmstats:native_heap:pss': expectBytes([0, 0]), |
639 'memory:chrome:browser:vmstats:overall:private_dirty': | 664 'memory:chrome:browser:vmstats:overall:private_dirty': |
640 expectBytes([8, 524288]), | 665 expectBytes([8, 524288]), |
641 'memory:chrome:browser:vmstats:overall:pss': expectBytes([0, 0]), | 666 'memory:chrome:browser:vmstats:overall:pss': expectBytes([0, 0]), |
642 'memory:chrome:gpu_process:android_memtrack:gl': expectBytes([0, 2097152]), | 667 'memory:chrome:gpu_process:subsystem:gpu:android_memtrack:gl:memtrack_pss': |
| 668 expectBytes([0, 2097152]), |
643 'memory:chrome:gpu_process:process_count': expectUnitless([1, 1]), | 669 'memory:chrome:gpu_process:process_count': expectUnitless([1, 1]), |
644 'memory:chrome:gpu_process:subsystem:gpu': expectBytes([0, 1048576]), | 670 'memory:chrome:gpu_process:subsystem:gpu:effective_size': |
| 671 expectBytes([0, 1048576]), |
645 'memory:chrome:gpu_process:vmstats:ashmem:pss': expectBytes([0, 0]), | 672 'memory:chrome:gpu_process:vmstats:ashmem:pss': expectBytes([0, 0]), |
646 'memory:chrome:gpu_process:vmstats:java_heap:private_dirty': | 673 'memory:chrome:gpu_process:vmstats:java_heap:private_dirty': |
647 expectBytes([16, 0]), | 674 expectBytes([16, 0]), |
648 'memory:chrome:gpu_process:vmstats:native_heap:pss': expectBytes([0, 0]), | 675 'memory:chrome:gpu_process:vmstats:native_heap:pss': expectBytes([0, 0]), |
649 'memory:chrome:gpu_process:vmstats:overall:private_dirty': | 676 'memory:chrome:gpu_process:vmstats:overall:private_dirty': |
650 expectBytes([16, 0]), | 677 expectBytes([16, 0]), |
651 'memory:chrome:gpu_process:vmstats:overall:pss': expectBytes([0, 0]), | 678 'memory:chrome:gpu_process:vmstats:overall:pss': expectBytes([0, 0]), |
652 'memory:chrome:renderer:process_count': expectUnitless([1, 0]), | 679 'memory:chrome:renderer:process_count': expectUnitless([1, 0]), |
653 'memory:chrome:renderer:subsystem:malloc': expectBytes([32, 0]), | 680 'memory:chrome:renderer:subsystem:malloc:effective_size': |
| 681 expectBytes([32, 0]), |
654 'memory:chrome:renderer:vmstats:ashmem:pss': expectBytes([0, 0]), | 682 'memory:chrome:renderer:vmstats:ashmem:pss': expectBytes([0, 0]), |
655 'memory:chrome:renderer:vmstats:java_heap:private_dirty': | 683 'memory:chrome:renderer:vmstats:java_heap:private_dirty': |
656 expectBytes([0, 0]), | 684 expectBytes([0, 0]), |
657 'memory:chrome:renderer:vmstats:native_heap:pss': expectBytes([0, 0]), | 685 'memory:chrome:renderer:vmstats:native_heap:pss': expectBytes([0, 0]), |
658 'memory:chrome:renderer:vmstats:overall:private_dirty': expectBytes([0, 0]), | 686 'memory:chrome:renderer:vmstats:overall:private_dirty': |
| 687 expectBytes([0, 0]), |
659 'memory:chrome:renderer:vmstats:overall:pss': expectBytes([0, 0]), | 688 'memory:chrome:renderer:vmstats:overall:pss': expectBytes([0, 0]), |
660 | 689 |
661 // Chrome 2 (GMD2, GMD7). | 690 // Chrome 2 (GMD2, GMD7). |
662 'memory:chrome2:all:dump_count:detailed': expectUnitless(1), | 691 'memory:chrome2:all:dump_count:detailed': expectUnitless(1), |
663 'memory:chrome2:all:dump_count:light': expectUnitless(1), | 692 'memory:chrome2:all:dump_count:light': expectUnitless(1), |
664 'memory:chrome2:all:dump_count:total': expectUnitless(2), | 693 'memory:chrome2:all:dump_count:total': expectUnitless(2), |
665 'memory:chrome2:all:process_count': expectUnitless([1, 2]), | 694 'memory:chrome2:all:process_count': expectUnitless([1, 2]), |
666 'memory:chrome2:all:subsystem:malloc': expectBytes([64, 512 + 1024]), | 695 'memory:chrome2:all:subsystem:discardable:effective_size': |
667 'memory:chrome2:all:subsystem:sqlite': expectBytes([128, 0]), | 696 expectBytes([8388608, 16777216]), |
668 'memory:chrome2:all:subsystem:v8': expectBytes([0, 2048]), | 697 'memory:chrome2:all:subsystem:discardable:locked_size': |
| 698 expectBytes([4194304, 0]), |
| 699 'memory:chrome2:all:subsystem:malloc:effective_size': |
| 700 expectBytes([64, 512 + 1024]), |
| 701 'memory:chrome2:all:subsystem:sqlite:effective_size': expectBytes([128, 0]), |
| 702 'memory:chrome2:all:subsystem:v8:effective_size': expectBytes([0, 2048]), |
669 'memory:chrome2:all:vmstats:ashmem:pss': expectBytes([0]), | 703 'memory:chrome2:all:vmstats:ashmem:pss': expectBytes([0]), |
670 'memory:chrome2:all:vmstats:java_heap:private_dirty': expectBytes([256]), | 704 'memory:chrome2:all:vmstats:java_heap:private_dirty': expectBytes([256]), |
671 'memory:chrome2:all:vmstats:native_heap:pss': expectBytes([0]), | 705 'memory:chrome2:all:vmstats:native_heap:pss': expectBytes([0]), |
672 'memory:chrome2:all:vmstats:overall:private_dirty': expectBytes([256]), | 706 'memory:chrome2:all:vmstats:overall:private_dirty': expectBytes([256]), |
673 'memory:chrome2:all:vmstats:overall:pss': expectBytes([0]), | 707 'memory:chrome2:all:vmstats:overall:pss': expectBytes([0]), |
674 'memory:chrome2:browser:process_count': expectUnitless([1, 1]), | 708 'memory:chrome2:browser:process_count': expectUnitless([1, 1]), |
675 'memory:chrome2:browser:subsystem:malloc': expectBytes([64, 512]), | 709 'memory:chrome2:browser:subsystem:malloc:effective_size': |
676 'memory:chrome2:browser:subsystem:sqlite': expectBytes([128, 0]), | 710 expectBytes([64, 512]), |
| 711 'memory:chrome2:browser:subsystem:discardable:effective_size': |
| 712 expectBytes([8388608, 16777216]), |
| 713 'memory:chrome2:browser:subsystem:discardable:locked_size': |
| 714 expectBytes([4194304, 0]), |
| 715 'memory:chrome2:browser:subsystem:sqlite:effective_size': |
| 716 expectBytes([128, 0]), |
677 'memory:chrome2:browser:vmstats:ashmem:pss': expectBytes([0]), | 717 'memory:chrome2:browser:vmstats:ashmem:pss': expectBytes([0]), |
678 'memory:chrome2:browser:vmstats:java_heap:private_dirty': | 718 'memory:chrome2:browser:vmstats:java_heap:private_dirty': |
679 expectBytes([256]), | 719 expectBytes([256]), |
680 'memory:chrome2:browser:vmstats:native_heap:pss': expectBytes([0]), | 720 'memory:chrome2:browser:vmstats:native_heap:pss': expectBytes([0]), |
681 'memory:chrome2:browser:vmstats:overall:private_dirty': expectBytes([256]), | 721 'memory:chrome2:browser:vmstats:overall:private_dirty': expectBytes([256]), |
682 'memory:chrome2:browser:vmstats:overall:pss': expectBytes([0]), | 722 'memory:chrome2:browser:vmstats:overall:pss': expectBytes([0]), |
683 'memory:chrome2:renderer:process_count': expectUnitless([0, 1]), | 723 'memory:chrome2:renderer:process_count': expectUnitless([0, 1]), |
684 'memory:chrome2:renderer:subsystem:malloc': expectBytes([0, 1024]), | 724 'memory:chrome2:renderer:subsystem:malloc:effective_size': |
685 'memory:chrome2:renderer:subsystem:v8': expectBytes([0, 2048]), | 725 expectBytes([0, 1024]), |
| 726 'memory:chrome2:renderer:subsystem:v8:effective_size': |
| 727 expectBytes([0, 2048]), |
686 | 728 |
687 // Unknown browser (GMD5). | 729 // Unknown browser (GMD5). |
688 'memory:unknown:all:dump_count:detailed': expectUnitless(0), | 730 'memory:unknown:all:dump_count:detailed': expectUnitless(0), |
689 'memory:unknown:all:dump_count:light': expectUnitless(1), | 731 'memory:unknown:all:dump_count:light': expectUnitless(1), |
690 'memory:unknown:all:dump_count:total': expectUnitless(1), | 732 'memory:unknown:all:dump_count:total': expectUnitless(1), |
691 'memory:unknown:all:process_count': expectUnitless([1]), | 733 'memory:unknown:all:process_count': expectUnitless([1]), |
692 'memory:unknown:all:subsystem:malloc': expectBytes([4096]), | 734 'memory:unknown:all:subsystem:malloc:effective_size': expectBytes([4096]), |
693 'memory:unknown:all:subsystem:sqlite': expectBytes([8192]), | 735 'memory:unknown:all:subsystem:sqlite:effective_size': expectBytes([8192]), |
694 'memory:unknown:browser:process_count': expectUnitless([1]), | 736 'memory:unknown:browser:process_count': expectUnitless([1]), |
695 'memory:unknown:browser:subsystem:malloc': expectBytes([4096]), | 737 'memory:unknown:browser:subsystem:malloc:effective_size': |
696 'memory:unknown:browser:subsystem:sqlite': expectBytes([8192]) | 738 expectBytes([4096]), |
| 739 'memory:unknown:browser:subsystem:sqlite:effective_size': |
| 740 expectBytes([8192]) |
697 }); | 741 }); |
698 | 742 |
699 test('dumpIdBrowserClashThrows', function() { | 743 test('dumpIdBrowserClashThrows', function() { |
700 var model = tr.c.TestUtils.newModel(function(model) { | 744 var model = tr.c.TestUtils.newModel(function(model) { |
701 var pWebView = createWebViewProcess(model); | 745 var pWebView = createWebViewProcess(model); |
702 var pChrome = createChromeBrowserProcess(model); | 746 var pChrome = createChromeBrowserProcess(model); |
703 | 747 |
704 var gmd = addGlobalMemoryDump(model, 10); | 748 var gmd = addGlobalMemoryDump(model, 10); |
705 addProcessMemoryDump(gmd, pWebView, 9); | 749 addProcessMemoryDump(gmd, pWebView, 9); |
706 addProcessMemoryDump(gmd, pChrome, 11); | 750 addProcessMemoryDump(gmd, pChrome, 11); |
707 }); | 751 }); |
708 var valueList = new tr.metrics.ValueList(); | 752 var valueList = new tr.metrics.ValueList(); |
709 | 753 |
710 assert.throws(function() { | 754 assert.throws(function() { |
711 tr.metrics.sh.memoryMetric(valueList, model); | 755 tr.metrics.sh.memoryMetric(valueList, model); |
712 }, 'Memory dump ID clash across multiple browsers with PIDs: 1 and 2'); | 756 }, 'Memory dump ID clash across multiple browsers with PIDs: 1 and 2'); |
713 }); | 757 }); |
714 }); | 758 }); |
715 </script> | 759 </script> |
OLD | NEW |