142593 2015-03-11 14:14:00 -0700 Many users of Heap::reportExtraMemory* are wrong, causing lots of memory growth 2015-03-11 15:32:47 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 142457 1 ggaren ggaren cdumez fpizlo kling mhahnenb oldest_to_newest 1076430 0 ggaren 2015-03-11 14:14:00 -0700 These users are wrong: JSReportExtraMemoryCost SparseArrayValueMap JSDocument JSImageData JSNodeList collectionindex canvas imageloader mediaelement sourcebuffer xmlhttprequest They only report cost upon allocation, not upon visit. This can cause lots of memory growth, since it makes the heap thing that eden collection is constantly succeeding in reclaiming huge amounts of memory. 1076457 1 248455 ggaren 2015-03-11 15:03:23 -0700 Created attachment 248455 Patch 1076460 2 248455 kling 2015-03-11 15:25:15 -0700 Comment on attachment 248455 Patch r=me 1076461 3 ggaren 2015-03-11 15:32:47 -0700 Committed r181411: <http://trac.webkit.org/changeset/181411> 248455 2015-03-11 15:03:23 -0700 2015-03-11 15:25:15 -0700 Patch bug-142593-20150311150258.patch text/plain 13196 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTgxNDA3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBA CisyMDE1LTAzLTExICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CisKKyAgICAg ICAgTWFueSB1c2VycyBvZiBIZWFwOjpyZXBvcnRFeHRyYU1lbW9yeSogYXJlIHdyb25nLCBjYXVz aW5nIGxvdHMgb2YgbWVtb3J5IGdyb3d0aAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRvcHQgZGVwcmVjYXRlZFJlcG9ydEV4dHJhTWVtb3J5IGFzIGEg c2hvcnQtdGVybSBmaXggZm9yIHJ1bmF3YXkKKyAgICAgICAgbWVtb3J5IGdyb3d0aCBpbiB0aGVz ZSBjYXNlcyB3aGVyZSB3ZSBoYXZlIG5vdCBhZG9wdGVkCisgICAgICAgIHJlcG9ydEV4dHJhTWVt b3J5VmlzaXRlZC4KKworICAgICAgICBMb25nLXRlcm0sIHdlIHNob3VsZCB1c2UgcmVwb3J0RXh0 cmFNZW1vcnlBbGxvY2F0ZWQrcmVwb3J0RXh0cmFNZW1vcnlWaXNpdGVkLgorICAgICAgICBUaGF0 J3MgdHJhY2tlZCBieSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQy NTk1LgorCisgICAgICAgICogQVBJL0pTQmFzZS5jcHA6CisgICAgICAgIChKU1JlcG9ydEV4dHJh TWVtb3J5Q29zdCk6CisgICAgICAgICogcnVudGltZS9TcGFyc2VBcnJheVZhbHVlTWFwLmNwcDoK KyAgICAgICAgKEpTQzo6U3BhcnNlQXJyYXlWYWx1ZU1hcDo6YWRkKToKKwogMjAxNS0wMy0xMSAg R2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlZmFjdG9yZWQg dGhlIEpTQzo6SGVhcCBleHRyYSBjb3N0IEFQSSBmb3IgY2xhcml0eSBhbmQgdG8gbWFrZSBzb21l IGtub3duIGJ1Z3MgbW9yZSBvYnZpb3VzCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJ L0pTQmFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0Jh c2UuY3BwCShyZXZpc2lvbiAxODE0MDcpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pT QmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0MCw5ICsxNDAsNyBAQCB2b2lkIEpTUmVwb3J0 RXh0cmFNZW1vcnlDb3N0KEpTQ29udGV4dFJlCiAgICAgRXhlY1N0YXRlKiBleGVjID0gdG9KUyhj dHgpOwogICAgIEpTTG9ja0hvbGRlciBsb2NrZXIoZXhlYyk7CiAKLSAgICAvLyBGSVhNRTogc3dp dGNoIHRvIGRlcHJlY2F0ZWRSZXBvcnRFeHRyYU1lbW9yeS4KLSAgICAvLyBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTkzCi0gICAgZXhlYy0+dm0oKS5oZWFwLnJl cG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkKHNpemUpOworICAgIGV4ZWMtPnZtKCkuaGVhcC5kZXBy ZWNhdGVkUmVwb3J0RXh0cmFNZW1vcnkoc2l6ZSk7CiB9CiAKIGV4dGVybiAiQyIgSlNfRVhQT1JU IHZvaWQgSlNTeW5jaHJvbm91c0dhcmJhZ2VDb2xsZWN0Rm9yRGVidWdnaW5nKEpTQ29udGV4dFJl Zik7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TcGFyc2VBcnJheVZhbHVl TWFwLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TcGFy c2VBcnJheVZhbHVlTWFwLmNwcAkocmV2aXNpb24gMTgxNDA3KQorKysgU291cmNlL0phdmFTY3Jp cHRDb3JlL3J1bnRpbWUvU3BhcnNlQXJyYXlWYWx1ZU1hcC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTgwLDkgKzgwLDkgQEAgU3BhcnNlQXJyYXlWYWx1ZU1hcDo6QWRkUmVzdWx0IFNwYXJzZUFycgog ICAgIEFkZFJlc3VsdCByZXN1bHQgPSBtX21hcC5hZGQoaSwgZW50cnkpOwogICAgIHNpemVfdCBj YXBhY2l0eSA9IG1fbWFwLmNhcGFjaXR5KCk7CiAgICAgaWYgKGNhcGFjaXR5ICE9IG1fcmVwb3J0 ZWRDYXBhY2l0eSkgewotICAgICAgICAvLyBGSVhNRTogU3dpdGNoIHRvIGRlcHJlY2F0ZWRSZXBv cnRFeHRyYU1lbW9yeSwgb3IgYWRvcHQgcmVwb3J0RXh0cmFNZW1vcnlWaXNpdGVkLgotICAgICAg ICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTkzCi0gICAg ICAgIEhlYXA6OmhlYXAoYXJyYXkpLT5yZXBvcnRFeHRyYU1lbW9yeUFsbG9jYXRlZCgoY2FwYWNp dHkgLSBtX3JlcG9ydGVkQ2FwYWNpdHkpICogKHNpemVvZih1bnNpZ25lZCkgKyBzaXplb2YoV3Jp dGVCYXJyaWVyPFVua25vd24+KSkpOworICAgICAgICAvLyBGSVhNRTogQWRvcHQgcmVwb3J0RXh0 cmFNZW1vcnlWaXNpdGVkLCBhbmQgc3dpdGNoIHRvIHJlcG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVk LgorICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQy NTk1CisgICAgICAgIEhlYXA6OmhlYXAoYXJyYXkpLT5kZXByZWNhdGVkUmVwb3J0RXh0cmFNZW1v cnkoKGNhcGFjaXR5IC0gbV9yZXBvcnRlZENhcGFjaXR5KSAqIChzaXplb2YodW5zaWduZWQpICsg c2l6ZW9mKFdyaXRlQmFycmllcjxVbmtub3duPikpKTsKICAgICAgICAgbV9yZXBvcnRlZENhcGFj aXR5ID0gY2FwYWNpdHk7CiAgICAgfQogICAgIHJldHVybiByZXN1bHQ7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxODE0MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwzOSBAQAorMjAxNS0wMy0xMSAgR2VvZmZyZXkgR2FyZW4gIDxnZ2Fy ZW5AYXBwbGUuY29tPgorCisgICAgICAgIE1hbnkgdXNlcnMgb2YgSGVhcDo6cmVwb3J0RXh0cmFN ZW1vcnkqIGFyZSB3cm9uZywgY2F1c2luZyBsb3RzIG9mIG1lbW9yeSBncm93dGgKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjU5MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkb3B0IGRlcHJlY2F0ZWRS ZXBvcnRFeHRyYU1lbW9yeSBhcyBhIHNob3J0LXRlcm0gZml4IGZvciBydW5hd2F5CisgICAgICAg IG1lbW9yeSBncm93dGggaW4gdGhlc2UgY2FzZXMgd2hlcmUgd2UgaGF2ZSBub3QgYWRvcHRlZAor ICAgICAgICByZXBvcnRFeHRyYU1lbW9yeVZpc2l0ZWQuCisKKyAgICAgICAgTG9uZy10ZXJtLCB3 ZSBzaG91bGQgdXNlIHJlcG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkK3JlcG9ydEV4dHJhTWVtb3J5 VmlzaXRlZC4KKyAgICAgICAgVGhhdCdzIHRyYWNrZWQgYnkgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE0MjU5NS4KKworICAgICAgICBVc2luZyBJT1NEZWJ1ZywgSSBj YW4gc2VlIHRoYXQgdGhlIGNhbnZhcyBzdHJlc3MgdGVzdCBAIGh0dHA6Ly9qc2ZpZGRsZS5uZXQv ZnZ5dzRiYTAvLAorICAgICAgICB3aGljaCB1c2VkIHRvIGtlZXAgPiAxMDAwIDFNQiBOb25Wb2xh dGlsZSBHUFUgYWxsb2NhdGlvbnMgbGl2ZSwgbm93IGtlZXBzIGFib3V0IDEwIGxpdmUuCisKKyAg ICAgICAgKiBNb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTb3VyY2VCdWZmZXI6OnJlcG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkKToKKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9KU0RvY3VtZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnRvSlMpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTSW1hZ2VEYXRhQ3VzdG9tLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnRvSlMpOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTTm9kZUxpc3RD dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlV3JhcHBlcik6CisgICAgICAgICog ZG9tL0NvbGxlY3Rpb25JbmRleENhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJlcG9ydEV4 dHJhTWVtb3J5QWxsb2NhdGVkRm9yQ29sbGVjdGlvbkluZGV4Q2FjaGUpOgorICAgICAgICAqIGh0 bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTENhbnZhc0Vs ZW1lbnQ6OmNyZWF0ZUltYWdlQnVmZmVyKToKKyAgICAgICAgKiBodG1sL0hUTUxJbWFnZUxvYWRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSW1hZ2VMb2FkZXI6OmltYWdlQ2hhbmdlZCk6 CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKToKKyAgICAgICAgKiB4bWwvWE1MSHR0 cFJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmRyb3BQcm90 ZWN0aW9uKToKKwogMjAxNS0wMy0xMSAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJlZmFjdG9yZWQgdGhlIEpTQzo6SGVhcCBleHRyYSBjb3N0IEFQSSBmb3Ig Y2xhcml0eSBhbmQgdG8gbWFrZSBzb21lIGtub3duIGJ1Z3MgbW9yZSBvYnZpb3VzCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIu Y3BwCShyZXZpc2lvbiAxODE0MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291 cmNlL1NvdXJjZUJ1ZmZlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE5OTksOSArMTk5OSw5IEBA IHZvaWQgU291cmNlQnVmZmVyOjpyZXBvcnRFeHRyYU1lbW9yeUFsbG8KIAogICAgIEpTQzo6SlNM b2NrSG9sZGVyIGxvY2soc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpKTsKICAgICBpZiAo ZXh0cmFNZW1vcnlDb3N0RGVsdGEgPiAwKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBTd2l0Y2ggdG8g ZGVwcmVjYXRlZFJlcG9ydEV4dHJhTWVtb3J5LCBvciBhZG9wdCByZXBvcnRFeHRyYU1lbW9yeVZp c2l0ZWQuCi0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNDI1OTMKLSAgICAgICAgc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpLmhlYXAucmVw b3J0RXh0cmFNZW1vcnlBbGxvY2F0ZWQoZXh0cmFNZW1vcnlDb3N0RGVsdGEpOworICAgICAgICAv LyBGSVhNRTogQWRvcHQgcmVwb3J0RXh0cmFNZW1vcnlWaXNpdGVkLCBhbmQgc3dpdGNoIHRvIHJl cG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkLgorICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTk1CisgICAgICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKS0+dm0oKS5oZWFwLmRlcHJlY2F0ZWRSZXBvcnRFeHRyYU1lbW9yeShleHRyYU1lbW9yeUNv c3REZWx0YSk7CiAgICAgfQogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0RvY3VtZW50Q3VzdG9tLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9KU0RvY3VtZW50Q3VzdG9tLmNwcAkocmV2aXNpb24gMTgxNDA3KQorKysgU291cmNlL1dl YkNvcmUvYmluZGluZ3MvanMvSlNEb2N1bWVudEN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTEwOSw5ICsxMDksOSBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlKiBleGVjLCBKU0RPTUdsb2Jh CiAgICAgICAgIGZvciAoTm9kZSogbiA9IGRvY3VtZW50OyBuOyBuID0gTm9kZVRyYXZlcnNhbDo6 bmV4dCgqbikpCiAgICAgICAgICAgICBub2RlQ291bnQrKzsKICAgICAgICAgCi0gICAgICAgIC8v IEZJWE1FOiBTd2l0Y2ggdG8gZGVwcmVjYXRlZFJlcG9ydEV4dHJhTWVtb3J5LCBvciBhZG9wdCBy ZXBvcnRFeHRyYU1lbW9yeVZpc2l0ZWQuCi0gICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1OTMKLSAgICAgICAgZXhlYy0+aGVhcCgpLT5yZXBvcnRF eHRyYU1lbW9yeUFsbG9jYXRlZChub2RlQ291bnQgKiBzaXplb2YoTm9kZSkpOworICAgICAgICAv LyBGSVhNRTogQWRvcHQgcmVwb3J0RXh0cmFNZW1vcnlWaXNpdGVkLCBhbmQgc3dpdGNoIHRvIHJl cG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkLgorICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTk1CisgICAgICAgIGV4ZWMtPmhlYXAoKS0+ZGVwcmVj YXRlZFJlcG9ydEV4dHJhTWVtb3J5KG5vZGVDb3VudCAqIHNpemVvZihOb2RlKSk7CiAgICAgfQog CiAgICAgcmV0dXJuIHdyYXBwZXI7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9K U0ltYWdlRGF0YUN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGlu Z3MvanMvSlNJbWFnZURhdGFDdXN0b20uY3BwCShyZXZpc2lvbiAxODE0MDcpCisrKyBTb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9KU0ltYWdlRGF0YUN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTQ3LDkgKzQ3LDkgQEAgSlNWYWx1ZSB0b0pTKEV4ZWNTdGF0ZSogZXhlYywgSlNET01HbG9i YQogICAgIHdyYXBwZXIgPSBDUkVBVEVfRE9NX1dSQVBQRVIoZ2xvYmFsT2JqZWN0LCBJbWFnZURh dGEsIGltYWdlRGF0YSk7CiAgICAgSWRlbnRpZmllciBkYXRhTmFtZShleGVjLCAiZGF0YSIpOwog ICAgIHdyYXBwZXItPnB1dERpcmVjdChleGVjLT52bSgpLCBkYXRhTmFtZSwgdG9KUyhleGVjLCBn bG9iYWxPYmplY3QsIGltYWdlRGF0YS0+ZGF0YSgpKSwgRG9udERlbGV0ZSB8IFJlYWRPbmx5KTsK LSAgICAvLyBGSVhNRTogU3dpdGNoIHRvIGRlcHJlY2F0ZWRSZXBvcnRFeHRyYU1lbW9yeSwgb3Ig YWRvcHQgcmVwb3J0RXh0cmFNZW1vcnlWaXNpdGVkLgotICAgIC8vIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1OTMKLSAgICBleGVjLT5oZWFwKCktPnJlcG9ydEV4 dHJhTWVtb3J5QWxsb2NhdGVkKGltYWdlRGF0YS0+ZGF0YSgpLT5sZW5ndGgoKSk7CisgICAgLy8g RklYTUU6IEFkb3B0IHJlcG9ydEV4dHJhTWVtb3J5VmlzaXRlZCwgYW5kIHN3aXRjaCB0byByZXBv cnRFeHRyYU1lbW9yeUFsbG9jYXRlZC4KKyAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTQyNTk1CisgICAgZXhlYy0+aGVhcCgpLT5kZXByZWNhdGVkUmVwb3J0 RXh0cmFNZW1vcnkoaW1hZ2VEYXRhLT5kYXRhKCktPmxlbmd0aCgpKTsKICAgICAKICAgICByZXR1 cm4gd3JhcHBlcjsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTTm9kZUxp c3RDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT Tm9kZUxpc3RDdXN0b20uY3BwCShyZXZpc2lvbiAxODE0MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9qcy9KU05vZGVMaXN0Q3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjIsOSAr NjIsOSBAQCBib29sIEpTTm9kZUxpc3Q6OmdldE93blByb3BlcnR5U2xvdERlbGVnCiAKIEpTQzo6 SlNWYWx1ZSBjcmVhdGVXcmFwcGVyKEpTRE9NR2xvYmFsT2JqZWN0JiBnbG9iYWxPYmplY3QsIE5v ZGVMaXN0JiBub2RlTGlzdCkKIHsKLSAgICAvLyBGSVhNRTogU3dpdGNoIHRvIGRlcHJlY2F0ZWRS ZXBvcnRFeHRyYU1lbW9yeSwgb3IgYWRvcHQgcmVwb3J0RXh0cmFNZW1vcnlWaXNpdGVkLgotICAg IC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1OTMKLSAgICBn bG9iYWxPYmplY3Qudm0oKS5oZWFwLnJlcG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkKG5vZGVMaXN0 Lm1lbW9yeUNvc3QoKSk7CisgICAgLy8gRklYTUU6IEFkb3B0IHJlcG9ydEV4dHJhTWVtb3J5Vmlz aXRlZCwgYW5kIHN3aXRjaCB0byByZXBvcnRFeHRyYU1lbW9yeUFsbG9jYXRlZC4KKyAgICAvLyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTk1CisgICAgZ2xvYmFs T2JqZWN0LnZtKCkuaGVhcC5kZXByZWNhdGVkUmVwb3J0RXh0cmFNZW1vcnkobm9kZUxpc3QubWVt b3J5Q29zdCgpKTsKICAgICByZXR1cm4gY3JlYXRlTmV3V3JhcHBlcjxKU05vZGVMaXN0PigmZ2xv YmFsT2JqZWN0LCAmbm9kZUxpc3QpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vQ29s bGVjdGlvbkluZGV4Q2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9D b2xsZWN0aW9uSW5kZXhDYWNoZS5jcHAJKHJldmlzaW9uIDE4MTQwNykKKysrIFNvdXJjZS9XZWJD b3JlL2RvbS9Db2xsZWN0aW9uSW5kZXhDYWNoZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM0LDkg KzM0LDkgQEAgdm9pZCByZXBvcnRFeHRyYU1lbW9yeUFsbG9jYXRlZEZvckNvbGxlYwogewogICAg IEpTQzo6Vk0mIHZtID0gSlNET01XaW5kb3dCYXNlOjpjb21tb25WTSgpOwogICAgIEpTQzo6SlNM b2NrSG9sZGVyIGxvY2sodm0pOwotICAgIC8vIEZJWE1FOiBTd2l0Y2ggdG8gZGVwcmVjYXRlZFJl cG9ydEV4dHJhTWVtb3J5LCBvciBhZG9wdCByZXBvcnRFeHRyYU1lbW9yeVZpc2l0ZWQuCi0gICAg Ly8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjU5MwotICAgIHZt LmhlYXAucmVwb3J0RXh0cmFNZW1vcnlBbGxvY2F0ZWQoY29zdCk7CisgICAgLy8gRklYTUU6IEFk b3B0IHJlcG9ydEV4dHJhTWVtb3J5VmlzaXRlZCwgYW5kIHN3aXRjaCB0byByZXBvcnRFeHRyYU1l bW9yeUFsbG9jYXRlZC4KKyAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQyNTk1CisgICAgdm0uaGVhcC5kZXByZWNhdGVkUmVwb3J0RXh0cmFNZW1vcnkoY29z dCk7CiB9CiAKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQu Y3BwCShyZXZpc2lvbiAxODE0MDcpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNF bGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTc2LDkgKzU3Niw5IEBAIHZvaWQgSFRNTENh bnZhc0VsZW1lbnQ6OmNyZWF0ZUltYWdlQnVmZmUKIAogICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxv Y2soc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLT52bSgpKTsKICAgICBzaXplX3QgbnVtQnl0ZXMg PSA0ICogbV9pbWFnZUJ1ZmZlci0+aW50ZXJuYWxTaXplKCkud2lkdGgoKSAqIG1faW1hZ2VCdWZm ZXItPmludGVybmFsU2l6ZSgpLmhlaWdodCgpOwotICAgIC8vIEZJWE1FOiBTd2l0Y2ggdG8gZGVw cmVjYXRlZFJlcG9ydEV4dHJhTWVtb3J5LCBvciBhZG9wdCByZXBvcnRFeHRyYU1lbW9yeVZpc2l0 ZWQuCi0gICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjU5 MwotICAgIHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKS5oZWFwLnJlcG9ydEV4dHJhTWVt b3J5QWxsb2NhdGVkKG51bUJ5dGVzKTsKKyAgICAvLyBGSVhNRTogQWRvcHQgcmVwb3J0RXh0cmFN ZW1vcnlWaXNpdGVkLCBhbmQgc3dpdGNoIHRvIHJlcG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkLgor ICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1OTUKKyAg ICBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCktPnZtKCkuaGVhcC5kZXByZWNhdGVkUmVwb3J0RXh0 cmFNZW1vcnkobnVtQnl0ZXMpOwogCiAjaWYgVVNFKElPU1VSRkFDRV9DQU5WQVNfQkFDS0lOR19T VE9SRSkgfHwgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBpZiAobV9jb250ZXh0 ICYmIG1fY29udGV4dC0+aXMyZCgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSW1h Z2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEltYWdl TG9hZGVyLmNwcAkocmV2aXNpb24gMTgxNDA3KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M SW1hZ2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04OCw5ICs4OCw5IEBAIHZvaWQgSFRN TEltYWdlTG9hZGVyOjppbWFnZUNoYW5nZWQoQ2FjaGUKICAgICAgICAgaWYgKCFlbGVtZW50KCku aW5Eb2N1bWVudCgpKSB7CiAgICAgICAgICAgICBKU0M6OlZNJiB2bSA9IEpTRE9NV2luZG93QmFz ZTo6Y29tbW9uVk0oKTsKICAgICAgICAgICAgIEpTQzo6SlNMb2NrSG9sZGVyIGxvY2sodm0pOwot ICAgICAgICAgICAgLy8gRklYTUU6IFN3aXRjaCB0byBkZXByZWNhdGVkUmVwb3J0RXh0cmFNZW1v cnksIG9yIGFkb3B0IHJlcG9ydEV4dHJhTWVtb3J5VmlzaXRlZC4KLSAgICAgICAgICAgIC8vIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1OTMKLSAgICAgICAgICAg IHZtLmhlYXAucmVwb3J0RXh0cmFNZW1vcnlBbGxvY2F0ZWQoY2FjaGVkSW1hZ2UtPmVuY29kZWRT aXplKCkpOworICAgICAgICAgICAgLy8gRklYTUU6IEFkb3B0IHJlcG9ydEV4dHJhTWVtb3J5Vmlz aXRlZCwgYW5kIHN3aXRjaCB0byByZXBvcnRFeHRyYU1lbW9yeUFsbG9jYXRlZC4KKyAgICAgICAg ICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1OTUKKyAg ICAgICAgICAgIHZtLmhlYXAuZGVwcmVjYXRlZFJlcG9ydEV4dHJhTWVtb3J5KGNhY2hlZEltYWdl LT5lbmNvZGVkU2l6ZSgpKTsKICAgICAgICAgfQogICAgIH0KIApJbmRleDogU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCShyZXZpc2lvbiAxODE0MDcpCisrKyBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Mzcs OSArNjM3LDkgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpyZW1vdmVkRnJvbShDb250YQogICAg ICAgICAgICAgbV9yZXBvcnRlZEV4dHJhTWVtb3J5Q29zdCA9IGV4dHJhTWVtb3J5Q29zdDsKIAog ICAgICAgICAgICAgaWYgKGV4dHJhTWVtb3J5Q29zdERlbHRhID4gMCkgewotICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBTd2l0Y2ggdG8gZGVwcmVjYXRlZFJlcG9ydEV4dHJhTWVtb3J5LCBvciBh ZG9wdCByZXBvcnRFeHRyYU1lbW9yeVZpc2l0ZWQuCi0gICAgICAgICAgICAgICAgLy8gaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjU5MwotICAgICAgICAgICAgICAg IHZtLmhlYXAucmVwb3J0RXh0cmFNZW1vcnlBbGxvY2F0ZWQoZXh0cmFNZW1vcnlDb3N0RGVsdGEp OworICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBBZG9wdCByZXBvcnRFeHRyYU1lbW9yeVZpc2l0 ZWQsIGFuZCBzd2l0Y2ggdG8gcmVwb3J0RXh0cmFNZW1vcnlBbGxvY2F0ZWQuCisgICAgICAgICAg ICAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjU5NQor ICAgICAgICAgICAgICAgIHZtLmhlYXAuZGVwcmVjYXRlZFJlcG9ydEV4dHJhTWVtb3J5KGV4dHJh TWVtb3J5Q29zdERlbHRhKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAkocmV2aXNpb24gMTgxNDA3KQorKysg U291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt OTEzLDkgKzkxMyw5IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmRyb3BQcm90ZWN0aW9uKCkKICAg ICAvLyByZXBvcnQgdGhlIGV4dHJhIGNvc3QgYXQgdGhhdCBwb2ludC4KICAgICBKU0M6OlZNJiB2 bSA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+dm0oKTsKICAgICBKU0M6OkpTTG9ja0hvbGRl ciBsb2NrKHZtKTsKLSAgICAvLyBGSVhNRTogU3dpdGNoIHRvIGRlcHJlY2F0ZWRSZXBvcnRFeHRy YU1lbW9yeSwgb3IgYWRvcHQgcmVwb3J0RXh0cmFNZW1vcnlWaXNpdGVkLgotICAgIC8vIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDI1OTMKLSAgICB2bS5oZWFwLnJl cG9ydEV4dHJhTWVtb3J5QWxsb2NhdGVkKG1fcmVzcG9uc2VCdWlsZGVyLmxlbmd0aCgpICogMik7 CisgICAgLy8gRklYTUU6IEFkb3B0IHJlcG9ydEV4dHJhTWVtb3J5VmlzaXRlZCwgYW5kIHN3aXRj aCB0byByZXBvcnRFeHRyYU1lbW9yeUFsbG9jYXRlZC4KKyAgICAvLyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNTk1CisgICAgdm0uaGVhcC5kZXByZWNhdGVkUmVw b3J0RXh0cmFNZW1vcnkobV9yZXNwb25zZUJ1aWxkZXIubGVuZ3RoKCkgKiAyKTsKIAogICAgIHVu c2V0UGVuZGluZ0FjdGl2aXR5KHRoaXMpOwogfQo=