200024 2019-07-22 18:46:32 -0700 [bmalloc] Each IsoPage gets 1MB VA because VMHeap::tryAllocateLargeChunk rounds up 2019-09-21 02:09:08 -0700 1 1 1 Unclassified WebKit bmalloc WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki benjamin cdumez cmarcelo dbates ews-watchlist ggaren keith_miller ljin.zq mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1554962 0 ysuzuki 2019-07-22 18:46:32 -0700 Finally, we found the issue! 1554963 1 ysuzuki 2019-07-22 18:46:57 -0700 <rdar://problem/53275201> 1554977 2 374665 ysuzuki 2019-07-22 19:30:50 -0700 Created attachment 374665 Patch 1554978 3 374665 saam 2019-07-22 19:37:18 -0700 Comment on attachment 374665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374665&action=review > Source/bmalloc/bmalloc/IsoPage.cpp:35 > + return tryVMAllocate(pageSize, pageSize, VMTag::IsoHeap); 👌 1554979 4 374665 mark.lam 2019-07-22 19:38:29 -0700 Comment on attachment 374665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374665&action=review > Source/WebCore/page/ResourceUsageOverlay.h:61 > - static const int normalHeight = 160; > + static const int normalHeight = 180; Is this necessary? 1554980 5 374665 ysuzuki 2019-07-22 19:39:47 -0700 Comment on attachment 374665 Patch Thanks! Landing. 1554981 6 374665 ysuzuki 2019-07-22 19:40:49 -0700 Comment on attachment 374665 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374665&action=review >> Source/WebCore/page/ResourceUsageOverlay.h:61 >> + static const int normalHeight = 180; > > Is this necessary? Without this change, ResourceOverlay failed to show all the categories since now we added IsoHeap data line :) 1554982 7 ysuzuki 2019-07-22 19:43:19 -0700 Committed r247714: <https://trac.webkit.org/changeset/247714> 1573057 8 ysuzuki 2019-09-21 02:09:08 -0700 *** Bug 202045 has been marked as a duplicate of this bug. *** 374665 2019-07-22 19:30:50 -0700 2019-07-22 19:37:18 -0700 Patch bug-200024-20190722193050.patch text/plain 14442 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh NmMyOGFmZWU0YmM2OTYzYTc2ODQyOTM2MmViMDE2MWU3Mjc1NTZjLi5kMjg5Mjc4ODgxYmJlNzY5 YTQ4ZDE0OGM4ZjA1OGU4NWU2NGIyOTIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxOS0wNy0yMiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtibWFsbG9jXSBFYWNoIElzb1BhZ2UgZ2V0cyAxTUIgVkEgYmVjYXVzZSBW TUhlYXA6OnRyeUFsbG9jYXRlTGFyZ2VDaHVuayByb3VuZHMgdXAKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDAyNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERpc2N1c3NlZCBhbmQgd2UgZGVjaWRlZCB0 byB1c2UgdGhpcyBWTSB0YWcgZm9yIElzb0hlYXAgaW5zdGVhZCBvZiBDTG9vcCBzdGFjay4KKwor ICAgICAgICAqIGludGVycHJldGVyL0NMb29wU3RhY2suY3BwOgorICAgICAgICAoSlNDOjpDTG9v cFN0YWNrOjpDTG9vcFN0YWNrKToKKwogMjAxOS0wNy0yMiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mu a2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBub24tdW5pZmllZCBidWls ZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5nZUxvZyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCmluZGV4IDkxMTA4MTQ3YjYxOWNmNWEyYTczOGJlNWE0OGZhNWVhYjZlN2MyNjguLjhh ZmQwMThiODU1OTZhNzQ3YjZhNzIwZGExZDIxYjEwYTNiZTJmYWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTktMDctMjIgIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KKworICAg ICAgICBbYm1hbGxvY10gRWFjaCBJc29QYWdlIGdldHMgMU1CIFZBIGJlY2F1c2UgVk1IZWFwOjp0 cnlBbGxvY2F0ZUxhcmdlQ2h1bmsgcm91bmRzIHVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDAwMjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTdGFydCB1c2luZyBhIFZNIHRhZyBmb3IgSXNvSGVhcCBp bnN0ZWFkIG9mIENMb29wIFN0YWNrLgorCisgICAgICAgICogd3RmL09TQWxsb2NhdG9yLmg6Cisg ICAgICAgICogd3RmL1ZNVGFncy5oOgorCiAyMDE5LTA3LTIwICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgU3BlZWQgdXAgSGFzaFRhYmxlIGRlY29kaW5nIGJ5IHJl c2VydmluZyBjYXBhY2l0eSBhbmQgYXZvaWRpbmcgcmVoYXNoaW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGUx NDIwMjdjYzE3NzkyNjVjNGJmMzRhZDdlMzRmZTRiMDE4YjJiMi4uNzQyMTkyY2RkZWI1ODc0NWNh OGM4MmIyZWVhZGE2ODgzMjdjNjE5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5 LTA3LTIyICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAgICAgICAgW2Jt YWxsb2NdIEVhY2ggSXNvUGFnZSBnZXRzIDFNQiBWQSBiZWNhdXNlIFZNSGVhcDo6dHJ5QWxsb2Nh dGVMYXJnZUNodW5rIHJvdW5kcyB1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjAwMDI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hhbmdlZCBob3cgd2UgaW50ZXJwcmV0IFZNIHRhZ3MuIEFkZCBJc29I ZWFwIFZNIHRhZyBzdXBwb3J0LCBhbmQgcmVuYW1lIFdlYkFzc2VtYmx5IHRhZworICAgICAgICB0 byBHaWdhY2FnZSB0YWcuCisKKyAgICAgICAgKiBwYWdlL1Jlc291cmNlVXNhZ2VEYXRhLmg6Cisg ICAgICAgICogcGFnZS9SZXNvdXJjZVVzYWdlT3ZlcmxheS5oOgorICAgICAgICAqIHBhZ2UvY29j b2EvUmVzb3VyY2VVc2FnZU92ZXJsYXlDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6Okhpc3Rv cmljUmVzb3VyY2VVc2FnZURhdGE6Okhpc3RvcmljUmVzb3VyY2VVc2FnZURhdGEpOgorICAgICAg ICAqIHBhZ2UvY29jb2EvUmVzb3VyY2VVc2FnZVRocmVhZENvY29hLm1tOgorICAgICAgICAoV2Vi Q29yZTo6ZGlzcGxheU5hbWVGb3JWTVRhZyk6CisgICAgICAgIChXZWJDb3JlOjpjYXRlZ29yeUZv clZNVGFnKToKKwogMjAxOS0wNy0yMiAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CiAKICAgICAgICAgRml4IGluc3BlY3RvciBvdmVycmlkZSBjb252ZXJzaW9uIGluIEluc3BlY3Rv clBhZ2VBZ2VudDo6b3ZlcnJpZGVTZXR0aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvYm1hbGxvYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvYm1hbGxvYy9DaGFuZ2VMb2cKaW5kZXggNmU1OTQ4YTg0NDJmMTA2 YTVkMDc3ODNiZDM3YzgxMzNmYzVmMTVjZi4uNmM5ZDNhZTQ5ZjYyYjk4MDE5ZGQ4MzllNDIyOTFk MTVjNjRiODVmNyAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9ibWFsbG9jL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE5LTA3LTIyICBZdXN1 a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CisKKyAgICAgICAgW2JtYWxsb2NdIEVhY2gg SXNvUGFnZSBnZXRzIDFNQiBWQSBiZWNhdXNlIFZNSGVhcDo6dHJ5QWxsb2NhdGVMYXJnZUNodW5r IHJvdW5kcyB1cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjAwMDI0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgV2hlbiB3ZSBhbGxvY2F0ZSBJc29IZWFwJ3MgcGFnZSwgd2UgcmV1c2VkIFZNSGVhcDo6dHJ5 QWxsb2NhdGVMYXJnZUNodW5rLiBIb3dldmVyLCB0aGlzIGZ1bmN0aW9uIGlzIG9yaWdpbmFsbHkg ZGVzaWduZWQKKyAgICAgICAgdG8gYmUgdXNlZCBmb3IgTGFyZ2UgYWxsb2NhdGlvbiBpbiBibWFs bG9jIChlLmcuIGFsbG9jYXRpbmcgQ2h1bmsgaW4gYm1hbGxvYykuIEFzIGEgcmVzdWx0LCB0aGlz IGZ1bmN0aW9uIHJvdW5kcyB1cCB0aGUKKyAgICAgICAgcmVxdWVzdGVkIHNpemUgd2l0aCAxTUIg KGJtYWxsb2M6OmNodW5rU2l6ZSkuIEFzIGEgcmVzdWx0LCBhbGwgSXNvSGVhcCdzIDE2S0IgcGFn ZSBnZXRzIDFNQiBWQSB3aGlsZSBpdCBqdXN0IHVzZXMgMTZLQiBvZgorICAgICAgICB0aGUgYWxs b2NhdGVkIHJlZ2lvbi4gVGhpcyBsZWFkcyB0byBWQSBleGhhdXN0aW9uIHNpbmNlIElzb0hlYXAg bm93IHVzZXMgNjR4IFZBIHRoYW4gd2UgZXhwZWN0ZWQhCisKKyAgICAgICAgVGhpcyBwYXRjaCBm aXhlcyB0aGUgYWJvdmUgVkEgZXhoYXVzdGlvbiBpc3N1ZSBieSBhbGxvY2F0aW5nIGEgcGFnZSBi eSB1c2luZyB0cnlWTUFsbG9jYXRlLiBXaGVuIGFsbG9jYXRpbmcgYSBwYWdlLCB3ZSBzdGFydAor ICAgICAgICB1c2luZyBhIFZNIHRhZyBmb3IgSXNvSGVhcC4gV2UgZGlzY3Vzc2VkIGF0IGUtbWFp bCBhbmQgd2UgZGVjaWRlZCByZXVzaW5nIGEgVk0gdGFnIHByZXZpb3VzbHkgYXNzaWduZWQgdG8g Q0xvb3AgU3RhY2sgc2luY2UKKyAgICAgICAgdGhpcyBpcyBsZXNzIHByb2ZpdGFibGUuIFNpbmNl IHRoaXMgdGFnIGlzIG5vdCBNYWxsb2MtcmVsYXRlZCB0YWcsIExlYWtzIHRvb2wgY2FuIHNjYW4g bWVtb3J5IHJlZ2lvbiBjb25zZXJ2YXRpdmVseSB3aXRob3V0CisgICAgICAgIHJlZ2lzdGVyaW5n IGFsbG9jYXRlZCByZWdpb24gaW50byBab25lLCB3aGljaCB3YXMgcHJldmlvdXNseSBkb25lIGlu IFZNSGVhcCBhbmQgdGhhdCdzIHdoeSB3ZSByZXVzZWQgVk1IZWFwIGZvciBJc29IZWFwLgorCisg ICAgICAgICogYm1hbGxvYy9CVk1UYWdzLmg6CisgICAgICAgICogYm1hbGxvYy9Jc29QYWdlLmNw cDoKKyAgICAgICAgKGJtYWxsb2M6Oklzb1BhZ2VCYXNlOjphbGxvY2F0ZVBhZ2VNZW1vcnkpOgor ICAgICAgICAqIGJtYWxsb2MvSXNvVExTLmNwcDoKKyAgICAgICAgKGJtYWxsb2M6Oklzb1RMUzo6 ZW5zdXJlRW50cmllcyk6CisgICAgICAgICogYm1hbGxvYy9WTUFsbG9jYXRlLmg6CisgICAgICAg IChibWFsbG9jOjp2bUFsbG9jYXRlKToKKwogMjAxOS0wNy0yMiAgWXVzdWtlIFN1enVraSAgPHlz dXp1a2lAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZvbGxvdy11cCBmaXggZm9y IHRscy0+c2l6ZSgpIGFjY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2lu dGVycHJldGVyL0NMb29wU3RhY2suY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJl dGVyL0NMb29wU3RhY2suY3BwCmluZGV4IDUyY2M3NGExNmVkODM4YmJlOGE4OTVhYzFlNDgxNmFj MTkwMjU4YzMuLjNjOTNhYjhlYmU1YWIyYzk2ZTM0YzAxOWEyYjdmMjA0MTNmODA4YTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9DTG9vcFN0YWNrLmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvQ0xvb3BTdGFjay5jcHAKQEAg LTU5LDcgKzU5LDcgQEAgQ0xvb3BTdGFjazo6Q0xvb3BTdGFjayhWTSYgdm0pCiAgICAgY2FwYWNp dHkgPSBXVEY6OnJvdW5kVXBUb011bHRpcGxlT2YocGFnZVNpemUoKSwgY2FwYWNpdHkpOwogICAg IEFTU0VSVChjYXBhY2l0eSAmJiBpc1BhZ2VBbGlnbmVkKGNhcGFjaXR5KSk7CiAKLSAgICBtX3Jl c2VydmF0aW9uID0gUGFnZVJlc2VydmF0aW9uOjpyZXNlcnZlKFdURjo6cm91bmRVcFRvTXVsdGlw bGVPZihjb21taXRTaXplKCksIGNhcGFjaXR5KSwgT1NBbGxvY2F0b3I6OkpTVk1TdGFja1BhZ2Vz KTsKKyAgICBtX3Jlc2VydmF0aW9uID0gUGFnZVJlc2VydmF0aW9uOjpyZXNlcnZlKFdURjo6cm91 bmRVcFRvTXVsdGlwbGVPZihjb21taXRTaXplKCksIGNhcGFjaXR5KSwgT1NBbGxvY2F0b3I6OlVu a25vd25Vc2FnZSk7CiAKICAgICBhdXRvKiBib3R0b21PZlN0YWNrID0gaGlnaEFkZHJlc3MoKTsK ICAgICBzZXRDTG9vcFN0YWNrTGltaXQoYm90dG9tT2ZTdGFjayk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV1RGL3d0Zi9PU0FsbG9jYXRvci5oIGIvU291cmNlL1dURi93dGYvT1NBbGxvY2F0b3IuaApp bmRleCBmZTU4ZTRlMTdmODU2MDY0MzI1ZThiMWJhYzA1NGUzNDhkNmVmZGE1Li40ZjQyZWNlNzcx MGQ3MDk2MTY4YTA5NGIxMTY0OGVjNGI2OWU5N2Q1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0 Zi9PU0FsbG9jYXRvci5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL09TQWxsb2NhdG9yLmgKQEAgLTM1 LDcgKzM1LDYgQEAgY2xhc3MgT1NBbGxvY2F0b3IgewogICAgIGVudW0gVXNhZ2UgewogICAgICAg ICBVbmtub3duVXNhZ2UgPSAtMSwKICAgICAgICAgRmFzdE1hbGxvY1BhZ2VzID0gVk1fVEFHX0ZP Ul9UQ01BTExPQ19NRU1PUlksCi0gICAgICAgIEpTVk1TdGFja1BhZ2VzID0gVk1fVEFHX0ZPUl9S RUdJU1RFUkZJTEVfTUVNT1JZLAogICAgICAgICBKU0pJVENvZGVQYWdlcyA9IFZNX1RBR19GT1Jf RVhFQ1VUQUJMRUFMTE9DQVRPUl9NRU1PUlksCiAgICAgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dURi93dGYvVk1UYWdzLmggYi9Tb3VyY2UvV1RGL3d0Zi9WTVRhZ3MuaAppbmRleCAxNGUwMjFm ZWYzNTBmYzdlMjJjMTI1Y2I3ODBkOTU1MDJjZjU3NGJhLi4zYzZjOTJjNDYxZTAwYjQ4N2E5NjQx Zjc0YjVjNTFhNDc5YTI4MzRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9WTVRhZ3MuaAor KysgYi9Tb3VyY2UvV1RGL3d0Zi9WTVRhZ3MuaApAQCAtMzAsNyArMzAsNyBAQAogI2RlZmluZSBW TV9UQUdfRk9SX1RDTUFMTE9DX01FTU9SWSAtMQogI2RlZmluZSBWTV9UQUdfRk9SX1dFQkFTU0VN QkxZX01FTU9SWSAtMQogI2RlZmluZSBWTV9UQUdfRk9SX0VYRUNVVEFCTEVBTExPQ0FUT1JfTUVN T1JZIC0xCi0jZGVmaW5lIFZNX1RBR19GT1JfUkVHSVNURVJGSUxFX01FTU9SWSAtMQorI2RlZmlu ZSBWTV9UQUdfRk9SX0lTT0hFQVBfTUVNT1JZIC0xCiAKICNlbHNlCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvUmVzb3VyY2VVc2FnZURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUmVzb3VyY2VVc2FnZURhdGEuaAppbmRleCA5NzA4ZTYxODVkODI2ZGE4MDA0NzdlMjg2Mzkw MThhMmE2ZjY2ZjAyLi42YzUwMWI3MzI2NTM2YWRiMDM1YjI2Y2IzNWM1YTZmZWUwOTRhMmYxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Jlc291cmNlVXNhZ2VEYXRhLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9SZXNvdXJjZVVzYWdlRGF0YS5oCkBAIC0zOSwxMiArMzksMTMg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHYoYm1hbGxvYywgMCwgZmFsc2UpIFwKICAgICB2 KExpYmNNYWxsb2MsIDEsIGZhbHNlKSBcCiAgICAgdihKU0pJVCwgMiwgZmFsc2UpIFwKLSAgICB2 KFdlYkFzc2VtYmx5LCAzLCBmYWxzZSkgXAorICAgIHYoR2lnYWNhZ2UsIDMsIGZhbHNlKSBcCiAg ICAgdihJbWFnZXMsIDQsIGZhbHNlKSBcCiAgICAgdihHQ0hlYXAsIDUsIHRydWUpIFwKICAgICB2 KEdDT3duZWQsIDYsIHRydWUpIFwKICAgICB2KE90aGVyLCA3LCBmYWxzZSkgXAogICAgIHYoTGF5 ZXJzLCA4LCBmYWxzZSkgXAorICAgIHYoSXNvSGVhcCwgOSwgZmFsc2UpIFwKIAogbmFtZXNwYWNl IE1lbW9yeUNhdGVnb3J5IHsKICNkZWZpbmUgV0VCQ09SRV9ERUZJTkVfTUVNT1JZX0NBVEVHT1JZ KG5hbWUsIGlkLCBzdWJjYXRlZ29yeSkgc3RhdGljIGNvbnN0ZXhwciB1bnNpZ25lZCBuYW1lID0g aWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Jlc291cmNlVXNhZ2VPdmVybGF5 LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Jlc291cmNlVXNhZ2VPdmVybGF5LmgKaW5kZXggNzgw YjZhYTBmODY5ZThhYTQwMGEzMDU3NmY2MWMxMGMzZGE0OTRiOC4uM2UxZjA1NDQ4NTQzZTc1NmI4 NzAzMmRiMTFiNmZhZmRkZjZkYTU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9S ZXNvdXJjZVVzYWdlT3ZlcmxheS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUmVzb3VyY2VV c2FnZU92ZXJsYXkuaApAQCAtNTgsNyArNTgsNyBAQCBjbGFzcyBSZXNvdXJjZVVzYWdlT3Zlcmxh eSBmaW5hbCA6IHB1YmxpYyBQYWdlT3ZlcmxheTo6Q2xpZW50IHsKICNlbmRpZgogCiAgICAgc3Rh dGljIGNvbnN0IGludCBub3JtYWxXaWR0aCA9IDU3MDsKLSAgICBzdGF0aWMgY29uc3QgaW50IG5v cm1hbEhlaWdodCA9IDE2MDsKKyAgICBzdGF0aWMgY29uc3QgaW50IG5vcm1hbEhlaWdodCA9IDE4 MDsKIAogcHJpdmF0ZToKICAgICB2b2lkIHdpbGxNb3ZlVG9QYWdlKFBhZ2VPdmVybGF5JiwgUGFn ZSopIG92ZXJyaWRlIHsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9jb2NvYS9S ZXNvdXJjZVVzYWdlT3ZlcmxheUNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9jb2NvYS9S ZXNvdXJjZVVzYWdlT3ZlcmxheUNvY29hLm1tCmluZGV4IDBjOGQyOTM2OWM0MWFmZGVjNGZiMjVi YzIzYjVkMWY1YmY1NzVlZWQuLjU1YjQwNDNhNjBjMDlmOTUzMTBiZWFhMDg3MTVlNmM5YTc3YjEw MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29jb2EvUmVzb3VyY2VVc2FnZU92 ZXJsYXlDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNlVXNh Z2VPdmVybGF5Q29jb2EubW0KQEAgLTE2MywxMSArMTYzLDEyIEBAIEhpc3RvcmljUmVzb3VyY2VV c2FnZURhdGE6Okhpc3RvcmljUmVzb3VyY2VVc2FnZURhdGEoKQogewogICAgIC8vIFZNIHRhZyBj YXRlZ29yaWVzLgogICAgIGNhdGVnb3JpZXNbTWVtb3J5Q2F0ZWdvcnk6OkpTSklUXSA9IEhpc3Rv cmljTWVtb3J5Q2F0ZWdvcnlJbmZvKE1lbW9yeUNhdGVnb3J5OjpKU0pJVCwgMHhGRkZGNjBGRiwg IkpTIEpJVCIpOwotICAgIGNhdGVnb3JpZXNbTWVtb3J5Q2F0ZWdvcnk6OldlYkFzc2VtYmx5XSA9 IEhpc3RvcmljTWVtb3J5Q2F0ZWdvcnlJbmZvKE1lbW9yeUNhdGVnb3J5OjpXZWJBc3NlbWJseSwg MHhGRjY1NEZGMCwgIldlYkFzc2VtYmx5Iik7CisgICAgY2F0ZWdvcmllc1tNZW1vcnlDYXRlZ29y eTo6R2lnYWNhZ2VdID0gSGlzdG9yaWNNZW1vcnlDYXRlZ29yeUluZm8oTWVtb3J5Q2F0ZWdvcnk6 OkdpZ2FjYWdlLCAweEZGNjU0RkYwLCAiR2lnYWNhZ2UiKTsKICAgICBjYXRlZ29yaWVzW01lbW9y eUNhdGVnb3J5OjpJbWFnZXNdID0gSGlzdG9yaWNNZW1vcnlDYXRlZ29yeUluZm8oTWVtb3J5Q2F0 ZWdvcnk6OkltYWdlcywgMHhGRkZGRkYwMCwgIkltYWdlcyIpOwogICAgIGNhdGVnb3JpZXNbTWVt b3J5Q2F0ZWdvcnk6OkxheWVyc10gPSBIaXN0b3JpY01lbW9yeUNhdGVnb3J5SW5mbyhNZW1vcnlD YXRlZ29yeTo6TGF5ZXJzLCAweEZGMDBGRkZGLCAiTGF5ZXJzIik7CiAgICAgY2F0ZWdvcmllc1tN ZW1vcnlDYXRlZ29yeTo6TGliY01hbGxvY10gPSBIaXN0b3JpY01lbW9yeUNhdGVnb3J5SW5mbyhN ZW1vcnlDYXRlZ29yeTo6TGliY01hbGxvYywgMHhGRjAwRkYwMCwgImxpYmMgbWFsbG9jIik7CiAg ICAgY2F0ZWdvcmllc1tNZW1vcnlDYXRlZ29yeTo6Ym1hbGxvY10gPSBIaXN0b3JpY01lbW9yeUNh dGVnb3J5SW5mbyhNZW1vcnlDYXRlZ29yeTo6Ym1hbGxvYywgMHhGRkZGNjA2MCwgImJtYWxsb2Mi KTsKKyAgICBjYXRlZ29yaWVzW01lbW9yeUNhdGVnb3J5OjpJc29IZWFwXSA9IEhpc3RvcmljTWVt b3J5Q2F0ZWdvcnlJbmZvKE1lbW9yeUNhdGVnb3J5OjpJc29IZWFwLCAweEZGODA5RjQwLCAiSXNv SGVhcCIpOwogICAgIGNhdGVnb3JpZXNbTWVtb3J5Q2F0ZWdvcnk6Ok90aGVyXSA9IEhpc3Rvcmlj TWVtb3J5Q2F0ZWdvcnlJbmZvKE1lbW9yeUNhdGVnb3J5OjpPdGhlciwgMHhGRkMwRkYwMCwgIk90 aGVyIik7CiAKICAgICAvLyBTdWIgY2F0ZWdvcmllcyAoZS5nIGJyZWFrZG93biBvZiBibWFsbG9j IHRhZy4pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2NvY29hL1Jlc291cmNlVXNh Z2VUaHJlYWRDb2NvYS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29jb2EvUmVzb3VyY2VVc2Fn ZVRocmVhZENvY29hLm1tCmluZGV4IDg2NDZhMGNlNDlhYjllZDE4ZGMxY2RmNTlmZmFiNjVlNTkz ODE3YjkuLjEwN2E5YzkyYTZiMDFjOWZmZmY5MjUxOTM2MTAzMmUyYmJiNjFmM2MgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29jb2EvUmVzb3VyY2VVc2FnZVRocmVhZENvY29hLm1t CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvY29jb2EvUmVzb3VyY2VVc2FnZVRocmVhZENvY29h Lm1tCkBAIC04Myw4ICs4Myw5IEBAIGNvbnN0IGNoYXIqIGRpc3BsYXlOYW1lRm9yVk1UYWcodW5z aWduZWQgdGFnKQogICAgIGNhc2UgVk1fTUVNT1JZX0xBWUVSS0lUOiByZXR1cm4gIkNvcmVBbmlt YXRpb24iOwogICAgIGNhc2UgVk1fTUVNT1JZX0lNQUdFSU86IHJldHVybiAiSW1hZ2VJTyI7CiAg ICAgY2FzZSBWTV9NRU1PUllfQ0dJTUFHRTogcmV0dXJuICJDRyBpbWFnZSI7CisgICAgY2FzZSBW TV9NRU1PUllfSkFWQVNDUklQVF9DT1JFOiByZXR1cm4gIkdpZ2FjYWdlIjsKICAgICBjYXNlIFZN X01FTU9SWV9KQVZBU0NSSVBUX0pJVF9FWEVDVVRBQkxFX0FMTE9DQVRPUjogcmV0dXJuICJKU0Mg SklUIjsKLSAgICBjYXNlIFZNX01FTU9SWV9KQVZBU0NSSVBUX0NPUkU6IHJldHVybiAiV2ViQXNz ZW1ibHkiOworICAgIGNhc2UgVk1fTUVNT1JZX0pBVkFTQ1JJUFRfSklUX1JFR0lTVEVSX0ZJTEU6 IHJldHVybiAiSXNvSGVhcCI7CiAgICAgY2FzZSBWTV9NRU1PUllfTUFMTE9DOiByZXR1cm4gIm1h bGxvYyI7CiAgICAgY2FzZSBWTV9NRU1PUllfTUFMTE9DX0hVR0U6IHJldHVybiAibWFsbG9jICho dWdlKSI7CiAgICAgY2FzZSBWTV9NRU1PUllfTUFMTE9DX0xBUkdFOiByZXR1cm4gIm1hbGxvYyAo bGFyZ2UpIjsKQEAgLTE1MSwxMCArMTUyLDEyIEBAIHN0YXRpYyB1bnNpZ25lZCBjYXRlZ29yeUZv clZNVGFnKHVuc2lnbmVkIHRhZykKICAgICBjYXNlIFZNX01FTU9SWV9JTUFHRUlPOgogICAgIGNh c2UgVk1fTUVNT1JZX0NHSU1BR0U6CiAgICAgICAgIHJldHVybiBNZW1vcnlDYXRlZ29yeTo6SW1h Z2VzOworICAgIGNhc2UgVk1fTUVNT1JZX0pBVkFTQ1JJUFRfSklUX1JFR0lTVEVSX0ZJTEU6Cisg ICAgICAgIHJldHVybiBNZW1vcnlDYXRlZ29yeTo6SXNvSGVhcDsKICAgICBjYXNlIFZNX01FTU9S WV9KQVZBU0NSSVBUX0pJVF9FWEVDVVRBQkxFX0FMTE9DQVRPUjoKICAgICAgICAgcmV0dXJuIE1l bW9yeUNhdGVnb3J5OjpKU0pJVDsKICAgICBjYXNlIFZNX01FTU9SWV9KQVZBU0NSSVBUX0NPUkU6 Ci0gICAgICAgIHJldHVybiBNZW1vcnlDYXRlZ29yeTo6V2ViQXNzZW1ibHk7CisgICAgICAgIHJl dHVybiBNZW1vcnlDYXRlZ29yeTo6R2lnYWNhZ2U7CiAgICAgY2FzZSBWTV9NRU1PUllfTUFMTE9D OgogICAgIGNhc2UgVk1fTUVNT1JZX01BTExPQ19IVUdFOgogICAgIGNhc2UgVk1fTUVNT1JZX01B TExPQ19MQVJHRToKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvQlZNVGFncy5o IGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9CVk1UYWdzLmgKaW5kZXggNjU3NDg4OTE3ZjExOTIy Y2ExOGZkODUzYmQ5NDBkZTIwNDY2Y2FkOC4uZWI1ZTVmOTAyZTJkN2U2YTUyOGI0OThjNmZhYmQ1 NDBjZGM2OGE2NiAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9CVk1UYWdzLmgK KysrIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9CVk1UYWdzLmgKQEAgLTQ2LDkgKzQ2LDkgQEAK ICNlbmRpZiAvLyBkZWZpbmVkKFZNX01FTU9SWV9KQVZBU0NSSVBUX0pJVF9FWEVDVVRBQkxFX0FM TE9DQVRPUikKIAogI2lmIGRlZmluZWQoVk1fTUVNT1JZX0pBVkFTQ1JJUFRfSklUX1JFR0lTVEVS X0ZJTEUpCi0jZGVmaW5lIFZNX1RBR19GT1JfUkVHSVNURVJGSUxFX01FTU9SWSBWTV9NQUtFX1RB RyhWTV9NRU1PUllfSkFWQVNDUklQVF9KSVRfUkVHSVNURVJfRklMRSkKKyNkZWZpbmUgVk1fVEFH X0ZPUl9JU09IRUFQX01FTU9SWSBWTV9NQUtFX1RBRyhWTV9NRU1PUllfSkFWQVNDUklQVF9KSVRf UkVHSVNURVJfRklMRSkKICNlbHNlCi0jZGVmaW5lIFZNX1RBR19GT1JfUkVHSVNURVJGSUxFX01F TU9SWSBWTV9NQUtFX1RBRyg2NSkKKyNkZWZpbmUgVk1fVEFHX0ZPUl9JU09IRUFQX01FTU9SWSBW TV9NQUtFX1RBRyg2NSkKICNlbmRpZiAvLyBkZWZpbmVkKFZNX01FTU9SWV9KQVZBU0NSSVBUX0pJ VF9SRUdJU1RFUl9GSUxFKQogCiAjaWYgZGVmaW5lZChWTV9NRU1PUllfSkFWQVNDUklQVF9DT1JF KQpAQCAtNjIsNyArNjIsNyBAQAogI2RlZmluZSBWTV9UQUdfRk9SX1RDTUFMTE9DX01FTU9SWSAt MQogI2RlZmluZSBWTV9UQUdfRk9SX0dJR0FDQUdFX01FTU9SWSAtMQogI2RlZmluZSBWTV9UQUdf Rk9SX0VYRUNVVEFCTEVBTExPQ0FUT1JfTUVNT1JZIC0xCi0jZGVmaW5lIFZNX1RBR19GT1JfUkVH SVNURVJGSUxFX01FTU9SWSAtMQorI2RlZmluZSBWTV9UQUdfRk9SX0lTT0hFQVBfTUVNT1JZIC0x CiAKICNlbmRpZiAvLyBCT1MoREFSV0lOKQogCkBAIC03MSw3ICs3MSw3IEBAIG5hbWVzcGFjZSBi bWFsbG9jIHsKIGVudW0gY2xhc3MgVk1UYWcgewogICAgIFVua25vd24gPSAtMSwKICAgICBNYWxs b2MgPSBWTV9UQUdfRk9SX1RDTUFMTE9DX01FTU9SWSwKLSAgICBKU1ZNU3RhY2sgPSBWTV9UQUdf Rk9SX1JFR0lTVEVSRklMRV9NRU1PUlksCisgICAgSXNvSGVhcCA9IFZNX1RBR19GT1JfSVNPSEVB UF9NRU1PUlksCiAgICAgSlNKSVRDb2RlID0gVk1fVEFHX0ZPUl9FWEVDVVRBQkxFQUxMT0NBVE9S X01FTU9SWSwKICAgICBKU0dpZ2FjYWdlID0gVk1fVEFHX0ZPUl9HSUdBQ0FHRV9NRU1PUlksCiB9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Jc29QYWdlLmNwcCBiL1NvdXJj ZS9ibWFsbG9jL2JtYWxsb2MvSXNvUGFnZS5jcHAKaW5kZXggMmRhYzBmNDJkNDcwZDI5ZWEwMjJh Nzc2ZTMzMWM4M2RjNTUzZWVkNy4uNzA3YzM2MGJkMWE0MDM4YWExMTNmZjc5ZTJmMWNhOWQ3ODkz MmRhMyAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Jc29QYWdlLmNwcAorKysg Yi9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0lzb1BhZ2UuY3BwCkBAIC0zMiw3ICszMiw3IEBAIG5h bWVzcGFjZSBibWFsbG9jIHsKIAogdm9pZCogSXNvUGFnZUJhc2U6OmFsbG9jYXRlUGFnZU1lbW9y eSgpCiB7Ci0gICAgcmV0dXJuIFZNSGVhcDo6Z2V0KCktPnRyeUFsbG9jYXRlTGFyZ2VDaHVuayhw YWdlU2l6ZSwgcGFnZVNpemUpLmJlZ2luKCk7CisgICAgcmV0dXJuIHRyeVZNQWxsb2NhdGUocGFn ZVNpemUsIHBhZ2VTaXplLCBWTVRhZzo6SXNvSGVhcCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIGJt YWxsb2MKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExTLmNwcCBiL1Nv dXJjZS9ibWFsbG9jL2JtYWxsb2MvSXNvVExTLmNwcAppbmRleCAwZGVjM2RlNzU2OTBkZjMzNmZj NTA0YzU3Njc1MTJlZTUwZjhhZWZhLi4wMTA0YjNhZDRkMDhkNWYxNGU4NWZkMTc5NWJlMzk0ZmU4 NmM1YWMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvYm1hbGxvYy9ibWFsbG9jL0lzb1RMUy5jcHAKKysr IGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9Jc29UTFMuY3BwCkBAIC0xMDAsNyArMTAwLDcgQEAg SXNvVExTKiBJc29UTFM6OmVuc3VyZUVudHJpZXModW5zaWduZWQgb2Zmc2V0KQogICAgICAgICBz aXplX3QgcmVxdWlyZWRTaXplID0gc2l6ZUZvckNhcGFjaXR5KHJlcXVpcmVkQ2FwYWNpdHkpOwog ICAgICAgICBzaXplX3QgZ29vZFNpemUgPSByb3VuZFVwVG9NdWx0aXBsZU9mKHZtUGFnZVNpemUo KSwgcmVxdWlyZWRTaXplKTsKICAgICAgICAgc2l6ZV90IGdvb2RDYXBhY2l0eSA9IGNhcGFjaXR5 Rm9yU2l6ZShnb29kU2l6ZSk7Ci0gICAgICAgIHZvaWQqIG1lbW9yeSA9IHZtQWxsb2NhdGUoZ29v ZFNpemUpOworICAgICAgICB2b2lkKiBtZW1vcnkgPSB2bUFsbG9jYXRlKGdvb2RTaXplLCBWTVRh Zzo6SXNvSGVhcCk7CiAgICAgICAgIElzb1RMUyogbmV3VExTID0gbmV3IChtZW1vcnkpIElzb1RM UygpOwogICAgICAgICBuZXdUTFMtPm1fY2FwYWNpdHkgPSBnb29kQ2FwYWNpdHk7CiAgICAgICAg IGlmICh0bHMpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9ibWFsbG9jL2JtYWxsb2MvVk1BbGxvY2F0 ZS5oIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9WTUFsbG9jYXRlLmgKaW5kZXggZTM5NzZjYTJk NDM2MjJjZmZkNDdjMTNkOTA0ZWE2M2Y1OGNiNzZlNC4uMTc4ODliZDM3NDk5YmZhNTUyNjI2ZWQ5 ZjhkOTA5MmQ4YjFmMTI3ZCAxMDA2NDQKLS0tIGEvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9WTUFs bG9jYXRlLmgKKysrIGIvU291cmNlL2JtYWxsb2MvYm1hbGxvYy9WTUFsbG9jYXRlLmgKQEAgLTEz MCw5ICsxMzAsOSBAQCBpbmxpbmUgdm9pZCogdHJ5Vk1BbGxvY2F0ZShzaXplX3Qgdm1TaXplLCBW TVRhZyB1c2FnZSA9IFZNVGFnOjpNYWxsb2MpCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotaW5s aW5lIHZvaWQqIHZtQWxsb2NhdGUoc2l6ZV90IHZtU2l6ZSkKK2lubGluZSB2b2lkKiB2bUFsbG9j YXRlKHNpemVfdCB2bVNpemUsIFZNVGFnIHVzYWdlID0gVk1UYWc6Ok1hbGxvYykKIHsKLSAgICB2 b2lkKiByZXN1bHQgPSB0cnlWTUFsbG9jYXRlKHZtU2l6ZSk7CisgICAgdm9pZCogcmVzdWx0ID0g dHJ5Vk1BbGxvY2F0ZSh2bVNpemUsIHVzYWdlKTsKICAgICBSRUxFQVNFX0JBU1NFUlQocmVzdWx0 KTsKICAgICByZXR1cm4gcmVzdWx0OwogfQpAQCAtMTg5LDkgKzE4OSw5IEBAIGlubGluZSB2b2lk KiB0cnlWTUFsbG9jYXRlKHNpemVfdCB2bUFsaWdubWVudCwgc2l6ZV90IHZtU2l6ZSwgVk1UYWcg dXNhZ2UgPSBWTVRhCiAgICAgcmV0dXJuIGFsaWduZWQ7CiB9CiAKLWlubGluZSB2b2lkKiB2bUFs bG9jYXRlKHNpemVfdCB2bUFsaWdubWVudCwgc2l6ZV90IHZtU2l6ZSkKK2lubGluZSB2b2lkKiB2 bUFsbG9jYXRlKHNpemVfdCB2bUFsaWdubWVudCwgc2l6ZV90IHZtU2l6ZSwgVk1UYWcgdXNhZ2Ug PSBWTVRhZzo6TWFsbG9jKQogewotICAgIHZvaWQqIHJlc3VsdCA9IHRyeVZNQWxsb2NhdGUodm1B bGlnbm1lbnQsIHZtU2l6ZSk7CisgICAgdm9pZCogcmVzdWx0ID0gdHJ5Vk1BbGxvY2F0ZSh2bUFs aWdubWVudCwgdm1TaXplLCB1c2FnZSk7CiAgICAgUkVMRUFTRV9CQVNTRVJUKHJlc3VsdCk7CiAg ICAgcmV0dXJuIHJlc3VsdDsKIH0K