184342 2018-04-05 16:47:58 -0700 bmalloc virtual allocation API should not treat memory it vends as dirty with respect to how it drives the scavenger 2018-04-06 17:02:33 -0700 1 1 1 Unclassified WebKit bmalloc Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184207 1 saam saam benjamin cdumez cmarcelo commit-queue dbates ews-watchlist fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff rmorisset ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1412207 0 saam 2018-04-05 16:47:58 -0700 The user of this API is Wasm. Currently, treating this as dirty is worse than treating it as non-dirty, since it'll make iOS think it's constantly under memory pressure. We should eventually implement something that has a more perfect idea of the total dirty memory, but let's start with this as a stop gap. 1412235 1 337323 saam 2018-04-05 18:35:11 -0700 Created attachment 337323 patch 1412236 2 ews-watchlist 2018-04-05 18:38:17 -0700 Attachment 337323 did not pass style-queue: ERROR: Source/bmalloc/bmalloc/bmalloc.h:85: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/bmalloc/bmalloc/bmalloc.h:85: The parameter name "kind" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1412497 3 337323 mark.lam 2018-04-06 15:36:10 -0700 Comment on attachment 337323 patch View in context: https://bugs.webkit.org/attachment.cgi?id=337323&action=review r=me > Source/bmalloc/ChangeLog:13 > + we vend as dirty, versus what we do now, which is treat is all as dirty. typo: /treat is all/treat it all/. > Source/bmalloc/ChangeLog:15 > + scavenger think its under memory pressure because memory it can't free isn't /because memory/because of memory/. 1412498 4 337399 saam 2018-04-06 15:39:49 -0700 Created attachment 337399 patch for landing 1412499 5 ews-watchlist 2018-04-06 15:41:50 -0700 Attachment 337399 did not pass style-queue: ERROR: Source/bmalloc/bmalloc/bmalloc.h:85: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/bmalloc/bmalloc/bmalloc.h:85: The parameter name "kind" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1412518 6 337399 commit-queue 2018-04-06 17:00:39 -0700 Comment on attachment 337399 patch for landing Clearing flags on attachment: 337399 Committed r230360: <https://trac.webkit.org/changeset/230360> 1412519 7 commit-queue 2018-04-06 17:00:41 -0700 All reviewed patches have been landed. Closing bug. 1412520 8 webkit-bug-importer 2018-04-06 17:02:33 -0700 <rdar://problem/39253734> 337323 2018-04-05 18:35:11 -0700 2018-04-06 15:39:49 -0700 patch c-backup.diff text/plain 4538 saam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMzAzMTUpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE4LTA0LTA1ICBTYWFtIEJhcmF0aSAgPHNiYXJh dGlAYXBwbGUuY29tPgorCisgICAgICAgIGJtYWxsb2MncyB0cnlMYXJnZVplcm9lZE1lbWFsaWdu VmlydHVhbCBzaG91bGRuJ3QgdHJlYXQgdGhlIGVudGlyZSB2aXJ0dWFsIHNpemUgYXMgZGlydHkg dG93YXJkcyBpdHMgZm9vdHByaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODQyMDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHd0Zi9HaWdhY2FnZS5jcHA6CisgICAgICAgIChHaWdhY2FnZTo6ZnJl ZVZpcnR1YWxQYWdlcyk6CisKIDIwMTgtMDQtMDUgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRl YUBnbWFpbC5jb20+CiAKICAgICAgICAgW1dURl0gUmVtb3ZlIFN0YXRpY0xvY2sKSW5kZXg6IFNv dXJjZS9XVEYvd3RmL0dpZ2FjYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9H aWdhY2FnZS5jcHAJKHJldmlzaW9uIDIzMDMxNSkKKysrIFNvdXJjZS9XVEYvd3RmL0dpZ2FjYWdl LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA4LDEyICsxMDgsMTIgQEAgdm9pZCogdHJ5QWxsb2Nh dGVaZXJvZWRWaXJ0dWFsUGFnZXMoS2luZAogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXZvaWQg ZnJlZVZpcnR1YWxQYWdlcyhLaW5kIGtpbmQsIHZvaWQqIGJhc2VQdHIsIHNpemVfdCkKK3ZvaWQg ZnJlZVZpcnR1YWxQYWdlcyhLaW5kIGtpbmQsIHZvaWQqIGJhc2VQdHIsIHNpemVfdCBzaXplKQog ewogICAgIGlmICghYmFzZVB0cikKICAgICAgICAgcmV0dXJuOwogICAgIFJFTEVBU0VfQVNTRVJU KGlzQ2FnZWQoa2luZCwgYmFzZVB0cikpOwotICAgIGJtYWxsb2M6OmFwaTo6ZnJlZUxhcmdlVmly dHVhbChiYXNlUHRyLCBibWFsbG9jOjpoZWFwS2luZChraW5kKSk7CisgICAgYm1hbGxvYzo6YXBp OjpmcmVlTGFyZ2VWaXJ0dWFsKGJhc2VQdHIsIHNpemUsIGJtYWxsb2M6OmhlYXBLaW5kKGtpbmQp KTsKICAgICBXVEY6OmNvbXBpbGVyRmVuY2UoKTsKIH0KIApJbmRleDogU291cmNlL2JtYWxsb2Mv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwkocmV2aXNp b24gMjMwMzE3KQorKysgU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMTgtMDQtMDUgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5j b20+CisKKyAgICAgICAgYm1hbGxvYyB2aXJ0dWFsIGFsbG9jYXRpb24gQVBJIHNob3VsZCBub3Qg dHJlYXQgbWVtb3J5IGl0IHZlbmRzIGFzIGRpcnR5IHdpdGggcmVzcGVjdCB0byBob3cgaXQgZHJp dmVzIHRoZSBzY2F2ZW5nZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NDM0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEN1cnJlbnRseSwgdGhlIG9ubHkgdXNlciBvZiB0aGlzIEFQSSBpcyBXYXNtLiBJ ZGVhbGx5LCBXYXNtIHdvdWxkIHRlbGwKKyAgICAgICAgdXMgZXhhY3RseSB3aGljaCBwYWdlIGlz IGRpcnRpZWQuIFdlIHNob3VsZCByZWFsbHkgZG8gdGhhdCBhdCBzb21lIHBvaW50OgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0MjA3CisgICAgICAg IAorICAgICAgICBIb3dldmVyLCB1bnRpbCB3ZSBkbyB0aGF0LCBpdCdzIGJldHRlciB0byB0cmVh dCBub25lIG9mIHRoZSB2aXJ0dWFsIG1lbW9yeQorICAgICAgICB3ZSB2ZW5kIGFzIGRpcnR5LCB2 ZXJzdXMgd2hhdCB3ZSBkbyBub3csIHdoaWNoIGlzIHRyZWF0IGlzIGFsbCBhcyBkaXJ0eS4KKyAg ICAgICAgVGhpcyBkaXJ0eSBtZW1vcnkgdHJhY2tpbmcgaGVscHMgZHJpdmUgdGhlIHNjYXZlbmdl ciwgc28gb24gaU9TLCBoYXZpbmcgdGhlCisgICAgICAgIHNjYXZlbmdlciB0aGluayBpdHMgdW5k ZXIgbWVtb3J5IHByZXNzdXJlIGJlY2F1c2UgbWVtb3J5IGl0IGNhbid0IGZyZWUgaXNuJ3QKKyAg ICAgICAgdXNlZnVsLgorCisgICAgICAgICogYm1hbGxvYy9ibWFsbG9jLmNwcDoKKyAgICAgICAg KGJtYWxsb2M6OmFwaTo6dHJ5TGFyZ2VaZXJvZWRNZW1hbGlnblZpcnR1YWwpOgorICAgICAgICAo Ym1hbGxvYzo6YXBpOjpmcmVlTGFyZ2VWaXJ0dWFsKToKKyAgICAgICAgKiBibWFsbG9jL2JtYWxs b2MuaDoKKwogMjAxOC0wNC0wNSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAog ICAgICAgICBJc29IZWFwSW1wbCBub3QgSXNvSGVhcEltcGxCYXNlIHNob3VsZCBhZGQgaXRzZWxm IHRvIEFsbElzb0hlYXBzCkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL2JtYWxsb2MuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvYm1hbGxvYy5jcHAJKHJldmlz aW9uIDIzMDMxNSkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvYm1hbGxvYy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTU0LDYgKzU0LDEzIEBAIHZvaWQqIHRyeUxhcmdlWmVyb2VkTWVtYWxpZ25W aXJ0dWFsKHNpemUKICAgICB7CiAgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxNdXRleD4gbG9jayhI ZWFwOjptdXRleCgpKTsKICAgICAgICAgcmVzdWx0ID0gaGVhcC50cnlBbGxvY2F0ZUxhcmdlKGxv Y2ssIGFsaWdubWVudCwgc2l6ZSk7CisgICAgICAgIGlmIChyZXN1bHQpIHsKKyAgICAgICAgICAg IC8vIERvbid0IHRyYWNrIHRoaXMgYXMgZGlydHkgbWVtb3J5IHRoYXQgZGljdGF0ZXMgaG93IHdl IGRyaXZlIHRoZSBzY2F2ZW5nZXIuCisgICAgICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1h a2UgaXQgc28gdGhhdCB1c2VycyBvZiB0aGlzIEFQSSBpbmZvcm0gYm1hbGxvYyB3aGljaAorICAg ICAgICAgICAgLy8gcGFnZXMgdGhleSBkaXJ0eToKKyAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQyMDcKKyAgICAgICAgICAgIGhlYXAuZXh0 ZXJuYWxEZWNvbW1pdChsb2NrLCByZXN1bHQsIHNpemUpOworICAgICAgICB9CiAgICAgfQogCiAg ICAgaWYgKHJlc3VsdCkKQEAgLTYxLDExICs2OCwxMyBAQCB2b2lkKiB0cnlMYXJnZVplcm9lZE1l bWFsaWduVmlydHVhbChzaXplCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotdm9pZCBmcmVlTGFy Z2VWaXJ0dWFsKHZvaWQqIG9iamVjdCwgSGVhcEtpbmQga2luZCkKK3ZvaWQgZnJlZUxhcmdlVmly dHVhbCh2b2lkKiBvYmplY3QsIHNpemVfdCBzaXplLCBIZWFwS2luZCBraW5kKQogewogICAgIGtp bmQgPSBtYXBUb0FjdGl2ZUhlYXBLaW5kKGtpbmQpOwogICAgIEhlYXAmIGhlYXAgPSBQZXJQcm9j ZXNzPFBlckhlYXBLaW5kPEhlYXA+Pjo6Z2V0KCktPmF0KGtpbmQpOwogICAgIHN0ZDo6bG9ja19n dWFyZDxNdXRleD4gbG9jayhIZWFwOjptdXRleCgpKTsKKyAgICAvLyBCYWxhbmNlIG91dCB0aGUg ZXh0ZXJuYWxEZWNvbW1pdCB3aGVuIHdlIGFsbG9jYXRlZCB0aGUgemVyb2VkIHZpcnR1YWwgbWVt b3J5LgorICAgIGhlYXAuZXh0ZXJuYWxDb21taXQobG9jaywgb2JqZWN0LCBzaXplKTsKICAgICBo ZWFwLmRlYWxsb2NhdGVMYXJnZShsb2NrLCBvYmplY3QpOwogfQogCkluZGV4OiBTb3VyY2UvYm1h bGxvYy9ibWFsbG9jL2JtYWxsb2MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFs bG9jL2JtYWxsb2MuaAkocmV2aXNpb24gMjMwMzE1KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxv Yy9ibWFsbG9jLmgJKHdvcmtpbmcgY29weSkKQEAgLTgyLDcgKzgyLDcgQEAgaW5saW5lIHZvaWQg ZnJlZSh2b2lkKiBvYmplY3QsIEhlYXBLaW5kIAogCiBCRVhQT1JUIHZvaWQgZnJlZU91dE9mTGlu ZSh2b2lkKiBvYmplY3QsIEhlYXBLaW5kIGtpbmQgPSBIZWFwS2luZDo6UHJpbWFyeSk7CiAKLUJF WFBPUlQgdm9pZCBmcmVlTGFyZ2VWaXJ0dWFsKHZvaWQqIG9iamVjdCwgSGVhcEtpbmQga2luZCA9 IEhlYXBLaW5kOjpQcmltYXJ5KTsKK0JFWFBPUlQgdm9pZCBmcmVlTGFyZ2VWaXJ0dWFsKHZvaWQq IG9iamVjdCwgc2l6ZV90LCBIZWFwS2luZCBraW5kID0gSGVhcEtpbmQ6OlByaW1hcnkpOwogCiBp bmxpbmUgdm9pZCBzY2F2ZW5nZVRoaXNUaHJlYWQoKQogewo= 337399 2018-04-06 15:39:49 -0700 2018-04-06 17:00:39 -0700 patch for landing patch.diff text/plain 4529 saam SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyMzAzMTUpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE4LTA0LTA1ICBTYWFtIEJhcmF0aSAgPHNiYXJh dGlAYXBwbGUuY29tPgorCisgICAgICAgIGJtYWxsb2MncyB0cnlMYXJnZVplcm9lZE1lbWFsaWdu VmlydHVhbCBzaG91bGRuJ3QgdHJlYXQgdGhlIGVudGlyZSB2aXJ0dWFsIHNpemUgYXMgZGlydHkg dG93YXJkcyBpdHMgZm9vdHByaW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODQyMDcKKworICAgICAgICBSZXZpZXdlZCBieSBNYXJrIExhbS4KKwor ICAgICAgICAqIHd0Zi9HaWdhY2FnZS5jcHA6CisgICAgICAgIChHaWdhY2FnZTo6ZnJlZVZpcnR1 YWxQYWdlcyk6CisKIDIwMTgtMDQtMDUgIFl1c3VrZSBTdXp1a2kgIDx1dGF0YW5lLnRlYUBnbWFp bC5jb20+CiAKICAgICAgICAgW1dURl0gUmVtb3ZlIFN0YXRpY0xvY2sKSW5kZXg6IFNvdXJjZS9X VEYvd3RmL0dpZ2FjYWdlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9HaWdhY2Fn ZS5jcHAJKHJldmlzaW9uIDIzMDMxNSkKKysrIFNvdXJjZS9XVEYvd3RmL0dpZ2FjYWdlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTA4LDEyICsxMDgsMTIgQEAgdm9pZCogdHJ5QWxsb2NhdGVaZXJv ZWRWaXJ0dWFsUGFnZXMoS2luZAogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXZvaWQgZnJlZVZp cnR1YWxQYWdlcyhLaW5kIGtpbmQsIHZvaWQqIGJhc2VQdHIsIHNpemVfdCkKK3ZvaWQgZnJlZVZp cnR1YWxQYWdlcyhLaW5kIGtpbmQsIHZvaWQqIGJhc2VQdHIsIHNpemVfdCBzaXplKQogewogICAg IGlmICghYmFzZVB0cikKICAgICAgICAgcmV0dXJuOwogICAgIFJFTEVBU0VfQVNTRVJUKGlzQ2Fn ZWQoa2luZCwgYmFzZVB0cikpOwotICAgIGJtYWxsb2M6OmFwaTo6ZnJlZUxhcmdlVmlydHVhbChi YXNlUHRyLCBibWFsbG9jOjpoZWFwS2luZChraW5kKSk7CisgICAgYm1hbGxvYzo6YXBpOjpmcmVl TGFyZ2VWaXJ0dWFsKGJhc2VQdHIsIHNpemUsIGJtYWxsb2M6OmhlYXBLaW5kKGtpbmQpKTsKICAg ICBXVEY6OmNvbXBpbGVyRmVuY2UoKTsKIH0KIApJbmRleDogU291cmNlL2JtYWxsb2MvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9ibWFsbG9jL0NoYW5nZUxvZwkocmV2aXNpb24gMjMw MzE3KQorKysgU291cmNlL2JtYWxsb2MvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMg KzEsMjUgQEAKKzIwMTgtMDQtMDUgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CisK KyAgICAgICAgYm1hbGxvYyB2aXJ0dWFsIGFsbG9jYXRpb24gQVBJIHNob3VsZCBub3QgdHJlYXQg bWVtb3J5IGl0IHZlbmRzIGFzIGRpcnR5IHdpdGggcmVzcGVjdCB0byBob3cgaXQgZHJpdmVzIHRo ZSBzY2F2ZW5nZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4NDM0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgTGFtLgorCisgICAgICAgIEN1 cnJlbnRseSwgdGhlIG9ubHkgdXNlciBvZiB0aGlzIEFQSSBpcyBXYXNtLiBJZGVhbGx5LCBXYXNt IHdvdWxkIHRlbGwKKyAgICAgICAgdXMgZXhhY3RseSB3aGljaCBwYWdlIGlzIGRpcnRpZWQuIFdl IHNob3VsZCByZWFsbHkgZG8gdGhhdCBhdCBzb21lIHBvaW50OgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0MjA3CisgICAgICAgIAorICAgICAgICBI b3dldmVyLCB1bnRpbCB3ZSBkbyB0aGF0LCBpdCdzIGJldHRlciB0byB0cmVhdCBub25lIG9mIHRo ZSB2aXJ0dWFsIG1lbW9yeQorICAgICAgICB3ZSB2ZW5kIGFzIGRpcnR5LCB2ZXJzdXMgd2hhdCB3 ZSBkbyBub3csIHdoaWNoIGlzIHRyZWF0IGl0IGFsbCBhcyBkaXJ0eS4KKyAgICAgICAgVGhpcyBk aXJ0eSBtZW1vcnkgdHJhY2tpbmcgaGVscHMgZHJpdmUgdGhlIHNjYXZlbmdlciwgc28gb24gaU9T LCBoYXZpbmcgdGhlCisgICAgICAgIHNjYXZlbmdlciB0aGluayBpdHMgdW5kZXIgbWVtb3J5IHBy ZXNzdXJlIGJlY2F1c2Ugb2YgbWVtb3J5IGl0IGNhbid0IGZyZWUgaXNuJ3QKKyAgICAgICAgdXNl ZnVsLgorCisgICAgICAgICogYm1hbGxvYy9ibWFsbG9jLmNwcDoKKyAgICAgICAgKGJtYWxsb2M6 OmFwaTo6dHJ5TGFyZ2VaZXJvZWRNZW1hbGlnblZpcnR1YWwpOgorICAgICAgICAoYm1hbGxvYzo6 YXBpOjpmcmVlTGFyZ2VWaXJ0dWFsKToKKyAgICAgICAgKiBibWFsbG9jL2JtYWxsb2MuaDoKKwog MjAxOC0wNC0wNSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAogICAgICAgICBJ c29IZWFwSW1wbCBub3QgSXNvSGVhcEltcGxCYXNlIHNob3VsZCBhZGQgaXRzZWxmIHRvIEFsbElz b0hlYXBzCkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL2JtYWxsb2MuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvYm1hbGxvYy5jcHAJKHJldmlzaW9uIDIzMDMx NSkKKysrIFNvdXJjZS9ibWFsbG9jL2JtYWxsb2MvYm1hbGxvYy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTU0LDYgKzU0LDEzIEBAIHZvaWQqIHRyeUxhcmdlWmVyb2VkTWVtYWxpZ25WaXJ0dWFsKHNp emUKICAgICB7CiAgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxNdXRleD4gbG9jayhIZWFwOjptdXRl eCgpKTsKICAgICAgICAgcmVzdWx0ID0gaGVhcC50cnlBbGxvY2F0ZUxhcmdlKGxvY2ssIGFsaWdu bWVudCwgc2l6ZSk7CisgICAgICAgIGlmIChyZXN1bHQpIHsKKyAgICAgICAgICAgIC8vIERvbid0 IHRyYWNrIHRoaXMgYXMgZGlydHkgbWVtb3J5IHRoYXQgZGljdGF0ZXMgaG93IHdlIGRyaXZlIHRo ZSBzY2F2ZW5nZXIuCisgICAgICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1ha2UgaXQgc28g dGhhdCB1c2VycyBvZiB0aGlzIEFQSSBpbmZvcm0gYm1hbGxvYyB3aGljaAorICAgICAgICAgICAg Ly8gcGFnZXMgdGhleSBkaXJ0eToKKyAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODQyMDcKKyAgICAgICAgICAgIGhlYXAuZXh0ZXJuYWxEZWNv bW1pdChsb2NrLCByZXN1bHQsIHNpemUpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKHJl c3VsdCkKQEAgLTYxLDExICs2OCwxMyBAQCB2b2lkKiB0cnlMYXJnZVplcm9lZE1lbWFsaWduVmly dHVhbChzaXplCiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotdm9pZCBmcmVlTGFyZ2VWaXJ0dWFs KHZvaWQqIG9iamVjdCwgSGVhcEtpbmQga2luZCkKK3ZvaWQgZnJlZUxhcmdlVmlydHVhbCh2b2lk KiBvYmplY3QsIHNpemVfdCBzaXplLCBIZWFwS2luZCBraW5kKQogewogICAgIGtpbmQgPSBtYXBU b0FjdGl2ZUhlYXBLaW5kKGtpbmQpOwogICAgIEhlYXAmIGhlYXAgPSBQZXJQcm9jZXNzPFBlckhl YXBLaW5kPEhlYXA+Pjo6Z2V0KCktPmF0KGtpbmQpOwogICAgIHN0ZDo6bG9ja19ndWFyZDxNdXRl eD4gbG9jayhIZWFwOjptdXRleCgpKTsKKyAgICAvLyBCYWxhbmNlIG91dCB0aGUgZXh0ZXJuYWxE ZWNvbW1pdCB3aGVuIHdlIGFsbG9jYXRlZCB0aGUgemVyb2VkIHZpcnR1YWwgbWVtb3J5LgorICAg IGhlYXAuZXh0ZXJuYWxDb21taXQobG9jaywgb2JqZWN0LCBzaXplKTsKICAgICBoZWFwLmRlYWxs b2NhdGVMYXJnZShsb2NrLCBvYmplY3QpOwogfQogCkluZGV4OiBTb3VyY2UvYm1hbGxvYy9ibWFs bG9jL2JtYWxsb2MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYm1hbGxvYy9ibWFsbG9jL2JtYWxs b2MuaAkocmV2aXNpb24gMjMwMzE1KQorKysgU291cmNlL2JtYWxsb2MvYm1hbGxvYy9ibWFsbG9j LmgJKHdvcmtpbmcgY29weSkKQEAgLTgyLDcgKzgyLDcgQEAgaW5saW5lIHZvaWQgZnJlZSh2b2lk KiBvYmplY3QsIEhlYXBLaW5kIAogCiBCRVhQT1JUIHZvaWQgZnJlZU91dE9mTGluZSh2b2lkKiBv YmplY3QsIEhlYXBLaW5kIGtpbmQgPSBIZWFwS2luZDo6UHJpbWFyeSk7CiAKLUJFWFBPUlQgdm9p ZCBmcmVlTGFyZ2VWaXJ0dWFsKHZvaWQqIG9iamVjdCwgSGVhcEtpbmQga2luZCA9IEhlYXBLaW5k OjpQcmltYXJ5KTsKK0JFWFBPUlQgdm9pZCBmcmVlTGFyZ2VWaXJ0dWFsKHZvaWQqIG9iamVjdCwg c2l6ZV90LCBIZWFwS2luZCBraW5kID0gSGVhcEtpbmQ6OlByaW1hcnkpOwogCiBpbmxpbmUgdm9p ZCBzY2F2ZW5nZVRoaXNUaHJlYWQoKQogewo=