168098 2017-02-09 19:41:50 -0800 Improve IOSurfacePool logging 2017-02-09 21:28:59 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser thorton oldest_to_newest 1275195 0 simon.fraser 2017-02-09 19:41:50 -0800 Improve IOSurfacePool logging 1275196 1 301120 simon.fraser 2017-02-09 19:42:34 -0800 Created attachment 301120 Patch 1275198 2 301120 sam 2017-02-09 20:01:23 -0800 Comment on attachment 301120 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301120&action=review > Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp:44 > +#define ENABLE_IOSURFACE_POOL_STATISTICS 1 Do you really want to define this to 1? 1275204 3 301120 simon.fraser 2017-02-09 20:12:36 -0800 Comment on attachment 301120 Patch I don't, no. Ignore that line. 1275208 4 301120 thorton 2017-02-09 20:18:14 -0800 Comment on attachment 301120 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301120&action=review > Source/WebCore/platform/graphics/cg/IOSurfacePool.cpp:177 > + WTFLogAlways("IOSurfacePool::addSurface %p (should cache %d) m_maximumBytesCached=%lu", surface.get(), shouldCacheSurface(*surface), m_maximumBytesCached); I don't think you meant to WTFLogAlways here? 1275222 5 simon.fraser 2017-02-09 21:28:59 -0800 https://trac.webkit.org/r212043 301120 2017-02-09 19:42:34 -0800 2017-02-09 20:18:14 -0800 Patch bug-168098-20170209194008.patch text/plain 7419 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDM5Mzc3ODM5OTBmYjg0 ZTJkZDhlZjYzMjdhMzVkODQ5ZmU5NTIzZS4uZmJkODYyNzM4NDg3MmE4Mjk0MDBlYzFmN2I5N2Nh YTVmNjJjYTk0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE3LTAyLTA5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEltcHJvdmUgSU9T dXJmYWNlUG9vbCBsb2dnaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjgwOTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBQYXNzIGEgc3RyaW5nIHRvIERVTVBfUE9PTF9TVEFUSVNUSUNTIHNvIHdlIGNh biB0ZWxsIHdoYXQncyB0cmlnZ2VyaW5nIHRoZQorICAgICAgICBsb2dnaW5nLgorCisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSU9TdXJmYWNlUG9vbC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpJT1N1cmZhY2VQb29sOjp0YWtlU3VyZmFjZSk6CisgICAgICAgIChXZWJDb3JlOjpJT1N1 cmZhY2VQb29sOjphZGRTdXJmYWNlKToKKyAgICAgICAgKFdlYkNvcmU6OklPU3VyZmFjZVBvb2w6 OmV2aWN0KToKKyAgICAgICAgKFdlYkNvcmU6OklPU3VyZmFjZVBvb2w6OmNvbGxlY3Rpb25UaW1l ckZpcmVkKToKKyAgICAgICAgKFdlYkNvcmU6OklPU3VyZmFjZVBvb2w6OnNob3dQb29sU3RhdGlz dGljcyk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cvSU9TdXJmYWNlUG9vbC5oOgor CiAyMDE3LTAyLTA2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlLWxhbmQgcjIxMDA5NSAoYXZvaWQgYSB0aWxlIHJldmFsaWRhdGlvbiBvbiBzY2Fs ZSBjaGFuZ2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j Zy9JT1N1cmZhY2VQb29sLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nn L0lPU3VyZmFjZVBvb2wuY3BwCmluZGV4IGI4MWQ1OGU2M2QxOGIyNmFmNGRiMTRmYTVjM2E4YTBm ZTBiZmYxNDguLjhkMjNiZTczOWYxZDFkMWNiMTZhOGRjZDlhZDdjYjRhMGRiMTJkYzQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBv b2wuY3BwCkBAIC00MSwxMSArNDEsMTEgQEAgY29uc3Qgc2l6ZV90IGRlZmF1bHRNYXhpbXVtQnl0 ZXNDYWNoZWQgPSAxMDI0ICogMTAyNCAqIDY0OwogLy8gdGhleSBjYW4ndCBiZSBpbW1lZGlhdGVs eSByZXR1cm5lZCB3aGVuIHJlcXVlc3RlZCAoYnV0IHdpbGwgYmUgZnJlZWQgdXAgaW4gdGhlIGZ1 dHVyZSkuCiBjb25zdCBzaXplX3QgbWF4aW11bUluVXNlQnl0ZXMgPSBkZWZhdWx0TWF4aW11bUJ5 dGVzQ2FjaGVkIC8gMjsKIAotI2RlZmluZSBFTkFCTEVfSU9TVVJGQUNFX1BPT0xfU1RBVElTVElD UyBmYWxzZQorI2RlZmluZSBFTkFCTEVfSU9TVVJGQUNFX1BPT0xfU1RBVElTVElDUyAxCiAjaWYg RU5BQkxFX0lPU1VSRkFDRV9QT09MX1NUQVRJU1RJQ1MKLSNkZWZpbmUgRFVNUF9QT09MX1NUQVRJ U1RJQ1MoKSBkbyB7IHNob3dQb29sU3RhdGlzdGljcygpOyB9IHdoaWxlICgwKTsKKyNkZWZpbmUg RFVNUF9QT09MX1NUQVRJU1RJQ1MocmVhc29uKSBkbyB7IHNob3dQb29sU3RhdGlzdGljcyhyZWFz b24pOyB9IHdoaWxlICgwKTsKICNlbHNlCi0jZGVmaW5lIERVTVBfUE9PTF9TVEFUSVNUSUNTKCkg KCh2b2lkKTApCisjZGVmaW5lIERVTVBfUE9PTF9TVEFUSVNUSUNTKHJlYXNvbikgKCh2b2lkKTAp CiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtMTEyLDcgKzExMiw3IEBAIHN0ZDo6 dW5pcXVlX3B0cjxJT1N1cmZhY2U+IElPU3VyZmFjZVBvb2w6OnRha2VTdXJmYWNlKEludFNpemUg c2l6ZSwgQ0dDb2xvclNwYWNlCiAgICAgQ2FjaGVkU3VyZmFjZU1hcDo6aXRlcmF0b3IgbWFwSXRl ciA9IG1fY2FjaGVkU3VyZmFjZXMuZmluZChzaXplKTsKIAogICAgIGlmIChtYXBJdGVyID09IG1f Y2FjaGVkU3VyZmFjZXMuZW5kKCkpIHsKLSAgICAgICAgRFVNUF9QT09MX1NUQVRJU1RJQ1MoKTsK KyAgICAgICAgRFVNUF9QT09MX1NUQVRJU1RJQ1MoInRha2VTdXJmYWNlIC0gbm9uZSB3aXRoIG1h dGNoaW5nIHNpemUiKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCkBAIC0xMzQs NyArMTM0LDcgQEAgc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFjZT4gSU9TdXJmYWNlUG9vbDo6dGFr ZVN1cmZhY2UoSW50U2l6ZSBzaXplLCBDR0NvbG9yU3BhY2UKIAogICAgICAgICBzdXJmYWNlLT5z ZXRJc1ZvbGF0aWxlKGZhbHNlKTsKIAotICAgICAgICBEVU1QX1BPT0xfU1RBVElTVElDUygpOwor ICAgICAgICBEVU1QX1BPT0xfU1RBVElTVElDUygidGFrZVN1cmZhY2UgLSB0YWtpbmciKTsKICAg ICAgICAgcmV0dXJuIHN1cmZhY2U7CiAgICAgfQogCkBAIC0xNTEsMTEgKzE1MSwxMSBAQCBzdGQ6 OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBJT1N1cmZhY2VQb29sOjp0YWtlU3VyZmFjZShJbnRTaXpl IHNpemUsIENHQ29sb3JTcGFjZQogCiAgICAgICAgIHN1cmZhY2UtPnNldElzVm9sYXRpbGUoZmFs c2UpOwogCi0gICAgICAgIERVTVBfUE9PTF9TVEFUSVNUSUNTKCk7CisgICAgICAgIERVTVBfUE9P TF9TVEFUSVNUSUNTKCJ0YWtlU3VyZmFjZSAtIHRha2luZyBpbi11c2UiKTsKICAgICAgICAgcmV0 dXJuIHN1cmZhY2U7CiAgICAgfQogCi0gICAgRFVNUF9QT09MX1NUQVRJU1RJQ1MoKTsKKyAgICBE VU1QX1BPT0xfU1RBVElTVElDUygidGFrZVN1cmZhY2UgLSBmYWlsaW5nIik7CiAgICAgcmV0dXJu IG51bGxwdHI7CiB9CiAKQEAgLTE3NCw2ICsxNzQsNyBAQCBib29sIElPU3VyZmFjZVBvb2w6OnNo b3VsZENhY2hlU3VyZmFjZShjb25zdCBJT1N1cmZhY2UmIHN1cmZhY2UpIGNvbnN0CiAKIHZvaWQg SU9TdXJmYWNlUG9vbDo6YWRkU3VyZmFjZShzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBzdXJm YWNlKQogeworICAgIFdURkxvZ0Fsd2F5cygiSU9TdXJmYWNlUG9vbDo6YWRkU3VyZmFjZSAlcCAo c2hvdWxkIGNhY2hlICVkKSBtX21heGltdW1CeXRlc0NhY2hlZD0lbHUiLCBzdXJmYWNlLmdldCgp LCBzaG91bGRDYWNoZVN1cmZhY2UoKnN1cmZhY2UpLCBtX21heGltdW1CeXRlc0NhY2hlZCk7CiAg ICAgaWYgKCFzaG91bGRDYWNoZVN1cmZhY2UoKnN1cmZhY2UpKQogICAgICAgICByZXR1cm47CiAK QEAgLTE4NCwxMiArMTg1LDEyIEBAIHZvaWQgSU9TdXJmYWNlUG9vbDo6YWRkU3VyZmFjZShzdGQ6 OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBzdXJmYWNlKQogICAgIGlmIChzdXJmYWNlSXNJblVzZSkg ewogICAgICAgICBtX2luVXNlU3VyZmFjZXMucHJlcGVuZChXVEZNb3ZlKHN1cmZhY2UpKTsKICAg ICAgICAgc2NoZWR1bGVDb2xsZWN0aW9uVGltZXIoKTsKLSAgICAgICAgRFVNUF9QT09MX1NUQVRJ U1RJQ1MoKTsKKyAgICAgICAgRFVNUF9QT09MX1NUQVRJU1RJQ1MoImFkZFN1cmZhY2UgLSBpbi11 c2UiKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIGluc2VydFN1cmZhY2VJbnRvUG9v bChXVEZNb3ZlKHN1cmZhY2UpKTsKLSAgICBEVU1QX1BPT0xfU1RBVElTVElDUygpOworICAgIERV TVBfUE9PTF9TVEFUSVNUSUNTKCJhZGRTdXJmYWNlIik7CiB9CiAKIHZvaWQgSU9TdXJmYWNlUG9v bDo6aW5zZXJ0U3VyZmFjZUludG9Qb29sKHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IHN1cmZh Y2UpCkBAIC0yNDAsOCArMjQxLDExIEBAIHZvaWQgSU9TdXJmYWNlUG9vbDo6dHJ5RXZpY3RPbGRl c3RDYWNoZWRTdXJmYWNlKCkKIAogdm9pZCBJT1N1cmZhY2VQb29sOjpldmljdChzaXplX3QgYWRk aXRpb25hbFNpemUpCiB7CisgICAgRFVNUF9QT09MX1NUQVRJU1RJQ1MoImJlZm9yZSBldmljdCIp OworCiAgICAgaWYgKGFkZGl0aW9uYWxTaXplID49IG1fbWF4aW11bUJ5dGVzQ2FjaGVkKSB7CiAg ICAgICAgIGRpc2NhcmRBbGxTdXJmYWNlcygpOworICAgICAgICBEVU1QX1BPT0xfU1RBVElTVElD UygiYWZ0ZXIgZXZpY3QgYWxsIik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTI2MSw2 ICsyNjUsOCBAQCB2b2lkIElPU3VyZmFjZVBvb2w6OmV2aWN0KHNpemVfdCBhZGRpdGlvbmFsU2l6 ZSkKIAogICAgIHdoaWxlIChtX2luVXNlQnl0ZXNDYWNoZWQgPiBtYXhpbXVtSW5Vc2VCeXRlcyB8 fCBtX2J5dGVzQ2FjaGVkID4gdGFyZ2V0U2l6ZSkKICAgICAgICAgdHJ5RXZpY3RJblVzZVN1cmZh Y2UoKTsKKworICAgIERVTVBfUE9PTF9TVEFUSVNUSUNTKCJhZnRlciBldmljdCIpOwogfQogCiB2 b2lkIElPU3VyZmFjZVBvb2w6OmNvbGxlY3RJblVzZVN1cmZhY2VzKCkKQEAgLTMxMCw3ICszMTYs NyBAQCB2b2lkIElPU3VyZmFjZVBvb2w6OmNvbGxlY3Rpb25UaW1lckZpcmVkKCkKICAgICAgICAg bV9jb2xsZWN0aW9uVGltZXIuc3RvcCgpOwogCiAgICAgcGxhdGZvcm1HYXJiYWdlQ29sbGVjdE5v dygpOwotICAgIERVTVBfUE9PTF9TVEFUSVNUSUNTKCk7CisgICAgRFVNUF9QT09MX1NUQVRJU1RJ Q1MoImNvbGxlY3Rpb25UaW1lckZpcmVkIik7CiB9CiAKIHZvaWQgSU9TdXJmYWNlUG9vbDo6c2No ZWR1bGVDb2xsZWN0aW9uVGltZXIoKQpAQCAtMzMxLDEwICszMzcsMTAgQEAgdm9pZCBJT1N1cmZh Y2VQb29sOjpkaXNjYXJkQWxsU3VyZmFjZXMoKQogICAgIHBsYXRmb3JtR2FyYmFnZUNvbGxlY3RO b3coKTsKIH0KIAotdm9pZCBJT1N1cmZhY2VQb29sOjpzaG93UG9vbFN0YXRpc3RpY3MoKQordm9p ZCBJT1N1cmZhY2VQb29sOjpzaG93UG9vbFN0YXRpc3RpY3MoY29uc3QgY2hhciogcmVhc29uKQog ewogI2lmIEVOQUJMRV9JT1NVUkZBQ0VfUE9PTF9TVEFUSVNUSUNTCi0gICAgV1RGTG9nQWx3YXlz KCJJT1N1cmZhY2VQb29sIFN0YXRpc3RpY3NcbiIpOworICAgIFdURkxvZ0Fsd2F5cygiSU9TdXJm YWNlUG9vbCBTdGF0aXN0aWNzOiAlc1xuIiwgcmVhc29uKTsKICAgICB1bnNpZ25lZCB0b3RhbFN1 cmZhY2VzID0gMDsKICAgICBzaXplX3QgdG90YWxTaXplID0gMDsKICAgICBzaXplX3QgdG90YWxQ dXJnZWFibGVTaXplID0gMDsKQEAgLTM1Niw3ICszNjIsNyBAQCB2b2lkIElPU3VyZmFjZVBvb2w6 OnNob3dQb29sU3RhdGlzdGljcygpCiAgICAgICAgIHRvdGFsU2l6ZSArPSBxdWV1ZVNpemU7CiAg ICAgICAgIHRvdGFsUHVyZ2VhYmxlU2l6ZSArPSBxdWV1ZVB1cmdlYWJsZVNpemU7CiAKLSAgICAg ICAgV1RGTG9nQWx3YXlzKCIgICAlZCB4ICVkOiAlenUgc3VyZmFjZXMgZm9yICV6ZCBLQiAoJXpk IEtCIHB1cmdlYWJsZSkiLCBrZXlBbmRTdXJmYWNlcy5rZXkud2lkdGgoKSwga2V5QW5kU3VyZmFj ZXMua2V5LmhlaWdodCgpLCBrZXlBbmRTdXJmYWNlcy52YWx1ZS5zaXplKCksIHF1ZXVlU2l6ZSAv IDEwMjQsIHF1ZXVlUHVyZ2VhYmxlU2l6ZSAvIDEwMjQpOworICAgICAgICBXVEZMb2dBbHdheXMo IiAgICVkIHggJWQ6ICV6dSBzdXJmYWNlcyBmb3IgJS4yZiBNQiAoJS4yZiBNQiBwdXJnZWFibGUp Iiwga2V5QW5kU3VyZmFjZXMua2V5LndpZHRoKCksIGtleUFuZFN1cmZhY2VzLmtleS5oZWlnaHQo KSwga2V5QW5kU3VyZmFjZXMudmFsdWUuc2l6ZSgpLCBxdWV1ZVNpemUgLyAoMTAyNC4wICogMTAy NC4wKSwgcXVldWVQdXJnZWFibGVTaXplIC8gKDEwMjQuMCAqIDEwMjQuMCkpOwogICAgIH0KIAog ICAgIHNpemVfdCBpblVzZVNpemUgPSAwOwpAQCAtMzY2LDEzICszNzIsMTMgQEAgdm9pZCBJT1N1 cmZhY2VQb29sOjpzaG93UG9vbFN0YXRpc3RpY3MoKQogICAgIH0KIAogICAgIHRvdGFsU2l6ZSAr PSBpblVzZVNpemU7Ci0gICAgV1RGTG9nQWx3YXlzKCIgICBJTiBVU0U6ICV6dSBzdXJmYWNlcyBm b3IgJXpkIEtCIiwgbV9pblVzZVN1cmZhY2VzLnNpemUoKSwgaW5Vc2VTaXplIC8gMTAyNCk7Cisg ICAgV1RGTG9nQWx3YXlzKCIgICBJTiBVU0U6ICV6dSBzdXJmYWNlcyBmb3IgJS4yZiBNQiIsIG1f aW5Vc2VTdXJmYWNlcy5zaXplKCksIGluVXNlU2l6ZSAvICgxMDI0LjAgKiAxMDI0LjApKTsKIAog ICAgIC8vIEZJWE1FOiBTaG91bGQgbW92ZSBjb25zaXN0ZW5jeSBjaGVja3MgZWxzZXdoZXJlLCBh bmQgYWx3YXlzIHBlcmZvcm0gdGhlbSBpbiBkZWJ1ZyBidWlsZHMuCiAgICAgQVNTRVJUKG1fYnl0 ZXNDYWNoZWQgPT0gdG90YWxTaXplKTsKICAgICBBU1NFUlQobV9ieXRlc0NhY2hlZCA8PSBtX21h eGltdW1CeXRlc0NhY2hlZCk7CiAKLSAgICBXVEZMb2dBbHdheXMoIiAgIFRPVEFMOiAlZCBzdXJm YWNlcyBmb3IgJXpkIEtCICglemQgS0IgcHVyZ2VhYmxlKVxuIiwgdG90YWxTdXJmYWNlcywgdG90 YWxTaXplIC8gMTAyNCwgdG90YWxQdXJnZWFibGVTaXplIC8gMTAyNCk7CisgICAgV1RGTG9nQWx3 YXlzKCIgICBUT1RBTDogJWQgc3VyZmFjZXMgZm9yICUuMmYgTUIgKCUuMmYgTUIgcHVyZ2VhYmxl KVxuIiwgdG90YWxTdXJmYWNlcywgdG90YWxTaXplIC8gKDEwMjQuMCAqIDEwMjQuMCksIHRvdGFs UHVyZ2VhYmxlU2l6ZSAvICgxMDI0LjAgKiAxMDI0LjApKTsKICNlbmRpZgogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JT1N1cmZhY2VQb29sLmgg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9JT1N1cmZhY2VQb29sLmgKaW5k ZXggMzQ5YTNiYzNkMjdjNTQ2OTZkN2I1YjU2Mzk1ZjNmM2UyZjI3ZjNjNC4uMGFlMzIwZDExNTg0 ZmQxNTMwMzRhMmUzODY3ZDE5MmEyNzFjZjE5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2cvSU9TdXJmYWNlUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2NnL0lPU3VyZmFjZVBvb2wuaApAQCAtNTMsOCArNTMsNiBAQCBw dWJsaWM6CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFBvb2xTaXplKHNpemVfdCk7CiAK LSAgICB2b2lkIHNob3dQb29sU3RhdGlzdGljcygpOwotCiBwcml2YXRlOgogICAgIElPU3VyZmFj ZVBvb2woKTsKIApAQCAtOTIsNiArOTAsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBwbGF0Zm9y bUdhcmJhZ2VDb2xsZWN0Tm93KCk7CiAKKyAgICB2b2lkIHNob3dQb29sU3RhdGlzdGljcyhjb25z dCBjaGFyKik7CisKICAgICBUaW1lciBtX2NvbGxlY3Rpb25UaW1lcjsKICAgICBDYWNoZWRTdXJm YWNlTWFwIG1fY2FjaGVkU3VyZmFjZXM7CiAgICAgQ2FjaGVkU3VyZmFjZVF1ZXVlIG1faW5Vc2VT dXJmYWNlczsK